From d4429ffe976c2b29099dc1fdea822c50c94ff485 Mon Sep 17 00:00:00 2001
From: Maximilien Siavelis <maximilien.siavelis@simulease.com>
Date: 周六, 13 1月 2018 01:37:49 +0800
Subject: [PATCH] fix some issues
---
src/tools/license-generator/license-generator.cpp | 63 +++++++++++++++----------------
1 files changed, 31 insertions(+), 32 deletions(-)
diff --git a/src/tools/license-generator/license-generator.cpp b/src/tools/license-generator/license-generator.cpp
index 846d5d9..e929748 100644
--- a/src/tools/license-generator/license-generator.cpp
+++ b/src/tools/license-generator/license-generator.cpp
@@ -1,12 +1,13 @@
#include <build_properties.h>
-#include "LicenseSigner.h"
+#include <private-key.h>
#include "license-generator.h"
-#include "../library/base/StringUtils.h"
+#include "../base_lib/CryptoHelper.h"
#include <stdlib.h>
#include <stdio.h>
#include <iostream>
#include <string.h>
#include <iostream>
+#include <string.h>
#include <boost/date_time.hpp>
#include <boost/program_options.hpp>
#include <boost/algorithm/string.hpp>
@@ -76,7 +77,7 @@
if (vm.count("expire_date")) {
const std::string dt_end = vm["expire_date"].as<string>();
try {
- end_date = normalize_date(dt_end.c_str());
+ end_date = normalize_date(dt_end);
char curdate[20];
time_t curtime = time(NULL);
strftime(curdate, 20, "%Y-%m-%d", localtime(&curtime));
@@ -90,7 +91,7 @@
if (vm.count("begin_date")) {
const std::string begin_date_str = vm["begin_date"].as<string>();
try {
- begin_date = normalize_date(begin_date_str.c_str());
+ begin_date = normalize_date(begin_date_str);
} catch (invalid_argument &e) {
cerr << endl << "Begin date not recognized: " << begin_date_str
<< " Please enter a valid date in format YYYYMMDD" << endl;
@@ -103,22 +104,20 @@
client_signature = vm["client_signature"].as<string>();
//fixme match + and /
/*regex e("(A-Za-z0-9){4}-(A-Za-z0-9){4}-(A-Za-z0-9){4}-(A-Za-z0-9){4}");
- if (!regex_match(client_signature, e)) {
- cerr << endl << "Client signature not recognized: "
- << client_signature
- << " Please enter a valid signature in format XXXX-XXXX-XXXX-XXXX"
- << endl;
- exit(2);
- }*/
+ if (!regex_match(client_signature, e)) {
+ cerr << endl << "Client signature not recognized: "
+ << client_signature
+ << " Please enter a valid signature in format XXXX-XXXX-XXXX-XXXX"
+ << endl;
+ exit(2);
+ }*/
}
string extra_data = "";
if (vm.count("extra_data")) {
extra_data = vm["extra_data"].as<string>();
}
- unsigned int from_sw_version = vm["start_version"].as<
- unsigned int>();
- unsigned int to_sw_version =
- vm["end_version"].as<unsigned int>();
+ unsigned int from_sw_version = vm["start_version"].as<unsigned int>();
+ unsigned int to_sw_version = vm["end_version"].as<unsigned int>();
if (vm.count("product") == 0) {
cerr << endl << "Parameter [product] not found. " << endl;
exit(2);
@@ -140,12 +139,13 @@
void LicenseGenerator::generateAndOutputLicenses(const po::variables_map& vm,
ostream& outputFile) {
vector<FullLicenseInfo> licenseInfo = parseLicenseInfo(vm);
- license::LicenseSigner licSigner =
- vm.count("private_key") == 0 ?
- license::LicenseSigner() :
- license::LicenseSigner(vm["private_key"].as<string>());
+ unique_ptr<CryptoHelper> helper = CryptoHelper::getInstance();
+ const char pkey[] = PRIVATE_KEY;
+ size_t len = sizeof(pkey);
for (auto it = licenseInfo.begin(); it != licenseInfo.end(); ++it) {
- licSigner.signLicense(*it);
+ const string license = it->printForSign();
+ string signature = helper->signString((const void *)pkey,len,license);
+ it->license_signature = signature;
it->printAsIni(outputFile);
}
}
@@ -188,26 +188,25 @@
return 0;
}
-
-const std::string formats[] = { "%4u-%2u-%2u","%4u/%2u/%2u","%4u%2u%2u" };
+const std::string formats[] = { "%4u-%2u-%2u", "%4u/%2u/%2u", "%4u%2u%2u" };
const size_t formats_n = 3;
-string LicenseGenerator::normalize_date(const char * s) {
+string LicenseGenerator::normalize_date(const std::string& sDate) {
+ if(sDate.size()<8)
+ throw invalid_argument("Date string too small for known formats");
unsigned int year, month, day;
- int chread;
bool found = false;
- for (size_t i = 0; i < formats_n &&!found; ++i) {
- chread = sscanf(s, formats[i].c_str(),&year, &month, &day);
- if (chread == 3){
+ for (size_t i = 0; i < formats_n && !found; ++i) {
+ const int chread = sscanf(sDate.c_str(),formats[i].c_str(),&year,&month,&day);
+ if(chread==3) {
found = true;
+ break;
}
}
- if (!found){
- throw invalid_argument("Date not recognized.");
- }
+ if(!found)
+ throw invalid_argument("Date string did not match a known format");
ostringstream oss;
- oss << year << "-"<<setfill('0') << std::setw(2)<< month<<"-"<<day;
- //delete (facet);
+ oss << year << "-" << setfill('0') << std::setw(2) << month << "-" << setfill('0') << std::setw(2) << day;
return oss.str();
}
}
--
Gitblit v1.9.1