From bf76bcf6c991746ccb95f07bc3baa066bdab3025 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周日, 08 12月 2019 17:36:20 +0800
Subject: [PATCH] fix new tests
---
src/library/LicenseReader.cpp | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/library/LicenseReader.cpp b/src/library/LicenseReader.cpp
index 0bb9262..a85b1ca 100644
--- a/src/library/LicenseReader.cpp
+++ b/src/library/LicenseReader.cpp
@@ -34,6 +34,7 @@
#include "locate/LocatorFactory.hpp"
namespace license {
+using namespace std;
FullLicenseInfo::FullLicenseInfo(const string &source, const string &product, const string &license_signature)
: source(source),
@@ -42,7 +43,7 @@
LicenseReader::LicenseReader(const LicenseLocation *licenseLocation) : licenseLocation(licenseLocation) {}
-EventRegistry LicenseReader::readLicenses(const string &product, vector<FullLicenseInfo> &licenseInfoOut) {
+EventRegistry LicenseReader::readLicenses(const string &product, vector<FullLicenseInfo> &licenseInfoOut) const {
vector<string> diskFiles;
vector<unique_ptr<locate::LocatorStrategy>> locator_strategies;
FUNCTION_RETURN ret = locate::LocatorFactory::get_active_strategies(locator_strategies, licenseLocation);
@@ -54,6 +55,8 @@
}
bool atLeastOneLicenseComplete = false;
+ const string product_up = toupper_copy(product);
+ const char *productNamePtr = product_up.c_str();
for (unique_ptr<locate::LocatorStrategy> &locator : locator_strategies) {
vector<string> licenseLocations = locator->license_locations(eventRegistry);
if (licenseLocations.size() == 0) {
@@ -62,13 +65,12 @@
CSimpleIniA ini;
for (auto it = licenseLocations.begin(); it != licenseLocations.end(); it++) {
ini.Reset();
- string license = locator->retrieve_license_content((*it).c_str());
+ const string license = locator->retrieve_license_content((*it).c_str());
const SI_Error rc = ini.LoadData(license.c_str(), license.size());
if (rc < 0) {
eventRegistry.addEvent(FILE_FORMAT_NOT_RECOGNIZED, *it);
continue;
}
- const char *productNamePtr = product.c_str();
const int sectionSize = ini.GetSectionSize(productNamePtr);
if (sectionSize <= 0) {
eventRegistry.addEvent(PRODUCT_NOT_LICENSED, *it);
@@ -85,8 +87,8 @@
* sig = XXXXXXXXXX (mandatory, 1024)
* application_data = xxxxxxxxx (optional string 16)
*/
- const char *license_signature = ini.GetValue(productNamePtr, "sig", nullptr);
- long license_version = ini.GetLongValue(productNamePtr, "lic_ver", -1);
+ const char *license_signature = ini.GetValue(productNamePtr, LICENSE_SIGNATURE, nullptr);
+ long license_version = ini.GetLongValue(productNamePtr, LICENSE_VERSION, -1);
if (license_signature != nullptr && license_version == 200) {
CSimpleIniA::TNamesDepend keys;
ini.GetAllKeys(productNamePtr, keys);
@@ -119,7 +121,7 @@
}
#ifdef _DEBUG
- cout << "[" << oss.str() << "]" << endl;
+ cout << "license to sign [" << oss.str() << "]" << endl;
#endif
return oss.str();
}
--
Gitblit v1.9.1