const everywhere (#30)

lurumdare

2019-09-07 3b1577ab7eb2000a3477a0aa489b888fb1256434

 src/library/LicenseReader.cpp

@@ -2,7 +2,7 @@
 * LicenseReader.cpp
 *
 *  Created on: Mar 30, 2014
 *      Author: devel
 *      
 */

#ifdef _WIN32
@@ -18,15 +18,17 @@
#include <fstream>
#include <sstream>
#include <stdlib.h>
#include <math.h>
#include "pc-identifiers.h"
#include "LicenseReader.h"
#include "base/StringUtils.h"
#include "base/public-key.h"
#include "base/logger.h"
#include "public-key.h"
#include <build_properties.h>

#include "os/os-cpp.h"

namespace license {

const char *FullLicenseInfo::UNUSED_TIME = "0000-00-00";

FullLicenseInfo::FullLicenseInfo(const string& source, const string& product,
      const string& license_signature, int licenseVersion, string from_date,
@@ -49,28 +51,29 @@
EventRegistry FullLicenseInfo::validate(int sw_version) {
   EventRegistry er;
   os_initialize();
   bool sigVerified = OsFunctions::verifySignature(printForSign().c_str(),
   const FUNCTION_RETURN sigVer = verifySignature(printForSign().c_str(),
         license_signature.c_str());
   const bool sigVerified = sigVer == FUNC_RET_OK;
   if (sigVerified) {
      er.addEvent(LICENSE_VERIFIED, INFO);
      er.addEvent(LICENSE_VERIFIED, SVRT_INFO);
   } else {
      er.addEvent(LICENSE_CORRUPTED, SEVERITY_ERROR);
      er.addEvent(LICENSE_CORRUPTED, SVRT_ERROR);
   }
   if (has_expiry) {
      time_t now = time(NULL);
      const time_t now = time(NULL);
      if (expires_on() < now) {
         er.addEvent(PRODUCT_EXPIRED, SEVERITY_ERROR, "");
         er.addEvent(PRODUCT_EXPIRED, SVRT_ERROR, "");
      }
      if (valid_from() > now) {
         er.addEvent(PRODUCT_EXPIRED, SEVERITY_ERROR);
         er.addEvent(PRODUCT_EXPIRED, SVRT_ERROR);
      }
   }
   if (has_client_sig) {
      PcSignature str_code;
      strncpy(str_code, client_signature.c_str(), sizeof(str_code));
      EVENT_TYPE event = validate_pc_signature(str_code);
      strncpy(str_code, client_signature.c_str(), sizeof(str_code)-1);
      const EVENT_TYPE event = validate_pc_signature(str_code);
      if (event != LICENSE_OK) {
         er.addEvent(event, SEVERITY_ERROR);
         er.addEvent(event, SVRT_ERROR);
      }
   }
   return er;
@@ -88,9 +91,10 @@
         license->days_left = 999999;
      } else {
         strncpy(license->expiry_date, to_date.c_str(), 11);
         double secs = difftime(time(NULL),
               seconds_from_epoch(to_date.c_str()));
         license->days_left = (int) secs / 60 * 60 * 24;
         const double secs = difftime(
            seconds_from_epoch(to_date.c_str()),
            time(NULL));
         license->days_left = round(secs / (60 * 60 * 24));
      }
   }
}
@@ -112,17 +116,17 @@
   CSimpleIniA ini;
   for (auto it = diskFiles.begin(); it != diskFiles.end(); it++) {
      ini.Reset();
      SI_Error rc = ini.LoadFile((*it).c_str());
      const SI_Error rc = ini.LoadFile((*it).c_str());
      if (rc < 0) {
         result.addEvent(FILE_FORMAT_NOT_RECOGNIZED, SEVERITY_WARN, *it);
         result.addEvent(FILE_FORMAT_NOT_RECOGNIZED, SVRT_WARN, *it);
         continue;
      } else {
         loadAtLeastOneFile = true;
      }
      const char* productNamePtr = product.c_str();
      int sectionSize = ini.GetSectionSize(productNamePtr);
      const int sectionSize = ini.GetSectionSize(productNamePtr);
      if (sectionSize <= 0) {
         result.addEvent(PRODUCT_NOT_LICENSED, SEVERITY_WARN, *it);
         result.addEvent(PRODUCT_NOT_LICENSED, SVRT_WARN, *it);
         continue;
      } else {
         atLeastOneProductLicensed = true;
@@ -138,31 +142,34 @@
       */
      const char * license_signature = ini.GetValue(productNamePtr,
            "license_signature", NULL);
      long license_version = ini.GetLongValue(productNamePtr,
      const long license_version = ini.GetLongValue(productNamePtr,
            "license_version", -1);
      if (license_signature != NULL && license_version > 0) {
         string from_date = trim_copy(
         const string from_date = trim_copy(
               ini.GetValue(productNamePtr, "from_date",
                     FullLicenseInfo::UNUSED_TIME));
         string to_date = trim_copy(
         const string to_date = trim_copy(
               ini.GetValue(productNamePtr, "to_date",
                     FullLicenseInfo::UNUSED_TIME));
         string client_signature = trim_copy(
               ini.GetValue(productNamePtr, "client_signature", ""));
         client_signature.erase(
               std::remove(client_signature.begin(), client_signature.end(), '-'),
               client_signature.end());
         int from_sw_version = ini.GetLongValue(productNamePtr,
               "from_sw_version", FullLicenseInfo::UNUSED_SOFTWARE_VERSION);
         int to_sw_version = ini.GetLongValue(productNamePtr,
         /*client_signature.erase(
          std::remove(client_signature.begin(), client_signature.end(), '-'),
          client_signature.end());*/
         const int from_sw_version = ini.GetLongValue(productNamePtr,
               "from_sw_version",
               FullLicenseInfo::UNUSED_SOFTWARE_VERSION);
         const int to_sw_version = ini.GetLongValue(productNamePtr,
               "to_sw_version", FullLicenseInfo::UNUSED_SOFTWARE_VERSION);
         string extra_data = trim_copy(
               ini.GetValue(productNamePtr, "extra_data", ""));
         FullLicenseInfo licInfo(*it, product, license_signature,
               (int) license_version, from_date, to_date,
               client_signature,from_sw_version,to_sw_version);
               (int) license_version, from_date, to_date, client_signature,
               from_sw_version, to_sw_version, extra_data);
         licenseInfoOut.push_back(licInfo);
         atLeastOneLicenseComplete = true;
      } else {
         result.addEvent(LICENSE_MALFORMED, SEVERITY_WARN, *it);
         result.addEvent(LICENSE_MALFORMED, SVRT_WARN, *it);
      }
   }
   if (!loadAtLeastOneFile) {
@@ -184,8 +191,8 @@
   if (licenseLocation.licenseFileLocation != NULL
         && licenseLocation.licenseFileLocation[0] != '\0') {
      //hasFileLocation = true;
      string varName(licenseLocation.licenseFileLocation);
      vector<string> declared_positions = splitLicensePositions(varName);
      const string varName(licenseLocation.licenseFileLocation);
      const vector<string> declared_positions = splitLicensePositions(varName);
      vector<string> existing_pos = filterExistingFiles(declared_positions);
      if (existing_pos.size() > 0) {
         if (existing_pos.size() > 0) {
@@ -193,12 +200,11 @@
            for (auto it = existing_pos.begin(); it != existing_pos.end();
                  ++it) {
               diskFiles.push_back(*it);
               eventRegistry.addEvent(LICENSE_FILE_FOUND, INFO, *it);
               eventRegistry.addEvent(LICENSE_FILE_FOUND, SVRT_INFO, *it);
            }
         }
      } else {
         eventRegistry.addEvent(LICENSE_FILE_NOT_FOUND, SEVERITY_WARN,
               varName);
         eventRegistry.addEvent(LICENSE_FILE_NOT_FOUND, SVRT_WARN, varName);
      }
   }
   return licenseFoundWithExplicitLocation;
@@ -209,12 +215,12 @@
   bool licenseFileFoundWithEnvVariable = false;
   if (licenseLocation.environmentVariableName != NULL
         && licenseLocation.environmentVariableName[0] != '\0') {
      string varName(licenseLocation.environmentVariableName);
      const string varName(licenseLocation.environmentVariableName);
      if (varName.length() > 0) {
         //var name is passed in by the calling application.
         char* env_var_value = getenv(varName.c_str());
         if (env_var_value != NULL && env_var_value[0] != '\0') {
            vector<string> declared_positions = splitLicensePositions(
            const vector<string> declared_positions = splitLicensePositions(
                  string(env_var_value));
            vector<string> existing_pos = filterExistingFiles(
                  declared_positions);
@@ -223,19 +229,19 @@
               for (auto it = existing_pos.begin();
                     it != existing_pos.end(); ++it) {
                  diskFiles.push_back(*it);
                  eventRegistry.addEvent(LICENSE_FILE_FOUND, INFO, *it);
                  eventRegistry.addEvent(LICENSE_FILE_FOUND, SVRT_INFO,
                        *it);
               }
            } else {
               eventRegistry.addEvent(LICENSE_FILE_NOT_FOUND,
                     SEVERITY_WARN, env_var_value);
               eventRegistry.addEvent(LICENSE_FILE_NOT_FOUND, SVRT_WARN,
                     env_var_value);
            }
         } else {
            eventRegistry.addEvent(ENVIRONMENT_VARIABLE_NOT_DEFINED,
                  SEVERITY_WARN);
                  SVRT_WARN);
         }
      } else {
         eventRegistry.addEvent(ENVIRONMENT_VARIABLE_NOT_DEFINED,
               SEVERITY_WARN);
         eventRegistry.addEvent(ENVIRONMENT_VARIABLE_NOT_DEFINED, SVRT_WARN);
      }
   }
   return licenseFileFoundWithEnvVariable;
@@ -243,23 +249,30 @@

EventRegistry LicenseReader::getLicenseDiskFiles(vector<string>& diskFiles) {
   EventRegistry eventRegistry;
   bool licenseFoundWithExplicitLocation = findLicenseWithExplicitLocation(
   const bool licenseFoundWithExplicitLocation = findLicenseWithExplicitLocation(
         diskFiles, eventRegistry);
   bool foundNearModule = false;
   if (licenseLocation.openFileNearModule) {
      string temptativeLicense = OsFunctions::getModuleName() + ".lic";
      ifstream f(temptativeLicense.c_str());
      if (f.good()) {
         foundNearModule = true;
         diskFiles.push_back(temptativeLicense);
         eventRegistry.addEvent(LICENSE_FILE_FOUND, INFO, temptativeLicense);
      char fname[MAX_PATH] = { 0 };
      const FUNCTION_RETURN fret = getModuleName(fname);
      if (fret == FUNC_RET_OK) {
         const string temptativeLicense = string(fname) + ".lic";
         ifstream f(temptativeLicense.c_str());
         if (f.good()) {
            foundNearModule = true;
            diskFiles.push_back(temptativeLicense);
            eventRegistry.addEvent(LICENSE_FILE_FOUND, SVRT_INFO,
                  temptativeLicense);
         } else {
            eventRegistry.addEvent(LICENSE_FILE_NOT_FOUND, SVRT_WARN,
                  temptativeLicense);
         }
         f.close();
      } else {
         eventRegistry.addEvent(LICENSE_FILE_NOT_FOUND, SEVERITY_WARN,
               temptativeLicense);
         LOG_WARN("Error determining module name.");
      }
      f.close();
   }
   bool licenseFileFoundWithEnvVariable = findFileWithEnvironmentVariable(
   const bool licenseFileFoundWithEnvVariable = findFileWithEnvironmentVariable(
         diskFiles, eventRegistry);

   if (!foundNearModule && !licenseFoundWithExplicitLocation
@@ -326,7 +339,7 @@
void FullLicenseInfo::printAsIni(ostream & a_ostream) const {
   CSimpleIniA ini;
   string result;
   string product = toupper_copy(trim_copy(this->product));
   const string product = toupper_copy(trim_copy(this->product));
   CSimpleIniA::StreamWriter sw(a_ostream);
   ini.SetLongValue(product.c_str(), "license_version",
   PROJECT_INT_VERSION);