From 8553a8d63f97cfa8d64b5b2260e81f8c896a8398 Mon Sep 17 00:00:00 2001
From: nancy.liao <huihui.liao@greentest.com.cn>
Date: 周五, 23 5月 2025 18:36:03 +0800
Subject: [PATCH] 修改部分因为标准原因的报错
---
src/library/licensecc.cpp | 90 +++++++++++++++++++++++++++++++--------------
1 files changed, 62 insertions(+), 28 deletions(-)
diff --git a/src/library/licensecc.cpp b/src/library/licensecc.cpp
index c7484c3..948603a 100644
--- a/src/library/licensecc.cpp
+++ b/src/library/licensecc.cpp
@@ -1,12 +1,14 @@
//============================================================================
-// Name : license-manager-cpp.cpp
+// Name : licensecc.cpp
// Author :
// Version :
// Copyright : BSD
//============================================================================
+#define __STDC_WANT_LIB_EXT1__ 1
#include <fstream>
#include <stdio.h>
+#include <string.h>
#include <stdlib.h>
#include <cstring>
#include <iostream>
@@ -15,24 +17,47 @@
#include <licensecc/licensecc.h>
#include <licensecc_properties.h>
+#include "base/logger.h"
+#include "base/string_utils.h"
+#include "hw_identifier/hw_identifier_facade.hpp"
+#include "os/execution_environment.hpp"
#include "limits/license_verifier.hpp"
+#include "base/string_utils.h"
#include "LicenseReader.hpp"
-#include "pc-identifiers.h"
-
+#include "../test/functional/generate-license.h"
+using namespace license;
using namespace std;
-void print_error(char out_buffer[256], LicenseInfo* licenseInfo) {}
-bool identify_pc(IDENTIFICATION_STRATEGY pc_id_method, char* chbuffer, size_t bufSize) {
- PcSignature identifier_out;
- FUNCTION_RETURN result = FUNC_RET_BUFFER_TOO_SMALL;
- if (bufSize >= sizeof(PcSignature)) {
- result = generate_user_pc_signature(identifier_out, pc_id_method);
- strncpy(chbuffer, identifier_out, bufSize);
+void print_error(char out_buffer[LCC_API_ERROR_BUFFER_SIZE], LicenseInfo* licenseInfo) {}
+
+bool identify_pc(LCC_API_HW_IDENTIFICATION_STRATEGY pc_id_method, char* chbuffer, size_t* bufSize,
+ ExecutionEnvironmentInfo* execution_environment_info) {
+ bool result = false;
+ if (*bufSize > LCC_API_PC_IDENTIFIER_SIZE && chbuffer != nullptr) {
+ try {
+ const string pc_id = license::hw_identifier::HwIdentifierFacade::generate_user_pc_signature(pc_id_method);
+ license::mstrlcpy(chbuffer, pc_id.c_str(), *bufSize);
+ result = true;
+ } catch (const std::exception& ex) {
+ LOG_ERROR("Error calculating hw_identifier: %s", ex.what());
+#ifndef NDEBUG
+ cerr << "Error occurred in identify_pc: " << ex.what() << std::endl;
+#endif
+ }
+ } else {
+ *bufSize = LCC_API_PC_IDENTIFIER_SIZE + 1;
}
- return result == FUNC_RET_OK;
+ static const license::os::ExecutionEnvironment exec_env;
+ if (execution_environment_info != nullptr) {
+ execution_environment_info->cloud_provider = exec_env.cloud_provider();
+ execution_environment_info->virtualization = exec_env.virtualization();
+ execution_environment_info->virtualization_detail = exec_env.virtualization_detail();
+ }
+ return result;
}
static void mergeLicenses(const vector<LicenseInfo>& licenses, LicenseInfo* license_out) {
+
if (license_out != nullptr) {
int days_left = INT_MIN;
for (auto it = licenses.begin(); it != licenses.end(); it++) {
@@ -47,33 +72,38 @@
}
}
}
-
-EVENT_TYPE acquire_license(const CallerInformations* callerInformation, const LicenseLocation* licenseLocation,
- LicenseInfo* license_out) {
+LCC_EVENT_TYPE acquire_license(const CallerInformations* callerInformation, const LicenseLocation* licenseLocation,
+ LicenseInfo* license_out) {
const license::LicenseReader lr = license::LicenseReader(licenseLocation);
vector<license::FullLicenseInfo> licenses;
string project;
- if (callerInformation != nullptr && strlen(callerInformation->project_name) > 0) {
- project = string(callerInformation->project_name);
+ size_t str_size;
+ if (callerInformation != nullptr &&
+ (str_size = license::mstrnlen_s(callerInformation->feature_name, sizeof callerInformation->feature_name)) > 0) {
+ project = string(callerInformation->feature_name, str_size);
} else {
project = string(LCC_PROJECT_NAME);
}
license::EventRegistry er = lr.readLicenses(string(project), licenses);
- EVENT_TYPE result;
+ LCC_EVENT_TYPE result;
if (licenses.size() > 0) {
vector<LicenseInfo> licenses_with_errors;
vector<LicenseInfo> licenses_ok;
license::LicenseVerifier verifier(er);
- for (auto it = licenses.begin(); it != licenses.end(); it++) {
- FUNCTION_RETURN signatureValid = verifier.verify_signature(*it);
+ for (auto full_lic_info_it = licenses.begin(); full_lic_info_it != licenses.end(); full_lic_info_it++) {
+ if (callerInformation != nullptr) {
+ full_lic_info_it->m_magic = callerInformation->magic;
+ }
+ const FUNCTION_RETURN signatureValid = verifier.verify_signature(*full_lic_info_it);
+ LicenseInfo licInfo = verifier.toLicenseInfo(*full_lic_info_it);
if (signatureValid == FUNC_RET_OK) {
- if (verifier.verify_limits(*it) == FUNC_RET_OK) {
- licenses_ok.push_back(verifier.toLicenseInfo(*it));
+ if (verifier.verify_limits(*full_lic_info_it) == FUNC_RET_OK) {
+ licenses_ok.push_back(licInfo);
} else {
- licenses_with_errors.push_back(verifier.toLicenseInfo(*it));
+ licenses_with_errors.push_back(licInfo);
}
} else {
- licenses_with_errors.push_back(verifier.toLicenseInfo(*it));
+ licenses_with_errors.push_back(licInfo);
}
}
if (licenses_ok.size() > 0) {
@@ -94,16 +124,20 @@
license_out->days_left = 0;
}
}
-#ifdef _DEBUG
- cout << er << endl;
+#ifndef NDEBUG
+ const string evlog = er.to_string();
+ LOG_DEBUG("License status %s", evlog.c_str());
#endif
if (license_out != nullptr) {
- er.exportLastEvents(license_out->status, AUDIT_EVENT_NUM);
+ er.exportLastEvents(license_out->status, LCC_API_AUDIT_EVENT_NUM);
}
+
return result;
}
-EVENT_TYPE confirm_license(char* product, LicenseLocation licenseLocation) { return LICENSE_OK; }
-EVENT_TYPE release_license(char* product, LicenseLocation licenseLocation) { return LICENSE_OK; }
+
+LCC_EVENT_TYPE confirm_license(char* product, LicenseLocation licenseLocation) { return LICENSE_OK; }
+
+LCC_EVENT_TYPE release_license(char* product, LicenseLocation licenseLocation) { return LICENSE_OK; }
--
Gitblit v1.9.1