Merge branch 'nightlyBuild' of gitlab.iaik.tugraz.at:egiz/eaaf_components into nightlyBuild

1 files changed, 27 insertions, 7 deletions

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.
    */