aboutsummaryrefslogtreecommitdiff
path: root/id/server/idserverlib
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2015-07-24 09:57:39 +0200
committerThomas Lenz <tlenz@iaik.tugraz.at>2015-07-24 09:57:39 +0200
commit54229ad45dcee43ea93b9853f346d484893e49df (patch)
treec0f0c1f4db576ce97aaa8beb1926e59e853c629c /id/server/idserverlib
parentf17afa66a2d8f5cb1d1f30227056346dfefd2d1e (diff)
downloadmoa-id-spss-54229ad45dcee43ea93b9853f346d484893e49df.tar.gz
moa-id-spss-54229ad45dcee43ea93b9853f346d484893e49df.tar.bz2
moa-id-spss-54229ad45dcee43ea93b9853f346d484893e49df.zip
set "https.cipherSuites" only if they are not set in user configuration
Diffstat (limited to 'id/server/idserverlib')
-rw-r--r--id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/MOAIDAuthInitializer.java15
1 files changed, 12 insertions, 3 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/MOAIDAuthInitializer.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/MOAIDAuthInitializer.java
index e1086bbd1..0c99d5ed4 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/MOAIDAuthInitializer.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/MOAIDAuthInitializer.java
@@ -32,6 +32,7 @@ import at.gv.egovernment.moa.logging.LoggingContextManager;
import at.gv.egovernment.moa.spss.server.config.ConfigurationProvider;
import at.gv.egovernment.moa.spss.server.iaik.config.IaikConfigurator;
import at.gv.egovernment.moa.util.Constants;
+import at.gv.egovernment.moa.util.MiscUtil;
/**
* Web application initializer
@@ -99,9 +100,17 @@ public class MOAIDAuthInitializer {
// EDH-DSS-DES-CBC3-SHA -
// DES-CBC3-SHA SSL_RSA_WITH_3DES_EDE_CBC_SHA
- System.setProperty(
- "https.cipherSuites",
- "TLS_DH_anon_WITH_AES_128_CBC_SHA,TLS_DHE_RSA_WITH_AES_128_CBC_SHA,TLS_DHE_DSS_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_128_CBC_SHA,SSL_DH_anon_WITH_3DES_EDE_CBC_SHA,SSL_RSA_WITH_3DES_EDE_CBC_SHA");
+ if (MiscUtil.isEmpty(System.getProperty("https.cipherSuites")))
+ System.setProperty(
+ "https.cipherSuites",
+ "TLS_DH_anon_WITH_AES_128_CBC_SHA" +
+ ",TLS_DHE_RSA_WITH_AES_128_CBC_SHA" +
+ ",TLS_DHE_DSS_WITH_AES_128_CBC_SHA" +
+ ",TLS_RSA_WITH_AES_128_CBC_SHA" +
+ ",TLS_RSA_WITH_AES_256_CBC_SHA" +
+ ",SSL_DH_anon_WITH_3DES_EDE_CBC_SHA" +
+ ",SSL_RSA_WITH_3DES_EDE_CBC_SHA"
+ );