From ddec2c5c7b7842536d6d705c2de20f96e16c8aa8 Mon Sep 17 00:00:00 2001
From: rsanchez <rsanchez@curisit.net>
Date: Wed, 22 Oct 2014 17:38:57 +0000
Subject: [PATCH] #2021 feature - Added blocked request table and refactoring License actions
---
securis/src/main/java/net/curisit/securis/LicenseGenerator.java | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/securis/src/main/java/net/curisit/securis/LicenseGenerator.java b/securis/src/main/java/net/curisit/securis/LicenseGenerator.java
index 40954f4..b614e4d 100644
--- a/securis/src/main/java/net/curisit/securis/LicenseGenerator.java
+++ b/securis/src/main/java/net/curisit/securis/LicenseGenerator.java
@@ -11,7 +11,6 @@
import java.security.Signature;
import java.security.SignatureException;
import java.security.spec.InvalidKeySpecException;
-import java.text.MessageFormat;
import java.util.Date;
import java.util.Map;
import java.util.TreeMap;
@@ -57,13 +56,11 @@
* @return
* @throws SeCurisException
*/
- public LicenseBean generateLicense(RequestBean req, Map<String, Object> metadata, Date expirationDate, String licenseType, String licenseCode)
+ public LicenseBean generateLicense(RequestBean req, Map<String, Object> metadata, Date expirationDate, String licenseCode, String appName)
throws SeCurisException {
- LOG.info(MessageFormat.format("Generating license: MAC: {0}, Customer code: {1}, AppCode: {2}", req.getMacAddresses(), req.getCustomerCode(),
- req.getAppCode()));
+ LOG.debug("Generating license: MAC: {}, Customer code: {}, AppName: {}", req.getMacAddresses(), req.getCustomerCode(), appName);
LicenseBean license = new LicenseBean(req);
- license.setLicenseType(licenseType);
- license.setLicenseCode(licenseCode);
+ license.setAppName(appName);
license.setExpirationDate(expirationDate);
license.setMetadata(metadata);
sign(license);
@@ -82,7 +79,7 @@
SignedLicenseBean signedLic = new SignedLicenseBean(license);
byte[] json;
try {
- json = JsonUtils.toJSON(signedLic, true).getBytes("utf-8");
+ json = JsonUtils.toPrettyJSON(signedLic).getBytes("utf-8");
Files.write(Paths.get(file.toURI()), json, StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING);
} catch (UnsupportedEncodingException e) {
LOG.error("Error creating json doc from license: " + license, e);
@@ -97,7 +94,6 @@
}
/**
- * TODO: This method should be removed from client code.
*
* @param licBean
* @return
@@ -113,7 +109,8 @@
Signature signature;
try {
signature = Signature.getInstance(SignatureHelper.SIGNATURE_GENERATION_ALGORITHM);
- signature.initSign(sh.generatePrivateKey(new File(System.getProperty("user.home") + File.separator + ".SeCuris" + File.separator + "keys" + File.separator + "securis_private_key.pkcs8")));
+ signature.initSign(sh.generatePrivateKey(new File(System.getProperty("user.home") + File.separator + ".SeCuris" + File.separator + "keys"
+ + File.separator + "securis_private_key.pkcs8")));
sh.prepareSignature(signature, licBean);
@@ -147,7 +144,7 @@
metadata.put("timeThreshold", 0);
metadata.put("datasetPrefix", "BP");
metadata.put("extendedMode", true);
-
+
Date expirationDate = new Date(new Date().getTime() + (1000L * 3600 * 24 * 365 * 10));
LicenseBean lic = LicenseGenerator.getInstance().generateLicense(req, metadata, expirationDate, "CI-01", "LIC-CURISTEC-0001");
LicenseGenerator.getInstance().save(lic, new File("/Users/cproberto/Desktop/AxelLicCI.lic"));
@@ -156,4 +153,3 @@
}
}
-
--
Gitblit v1.3.2