1 files changed, 45 insertions, 35 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetMISSessionIDServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetMISSessionIDServlet.java
index ad0592694..5c193aca1 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetMISSessionIDServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetMISSessionIDServlet.java
@@ -24,40 +24,40 @@
 
 package at.gv.egovernment.moa.id.auth.servlet;

 

-import iaik.pki.PKIException;

-

-import java.io.IOException;

-import java.io.PrintWriter;

-import java.security.GeneralSecurityException;

-import java.util.List;

-import java.util.Map;

-

-import javax.net.ssl.SSLSocketFactory;

-import javax.servlet.ServletException;

-import javax.servlet.http.HttpServletRequest;

-import javax.servlet.http.HttpServletResponse;

-

-import org.apache.commons.fileupload.FileUploadException;

-import org.apache.commons.lang.StringEscapeUtils;

-

-import at.gv.egovernment.moa.id.AuthenticationException;

-import at.gv.egovernment.moa.id.BuildException;

-import at.gv.egovernment.moa.id.MOAIDException;

-import at.gv.egovernment.moa.id.auth.AuthenticationServer;

-import at.gv.egovernment.moa.id.auth.MOAIDAuthConstants;

-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.GetIdentityLinkFormBuilder;

-import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;

-import at.gv.egovernment.moa.id.config.ConnectionParameter;

-import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider;

-import at.gv.egovernment.moa.id.util.ParamValidatorUtils;

-import at.gv.egovernment.moa.id.util.SSLUtils;

-import at.gv.egovernment.moa.id.util.client.mis.simple.MISMandate;

-import at.gv.egovernment.moa.id.util.client.mis.simple.MISSimpleClient;

-import at.gv.egovernment.moa.id.util.client.mis.simple.MISSimpleClientException;

-import at.gv.egovernment.moa.logging.Logger;

-import at.gv.egovernment.moa.util.FileUtils;

+import iaik.pki.PKIException;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.security.GeneralSecurityException;
+import java.util.List;
+
+import javax.net.ssl.SSLSocketFactory;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.apache.commons.lang.StringEscapeUtils;
+import org.w3c.dom.Document;
+import org.xml.sax.SAXException;
+
+import at.gv.egovernment.moa.id.BuildException;
+import at.gv.egovernment.moa.id.MOAIDException;
+import at.gv.egovernment.moa.id.auth.AuthenticationServer;
+import at.gv.egovernment.moa.id.auth.MOAIDAuthConstants;
+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.GetIdentityLinkFormBuilder;
+import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
+import at.gv.egovernment.moa.id.config.ConnectionParameter;
+import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider;
+import at.gv.egovernment.moa.id.util.ParamValidatorUtils;
+import at.gv.egovernment.moa.id.util.SSLUtils;
+import at.gv.egovernment.moa.id.util.client.mis.simple.MISMandate;
+import at.gv.egovernment.moa.id.util.client.mis.simple.MISSimpleClient;
+import at.gv.egovernment.moa.id.util.client.mis.simple.MISSimpleClientException;
+import at.gv.egovernment.moa.logging.Logger;
+import at.gv.egovernment.moa.util.DOMUtils;
 

 /**

  * Servlet requested for getting the foreign eID

@@ -161,7 +161,13 @@ public class GetMISSessionIDServlet extends AuthServlet {
    	

 	    	// verify mandate signature

 	    	String createXMLSignatureRequestOrRedirect = AuthenticationServer.getInstance().verifyMandate(sessionID, mandate);

-	    	

+
+	    	byte[] byteMandate = mandate.getMandate();
+	    	String stringMandate = new String(byteMandate);
+	    	Document mandateDoc = DOMUtils.parseDocument(stringMandate, false, null, null);
+	    	session.setMandateElem(mandateDoc.getDocumentElement());
+	    	//System.out.println("stringMandate: " + stringMandate);
+	    	
 	    	String dataurl =

 	             new DataURLBuilder().buildDataURL(

 	               session.getAuthURL(),

@@ -187,6 +193,10 @@ public class GetMISSessionIDServlet extends AuthServlet {
 			handleError(null, e, req, resp);

 		} catch (MISSimpleClientException e) {

 			handleError(null, e, req, resp);

+		} catch (SAXException e) {
+			handleError(null, e, req, resp);
+		} catch (ParserConfigurationException e) {
+			handleError(null, e, req, resp);
 		} 

   }