Bugfix:

Database Session management

4 files changed, 28 insertions, 21 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/AuthenticationManager.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/AuthenticationManager.java
index b9f0b2144..be0132c14 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/AuthenticationManager.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/AuthenticationManager.java
@@ -48,20 +48,20 @@ public class AuthenticationManager extends AuthServlet {
 	}
 	
 	
-	public AuthenticationSession getAuthenticationSession(
-			HttpSession session) {
-		String sessionID = HTTPSessionUtils.getHTTPSessionString(session,
-				MOA_SESSION, null);
-		if (sessionID != null) {
-			try {
-				return AuthenticationSessionStoreage.getSession(sessionID);
-				
-			} catch (MOADatabaseException e) {
-				return null;
-			}
-		}
-		return null;
-	}
+//	public AuthenticationSession getAuthenticationSession(
+//			HttpSession session) {
+//		String sessionID = HTTPSessionUtils.getHTTPSessionString(session,
+//				MOA_SESSION, null);
+//		if (sessionID != null) {
+//			try {
+//				return AuthenticationSessionStoreage.getSession(sessionID);
+//				
+//			} catch (MOADatabaseException e) {
+//				return null;
+//			}
+//		}
+//		return null;
+//	}
 
 //	/**
 //	 * Checks if the session is authenticated
@@ -134,8 +134,8 @@ public class AuthenticationManager extends AuthServlet {
 					
 						AuthenticationSessionStoreage.storeSession(authSession);
 					
-						HTTPSessionUtils.setHTTPSessionString(session, MOA_SESSION,
-								sessionID);
+//						HTTPSessionUtils.setHTTPSessionString(session, MOA_SESSION,
+//								sessionID);
 						return true; // got authenticated
 					}
 				}
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/RequestImpl.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/RequestImpl.java
index 420f11622..d47e8df05 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/RequestImpl.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/RequestImpl.java
@@ -1,7 +1,11 @@
 package at.gv.egovernment.moa.id.moduls;
 
-public class RequestImpl implements IRequest {
+import java.io.Serializable;
 
+public class RequestImpl implements IRequest, Serializable{
+
+	private static final long serialVersionUID = 1L;
+	
 	private String oaURL;
 	private boolean passiv = false;
 	private boolean force = false;
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/RequestStorage.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/RequestStorage.java
index 35481a0a1..d33d4693d 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/RequestStorage.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/RequestStorage.java
@@ -41,6 +41,9 @@ public class RequestStorage {
 	}
 
 	public static void removeAllPendingRequests(HttpSession session) {
+		
+		Logger.debug(RequestStorage.class.getName()+": Remove all PendingRequests");
+		
 		session.setAttribute(PENDING_REQUEST, null);
 	}
 	
@@ -54,7 +57,7 @@ public class RequestStorage {
 			
 				if (requestmap.containsKey(requestID)) {
 					requestmap.remove(requestID);
-					Logger.debug("Remove PendingRequest with ID " + requestID);
+					Logger.debug(RequestStorage.class.getName()+": Remove PendingRequest with ID " + requestID);
 				
 				}
 			
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/SSOManager.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/SSOManager.java
index 82273da83..18eeae58e 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/SSOManager.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/SSOManager.java
@@ -59,10 +59,10 @@ public class SSOManager {
 			return false;		
 		}
 		
-		String moaSessionId =HTTPSessionUtils.getHTTPSessionString(httpReq.getSession(),
-				AuthenticationManager.MOA_SESSION, null);
+//		String moaSessionId =HTTPSessionUtils.getHTTPSessionString(httpReq.getSession(),
+//				AuthenticationManager.MOA_SESSION, null);
 		
-		return AuthenticationSessionStoreage.isValidSessionWithSSOID(ssoSessionID, moaSessionId);	
+		return AuthenticationSessionStoreage.isValidSessionWithSSOID(ssoSessionID, null);	
 		
 	}