1 files changed, 35 insertions, 9 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetForeignIDServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetForeignIDServlet.java
index 6516e64b7..02c751a0a 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetForeignIDServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetForeignIDServlet.java
@@ -49,10 +49,12 @@ import at.gv.egovernment.moa.id.auth.parser.CreateXMLSignatureResponseParser;
 import at.gv.egovernment.moa.id.auth.parser.IdentityLinkAssertionParser;
 import at.gv.egovernment.moa.id.auth.validator.parep.client.szrgw.CreateIdentityLinkResponse;
 import at.gv.egovernment.moa.id.auth.validator.parep.client.szrgw.SZRGWClientException;
+import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException;
+import at.gv.egovernment.moa.id.moduls.ModulUtils;
+import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage;
 import at.gv.egovernment.moa.id.util.ParamValidatorUtils;
 import at.gv.egovernment.moa.logging.Logger;
 import at.gv.egovernment.moa.util.DOMUtils;
-import at.gv.egovernment.moa.util.URLEncoder;
 

 /**

  * Servlet requested for getting the foreign eID

@@ -112,7 +114,10 @@ public class GetForeignIDServlet extends AuthServlet {
 		resp.setHeader(MOAIDAuthConstants.HEADER_CACHE_CONTROL,MOAIDAuthConstants.HEADER_VALUE_CACHE_CONTROL);

 		resp.addHeader(MOAIDAuthConstants.HEADER_CACHE_CONTROL,MOAIDAuthConstants.HEADER_VALUE_CACHE_CONTROL_IE);

 		

-		Map parameters;

+		Map parameters;
+		
+		String pendingRequestID = null;
+		

 	    try 

 	    {

 	      parameters = getParameters(req);

@@ -121,7 +126,8 @@ public class GetForeignIDServlet extends AuthServlet {
 	      Logger.error("Parsing mulitpart/form-data request parameters failed: " + e.getMessage());

 	      throw new IOException(e.getMessage());

 	     	}

-	    String sessionID = req.getParameter(PARAM_SESSIONID);

+	    String sessionID = req.getParameter(PARAM_SESSIONID);
+	    pendingRequestID = AuthenticationSessionStoreage.getPendingRequestID(sessionID);

 	    

 	    // escape parameter strings

 	    sessionID = StringEscapeUtils.escapeHtml(sessionID);

@@ -177,18 +183,38 @@ public class GetForeignIDServlet extends AuthServlet {
 		    	session.setIdentityLink(identitylink);

 	  	   	

 		    	String samlArtifactBase64 = 

-		    		AuthenticationServer.getInstance().getForeignAuthenticationData(sessionID);
+		    		AuthenticationServer.getInstance().getForeignAuthenticationData(session);
+		    	
+		    	
+	    		//session is implicit stored in changeSessionID!!!! 
+	    		String newMOASessionID = AuthenticationSessionStoreage.changeSessionID(session);
+	    		
+	    		Logger.info("Changed MOASession " + sessionID + " to Session " + newMOASessionID);
+	    		Logger.info("Daten angelegt zu MOASession " + newMOASessionID);
+		    	
 		    	if (!samlArtifactBase64.equals("Redirect to Input Processor")) {
-		    		redirectURL = session.getOAURLRequested();
+		    		/*redirectURL = session.getOAURLRequested();
 		    		if (!session.getBusinessService()) {
 		    			redirectURL = addURLParameter(redirectURL, PARAM_TARGET, URLEncoder.encode(session.getTarget(), "UTF-8"));
 		    		}
 		    		redirectURL = addURLParameter(redirectURL, PARAM_SAMLARTIFACT, URLEncoder.encode(samlArtifactBase64, "UTF-8"));
+		    		redirectURL = resp.encodeRedirectURL(redirectURL);*/
+		    							
+		    		redirectURL = new DataURLBuilder().buildDataURL(session.getAuthURL(), 
+							ModulUtils.buildAuthURL(session.getModul(), session.getAction(), pendingRequestID), newMOASessionID);
 		    		redirectURL = resp.encodeRedirectURL(redirectURL);
 		    		
-		    	} else {
-		    		redirectURL = new DataURLBuilder().buildDataURL(session.getAuthURL(), AuthenticationServer.REQ_PROCESS_VALIDATOR_INPUT, session.getSessionID());
+		    	} else {				    		
+		    		redirectURL = new DataURLBuilder().buildDataURL(session.getAuthURL(), AuthenticationServer.REQ_PROCESS_VALIDATOR_INPUT, newMOASessionID);
+		    		
 		    	}

+		    	
+		    	try {
+					AuthenticationSessionStoreage.storeSession(session);
+				} catch (MOADatabaseException e) {
+					throw new MOAIDException("Session store error", null);
+				}
+		    	
 		    	

 		    	resp.setContentType("text/html");

 		    	resp.setStatus(302);

@@ -198,10 +224,10 @@ public class GetForeignIDServlet extends AuthServlet {
 	    	    		      

 	    }

 	    catch (MOAIDException ex) {

-	      handleError(null, ex, req, resp);

+	      handleError(null, ex, req, resp, pendingRequestID);

 	    } 

 	    catch (SZRGWClientException ex) {

-	       handleError(null, ex, req, resp);

+	       handleError(null, ex, req, resp, pendingRequestID);

 		}

   }