From 6624f0c3ac6f2636cf237b7ebcf602f3efcbfdc9 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Tue, 31 Jan 2017 13:18:30 +0100
Subject: fix problem with iaik pki-module and worker threads

---
 .../moa/id/commons/utils/ssl/SSLUtils.java         | 27 ++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/SSLUtils.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/SSLUtils.java
index 4ecda435d..109390132 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/SSLUtils.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/SSLUtils.java
@@ -61,6 +61,8 @@ import javax.net.ssl.TrustManager;
 
 import at.gv.egovernment.moa.logging.Logger;
 import at.gv.egovernment.moa.util.KeyStoreUtils;
+import at.gv.egovernment.moaspss.logging.LoggingContext;
+import at.gv.egovernment.moaspss.logging.LoggingContextManager;
 import iaik.pki.DefaultPKIConfiguration;
 import iaik.pki.PKIException;
 import iaik.pki.PKIFactory;
@@ -94,6 +96,21 @@ public class SSLUtils {
     
   }
 
+  /**
+   * IAIK PKI module and MOA-SIG uses a ThreadLocal variable for logging
+   * check if current thread has set this variable and set loggingcontext otherwise
+   * 
+   * @param url transactionID for logging
+   */
+  private static void checkMoaSigLoggingContext(String url) {
+	  LoggingContextManager logMgr = LoggingContextManager.getInstance();  
+	  if (logMgr.getLoggingContext() == null) {
+		  LoggingContext ctx = new LoggingContext(url);
+	      logMgr.setLoggingContext(ctx);
+	        
+	  }	  
+  }
+  
   public static SSLSocketFactory getSSLSocketFactory(
 		  String url, 
 		  String certStoreRootDirParam, 
@@ -111,8 +128,11 @@ public class SSLUtils {
     Logger.debug("Get SSLSocketFactory for " + url);
     // retrieve SSLSocketFactory if already created
     SSLSocketFactory ssf = (SSLSocketFactory)sslSocketFactories.get(url);
-    if (ssf != null) 
-      return ssf;
+    if (ssf != null) {
+    	checkMoaSigLoggingContext(url);    	
+    	return ssf;
+    	
+    }
         
     TrustManager[] tms = getTrustManagers(
     		 certStoreRootDirParam,
@@ -129,6 +149,9 @@ public class SSLUtils {
     ssf = ctx.getSocketFactory();
     // store SSLSocketFactory
     sslSocketFactories.put(url, ssf);
+    
+    checkMoaSigLoggingContext(url); 
+    
     return ssf;
   }
   
-- 
cgit v1.2.3