1 files changed, 53 insertions, 4 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 329749e96..4f98e85e2 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
@@ -25,8 +25,13 @@ import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.fileupload.FileUploadException;
 
 import at.gv.egovernment.moa.id.MOAIDException;
+import at.gv.egovernment.moa.id.ParseException;
 import at.gv.egovernment.moa.id.auth.AuthenticationServer;
+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.util.ParamValidatorUtils;
 import at.gv.egovernment.moa.id.util.ServletUtils;
 import at.gv.egovernment.moa.logging.Logger;
 
@@ -60,7 +65,8 @@ public class VerifyIdentityLinkServlet extends AuthServlet {
 
   /**
    * Verifies the identity link and responds with a new 
-   * <code>CreateXMLSignatureRequest</code>.
+   * <code>CreateXMLSignatureRequest</code> or a new <code>
+   * InfoboxReadRequest</code> (in case of a foreign eID card).
    * <br>
    * Request parameters:
    * <ul>
@@ -88,13 +94,56 @@ public class VerifyIdentityLinkServlet extends AuthServlet {
       Logger.error("Parsing mulitpart/form-data request parameters failed: " + e.getMessage());
       throw new IOException(e.getMessage());
     }
+  //@TODO Parameter
     String sessionID = req.getParameter(PARAM_SESSIONID);
     
+    
+
+    
     try {
-      AuthenticationSession session = AuthenticationServer.getSession(sessionID);
-      String createXMLSignatureRequestOrRedirect = AuthenticationServer.getInstance().verifyIdentityLink(sessionID, parameters);
-      ServletUtils.writeCreateXMLSignatureRequestOrRedirect(resp, session, createXMLSignatureRequestOrRedirect, AuthenticationServer.REQ_PROCESS_VALIDATOR_INPUT, "VerifyIdentityLink"); 
+    // check parameter
+       if (!ParamValidatorUtils.isValidSessionID(sessionID))
+          throw new WrongParametersException("VerifyIdentityLink", PARAM_SESSIONID, "auth.12");
+       
+    	AuthenticationSession session = AuthenticationServer.getSession(sessionID);  
+    	String createXMLSignatureRequestOrRedirect = AuthenticationServer.getInstance().verifyIdentityLink(sessionID, parameters);
+    	
+    	if (createXMLSignatureRequestOrRedirect == null) {
+    	   
+    	   System.out.println("Send InfoboxReadRequest to BKU to get signer certificate.");
+    		// no identity link found
+    		try {
+    		
+    		   Logger.debug("Send InfoboxReadRequest to BKU to get signer certificate.");
+    		   
+    		// create the InfoboxReadRequest to get the certificate
+    		   String infoboxReadRequest = new InfoboxReadRequestBuilderCertificate().build(true);
+
+    		   // build dataurl (to the GetForeignIDSerlvet)
+          String dataurl =
+                new DataURLBuilder().buildDataURL(
+                  session.getAuthURL(),
+                  REQ_VERIFY_CERTIFICATE,
+                  session.getSessionID());
+          
+         
+          ServletUtils.writeCreateXMLSignatureRequest(resp, session, infoboxReadRequest, AuthenticationServer.REQ_PROCESS_VALIDATOR_INPUT, "VerifyCertificate", dataurl);
+    	    	
+    	    }
+    	    catch(Exception e) {
+    	    	handleError(null, e, req, resp);
+    	    }
+    	    
+    	}
+    	else {
+    		ServletUtils.writeCreateXMLSignatureRequestOrRedirect(resp, session, createXMLSignatureRequestOrRedirect, AuthenticationServer.REQ_PROCESS_VALIDATOR_INPUT, "VerifyIdentityLink");
+    	}
+      
+    }
+    catch (ParseException ex) {
+    	handleError(null, ex, req, resp);
     }
+    
     catch (MOAIDException ex) {
       handleError(null, ex, req, resp);
     }