From 29d222da06d3ec281b605ce1d7fccf558d29110b Mon Sep 17 00:00:00 2001
From: rsanchez <rsanchez@curisit.net>
Date: Mon, 10 Aug 2015 14:39:28 +0000
Subject: [PATCH] #2695 fix - Minor changes
---
src/main/java/net/curisit/securis/beans/LicenseBean.java | 2 +-
src/main/java/net/curisit/securis/LicenseManager.java | 6 +++++-
src/main/java/net/curisit/securis/beans/RequestBean.java | 2 +-
src/main/java/net/curisit/securis/utils/SignatureHelper.java | 3 ---
4 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/main/java/net/curisit/securis/LicenseManager.java b/src/main/java/net/curisit/securis/LicenseManager.java
index 99db584..49fb807 100644
--- a/src/main/java/net/curisit/securis/LicenseManager.java
+++ b/src/main/java/net/curisit/securis/LicenseManager.java
@@ -221,12 +221,16 @@
}
public static void main(String[] args) throws SeCurisException {
- String filename = "/Users/rob/.doxr/config_server.lic";
+ String filename = "/Users/rob/.doxr/doxr.lic";
if (filename == null)
filename = "./license.req";
File file = new File(filename);
LicenseManager.getInstance().validateLicense(file);
+ LOG.info("Validation Ok");
+ String r = "{\"licenseTypeCode\":\"DX01\",\"packCode\":\"DEVDX01\",\"arch\":\"x86_64\",\"osName\":\"darwin\",\"customerCode\":\"CIT\",\"macAddresses\":[\"60:c5:47:03:cf:c8\",\"b2:00:12:b6:88:e0\"]}";
+ RequestBean rb = JsonUtils.json2object(r, RequestBean.class);
+ System.out.println(rb);
LOG.info("Request file {} generated OK", file.getAbsolutePath());
}
diff --git a/src/main/java/net/curisit/securis/beans/LicenseBean.java b/src/main/java/net/curisit/securis/beans/LicenseBean.java
index 6a4a1e0..8a40399 100644
--- a/src/main/java/net/curisit/securis/beans/LicenseBean.java
+++ b/src/main/java/net/curisit/securis/beans/LicenseBean.java
@@ -11,7 +11,7 @@
@JsonAutoDetect
@JsonPropertyOrder({
- "appName", "licenseCode", "licenseTypeCode", "expirationDate", "arch", "osName", "customerCode", "macAddresses", "crcLogo", "metadata"
+ "appName", "licenseCode", "licenseTypeCode", "expirationDate", "arch", "osName", "customerCode", "macAddresses", "crcLogo", "metadata", "packCode"
})
public class LicenseBean extends RequestBean {
private Date expirationDate;
diff --git a/src/main/java/net/curisit/securis/beans/RequestBean.java b/src/main/java/net/curisit/securis/beans/RequestBean.java
index f97ee40..69867cd 100644
--- a/src/main/java/net/curisit/securis/beans/RequestBean.java
+++ b/src/main/java/net/curisit/securis/beans/RequestBean.java
@@ -14,7 +14,7 @@
@JsonAutoDetect
@JsonInclude(Include.NON_NULL)
@JsonPropertyOrder({
- "appName", "licenseTypeCode", "packCode", "arch", "osName", "customerCode", "macAddresses", "crcLogo"
+ "licenseTypeCode", "packCode", "arch", "osName", "customerCode", "macAddresses", "crcLogo"
})
public class RequestBean {
private String customerCode;
diff --git a/src/main/java/net/curisit/securis/utils/SignatureHelper.java b/src/main/java/net/curisit/securis/utils/SignatureHelper.java
index 33ceae0..71cc18b 100644
--- a/src/main/java/net/curisit/securis/utils/SignatureHelper.java
+++ b/src/main/java/net/curisit/securis/utils/SignatureHelper.java
@@ -49,9 +49,6 @@
public void prepareSignature(Signature signature, LicenseBean licBean) throws SeCurisException {
try {
String aux = JsonUtils.toJSON(licBean) + AUX;
- System.out.println();
- System.out.println(aux);
- System.out.println();
signature.update(JsonUtils.toJSON(licBean).getBytes("utf-8"));
signature.update(AUX.getBytes("utf-8"));
} catch (SignatureException | UnsupportedEncodingException e) {
--
Gitblit v1.3.2