Adapted for MOA-ID 1.4 (validating additional infoboxes).

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@769 d688527b-c9ab-4aba-bd8d-4036d912da1d

2 files changed, 23 insertions, 19 deletions

diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/servlet/AuthServlet.java b/id.server/src/at/gv/egovernment/moa/id/auth/servlet/AuthServlet.java
index 70e53d83e..96e8e6dd6 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/servlet/AuthServlet.java
+++ b/id.server/src/at/gv/egovernment/moa/id/auth/servlet/AuthServlet.java
@@ -131,7 +131,7 @@ public class AuthServlet extends HttpServlet implements MOAIDAuthConstants {
     {
       // request is encoded as mulitpart/form-data
       FileItemFactory factory = new DiskFileItemFactory();
-      ServletFileUpload upload = null;;
+      ServletFileUpload upload = null;
       upload = new ServletFileUpload(factory);
       List items = null;
       items = upload.parseRequest(req);
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/servlet/VerifyIdentityLinkServlet.java b/id.server/src/at/gv/egovernment/moa/id/auth/servlet/VerifyIdentityLinkServlet.java
index 9d5c4b191..2134c1444 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/servlet/VerifyIdentityLinkServlet.java
+++ b/id.server/src/at/gv/egovernment/moa/id/auth/servlet/VerifyIdentityLinkServlet.java
@@ -2,11 +2,14 @@ package at.gv.egovernment.moa.id.auth.servlet;
 
 import java.io.IOException;
 import java.io.OutputStream;
+import java.util.Enumeration;
 import java.util.Map;
 
+import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 
 import org.apache.commons.fileupload.FileUploadException;
 
@@ -75,29 +78,30 @@ public class VerifyIdentityLinkServlet extends AuthServlet {
       throw new IOException(e.getMessage());
     }
     String sessionID = req.getParameter(PARAM_SESSIONID);
-    String infoboxReadResponse = (String)parameters.get(PARAM_XMLRESPONSE);
     
-		try {
-			String createXMLSignatureRequest = 
-				AuthenticationServer.getInstance().verifyIdentityLink(sessionID, infoboxReadResponse);
-			AuthenticationSession session = AuthenticationServer.getSession(sessionID);
-			resp.setStatus(307);
-			String dataURL = new DataURLBuilder().buildDataURL(
-				session.getAuthURL(), AuthenticationServer.REQ_VERIFY_AUTH_BLOCK, sessionID);
-			resp.addHeader("Location", dataURL);
-			
-			//TODO test impact of explicit setting charset with older versions of BKUs (HotSign)
-			resp.setContentType("text/xml;charset=UTF-8");
+    
+    try {
+      AuthenticationSession session = AuthenticationServer.getSession(sessionID);
+      
+      String createXMLSignatureRequest = 
+        AuthenticationServer.getInstance().verifyIdentityLink(sessionID, parameters);
+      resp.setStatus(307);
+      String dataURL = new DataURLBuilder().buildDataURL(
+        session.getAuthURL(), AuthenticationServer.REQ_VERIFY_AUTH_BLOCK, sessionID);
+      resp.addHeader("Location", dataURL);
+      
+      //TODO test impact of explicit setting charset with older versions of BKUs (HotSign)
+      resp.setContentType("text/xml;charset=UTF-8");
       
       OutputStream out = resp.getOutputStream();
       out.write(createXMLSignatureRequest.getBytes("UTF-8"));
-			out.flush();
+      out.flush();
       out.close();
-			Logger.debug("Finished POST VerifyIdentityLink");
-		}
-		catch (MOAIDException ex) {
-			handleError(null, ex, req, resp);
-		}
+      Logger.debug("Finished POST VerifyIdentityLink");
+    }
+    catch (MOAIDException ex) {
+      handleError(null, ex, req, resp);
+    }
   }
 
 }