Merge branch 'nightlyBuild' into 'master'1.1.10

Nightly build

See merge request egiz/eaaf_components!4

4 files changed, 37 insertions, 8 deletions

diff --git a/eaaf_modules/eaaf_module_moa-sig/pom.xml b/eaaf_modules/eaaf_module_moa-sig/pom.xml
index f7603d6d..61e7e6a2 100644
--- a/eaaf_modules/eaaf_module_moa-sig/pom.xml
+++ b/eaaf_modules/eaaf_module_moa-sig/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>at.gv.egiz.eaaf</groupId>
     <artifactId>eaaf_modules</artifactId>
-    <version>1.1.9.1</version>
+    <version>1.1.10</version>
   </parent>
   <artifactId>eaaf_module_moa-sig</artifactId>
   <name>MOA-Sig signature verification module</name>
diff --git a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_pki_module/2.02_moa/iaik_pki_module-2.02_moa.jar b/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_pki_module/2.02_moa/iaik_pki_module-2.02_moa.jar
new file mode 100644
index 00000000..b7979e51
--- /dev/null
+++ b/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_pki_module/2.02_moa/iaik_pki_module-2.02_moa.jar
diff --git a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_pki_module/2.02_moa/iaik_pki_module-2.02_moa.pom b/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_pki_module/2.02_moa/iaik_pki_module-2.02_moa.pom
new file mode 100644
index 00000000..b947fb59
--- /dev/null
+++ b/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_pki_module/2.02_moa/iaik_pki_module-2.02_moa.pom
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>iaik.prod</groupId>
+  <artifactId>iaik_pki_module</artifactId>
+  <version>2.02_moa</version>
+  <description>POM was created from install:install-file</description>
+</project>
diff --git a/eaaf_modules/eaaf_module_moa-sig/src/main/java/at/gv/egiz/eaaf/modules/sigverify/moasig/impl/AbstractSignatureService.java b/eaaf_modules/eaaf_module_moa-sig/src/main/java/at/gv/egiz/eaaf/modules/sigverify/moasig/impl/AbstractSignatureService.java
index 11881cbf..b9219ee4 100644
--- a/eaaf_modules/eaaf_module_moa-sig/src/main/java/at/gv/egiz/eaaf/modules/sigverify/moasig/impl/AbstractSignatureService.java
+++ b/eaaf_modules/eaaf_module_moa-sig/src/main/java/at/gv/egiz/eaaf/modules/sigverify/moasig/impl/AbstractSignatureService.java
@@ -1,20 +1,24 @@
 package at.gv.egiz.eaaf.modules.sigverify.moasig.impl;
 
+import java.security.Provider;
+import java.security.Security;
+
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.w3c.dom.Document;
+
 import at.gv.egovernment.moa.spss.server.config.ConfigurationException;
+import at.gv.egovernment.moa.spss.server.iaik.config.IaikConfigurator;
 import at.gv.egovernment.moa.spss.server.transaction.TransactionContext;
 import at.gv.egovernment.moa.spss.server.transaction.TransactionContextManager;
 import at.gv.egovernment.moaspss.logging.LoggingContext;
 import at.gv.egovernment.moaspss.logging.LoggingContextManager;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.w3c.dom.Document;
-
 public abstract class AbstractSignatureService {
   private static final Logger log = LoggerFactory.getLogger(AbstractSignatureService.class);
 
@@ -45,7 +49,7 @@ public abstract class AbstractSignatureService {
   protected final void setUpContexts(final String transactionID) throws ConfigurationException {
     final TransactionContextManager txMgr = TransactionContextManager.getInstance();
     final LoggingContextManager logMgr = LoggingContextManager.getInstance();
-
+    
     if (txMgr.getTransactionContext() == null) {
       log.debug("Set not MOA-Sig transaction context");
       final TransactionContext ctx =
@@ -54,16 +58,32 @@ public abstract class AbstractSignatureService {
 
     }
 
+    //set Logging context into MOA-Sig
     if (logMgr.getLoggingContext() == null) {
       final LoggingContext ctx = new LoggingContext(transactionID);
       logMgr.setLoggingContext(ctx);
 
     }
 
-    //new IaikConfigurator().configure(moaSigConfig.getMoaSigConfig());
+    //dump Java Security-Providers
+    if (log.isTraceEnabled()) {
+      log.trace("Set-Up verifier Bean: {}", this);
+      dumpSecProviders("MOA-Sig Context-Set-Up");
+
+    }
+
+    new IaikConfigurator().configure(moaSigConfig.getMoaSigConfig());
 
   }
 
+  private static void dumpSecProviders(String message) {
+    log.trace("Security Providers: {}", message);
+    for (final Provider provider : Security.getProviders()) {
+      log.trace("  - {} - {}", provider.getName(), provider.getVersion());
+
+    }
+  }
+
   /**
    * Tear down thread-local context information.
    */