aboutsummaryrefslogtreecommitdiff
path: root/id/server/moa-id-commons/src
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2017-02-03 08:51:45 +0100
committerThomas Lenz <tlenz@iaik.tugraz.at>2017-02-03 08:51:45 +0100
commit2b68b287aa55dc48e9f3a01bd42d6099bbe1deb2 (patch)
tree28e34446dc263144a09441120b0483e50e8e95b2 /id/server/moa-id-commons/src
parent3573f8ea5a4b269834723da4708bf0bace50fa65 (diff)
parente25d9bfa5fb81fd275706fb7cbee21fe5add5b19 (diff)
downloadmoa-id-spss-2b68b287aa55dc48e9f3a01bd42d6099bbe1deb2.tar.gz
moa-id-spss-2b68b287aa55dc48e9f3a01bd42d6099bbe1deb2.tar.bz2
moa-id-spss-2b68b287aa55dc48e9f3a01bd42d6099bbe1deb2.zip
Merge branch 'eIDAS_node_implementation' into development_preview
Diffstat (limited to 'id/server/moa-id-commons/src')
-rw-r--r--id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/MOAIDConstants.java2
-rw-r--r--id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/SSLUtils.java27
2 files changed, 27 insertions, 2 deletions
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/MOAIDConstants.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/MOAIDConstants.java
index 6d573efe8..e9f9a7e80 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/MOAIDConstants.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/MOAIDConstants.java
@@ -36,6 +36,8 @@ public class MOAIDConstants {
//general configuration constants
+ public static final String DEFAULT_CONTENT_TYPE_HTML_UTF8 = "text/html; charset=UTF-8";
+
public static final String FILE_URI_PREFIX = "file:/";
public static final String PREFIX_WPBK = "urn:publicid:gv.at:wbpk+";
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;
}