1 files changed, 29 insertions, 17 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java
index 2f4bbbcf4..9f1b6b3e8 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java
@@ -249,26 +249,38 @@ public class DispatcherServlet extends AuthServlet{
 					try {
 						protocolRequest = info.preProcess(req, resp, action);
 						
-						if (protocolRequest != null &&
-								MiscUtil.isEmpty(protocolRequest.getRequestID())) {
-								
-							//Start new Authentication
-							protocolRequest.setAction(action);
-							protocolRequest.setModule(module);
-							protocolRequestID = Random.nextRandom();
-							protocolRequest.setRequestID(protocolRequestID);
-							
-							RequestStorage.setPendingRequest(protocolRequest);
-							
-							Logger.debug(DispatcherServlet.class.getName()+": Create PendingRequest with ID " + protocolRequestID + ".");
-							
-						} else if (protocolRequest != null && 
+						//request is a valid interfederation response 
+						if (protocolRequest != null && 
 								protocolRequest.getInterfederationResponse() != null ) {							
 							Logger.debug("Create new interfederated MOA-Session and add to HTTPRequest");
+
+							//reload SP protocol implementation 
+							info = ModulStorage.getModuleByPath(protocolRequest.requestedModule());
+							moduleAction = info.getAction(protocolRequest.requestedAction());
+
+							//create interfederated mOASession
 							String sessionID = AuthenticationSessionStoreage.createInterfederatedSession(protocolRequest, true);
 							req.getParameterMap().put(PARAM_SESSIONID, sessionID);
+														
 							Logger.info("PreProcessing of SSO interfederation response complete. ");
-													
+
+						//request is a not valid interfederation response -> Restart local authentication  
+						} else if (protocolRequest != null &&
+								MiscUtil.isNotEmpty(protocolRequest.getRequestID())) {
+							Logger.info("PreProcessing of SSO interfederation response FAILED. Starting local authentication ...");
+							
+						//request is a new authentication request	
+						} else if (protocolRequest != null &&
+								MiscUtil.isEmpty(protocolRequest.getRequestID())) {								
+							//Start new Authentication
+							protocolRequest.setAction(action);
+							protocolRequest.setModule(module);
+							protocolRequestID = Random.nextRandom();
+							protocolRequest.setRequestID(protocolRequestID);							
+							RequestStorage.setPendingRequest(protocolRequest);							
+							Logger.debug(DispatcherServlet.class.getName()+": Create PendingRequest with ID " + protocolRequestID + ".");
+
+																										
 						} else {
 							Logger.error("Failed to generate a valid protocol request!");
 							resp.setContentType("text/html;charset=UTF-8");
@@ -335,7 +347,7 @@ public class DispatcherServlet extends AuthServlet{
 					}
 
 					
-					isValidSSOSession = ssomanager.isValidSSOSession(ssoId, req);
+					isValidSSOSession = ssomanager.isValidSSOSession(ssoId, protocolRequest);
 					useSSOOA = oaParam.useSSO();
 					
 					
@@ -445,7 +457,7 @@ public class DispatcherServlet extends AuthServlet{
 				
 					//Advanced statistic logging
 					StatisticLogger logger = StatisticLogger.getInstance();
-					logger.logSuccessOperation(protocolRequest, moasession, isSSOSession);
+					logger.logSuccessOperation(protocolRequest, authData, isSSOSession);
 					
 				}