1 files changed, 19 insertions, 28 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 cf5615a13..725773b75 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
@@ -28,6 +28,7 @@ import iaik.pki.PKIException;
 import iaik.pki.jsse.IAIKX509TrustManager;
 
 import java.io.IOException;
+import java.math.BigInteger;
 import java.security.GeneralSecurityException;
 import java.util.Properties;
 
@@ -93,7 +94,7 @@ public class MOAIDAuthInitializer {
 //	 	  Mapping OpenSSL - Java
 //        OpenSSL							Java
 //        http://www.openssl.org/docs/apps/ciphers.html		http://docs.oracle.com/javase/6/docs/technotes/guides/security/SunProviders.html
-//        via “openssl ciphers -tls1 HIGH –v”
+//        via !openssl ciphers -tls1 HIGH !v!
 //
 //        ADH-AES256-SHA			TLS_DH_anon_WITH_AES_256_CBC_SHA
 //        DHE-RSA-AES256-SHA		TLS_DHE_RSA_WITH_AES_256_CBC_SHA
@@ -139,6 +140,7 @@ public class MOAIDAuthInitializer {
 
         // Loads the configuration
         AuthConfigurationProvider authConf = AuthConfigurationProvider.reload();
+        
         ConnectionParameter moaSPConnParam = authConf
                 .getMoaSpConnectionParameter();
 
@@ -158,6 +160,7 @@ public class MOAIDAuthInitializer {
 
         // Initializes IAIKX509TrustManager logging
         String log4jConfigURL = System.getProperty("log4j.configuration");
+        Logger.info("Log4J Configuration: " + log4jConfigURL);
         if (log4jConfigURL != null) {
             IAIKX509TrustManager.initLog(new LoggerConfigImpl(log4jConfigURL));
         }
@@ -170,39 +173,27 @@ public class MOAIDAuthInitializer {
             AxisSecureSocketFactory.initialize(ssf);
         }
 
+        
         // sets the authentication session and authentication data time outs
-        String param = authConf
-                .getGenericConfigurationParameter(AuthConfigurationProvider.AUTH_SESSION_TIMEOUT_PROPERTY);
+        BigInteger param = authConf.getTimeOuts().getMOASessionCreated();
         if (param != null) {
-            long sessionTimeOut = 0;
-            try {
-                sessionTimeOut = new Long(param).longValue();
-            } catch (NumberFormatException ex) {
-                Logger
-                        .error(MOAIDMessageProvider
-                                .getInstance()
-                                .getMessage(
-                                        "config.05",
-                                        new Object[] { AuthConfigurationProvider.AUTH_SESSION_TIMEOUT_PROPERTY }));
-            }
+                long sessionTimeOut = param.longValue();
             if (sessionTimeOut > 0)
                     AuthenticationServer.getInstance()
-                            .setSecondsSessionTimeOut(sessionTimeOut);
+                            .setSecondsSessionTimeOutCreated(sessionTimeOut);
         }
-        param = authConf
-                .getGenericConfigurationParameter(AuthConfigurationProvider.AUTH_DATA_TIMEOUT_PROPERTY);
+        
+        param = authConf.getTimeOuts().getMOASessionUpdated();
         if (param != null) {
-            long authDataTimeOut = 0;
-            try {
-                authDataTimeOut = new Long(param).longValue();
-            } catch (NumberFormatException ex) {
-                Logger
-                        .error(MOAIDMessageProvider
-                                .getInstance()
-                                .getMessage(
-                                        "config.05",
-                                        new Object[] { AuthConfigurationProvider.AUTH_DATA_TIMEOUT_PROPERTY }));
-            }
+                long sessionTimeOut = param.longValue();
+            if (sessionTimeOut > 0)
+                    AuthenticationServer.getInstance()
+                            .setSecondsSessionTimeOutUpdated(sessionTimeOut);
+        }
+        
+        param = authConf.getTimeOuts().getAssertion();
+        if (param != null) {
+            long authDataTimeOut = param.longValue();
             if (authDataTimeOut > 0)
                     AuthenticationServer.getInstance()
                             .setSecondsAuthDataTimeOut(authDataTimeOut);