update eaaf-utils to HSM-Facade v0.3.0-SNAPSHOT

6 files changed, 16 insertions, 50 deletions

diff --git a/eaaf_core_utils/pom.xml b/eaaf_core_utils/pom.xml
index 6392fb76..8bff7ed5 100644
--- a/eaaf_core_utils/pom.xml
+++ b/eaaf_core_utils/pom.xml
@@ -44,6 +44,10 @@
     <dependency>
       <groupId>at.asitplus.hsmfacade</groupId>
       <artifactId>provider</artifactId>
+    </dependency> 
+    <dependency>
+      <groupId>io.grpc</groupId>
+      <artifactId>grpc-core</artifactId>
     </dependency>
 
     <dependency>
diff --git a/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/credential/EaafKeyStoreFactory.java b/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/credential/EaafKeyStoreFactory.java
index 40bf7175..e60c326c 100644
--- a/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/credential/EaafKeyStoreFactory.java
+++ b/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/credential/EaafKeyStoreFactory.java
@@ -43,7 +43,6 @@ public class EaafKeyStoreFactory {
   public static final String CONFIG_PROP_HSM_FACADE_SSLTRUST = "security.hsmfacade.trustedsslcert";
   public static final String CONFIG_PROP_HSM_FACADE_CLIENT_USERNAME = "security.hsmfacade.username";
   public static final String CONFIG_PROP_HSM_FACADE_CLIENT_PASSWORD = "security.hsmfacade.password";
-  public static final String CONFIG_PROP_HSM_FACADE_HSM_NAME = "security.hsmfacade.hsmname";
 
   public static final String ERRORCODE_00 = "internal.keystore.00";
   public static final String ERRORCODE_01 = "internal.keystore.01";
@@ -128,12 +127,9 @@ public class EaafKeyStoreFactory {
             getConfigurationParameter(CONFIG_PROP_HSM_FACADE_CLIENT_USERNAME);
         final String clientPassword =
             getConfigurationParameter(CONFIG_PROP_HSM_FACADE_CLIENT_PASSWORD);
-        final String hsmName =
-            getConfigurationParameter(CONFIG_PROP_HSM_FACADE_HSM_NAME);
 
         final HsmFacadeProvider provider = HsmFacadeProvider.Companion.getInstance();
-        provider.init(getHsmFacadeTrustSslCertificate(), clientUsername, clientPassword, hsmFacadeHost, port,
-            hsmName);
+        provider.init(getHsmFacadeTrustSslCertificate(), clientUsername, clientPassword, hsmFacadeHost, port);
         //Security.addProvider(provider);
         Security.insertProviderAt(provider, 0);
         isHsmFacadeInitialized = true;
diff --git a/eaaf_core_utils/src/main/resources/messages/eaaf_utils_message.properties b/eaaf_core_utils/src/main/resources/messages/eaaf_utils_message.properties
index 2d9a863a..f531e02d 100644
--- a/eaaf_core_utils/src/main/resources/messages/eaaf_utils_message.properties
+++ b/eaaf_core_utils/src/main/resources/messages/eaaf_utils_message.properties
@@ -1,3 +1,6 @@
+internal.configuration.00=Wrong configuration. Missing property: {0}
+internal.configuration.01=Wrong configuration property: {0}. Reason: {1}
+
 internal.keystore.00=HSM-Facade NOT INITIALIZED. KeyStore:{0} initialization failed 
 internal.keystore.01=KeyStore:{0} configuration has an unsupported type in configuration.
 internal.keystore.02=Type:{1} of KeyStore:{0} is NOT SUPPORTED yet.
diff --git a/eaaf_core_utils/src/test/java/at/gv/egiz/eaaf/core/test/credentials/EaafKeyStoreFactoryTest.java b/eaaf_core_utils/src/test/java/at/gv/egiz/eaaf/core/test/credentials/EaafKeyStoreFactoryTest.java
index 5b6b8170..ed2e159b 100644
--- a/eaaf_core_utils/src/test/java/at/gv/egiz/eaaf/core/test/credentials/EaafKeyStoreFactoryTest.java
+++ b/eaaf_core_utils/src/test/java/at/gv/egiz/eaaf/core/test/credentials/EaafKeyStoreFactoryTest.java
@@ -47,8 +47,6 @@ public class EaafKeyStoreFactoryTest {
   private static final String HSM_FACASE_SSL_TRUST = "src/test/resources/data/hsm_facade_trust_root.crt";
   private static final String HSM_FACASE_USERNAME = "authhandler-junit";
   private static final String HSM_FACASE_PASSWORD = "supersecret123";
-  private static final String HSM_FACASE_HSM_NAME = "software";
-
   private static final String PATH_TO_SOFTWARE_KEYSTORE_JKS_WITH_TRUSTED_CERTS =
       "src/test/resources/data/junit.jks";
   private static final String PATH_TO_SOFTWARE_KEYSTORE_JKS =
@@ -395,8 +393,6 @@ public class EaafKeyStoreFactoryTest {
         RandomStringUtils.randomAlphanumeric(10));
     mapConfig.putConfigValue(EaafKeyStoreFactory.CONFIG_PROP_HSM_FACADE_CLIENT_PASSWORD,
         RandomStringUtils.randomNumeric(10));
-    mapConfig.putConfigValue(EaafKeyStoreFactory.CONFIG_PROP_HSM_FACADE_HSM_NAME,
-        RandomStringUtils.randomAlphanumeric(10));
 
     try {
       context.getBean(EaafKeyStoreFactory.class);
@@ -416,9 +412,6 @@ public class EaafKeyStoreFactoryTest {
         RandomStringUtils.randomNumeric(4));
     mapConfig.putConfigValue(EaafKeyStoreFactory.CONFIG_PROP_HSM_FACADE_CLIENT_PASSWORD,
         RandomStringUtils.randomNumeric(10));
-    mapConfig.putConfigValue(EaafKeyStoreFactory.CONFIG_PROP_HSM_FACADE_HSM_NAME,
-        RandomStringUtils.randomAlphanumeric(10));
-
     try {
       context.getBean(EaafKeyStoreFactory.class);
       Assert.fail("Missing HSM Facade not detected");
@@ -437,29 +430,6 @@ public class EaafKeyStoreFactoryTest {
         RandomStringUtils.randomNumeric(4));
     mapConfig.putConfigValue(EaafKeyStoreFactory.CONFIG_PROP_HSM_FACADE_CLIENT_USERNAME,
         RandomStringUtils.randomAlphanumeric(10));
-    mapConfig.putConfigValue(EaafKeyStoreFactory.CONFIG_PROP_HSM_FACADE_HSM_NAME,
-        RandomStringUtils.randomAlphanumeric(10));
-
-    try {
-      context.getBean(EaafKeyStoreFactory.class);
-      Assert.fail("Missing HSM Facade not detected");
-
-    } catch (final BeansException e) {
-      checkMissingConfigException(e);
-
-    }
-  }
-
-  @Test
-  public void hsmFacadeMissingKeyStoreName() {
-    mapConfig.putConfigValue(EaafKeyStoreFactory.CONFIG_PROP_HSM_FACADE_HOST,
-        RandomStringUtils.randomNumeric(10));
-    mapConfig.putConfigValue(EaafKeyStoreFactory.CONFIG_PROP_HSM_FACADE_PORT,
-        RandomStringUtils.randomNumeric(4));
-    mapConfig.putConfigValue(EaafKeyStoreFactory.CONFIG_PROP_HSM_FACADE_CLIENT_USERNAME,
-        RandomStringUtils.randomAlphanumeric(10));
-    mapConfig.putConfigValue(EaafKeyStoreFactory.CONFIG_PROP_HSM_FACADE_CLIENT_PASSWORD,
-        RandomStringUtils.randomAlphanumeric(10));
 
     try {
       context.getBean(EaafKeyStoreFactory.class);
@@ -481,8 +451,6 @@ public class EaafKeyStoreFactoryTest {
         RandomStringUtils.randomNumeric(10));
     mapConfig.putConfigValue(EaafKeyStoreFactory.CONFIG_PROP_HSM_FACADE_CLIENT_PASSWORD,
         RandomStringUtils.randomAlphanumeric(10));
-    mapConfig.putConfigValue(EaafKeyStoreFactory.CONFIG_PROP_HSM_FACADE_HSM_NAME,
-        RandomStringUtils.randomAlphanumeric(10));
 
     try {
       context.getBean(EaafKeyStoreFactory.class);
@@ -504,8 +472,6 @@ public class EaafKeyStoreFactoryTest {
         RandomStringUtils.randomNumeric(10));
     mapConfig.putConfigValue(EaafKeyStoreFactory.CONFIG_PROP_HSM_FACADE_CLIENT_PASSWORD,
         RandomStringUtils.randomAlphanumeric(10));
-    mapConfig.putConfigValue(EaafKeyStoreFactory.CONFIG_PROP_HSM_FACADE_HSM_NAME,
-        RandomStringUtils.randomAlphanumeric(10));
     mapConfig.putConfigValue(EaafKeyStoreFactory.CONFIG_PROP_HSM_FACADE_SSLTRUST,
         "src/test/resources/data/notexist.crt");
 
@@ -529,8 +495,6 @@ public class EaafKeyStoreFactoryTest {
         RandomStringUtils.randomNumeric(10));
     mapConfig.putConfigValue(EaafKeyStoreFactory.CONFIG_PROP_HSM_FACADE_CLIENT_PASSWORD,
         RandomStringUtils.randomAlphanumeric(10));
-    mapConfig.putConfigValue(EaafKeyStoreFactory.CONFIG_PROP_HSM_FACADE_HSM_NAME,
-        RandomStringUtils.randomAlphanumeric(10));
     mapConfig.putConfigValue(EaafKeyStoreFactory.CONFIG_PROP_HSM_FACADE_SSLTRUST,
         "src/test/resources/spring/test_eaaf_pvp_lazy.beans.xml");
 
@@ -555,8 +519,6 @@ public class EaafKeyStoreFactoryTest {
         RandomStringUtils.randomNumeric(10));
     mapConfig.putConfigValue(EaafKeyStoreFactory.CONFIG_PROP_HSM_FACADE_CLIENT_PASSWORD,
         RandomStringUtils.randomAlphanumeric(10));
-    mapConfig.putConfigValue(EaafKeyStoreFactory.CONFIG_PROP_HSM_FACADE_HSM_NAME,
-        RandomStringUtils.randomAlphanumeric(10));
     mapConfig.putConfigValue(EaafKeyStoreFactory.CONFIG_PROP_HSM_FACADE_SSLTRUST,
         PATH_TO_HSM_FACADE_TRUST_CERT);
 
@@ -673,8 +635,6 @@ public class EaafKeyStoreFactoryTest {
     mapConfig.putConfigValue(EaafKeyStoreFactory.CONFIG_PROP_HSM_FACADE_CLIENT_USERNAME, HSM_FACASE_USERNAME);
     mapConfig.putConfigValue(EaafKeyStoreFactory.CONFIG_PROP_HSM_FACADE_CLIENT_PASSWORD, HSM_FACASE_PASSWORD);
 
-    mapConfig.putConfigValue(EaafKeyStoreFactory.CONFIG_PROP_HSM_FACADE_HSM_NAME, HSM_FACASE_HSM_NAME);
-
   }
 
   private void checkMissingConfigException(Exception e) {
diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/test/java/at/gv/egiz/eaaf/modules/pvp2/test/CredentialProviderTest.java b/eaaf_modules/eaaf_module_pvp2_core/src/test/java/at/gv/egiz/eaaf/modules/pvp2/test/CredentialProviderTest.java
index 5690038c..c784e392 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/test/java/at/gv/egiz/eaaf/modules/pvp2/test/CredentialProviderTest.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/test/java/at/gv/egiz/eaaf/modules/pvp2/test/CredentialProviderTest.java
@@ -40,8 +40,6 @@ public class CredentialProviderTest {
   private static final String HSM_FACASE_SSL_TRUST = "src/test/resources/data/hsm_facade_trust_root.crt";
   private static final String HSM_FACASE_USERNAME = "authhandler-junit";
   private static final String HSM_FACASE_PASSWORD = "supersecret123";
-  private static final String HSM_FACASE_HSM_NAME = "software";
-
   private static final String PATH_JKS_WITH_TRUST_CERTS = "src/test/resources/data/junit.jks";
   private static final String PATH_JKS_WITHOUT_TRUST_CERTS = "src/test/resources/data/junit_without_trustcerts.jks";
 
@@ -69,7 +67,6 @@ public class CredentialProviderTest {
     config.putConfigValue(EaafKeyStoreFactory.CONFIG_PROP_HSM_FACADE_SSLTRUST, HSM_FACASE_SSL_TRUST);
     config.putConfigValue(EaafKeyStoreFactory.CONFIG_PROP_HSM_FACADE_CLIENT_USERNAME, HSM_FACASE_USERNAME);
     config.putConfigValue(EaafKeyStoreFactory.CONFIG_PROP_HSM_FACADE_CLIENT_PASSWORD, HSM_FACASE_PASSWORD);
-    config.putConfigValue(EaafKeyStoreFactory.CONFIG_PROP_HSM_FACADE_HSM_NAME, HSM_FACASE_HSM_NAME);
 
     config.putConfigValue(DummyCredentialProvider.KEYSTORE_NAME, HSM_FACASE_KEYSTORE_NAME);
 
diff --git a/pom.xml b/pom.xml
index 9f615cb6..c8ec7835 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,8 @@
     <iaik.prod.iaik_xades.version>2.13_moa</iaik.prod.iaik_xades.version>
     <iaik.prod.iaik_xsect.version>2.13_moa</iaik.prod.iaik_xsect.version>
 
-    <hsm-facade-provider.version>0.1.1-SNAPSHOT</hsm-facade-provider.version>
+    <hsm-facade-provider.version>0.3.0-SNAPSHOT</hsm-facade-provider.version>
+    <io.grpc-core.version>1.25.0</io.grpc-core.version>
 
     <!-- Other third-party libs -->
     <org.springframework.version>5.1.5.RELEASE</org.springframework.version>
@@ -276,7 +277,7 @@
       <dependency>
         <groupId>iaik.prod</groupId>
         <artifactId>iaik_moa</artifactId>
-        <version>${iaik.prod.iaik_moa.version}</version>
+        <version>${iaik.prod.iaik_moa.version}</version> 
       </dependency>
       <dependency>
         <groupId>iaik.prod</groupId>
@@ -320,6 +321,11 @@
         <artifactId>provider</artifactId>
         <version>${hsm-facade-provider.version}</version>
       </dependency>
+      <dependency>
+        <groupId>io.grpc</groupId>
+        <artifactId>grpc-core</artifactId>
+        <version>${io.grpc-core.version}</version>
+      </dependency>
 
       <dependency>
         <groupId>javax.annotation</groupId>