From abd28a90d56744c46128711ca881d1e584426c23 Mon Sep 17 00:00:00 2001
From: Roberto Sánchez <roberto.sanchez@curisit.net>
Date: Wed, 18 Jun 2014 12:45:57 +0000
Subject: [PATCH] #593 fix - Added further information when license is not valid due to HW validation
---
src/main/java/net/curisit/securis/License.java | 1 +
src/main/java/net/curisit/securis/utils/SignatureHelper.java | 4 +---
src/patch/java/net/curisit/securis/LicenseGenerator.java | 4 ++--
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/main/java/net/curisit/securis/License.java b/src/main/java/net/curisit/securis/License.java
index 605b50a..224c506 100644
--- a/src/main/java/net/curisit/securis/License.java
+++ b/src/main/java/net/curisit/securis/License.java
@@ -79,6 +79,7 @@
log.info("License file {} is valid", file.getAbsolutePath());
} catch (SeCurisException e) {
log.info("License file {} is NOT valid", file.getAbsolutePath());
+ log.info("Reason: {}", e.toString());
}
System.exit(0);
diff --git a/src/main/java/net/curisit/securis/utils/SignatureHelper.java b/src/main/java/net/curisit/securis/utils/SignatureHelper.java
index 8618b97..2904f20 100644
--- a/src/main/java/net/curisit/securis/utils/SignatureHelper.java
+++ b/src/main/java/net/curisit/securis/utils/SignatureHelper.java
@@ -47,10 +47,8 @@
public void prepareSignature(Signature signature, LicenseBean licBean) throws SeCurisException {
try {
- log.info("JSON: {}", JsonUtils.toJSON(licBean));
signature.update(JsonUtils.toJSON(licBean).getBytes("utf-8"));
signature.update(AUX.getBytes("utf-8"));
-
} catch (SignatureException | UnsupportedEncodingException e) {
throw new SeCurisException("Error generating or validating signature", e);
}
@@ -94,7 +92,7 @@
KeyFactory keyFactory = KeyFactory.getInstance(DEFAULT_ALGORITHM);
X509EncodedKeySpec publicKeySpec = new X509EncodedKeySpec(Base64.decodeBase64(pubKeyBase64));
PublicKey publicKey = keyFactory.generatePublic(publicKeySpec);
- log.info("Public key read sucessfully from file: {}", publicKeyFile.getAbsolutePath());
+ log.debug("Public key read sucessfully from file: {}", publicKeyFile.getAbsolutePath());
return publicKey;
}
diff --git a/src/patch/java/net/curisit/securis/LicenseGenerator.java b/src/patch/java/net/curisit/securis/LicenseGenerator.java
index b9ef26e..1336d4f 100644
--- a/src/patch/java/net/curisit/securis/LicenseGenerator.java
+++ b/src/patch/java/net/curisit/securis/LicenseGenerator.java
@@ -135,12 +135,12 @@
public static void main(String[] args) throws SeCurisException {
Paths.get(new File("/Users/cproberto/Documents/wsCurisIT/SeCurisClient/license.req").toURI());
- RequestBean req = ReqGenerator.getInstance().loadRequest(new File("/Users/cproberto/Downloads/license.req"));
+ RequestBean req = ReqGenerator.getInstance().loadRequest(new File("/Users/cproberto/Desktop/lic_win.req"));
Map<String, Object> metadata = new TreeMap<>();
metadata.put("maxUsers", 23);
metadata.put("maxInstances", 12);
LicenseBean lic = LicenseGenerator.getInstance().generateLicense(req, metadata, new Date(new Date().getTime() + 3600 * 1000), "CurisData01", "LIC-9812987123-12837129873");
- LicenseGenerator.getInstance().save(lic, new File("/Users/cproberto/Downloads/license_curisdata.lic"));
+ LicenseGenerator.getInstance().save(lic, new File("/Users/cproberto/Desktop/license_win.lic"));
System.out.print("os.arch: " + System.getProperty("os.arch") + " " + System.getProperty("os.name"));
--
Gitblit v1.3.2