Merge pull request #311 from sumeetphadnis/next

Enable cryptoservice and cryptoserver modules
jpos · Sep 12, 2024 · 2f51629 · 2f51629
2 parents ef34fbc + cf5918f
commit 2f51629
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 13 deletions.
diff --git a/modules/cryptoserver/build.gradle b/modules/cryptoserver/build.gradle
@@ -1,16 +1,14 @@
 description = 'jPOS-EE :: Crypto Server'
 
 dependencies {
-    testImplementation libraries.junit
-    testImplementation libraries.restAssured
+    testImplementation libs.junit
+    testImplementation testlibs.restAssured
     api project(':modules:qrest')
     api project(':modules:cryptoservice')
     api project(':modules:db-mysql')
     api project(':modules:logback')
 }
 
-apply from: "${rootProject.projectDir}/jpos-app.gradle"
-
 test {
     dependsOn('installApp')
     workingDir = "build/install/cryptoserver"

diff --git a/modules/cryptoserver/src/main/java/org/jpos/cryptoserver/participant/Decrypt.java b/modules/cryptoserver/src/main/java/org/jpos/cryptoserver/participant/Decrypt.java
@@ -56,7 +56,7 @@ public int prepare(long id, Serializable context) {
             String jsonStr = request.content().toString(CharsetUtil.UTF_8);
             ctx.log (jsonStr);
             @SuppressWarnings("unchecked")
-            Map<String,String> m = (Map<String,String>) mapper.readValue(jsonStr, Map.class);
+            Map<String,String> m = mapper.readValue(jsonStr, Map.class);
             UUID keyId = UUID.fromString(m.get("kid"));
             byte[] encoded = decoder.decode(m.get("cryptogram"));
             byte[] b = cs.aesDecrypt(jobId, keyId, encoded);

diff --git a/modules/cryptoserver/src/main/java/org/jpos/cryptoserver/participant/Encrypt.java b/modules/cryptoserver/src/main/java/org/jpos/cryptoserver/participant/Encrypt.java
@@ -18,7 +18,6 @@
 
 package org.jpos.cryptoserver.participant;
 
-import java.io.IOException;
 import java.io.Serializable;
 import java.util.*;
 
@@ -52,7 +51,7 @@ public int prepare(long id, Serializable context) {
             String jsonStr = request.content().toString(CharsetUtil.UTF_8);
             ctx.log (jsonStr);
             @SuppressWarnings("unchecked")
-            Map<String,String> m = (Map<String,String>) mapper.readValue(jsonStr, Map.class);
+            Map<String,String> m = mapper.readValue(jsonStr, Map.class);
 
             SecureData sd = cs.aesEncrypt(m.get("text").getBytes());
 

diff --git a/modules/cryptoservice/build.gradle b/modules/cryptoservice/build.gradle
@@ -1,7 +1,7 @@
 description = 'jPOS-EE :: CryptoService'
 
 dependencies {
-    api libraries.jpos
+    api libs.jpos
     api project(':modules:sysconfig')
 }
 

diff --git a/...s/cryptoservice/src/main/java/org/jpos/crypto/SysConfigCryptoServiceKeyStoreProvider.java b/...s/cryptoservice/src/main/java/org/jpos/crypto/SysConfigCryptoServiceKeyStoreProvider.java
@@ -19,7 +19,7 @@
 package org.jpos.crypto;
 
 import org.jpos.ee.DB;
-import org.jpos.ee.SysConfigManager;
+import org.jpos.sysconfig.SysConfigManager;
 
 public class SysConfigCryptoServiceKeyStoreProvider implements CryptoServiceKeyStoreProvider {
     @Override
@@ -30,7 +30,7 @@ public void put(String id, String value) throws CryptoServiceKeyStoreException {
                 if (mgr.get(id, null) != null)
                     throw new KeyAlreadyExistsException();
 
-                mgr.put(id, value, "security.read", "security.write");
+                mgr.put(id, value);
                 return true;
             });
         } catch (Exception e) {

diff --git a/settings.gradle b/settings.gradle
@@ -24,7 +24,8 @@ include  ':modules:binlog-quartz'
 include  ':modules:server-simulator'
 include  ':modules:client-simulator'
 include  ':modules:syslog'
-
+include  ':modules:cryptoservice'
+include  ':modules:cryptoserver'
 // include  ':modules:dbtest'
 
 dependencyResolutionManagement {
@@ -60,8 +61,6 @@ dependencyResolutionManagement {
 // include  ':modules:qi-eeuser'
 // include  ':modules:qi-sysconfig'
 // include  ':modules:qi-minigl'
-// include  ':modules:cryptoservice'
-// include  ':modules:cryptoserver'
 // include  ':modules:iso-http-client'
 // include  ':modules:iso-http-server'
 // include  ':modules:iso-http-servlet'