From 4fb532ff2445046e02f59e969647cf686da7c66e Mon Sep 17 00:00:00 2001
From: Gabriele Contini <contini.mailing@gmail.com>
Date: 周六, 02 5月 2020 10:20:38 +0800
Subject: [PATCH] rename StringUtils in string_utls
---
src/library/locate/ExternalDefinition.cpp | 2
src/library/os/linux/execution_environment.cpp | 2
src/library/limits/license_verifier.cpp | 2
test/library/os_linux_test.cpp | 2
src/library/locate/EnvironmentVarData.cpp | 2
src/library/os/linux/dmi_info.cpp | 2
src/library/os/windows/network.cpp | 2
src/inspector/inspector.cpp | 66 ++++++++++++++++++++++++++-------
test/library/os/execution_environment_test.cpp | 2
src/library/os/windows/dmi_info.cpp | 2
src/library/base/string_utils.cpp | 2
src/library/locate/EnvironmentVarLocation.cpp | 2
src/library/os/linux/network.cpp | 2
test/library/os/network_test.cpp | 2
src/library/licensecc.cpp | 2
src/library/LicenseReader.cpp | 2
include/licensecc/datatypes.h | 14 ++++++
17 files changed, 80 insertions(+), 30 deletions(-)
diff --git a/include/licensecc/datatypes.h b/include/licensecc/datatypes.h
index f99e232..8a229ea 100644
--- a/include/licensecc/datatypes.h
+++ b/include/licensecc/datatypes.h
@@ -95,7 +95,19 @@
*/
typedef struct {
char version[LCC_API_VERSION_LENGTH + 1]; // software version in format xxxx[.xxxx.xxxx] //TODO
- char project_name[LCC_API_PROJECT_NAME_SIZE + 1]; // name of the project (must correspond to the name in the license)
+ /**
+ * Name of the feature you want to verify. If empty the default feature will be verified.
+ * Every project has a default feature that is equal to the project name.
+ * Every feature has a section in the license file:
+ * <pre>
+ * [feature_xx]
+ * sig=AAAA
+ * [bb]
+ * expiry-date
+ * </pre>
+ */
+ char feature_name[LCC_API_PROJECT_NAME_SIZE +
+ 1]; // name of the feature you' (must correspond to the name in the license)
/**
* this number passed in by the application must correspond to the magic number used when compiling the library.
* See cmake parameter -DLCC_PROJECT_MAGIC_NUM and licensecc_properties.h macro VERIFY_MAGIC
diff --git a/src/inspector/inspector.cpp b/src/inspector/inspector.cpp
index 3ec672c..1c4d0af 100644
--- a/src/inspector/inspector.cpp
+++ b/src/inspector/inspector.cpp
@@ -1,8 +1,13 @@
#include <iostream>
+#include <vector>
#include <map>
#include <unordered_map>
#include <licensecc/licensecc.h>
#include <fstream>
+#include <string.h>
+#include "../library/base/string_utils.h"
+#include "../library/ini/SimpleIni.h"
+#include "../library/os/dmi_info.hpp"
#include "../library/os/cpu_info.hpp"
#include "../library/os/dmi_info.hpp"
@@ -23,10 +28,9 @@
{HV, "Microsoft Hypervisor"},
{V_OTHER, "Other type of vm"}};
-const unordered_map<int, string> descByVirt = {
- {LCC_API_VIRTUALIZATION_SUMMARY::NONE, "No virtualization"},
- {LCC_API_VIRTUALIZATION_SUMMARY::VM, "Virtual machine"},
- {LCC_API_VIRTUALIZATION_SUMMARY::CONTAINER, "Container"}};
+const unordered_map<int, string> descByVirt = {{LCC_API_VIRTUALIZATION_SUMMARY::NONE, "No virtualization"},
+ {LCC_API_VIRTUALIZATION_SUMMARY::VM, "Virtual machine"},
+ {LCC_API_VIRTUALIZATION_SUMMARY::CONTAINER, "Container"}};
const unordered_map<int, string> descByCloudProvider = {{PROV_UNKNOWN, "Provider unknown"},
{ON_PREMISE, "On premise hardware (no cloud)"},
@@ -53,11 +57,27 @@
std::copy(fname.begin(), fname.end(), licLocation.licenseData);
LCC_EVENT_TYPE result = acquire_license(nullptr, &licLocation, &licenseInfo);
if (result == LICENSE_OK) {
- cout << "license OK" << endl;
+ cout << "default project [" << LCC_PROJECT_NAME << "]: license OK" << endl;
} else {
- cerr << stringByEventType.find(result)->second << endl;
+ cerr << "default project [" << LCC_PROJECT_NAME << "]:" << stringByEventType.find(result)->second << endl;
}
-
+ CSimpleIniA ini;
+ ini.LoadFile(fname.c_str());
+ CSimpleIniA::TNamesDepend sections;
+ ini.GetAllSections(sections);
+ CallerInformations callerInformation;
+ for (CSimpleIniA::Entry section : sections) {
+ const string section_name(section.pItem, 15);
+ if (section_name != LCC_PROJECT_NAME) {
+ std::copy(section_name.begin(), section_name.end(), callerInformation.project_name);
+ LCC_EVENT_TYPE result = acquire_license(&callerInformation, &licLocation, &licenseInfo);
+ if (result == LICENSE_OK) {
+ cout << "project [" << section.pItem << "]: license OK" << endl;
+ } else {
+ cerr << "project [" << section.pItem << "]" << stringByEventType.find(result)->second << endl;
+ }
+ }
+ }
return result;
}
@@ -75,19 +95,18 @@
}
cout << "Virtualiz. class :" << descByVirt.find(exec_env_info.virtualization)->second << endl;
cout << "Virtualiz. detail:" << descByVirtDetail.find(exec_env_info.virtualization_detail)->second << endl;
- cout << "Cloud provider :" << descByCloudProvider.find(exec_env_info.cloud_provider)->second << endl
- << "=============" << endl;
+ cout << "Cloud provider :" << descByCloudProvider.find(exec_env_info.cloud_provider)->second << endl;
+
license::os::CpuInfo cpu;
cout << "Cpu Vendor :" << cpu.vendor() << endl;
cout << "Cpu Brand :" << cpu.brand() << endl;
cout << "Cpu hypervisor :" << cpu.is_hypervisor_set() << endl;
cout << "Cpu model :0x" << std::hex << ((long)cpu.model()) << std::dec << endl;
license::os::DmiInfo dmi_info;
- cout << "Bios vendor :" << dmi_info.bios_vendor() << endl;
- cout << "Bios description:" << dmi_info.bios_description() << endl;
- cout << "System vendor :" << dmi_info.sys_vendor() << endl << endl;
-
-
+ cout << "Bios vendor :" << dmi_info.bios_vendor() << endl;
+ cout << "Bios description :" << dmi_info.bios_description() << endl;
+ cout << "System vendor :" << dmi_info.sys_vendor() << endl << endl;
+ cout << "==================" << endl;
if (argc == 2) {
const string fname(argv[1]);
ifstream license_file(fname);
@@ -97,4 +116,23 @@
cerr << "license file :" << fname << " not found." << endl;
}
}
+ bool find_license_with_env_var = FIND_LICENSE_WITH_ENV_VAR;
+ if (find_license_with_env_var) {
+ char* env_var_value = getenv(LCC_LICENSE_LOCATION_ENV_VAR);
+ if (env_var_value != nullptr && env_var_value[0] != '\0') {
+ cout << "environment variable [" << LCC_LICENSE_LOCATION_ENV_VAR << "] value [" << env_var_value << "]"
+ << endl;
+ const vector<string> declared_licenses = license::split_string(string(env_var_value), ';');
+ for (string fname : declared_licenses) {
+ ifstream license_file(fname);
+ if (license_file.good()) {
+ verifyLicense(fname);
+ } else {
+ cerr << "license file :" << fname << " not found." << endl;
+ }
+ }
+ } else {
+ cout << "environment variable [" << LCC_LICENSE_LOCATION_ENV_VAR << "] configured but not defined." << endl;
+ }
+ }
}
diff --git a/src/library/LicenseReader.cpp b/src/library/LicenseReader.cpp
index 673bb1d..5d071c3 100644
--- a/src/library/LicenseReader.cpp
+++ b/src/library/LicenseReader.cpp
@@ -26,7 +26,7 @@
#include "base/base.h"
#include "LicenseReader.hpp"
-#include "base/StringUtils.h"
+#include "base/string_utils.h"
#include "base/logger.h"
#include "locate/LocatorFactory.hpp"
diff --git a/src/library/base/string_utils.cpp b/src/library/base/string_utils.cpp
index 1d5d27b..74b0458 100644
--- a/src/library/base/string_utils.cpp
+++ b/src/library/base/string_utils.cpp
@@ -13,7 +13,7 @@
#include <algorithm>
#include <stdexcept>
#include <regex>
-#include "StringUtils.h"
+#include "string_utils.h"
#ifdef _WIN32
#include <time.h> //mktime under windows
diff --git a/src/library/licensecc.cpp b/src/library/licensecc.cpp
index dd377e1..087d7cf 100644
--- a/src/library/licensecc.cpp
+++ b/src/library/licensecc.cpp
@@ -21,7 +21,7 @@
#include "hw_identifier/hw_identifier_facade.hpp"
#include "os/execution_environment.hpp"
#include "limits/license_verifier.hpp"
-#include "base/StringUtils.h"
+#include "base/string_utils.h"
#include "LicenseReader.hpp"
using namespace std;
diff --git a/src/library/limits/license_verifier.cpp b/src/library/limits/license_verifier.cpp
index 71c2cc8..cfd89c0 100644
--- a/src/library/limits/license_verifier.cpp
+++ b/src/library/limits/license_verifier.cpp
@@ -9,7 +9,7 @@
#include <licensecc_properties.h>
#include "license_verifier.hpp"
-#include "../base/StringUtils.h"
+#include "../base/string_utils.h"
#include "../os/signature_verifier.hpp"
#include "../hw_identifier/hw_identifier_facade.hpp"
diff --git a/src/library/locate/EnvironmentVarData.cpp b/src/library/locate/EnvironmentVarData.cpp
index 707d6a5..21dc9ea 100644
--- a/src/library/locate/EnvironmentVarData.cpp
+++ b/src/library/locate/EnvironmentVarData.cpp
@@ -16,7 +16,7 @@
#include "../base/base64.h"
#include "../base/EventRegistry.h"
-#include "../base/StringUtils.h"
+#include "../base/string_utils.h"
namespace license {
namespace locate {
diff --git a/src/library/locate/EnvironmentVarLocation.cpp b/src/library/locate/EnvironmentVarLocation.cpp
index e74228a..e029483 100644
--- a/src/library/locate/EnvironmentVarLocation.cpp
+++ b/src/library/locate/EnvironmentVarLocation.cpp
@@ -7,7 +7,7 @@
#include <licensecc_properties.h>
-#include "../base/StringUtils.h"
+#include "../base/string_utils.h"
#include "EnvironmentVarLocation.hpp"
#include "../base/file_utils.hpp"
diff --git a/src/library/locate/ExternalDefinition.cpp b/src/library/locate/ExternalDefinition.cpp
index a5309de..a7386de 100644
--- a/src/library/locate/ExternalDefinition.cpp
+++ b/src/library/locate/ExternalDefinition.cpp
@@ -14,7 +14,7 @@
#include "../base/base64.h"
#include "../base/EventRegistry.h"
-#include "../base/StringUtils.h"
+#include "../base/string_utils.h"
#include "ExternalDefinition.hpp"
#include "../base/file_utils.hpp"
diff --git a/src/library/os/linux/dmi_info.cpp b/src/library/os/linux/dmi_info.cpp
index c5d388d..e03cbd4 100644
--- a/src/library/os/linux/dmi_info.cpp
+++ b/src/library/os/linux/dmi_info.cpp
@@ -1,6 +1,6 @@
#include "../../base/file_utils.hpp"
-#include "../../base/StringUtils.h"
+#include "../../base/string_utils.h"
#include "../dmi_info.hpp"
diff --git a/src/library/os/linux/execution_environment.cpp b/src/library/os/linux/execution_environment.cpp
index a00df29..75520eb 100644
--- a/src/library/os/linux/execution_environment.cpp
+++ b/src/library/os/linux/execution_environment.cpp
@@ -18,7 +18,7 @@
#include "../cpu_info.hpp"
#include "../execution_environment.hpp"
#include "../../base/file_utils.hpp"
-#include "../../base/StringUtils.h"
+#include "../../base/string_utils.h"
namespace license {
namespace os {
diff --git a/src/library/os/linux/network.cpp b/src/library/os/linux/network.cpp
index 1f7a76a..4e8ccda 100644
--- a/src/library/os/linux/network.cpp
+++ b/src/library/os/linux/network.cpp
@@ -28,7 +28,7 @@
#include <string.h>
#include <memory.h>
-#include "../../base/StringUtils.h"
+#include "../../base/string_utils.h"
#include "../../base/logger.h"
#include "../network.hpp"
diff --git a/src/library/os/windows/dmi_info.cpp b/src/library/os/windows/dmi_info.cpp
index 0b9103a..618be23 100644
--- a/src/library/os/windows/dmi_info.cpp
+++ b/src/library/os/windows/dmi_info.cpp
@@ -8,7 +8,7 @@
#include <windows.h>
#include "isvm/BIOSReader.h"
#include "isvm/Native.h"
-#include "../../base/StringUtils.h"
+#include "../../base/string_utils.h"
#include "../dmi_info.hpp"
namespace license {
diff --git a/src/library/os/windows/network.cpp b/src/library/os/windows/network.cpp
index 6334b9d..f3ccd2d 100644
--- a/src/library/os/windows/network.cpp
+++ b/src/library/os/windows/network.cpp
@@ -17,7 +17,7 @@
#include <stdio.h>
//#pragma comment(lib, "IPHLPAPI.lib")
-#include "../../base/StringUtils.h"
+#include "../../base/string_utils.h"
#include "../../base/logger.h"
#include "../network.hpp"
diff --git a/test/library/os/execution_environment_test.cpp b/test/library/os/execution_environment_test.cpp
index 14a2abc..be9256c 100644
--- a/test/library/os/execution_environment_test.cpp
+++ b/test/library/os/execution_environment_test.cpp
@@ -5,7 +5,7 @@
#include <licensecc_properties.h>
#include <licensecc_properties_test.h>
-#include "../../../src/library/base/StringUtils.h"
+#include "../../../src/library/base/string_utils.h"
#include "../../../src/library/os/network.hpp"
#include "../../../src/library/os/execution_environment.hpp"
diff --git a/test/library/os/network_test.cpp b/test/library/os/network_test.cpp
index f5a7483..50e4254 100644
--- a/test/library/os/network_test.cpp
+++ b/test/library/os/network_test.cpp
@@ -5,7 +5,7 @@
#include <licensecc_properties.h>
#include <licensecc_properties_test.h>
-#include "../../../src/library/base/StringUtils.h"
+#include "../../../src/library/base/string_utils.h"
#include "../../../src/library/os/network.hpp"
#include "../../../src/library/os/execution_environment.hpp"
diff --git a/test/library/os_linux_test.cpp b/test/library/os_linux_test.cpp
index 510d50f..68d3c76 100644
--- a/test/library/os_linux_test.cpp
+++ b/test/library/os_linux_test.cpp
@@ -5,7 +5,7 @@
#include <licensecc_properties.h>
#include <licensecc_properties_test.h>
-#include "../../src/library/base/StringUtils.h"
+#include "../../src/library/base/string_utils.h"
#include "../../src/library/os/os.h"
#include "../../src/library/os/execution_environment.hpp"
--
Gitblit v1.9.1