From e822a65b487de2891eacc19b717e744a1af0c87d Mon Sep 17 00:00:00 2001
From: Thomas Lenz <thomas.lenz@egiz.gv.at>
Date: Mon, 14 Sep 2015 16:02:31 +0200
Subject: fix allowed SSL Cipher problem in MOA-ID-Proxy

---
 .../gv/egovernment/moa/id/proxy/MOAIDProxyInitializer.java | 14 +++++++++++++-
 id/server/proxy/pom.xml                                    |  2 +-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/MOAIDProxyInitializer.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/MOAIDProxyInitializer.java
index 91df96027..6a35b175d 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/MOAIDProxyInitializer.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/MOAIDProxyInitializer.java
@@ -63,6 +63,7 @@ import at.gv.egovernment.moa.id.util.AxisSecureSocketFactory;
 import at.gv.egovernment.moa.id.util.MOAIDMessageProvider;
 import at.gv.egovernment.moa.id.util.SSLUtils;
 import at.gv.egovernment.moa.logging.Logger;
+import at.gv.egovernment.moa.util.MiscUtil;
 
 /**
  * Web application initializer
@@ -82,7 +83,18 @@ public class MOAIDProxyInitializer {
     Logger.setHierarchy("moa.id.proxy");
     
     // Restricts TLS cipher suites
-    System.setProperty("https.cipherSuites", "SSL_RSA_WITH_RC4_128_SHA,SSL_RSA_WITH_RC4_128_MD5,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"
+    					);
+//    System.setProperty("https.cipherSuites", "SSL_RSA_WITH_RC4_128_SHA,SSL_RSA_WITH_RC4_128_MD5,SSL_RSA_WITH_3DES_EDE_CBC_SHA");
         
     // load some jsse classes so that the integrity of the jars can be verified
     // before the iaik jce is installed as the security provider
diff --git a/id/server/proxy/pom.xml b/id/server/proxy/pom.xml
index 3d4d8c74d..111e13949 100644
--- a/id/server/proxy/pom.xml
+++ b/id/server/proxy/pom.xml
@@ -20,7 +20,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>MOA.id.server</groupId>
 	<artifactId>moa-id-proxy</artifactId>
-	<version>2.0.0</version>
+	<version>2.0.1</version>
 	<packaging>war</packaging>
 	<name>MOA ID-Proxy WebService</name>
 	
-- 
cgit v1.2.3