From 59521087f7c80c40525b17431f2988a815a842a0 Mon Sep 17 00:00:00 2001
From: Maximilien Siavelis <m@siav.pw>
Date: 周一, 06 5月 2019 00:51:57 +0800
Subject: [PATCH] Merge pull request #20 from willamowius/master
---
src/library/LicenseReader.cpp | 71 ++++++++++++++++++++---------------
1 files changed, 41 insertions(+), 30 deletions(-)
diff --git a/src/library/LicenseReader.cpp b/src/library/LicenseReader.cpp
index 4beb067..06a068c 100644
--- a/src/library/LicenseReader.cpp
+++ b/src/library/LicenseReader.cpp
@@ -2,7 +2,7 @@
* LicenseReader.cpp
*
* Created on: Mar 30, 2014
- * Author: devel
+ *
*/
#ifdef _WIN32
@@ -18,13 +18,13 @@
#include <fstream>
#include <sstream>
#include <stdlib.h>
+#include <math.h>
#include "pc-identifiers.h"
#include "LicenseReader.h"
#include "base/StringUtils.h"
-#include "base/public-key.h"
+#include "base/logger.h"
+#include "public-key.h"
#include <build_properties.h>
-
-#include "os/os-cpp.h"
namespace license {
@@ -51,8 +51,9 @@
EventRegistry FullLicenseInfo::validate(int sw_version) {
EventRegistry er;
os_initialize();
- bool sigVerified = OsFunctions::verifySignature(printForSign().c_str(),
+ FUNCTION_RETURN sigVer = verifySignature(printForSign().c_str(),
license_signature.c_str());
+ bool sigVerified = sigVer == FUNC_RET_OK;
if (sigVerified) {
er.addEvent(LICENSE_VERIFIED, SVRT_INFO);
} else {
@@ -69,7 +70,7 @@
}
if (has_client_sig) {
PcSignature str_code;
- strncpy(str_code, client_signature.c_str(), sizeof(str_code));
+ strncpy(str_code, client_signature.c_str(), sizeof(str_code)-1);
EVENT_TYPE event = validate_pc_signature(str_code);
if (event != LICENSE_OK) {
er.addEvent(event, SVRT_ERROR);
@@ -90,9 +91,10 @@
license->days_left = 999999;
} else {
strncpy(license->expiry_date, to_date.c_str(), 11);
- double secs = difftime(time(NULL),
- seconds_from_epoch(to_date.c_str()));
- license->days_left = (int) secs / 60 * 60 * 24;
+ double secs = difftime(
+ seconds_from_epoch(to_date.c_str()),
+ time(NULL));
+ license->days_left = round(secs / (60 * 60 * 24));
}
}
}
@@ -152,15 +154,18 @@
string client_signature = trim_copy(
ini.GetValue(productNamePtr, "client_signature", ""));
/*client_signature.erase(
- std::remove(client_signature.begin(), client_signature.end(), '-'),
- client_signature.end());*/
+ std::remove(client_signature.begin(), client_signature.end(), '-'),
+ client_signature.end());*/
int from_sw_version = ini.GetLongValue(productNamePtr,
- "from_sw_version", FullLicenseInfo::UNUSED_SOFTWARE_VERSION);
+ "from_sw_version",
+ FullLicenseInfo::UNUSED_SOFTWARE_VERSION);
int to_sw_version = ini.GetLongValue(productNamePtr,
"to_sw_version", FullLicenseInfo::UNUSED_SOFTWARE_VERSION);
+ string extra_data = trim_copy(
+ ini.GetValue(productNamePtr, "extra_data", ""));
FullLicenseInfo licInfo(*it, product, license_signature,
- (int) license_version, from_date, to_date,
- client_signature,from_sw_version,to_sw_version);
+ (int) license_version, from_date, to_date, client_signature,
+ from_sw_version, to_sw_version, extra_data);
licenseInfoOut.push_back(licInfo);
atLeastOneLicenseComplete = true;
} else {
@@ -199,8 +204,7 @@
}
}
} else {
- eventRegistry.addEvent(LICENSE_FILE_NOT_FOUND, SVRT_WARN,
- varName);
+ eventRegistry.addEvent(LICENSE_FILE_NOT_FOUND, SVRT_WARN, varName);
}
}
return licenseFoundWithExplicitLocation;
@@ -225,19 +229,19 @@
for (auto it = existing_pos.begin();
it != existing_pos.end(); ++it) {
diskFiles.push_back(*it);
- eventRegistry.addEvent(LICENSE_FILE_FOUND, SVRT_INFO, *it);
+ eventRegistry.addEvent(LICENSE_FILE_FOUND, SVRT_INFO,
+ *it);
}
} else {
- eventRegistry.addEvent(LICENSE_FILE_NOT_FOUND,
- SVRT_WARN, env_var_value);
+ eventRegistry.addEvent(LICENSE_FILE_NOT_FOUND, SVRT_WARN,
+ env_var_value);
}
} else {
eventRegistry.addEvent(ENVIRONMENT_VARIABLE_NOT_DEFINED,
SVRT_WARN);
}
} else {
- eventRegistry.addEvent(ENVIRONMENT_VARIABLE_NOT_DEFINED,
- SVRT_WARN);
+ eventRegistry.addEvent(ENVIRONMENT_VARIABLE_NOT_DEFINED, SVRT_WARN);
}
}
return licenseFileFoundWithEnvVariable;
@@ -249,17 +253,24 @@
diskFiles, eventRegistry);
bool foundNearModule = false;
if (licenseLocation.openFileNearModule) {
- string temptativeLicense = OsFunctions::getModuleName() + ".lic";
- ifstream f(temptativeLicense.c_str());
- if (f.good()) {
- foundNearModule = true;
- diskFiles.push_back(temptativeLicense);
- eventRegistry.addEvent(LICENSE_FILE_FOUND, SVRT_INFO, temptativeLicense);
+ char fname[MAX_PATH] = { 0 };
+ FUNCTION_RETURN fret = getModuleName(fname);
+ if (fret == FUNC_RET_OK) {
+ string temptativeLicense = string(fname) + ".lic";
+ ifstream f(temptativeLicense.c_str());
+ if (f.good()) {
+ foundNearModule = true;
+ diskFiles.push_back(temptativeLicense);
+ eventRegistry.addEvent(LICENSE_FILE_FOUND, SVRT_INFO,
+ temptativeLicense);
+ } else {
+ eventRegistry.addEvent(LICENSE_FILE_NOT_FOUND, SVRT_WARN,
+ temptativeLicense);
+ }
+ f.close();
} else {
- eventRegistry.addEvent(LICENSE_FILE_NOT_FOUND, SVRT_WARN,
- temptativeLicense);
+ LOG_WARN("Error determining module name.");
}
- f.close();
}
bool licenseFileFoundWithEnvVariable = findFileWithEnvironmentVariable(
diskFiles, eventRegistry);
--
Gitblit v1.9.1