From 3e181c597c1088b7bfee445deaef514fcf198bfa Mon Sep 17 00:00:00 2001
From: rsanchez <rsanchez@curisit.net>
Date: Mon, 10 Aug 2015 09:10:09 +0000
Subject: [PATCH] #0 fix - Replaced "app.code" by "license.type.code" parameter in config file (keeping compatibility)
---
src/main/java/net/curisit/securis/utils/Params.java | 2 ++
src/main/java/net/curisit/securis/LicenseManager.java | 11 ++++++-----
pom.xml | 2 +-
src/main/java/net/curisit/securis/License.java | 4 ++--
src/main/java/net/curisit/securis/utils/SignatureHelper.java | 4 ++++
5 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9786a1f..b636874 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>net.curisit</groupId>
<artifactId>securis-client</artifactId>
- <version>1.0.5-SNAPSHOT</version>
+ <version>1.0.6-SNAPSHOT</version>
<build>
<plugins>
<plugin>
diff --git a/src/main/java/net/curisit/securis/License.java b/src/main/java/net/curisit/securis/License.java
index 14d0aa4..f06a177 100644
--- a/src/main/java/net/curisit/securis/License.java
+++ b/src/main/java/net/curisit/securis/License.java
@@ -138,8 +138,8 @@
* Checks that config file exists and contains mandatory parameters
*/
private static void checkConfigFile() {
- if (Params.get(Params.KEYS.APPLICATION_CODE) == null) {
- LOG.error("Manadatory parameter {} is not set in config file", Params.KEYS.APPLICATION_CODE);
+ if (Params.get(Params.KEYS.LIC_TYPE_CODE) == null && Params.get(Params.KEYS.APPLICATION_CODE) == null) {
+ LOG.error("Manadatory parameter {} is not set in config file", Params.KEYS.LIC_TYPE_CODE);
System.exit(-3);
}
if (Params.get(Params.KEYS.CUSTOMER_CODE) == null) {
diff --git a/src/main/java/net/curisit/securis/LicenseManager.java b/src/main/java/net/curisit/securis/LicenseManager.java
index 5cd0c22..99db584 100644
--- a/src/main/java/net/curisit/securis/LicenseManager.java
+++ b/src/main/java/net/curisit/securis/LicenseManager.java
@@ -99,7 +99,7 @@
public LicenseBean validateLicense(File licFile, boolean excludeDateValidation) throws SeCurisException {
LicenseBean licBean = load(licFile);
SignatureHelper.getInstance().validateSignature(licBean);
- LicenseValidator.getInstance().validateHW(licBean, Params.get(Params.KEYS.APPLICATION_CODE), Params.get(Params.KEYS.CUSTOMER_CODE), Params.get(Params.KEYS.PACK_CODE));
+ LicenseValidator.getInstance().validateHW(licBean, Params.get(Params.KEYS.LIC_TYPE_CODE, Params.get(Params.KEYS.APPLICATION_CODE)), Params.get(Params.KEYS.CUSTOMER_CODE), Params.get(Params.KEYS.PACK_CODE));
LicenseValidator.getInstance().validateLogo(licBean);
if (!excludeDateValidation) {
@@ -118,7 +118,7 @@
* @throws SeCurisException
*/
public SignedLicenseBean requestLicense(String nameOrReference, String email) throws SeCurisException {
- RequestBean req = ReqGenerator.getInstance().createRequest(Params.get(Params.KEYS.APPLICATION_CODE), Params.get(Params.KEYS.CUSTOMER_CODE), Params.get(Params.KEYS.PACK_CODE));
+ RequestBean req = ReqGenerator.getInstance().createRequest(Params.get(Params.KEYS.LIC_TYPE_CODE, Params.get(Params.KEYS.APPLICATION_CODE)), Params.get(Params.KEYS.CUSTOMER_CODE), Params.get(Params.KEYS.PACK_CODE));
SignedLicenseBean lic = requestLicenseToServer(req, nameOrReference, email);
return lic;
@@ -178,7 +178,7 @@
* @throws SeCurisException
*/
public RequestBean createRequestFile(File outputRequestFile) throws SeCurisException {
- RequestBean req = ReqGenerator.getInstance().createRequest(Params.get(Params.KEYS.APPLICATION_CODE), Params.get(Params.KEYS.CUSTOMER_CODE), Params.get(Params.KEYS.PACK_CODE));
+ RequestBean req = ReqGenerator.getInstance().createRequest(Params.get(Params.KEYS.LIC_TYPE_CODE, Params.get(Params.KEYS.APPLICATION_CODE)), Params.get(Params.KEYS.CUSTOMER_CODE), Params.get(Params.KEYS.PACK_CODE));
ReqGenerator.getInstance().save(req, outputRequestFile);
@@ -221,11 +221,12 @@
}
public static void main(String[] args) throws SeCurisException {
- String filename = null;
+ String filename = "/Users/rob/.doxr/config_server.lic";
+
if (filename == null)
filename = "./license.req";
File file = new File(filename);
- LicenseManager.getInstance().createRequestFile(file);
+ LicenseManager.getInstance().validateLicense(file);
LOG.info("Request file {} generated OK", file.getAbsolutePath());
}
diff --git a/src/main/java/net/curisit/securis/utils/Params.java b/src/main/java/net/curisit/securis/utils/Params.java
index af21626..2281c0f 100644
--- a/src/main/java/net/curisit/securis/utils/Params.java
+++ b/src/main/java/net/curisit/securis/utils/Params.java
@@ -213,6 +213,8 @@
*/
public static final String PUBLIC_KEY_FILE = "public.key.file";
+ public static final String LIC_TYPE_CODE = "license.type.code";
+
public static final String APPLICATION_CODE = "app.code";
public static final String CUSTOMER_CODE = "customer.code";
diff --git a/src/main/java/net/curisit/securis/utils/SignatureHelper.java b/src/main/java/net/curisit/securis/utils/SignatureHelper.java
index a23586b..33ceae0 100644
--- a/src/main/java/net/curisit/securis/utils/SignatureHelper.java
+++ b/src/main/java/net/curisit/securis/utils/SignatureHelper.java
@@ -48,6 +48,10 @@
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