From d0b85cf10415a378c11d385066bb27116f2c2df1 Mon Sep 17 00:00:00 2001
From: Shahar Hadas <shaharhd@gmail.com>
Date: 周日, 10 5月 2020 19:18:01 +0800
Subject: [PATCH] Fix network detection for Windows OS (#94)
---
src/inspector/inspector.cpp | 102 ++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 76 insertions(+), 26 deletions(-)
diff --git a/src/inspector/inspector.cpp b/src/inspector/inspector.cpp
index e5ee64d..40cd281 100644
--- a/src/inspector/inspector.cpp
+++ b/src/inspector/inspector.cpp
@@ -1,18 +1,24 @@
#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/execution_environment.hpp"
+#include "../library/os/dmi_info.hpp"
using namespace std;
using namespace license::os;
-const map<int, string> stringByStrategyId = {{STRATEGY_DEFAULT, "DEFAULT"}, {STRATEGY_ETHERNET, "MAC"},
- {STRATEGY_IP_ADDRESS, "IP"}, {STRATEGY_DISK_NUM, "Disk1"},
- {STRATEGY_DISK_LABEL, "Disk2"}, {STRATEGY_NONE, "Custom"}};
-
+const map<int, string> stringByStrategyId = {{STRATEGY_DEFAULT, "DEFAULT"},
+ {STRATEGY_ETHERNET, "MAC"},
+ {STRATEGY_IP_ADDRESS, "IP"},
+ {STRATEGY_DISK_NUM, "Disk1"},
+ {STRATEGY_DISK_LABEL, "Disk2"}};
const unordered_map<int, string> descByVirtDetail = {{BARE_TO_METAL, "No virtualization"},
{VMWARE, "Vmware"},
@@ -20,10 +26,19 @@
{V_XEN, "XEN"},
{KVM, "KVM"},
{HV, "Microsoft Hypervisor"},
+ {PARALLELS, "Parallels Desktop"},
{V_OTHER, "Other type of vm"}};
-const unordered_map<int, string> descByVirt = {
- {VIRTUALIZATION::NONE, "No virtualization"}, {VIRTUALIZATION::VM, "VM"}, {VIRTUALIZATION::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)"},
+ {GOOGLE_CLOUD, "Google Cloud"},
+ {AZURE_CLOUD, "Microsoft Azure"},
+ {AWS, "Amazon AWS"},
+ {ALI_CLOUD, "Alibaba Cloud (Chinese cloud provider)"}};
const unordered_map<int, string> stringByEventType = {
{LICENSE_OK, "OK "},
@@ -43,40 +58,56 @@
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.feature_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;
}
int main(int argc, char* argv[]) {
- license::os::CpuInfo cpu;
- cout << "CpuVendor :" << cpu.vendor() << endl;
- cout << "Virtual machine :" << cpu.cpu_virtual() << endl;
- cout << "Cpu model :0x" << std::hex << ((long)cpu.model()) << std::dec << endl;
- cout << "Virt. detail cpu:" << descByVirtDetail.find(cpu.getVirtualizationDetail())->second << endl;
- ExecutionEnvironment execEnv;
- cout << "Running in cloud:" << execEnv.is_cloud() << endl;
- cout << "Docker :" << execEnv.is_docker() << endl;
- cout << "other container :" << execEnv.is_container() << endl;
- cout << "Virtualiz. class:" << descByVirt.find(execEnv.getVirtualization())->second << endl;
-
- cout << "Bios vendor :" << execEnv.bios_vendor() << endl;
- cout << "Bios description:" << execEnv.bios_description() << endl;
- cout << "System vendor :" << execEnv.sys_vendor() << endl;
-
char hw_identifier[LCC_API_PC_IDENTIFIER_SIZE + 1];
size_t bufSize = LCC_API_PC_IDENTIFIER_SIZE + 1;
+ ExecutionEnvironmentInfo exec_env_info;
for (const auto& x : stringByStrategyId) {
- if (identify_pc(static_cast<LCC_API_IDENTIFICATION_STRATEGY>(x.first), hw_identifier, &bufSize)) {
+ if (identify_pc(static_cast<LCC_API_HW_IDENTIFICATION_STRATEGY>(x.first), hw_identifier, &bufSize,
+ &exec_env_info)) {
std::cout << x.second << ':' << hw_identifier << std::endl;
} else {
std::cout << x.second << ": NA" << endl;
}
}
+ 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;
+ 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 << "==================" << endl;
if (argc == 2) {
const string fname(argv[1]);
ifstream license_file(fname);
@@ -86,4 +117,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;
+ }
+ }
}
--
Gitblit v1.9.1