#0 fix - Replaced "app.code" by "license.type.code" parameter in config fil...

rsanchez

2015-08-10 3e181c597c1088b7bfee445deaef514fcf198bfa

#0 fix - Replaced "app.code" by "license.type.code" parameter in config
file (keeping compatibility)

 pom.xml
..
..
@@ -3,7 +3,7 @@
3
3
 	<modelVersion>4.0.0</modelVersion>
4
4
 	<groupId>net.curisit</groupId>
5
5
 	<artifactId>securis-client</artifactId>
6
-	<version>1.0.5-SNAPSHOT</version>
6
+	<version>1.0.6-SNAPSHOT</version>
7
7
 	<build>
8
8
 		<plugins>
9
9
 			<plugin>
 src/main/java/net/curisit/securis/License.java
..
..
@@ -138,8 +138,8 @@
138
138
 	 * Checks that config file exists and contains mandatory parameters
139
139
 	 */
140
140
 	private static void checkConfigFile() {
141
-		if (Params.get(Params.KEYS.APPLICATION_CODE) == null) {
142
-			LOG.error("Manadatory parameter {} is not set in config file", Params.KEYS.APPLICATION_CODE);
141
+		if (Params.get(Params.KEYS.LIC_TYPE_CODE) == null && Params.get(Params.KEYS.APPLICATION_CODE) == null) {
142
+			LOG.error("Manadatory parameter {} is not set in config file", Params.KEYS.LIC_TYPE_CODE);
143
143
 			System.exit(-3);
144
144
 		}
145
145
 		if (Params.get(Params.KEYS.CUSTOMER_CODE) == null) {
 src/main/java/net/curisit/securis/LicenseManager.java
..
..
@@ -99,7 +99,7 @@
99
99
 	public LicenseBean validateLicense(File licFile, boolean excludeDateValidation) throws SeCurisException {
100
100
 		LicenseBean licBean = load(licFile);
101
101
 		SignatureHelper.getInstance().validateSignature(licBean);
102
-		LicenseValidator.getInstance().validateHW(licBean, Params.get(Params.KEYS.APPLICATION_CODE), Params.get(Params.KEYS.CUSTOMER_CODE), Params.get(Params.KEYS.PACK_CODE));
102
+		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));
103
103
 		LicenseValidator.getInstance().validateLogo(licBean);
104
104
 
105
105
 		if (!excludeDateValidation) {
..
..
@@ -118,7 +118,7 @@
118
118
 	 * @throws SeCurisException
119
119
 	 */
120
120
 	public SignedLicenseBean requestLicense(String nameOrReference, String email) throws SeCurisException {
121
-		RequestBean req = ReqGenerator.getInstance().createRequest(Params.get(Params.KEYS.APPLICATION_CODE), Params.get(Params.KEYS.CUSTOMER_CODE), Params.get(Params.KEYS.PACK_CODE));
121
+		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));
122
122
 
123
123
 		SignedLicenseBean lic = requestLicenseToServer(req, nameOrReference, email);
124
124
 		return lic;
..
..
@@ -178,7 +178,7 @@
178
178
 	 * @throws SeCurisException
179
179
 	 */
180
180
 	public RequestBean createRequestFile(File outputRequestFile) throws SeCurisException {
181
-		RequestBean req = ReqGenerator.getInstance().createRequest(Params.get(Params.KEYS.APPLICATION_CODE), Params.get(Params.KEYS.CUSTOMER_CODE), Params.get(Params.KEYS.PACK_CODE));
181
+		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));
182
182
 
183
183
 		ReqGenerator.getInstance().save(req, outputRequestFile);
184
184
 
..
..
@@ -221,11 +221,12 @@
221
221
 	}
222
222
 
223
223
 	public static void main(String[] args) throws SeCurisException {
224
-		String filename = null;
224
+		String filename  = "/Users/rob/.doxr/config_server.lic";
225
+
225
226
 		if (filename == null)
226
227
 			filename = "./license.req";
227
228
 		File file = new File(filename);
228
-		LicenseManager.getInstance().createRequestFile(file);
229
+		LicenseManager.getInstance().validateLicense(file);
229
230
 		LOG.info("Request file {} generated OK", file.getAbsolutePath());
230
231
 
231
232
 	}
 src/main/java/net/curisit/securis/utils/Params.java
..
..
@@ -213,6 +213,8 @@
213
213
 		 */
214
214
 		public static final String PUBLIC_KEY_FILE = "public.key.file";
215
215
 
216
+		public static final String LIC_TYPE_CODE = "license.type.code";
217
+		
216
218
 		public static final String APPLICATION_CODE = "app.code";
217
219
 
218
220
 		public static final String CUSTOMER_CODE = "customer.code";
 src/main/java/net/curisit/securis/utils/SignatureHelper.java
..
..
@@ -48,6 +48,10 @@
48
48
 
49
49
 	public void prepareSignature(Signature signature, LicenseBean licBean) throws SeCurisException {
50
50
 		try {
51
+			String aux = JsonUtils.toJSON(licBean) + AUX;
52
+			System.out.println();
53
+			System.out.println(aux);
54
+			System.out.println();
51
55
 			signature.update(JsonUtils.toJSON(licBean).getBytes("utf-8"));
52
56
 			signature.update(AUX.getBytes("utf-8"));
53
57
 		} catch (SignatureException | UnsupportedEncodingException e) {