From b446e4d14a0694d23573d77672ef6d70c51d6a08 Mon Sep 17 00:00:00 2001
From: Maximilien Siavelis <maximilien.siavelis@simulease.com>
Date: 周五, 05 1月 2018 09:10:37 +0800
Subject: [PATCH] make install and some cleanup
---
src/library/LicenseReader.cpp | 87 ++++++++++++++++++++++++-------------------
1 files changed, 48 insertions(+), 39 deletions(-)
diff --git a/src/library/LicenseReader.cpp b/src/library/LicenseReader.cpp
index bbddf04..e9abce6 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
@@ -21,12 +21,13 @@
#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 {
+
+const char *FullLicenseInfo::UNUSED_TIME = "0000-00-00";
FullLicenseInfo::FullLicenseInfo(const string& source, const string& product,
const string& license_signature, int licenseVersion, string from_date,
@@ -49,28 +50,29 @@
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, INFO);
+ er.addEvent(LICENSE_VERIFIED, SVRT_INFO);
} else {
- er.addEvent(LICENSE_CORRUPTED, SEVERITY_ERROR);
+ er.addEvent(LICENSE_CORRUPTED, SVRT_ERROR);
}
if (has_expiry) {
time_t now = time(NULL);
if (expires_on() < now) {
- er.addEvent(PRODUCT_EXPIRED, SEVERITY_ERROR, "");
+ er.addEvent(PRODUCT_EXPIRED, SVRT_ERROR, "");
}
if (valid_from() > now) {
- er.addEvent(PRODUCT_EXPIRED, SEVERITY_ERROR);
+ er.addEvent(PRODUCT_EXPIRED, SVRT_ERROR);
}
}
if (has_client_sig) {
- UserPcIdentifier str_code;
+ PcSignature str_code;
strncpy(str_code, client_signature.c_str(), sizeof(str_code));
- EVENT_TYPE event = validate_user_pc_identifier(str_code);
+ EVENT_TYPE event = validate_pc_signature(str_code);
if (event != LICENSE_OK) {
- er.addEvent(event, SEVERITY_ERROR);
+ er.addEvent(event, SVRT_ERROR);
}
}
return er;
@@ -114,7 +116,7 @@
ini.Reset();
SI_Error rc = ini.LoadFile((*it).c_str());
if (rc < 0) {
- result.addEvent(FILE_FORMAT_NOT_RECOGNIZED, SEVERITY_WARN, *it);
+ result.addEvent(FILE_FORMAT_NOT_RECOGNIZED, SVRT_WARN, *it);
continue;
} else {
loadAtLeastOneFile = true;
@@ -122,7 +124,7 @@
const char* productNamePtr = product.c_str();
int sectionSize = ini.GetSectionSize(productNamePtr);
if (sectionSize <= 0) {
- result.addEvent(PRODUCT_NOT_LICENSED, SEVERITY_WARN, *it);
+ result.addEvent(PRODUCT_NOT_LICENSED, SVRT_WARN, *it);
continue;
} else {
atLeastOneProductLicensed = true;
@@ -149,20 +151,21 @@
FullLicenseInfo::UNUSED_TIME));
string client_signature = trim_copy(
ini.GetValue(productNamePtr, "client_signature", ""));
- client_signature.erase(
- std::remove(client_signature.begin(), client_signature.end(), '-'),
- client_signature.end());
+ /*client_signature.erase(
+ 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);
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);
licenseInfoOut.push_back(licInfo);
atLeastOneLicenseComplete = true;
} else {
- result.addEvent(LICENSE_MALFORMED, SEVERITY_WARN, *it);
+ result.addEvent(LICENSE_MALFORMED, SVRT_WARN, *it);
}
}
if (!loadAtLeastOneFile) {
@@ -193,12 +196,11 @@
for (auto it = existing_pos.begin(); it != existing_pos.end();
++it) {
diskFiles.push_back(*it);
- eventRegistry.addEvent(LICENSE_FILE_FOUND, INFO, *it);
+ eventRegistry.addEvent(LICENSE_FILE_FOUND, SVRT_INFO, *it);
}
}
} else {
- eventRegistry.addEvent(LICENSE_FILE_NOT_FOUND, SEVERITY_WARN,
- varName);
+ eventRegistry.addEvent(LICENSE_FILE_NOT_FOUND, SVRT_WARN, varName);
}
}
return licenseFoundWithExplicitLocation;
@@ -223,19 +225,19 @@
for (auto it = existing_pos.begin();
it != existing_pos.end(); ++it) {
diskFiles.push_back(*it);
- eventRegistry.addEvent(LICENSE_FILE_FOUND, INFO, *it);
+ eventRegistry.addEvent(LICENSE_FILE_FOUND, SVRT_INFO,
+ *it);
}
} else {
- eventRegistry.addEvent(LICENSE_FILE_NOT_FOUND,
- SEVERITY_WARN, env_var_value);
+ eventRegistry.addEvent(LICENSE_FILE_NOT_FOUND, SVRT_WARN,
+ env_var_value);
}
} else {
eventRegistry.addEvent(ENVIRONMENT_VARIABLE_NOT_DEFINED,
- SEVERITY_WARN);
+ SVRT_WARN);
}
} else {
- eventRegistry.addEvent(ENVIRONMENT_VARIABLE_NOT_DEFINED,
- SEVERITY_WARN);
+ eventRegistry.addEvent(ENVIRONMENT_VARIABLE_NOT_DEFINED, SVRT_WARN);
}
}
return licenseFileFoundWithEnvVariable;
@@ -247,17 +249,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, 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, SEVERITY_WARN,
- temptativeLicense);
+ LOG_WARN("Error determining module name.");
}
- f.close();
}
bool licenseFileFoundWithEnvVariable = findFileWithEnvironmentVariable(
diskFiles, eventRegistry);
--
Gitblit v1.9.1