MOA-ID 2.x Configuration implemented

  -SSO deaktivated
  -Login with mandate and normal tested

1 files changed, 15 insertions, 32 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 e23b26417..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,7 +28,7 @@ import iaik.pki.PKIException;
 import iaik.pki.jsse.IAIKX509TrustManager;
 
 import java.io.IOException;
-import java.io.PrintWriter;
+import java.math.BigInteger;
 import java.security.GeneralSecurityException;
 import java.util.Properties;
 
@@ -37,9 +37,6 @@ import javax.activation.MailcapCommandMap;
 import javax.mail.Session;
 import javax.net.ssl.SSLSocketFactory;
 
-import org.apache.commons.logging.impl.SLF4JLog;
-import org.apache.log4j.config.PropertyPrinter;
-
 import at.gv.egovernment.moa.id.config.ConfigurationException;
 import at.gv.egovernment.moa.id.config.ConnectionParameter;
 import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider;
@@ -177,40 +174,26 @@ public class MOAIDAuthInitializer {
         }
 
         
-        //TODO: Set TimeOuts!!!
         // 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);