1 files changed, 48 insertions, 13 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyIdentityLinkServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyIdentityLinkServlet.java
index 5178e27d3..38f650a65 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyIdentityLinkServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyIdentityLinkServlet.java
@@ -43,6 +43,11 @@ import at.gv.egovernment.moa.id.auth.WrongParametersException;
 import at.gv.egovernment.moa.id.auth.builder.DataURLBuilder;
 import at.gv.egovernment.moa.id.auth.builder.InfoboxReadRequestBuilderCertificate;
 import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
+import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils;
+import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException;
+import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider;
+import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
+import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage;
 import at.gv.egovernment.moa.id.util.ParamValidatorUtils;
 import at.gv.egovernment.moa.id.util.ServletUtils;
 import at.gv.egovernment.moa.logging.Logger;
@@ -109,6 +114,8 @@ public class VerifyIdentityLinkServlet extends AuthServlet {
 		Logger.debug("POST VerifyIdentityLink");
 		  
     Map parameters;
+    String pendingRequestID = null;
+    
     try 
     {
       parameters = getParameters(req);
@@ -123,6 +130,8 @@ public class VerifyIdentityLinkServlet extends AuthServlet {
     // escape parameter strings
 	sessionID = StringEscapeUtils.escapeHtml(sessionID);
     
+	pendingRequestID = AuthenticationSessionStoreage.getPendingRequestID(sessionID);
+	
     resp.setHeader(MOAIDAuthConstants.HEADER_EXPIRES,MOAIDAuthConstants.HEADER_VALUE_EXPIRES);
 	resp.setHeader(MOAIDAuthConstants.HEADER_PRAGMA,MOAIDAuthConstants.HEADER_VALUE_PRAGMA);
 	resp.setHeader(MOAIDAuthConstants.HEADER_CACHE_CONTROL,MOAIDAuthConstants.HEADER_VALUE_CACHE_CONTROL);
@@ -134,14 +143,17 @@ public class VerifyIdentityLinkServlet extends AuthServlet {
        if (!ParamValidatorUtils.isValidSessionID(sessionID))
           throw new WrongParametersException("VerifyIdentityLink", PARAM_SESSIONID, "auth.12");
        
-    	AuthenticationSession session = AuthenticationServer.getSession(sessionID);  
-    	String createXMLSignatureRequestOrRedirect = AuthenticationServer.getInstance().verifyIdentityLink(sessionID, parameters);
+       
+       AuthenticationSession session = AuthenticationServer.getSession(sessionID);
+    	  
+    	String createXMLSignatureRequestOrRedirect = AuthenticationServer.getInstance().verifyIdentityLink(session, parameters);
 
     	Logger.debug(createXMLSignatureRequestOrRedirect);
     	
+    	    	
     	if (createXMLSignatureRequestOrRedirect == null) {
     	   // no identity link found
-    		
+
     		boolean useMandate = session.getUseMandate();
     		if (useMandate) {
     			Logger.error("Online-Mandate Mode for foreign citizencs not supported.");
@@ -150,7 +162,7 @@ public class VerifyIdentityLinkServlet extends AuthServlet {
     		
     		try {
     		
-    		   Logger.debug("Send InfoboxReadRequest to BKU to get signer certificate.");
+    		   Logger.info("Send InfoboxReadRequest to BKU to get signer certificate.");
     		   
     		   // create the InfoboxReadRequest to get the certificate
     		   String infoboxReadRequest = new InfoboxReadRequestBuilderCertificate().build(true);
@@ -168,15 +180,18 @@ public class VerifyIdentityLinkServlet extends AuthServlet {
     	    	
     	    }
     	    catch(Exception e) {
-    	    	handleError(null, e, req, resp);
+    	    	handleError(null, e, req, resp, pendingRequestID);
     	    }
     	    
     	}
     	else {
     		// @TODO: unteren InfoboxReadRequest zu, Signer-Cert auslesen (wegen Cert Abfrage auf Organwalter OID),
-    		// nach oben verschoben vor verifyIdentityLink (da hier schon bPK berechnet, die aber für OW nicht in
+    		// nach oben verschoben vor verifyIdentityLink (da hier schon bPK berechnet, die aber f�r OW nicht in
     		// AUTH Block aufscheinen darf. --> D.h. verifyIdentityLink umbauen - verify und AUTH Block bauen trennen)
+    		
+    		//TODO: Klaus fragen ob der Teil wirklich noch benötigt wird!!!!!
     		boolean useMandate = session.getUseMandate();
+    		
     		if (useMandate) { // Mandate modus
     			// read certificate and set dataurl to 
     			Logger.debug("Send InfoboxReadRequest to BKU to get signer certificate.");
@@ -191,27 +206,47 @@ public class VerifyIdentityLinkServlet extends AuthServlet {
                    REQ_VERIFY_CERTIFICATE,
                    session.getSessionID());
            
-          
      		  //Logger.debug("ContentType set to: application/x-www-form-urlencoded (ServletUtils)");
      		  //ServletUtils.writeCreateXMLSignatureRequestURLEncoded(resp, session, infoboxReadRequest, AuthenticationServer.REQ_PROCESS_VALIDATOR_INPUT, "VerifyIdentityLink", dataurl);
+     		   
      		  Logger.debug("ContentType set to: text/xml;charset=UTF-8 (ServletUtils)");
      		  ServletUtils.writeCreateXMLSignatureRequest(resp, session, infoboxReadRequest, AuthenticationServer.REQ_PROCESS_VALIDATOR_INPUT, "VerifyIdentityLink", dataurl);
     			
-    		}
+    		}	
     		else {
+    			Logger.info("Normal");
+    			
+    			OAAuthParameter oaParam = AuthConfigurationProvider.getInstance()
+    					.getOnlineApplicationParameter(session.getPublicOAURLPrefix());
+    			AuthConfigurationProvider authConf = AuthConfigurationProvider
+    					.getInstance();
+    			
+    			createXMLSignatureRequestOrRedirect =  AuthenticationServer.getInstance()
+    					.getCreateXMLSignatureRequestAuthBlockOrRedirect(session,
+    					authConf, oaParam);
+    			
     			ServletUtils.writeCreateXMLSignatureRequestOrRedirect(resp, session, createXMLSignatureRequestOrRedirect, AuthenticationServer.REQ_PROCESS_VALIDATOR_INPUT, "VerifyIdentityLink");
     		}
-    		
-    		
     	}
-      
+    	
+		try {
+			AuthenticationSessionStoreage.storeSession(session);
+			
+		} catch (MOADatabaseException e) {
+			Logger.info("No valid MOA session found. Authentification process is abourted.");
+			throw new AuthenticationException("auth.20", null);
+		}
     }
     catch (ParseException ex) {
-    	handleError(null, ex, req, resp);
+    	handleError(null, ex, req, resp, pendingRequestID);
     }
     
     catch (MOAIDException ex) {
-      handleError(null, ex, req, resp);
+      handleError(null, ex, req, resp, pendingRequestID);
+    }
+    
+    finally {
+    	ConfigurationDBUtils.closeSession();
     }
   }