1 files changed, 15 insertions, 14 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java
index 670ce8b3d..ade7d3f3c 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java
@@ -23,16 +23,17 @@
 package at.gv.egovernment.moa.id.auth.servlet;

 

 import iaik.x509.X509Certificate;

+

 import java.io.IOException;

 import java.io.InputStream;

 import java.io.StringWriter;

 import java.util.ArrayList;

+

 import javax.activation.DataSource;

 import javax.servlet.ServletException;

 import javax.servlet.http.HttpServlet;

 import javax.servlet.http.HttpServletRequest;

 import javax.servlet.http.HttpServletResponse;

-import javax.servlet.http.HttpSession;

 import javax.xml.bind.JAXBContext;

 import javax.xml.bind.JAXBElement;

 import javax.xml.transform.stream.StreamSource;

@@ -50,18 +51,15 @@ import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
 import at.gv.egovernment.moa.id.auth.data.IdentityLink;

 import at.gv.egovernment.moa.id.auth.exception.AuthenticationException;

 import at.gv.egovernment.moa.id.auth.exception.MOAIDException;

-import at.gv.egovernment.moa.id.auth.exception.WrongParametersException;

 import at.gv.egovernment.moa.id.auth.stork.STORKException;

 import at.gv.egovernment.moa.id.auth.stork.STORKResponseProcessor;

 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.moduls.ModulUtils;

 import at.gv.egovernment.moa.id.protocols.pvp2x.PVPConstants;

 import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage;

 import at.gv.egovernment.moa.id.util.HTTPUtils;

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

 import at.gv.egovernment.moa.id.util.VelocityProvider;

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

 import at.gv.egovernment.moa.util.StringUtils;

@@ -188,7 +186,6 @@ public class PEPSConnectorServlet extends AuthServlet {
 			

 			//load MOASession from database

 			AuthenticationSession moaSession = AuthenticationServer.getSession(moaSessionID);

-			

 			//change MOASessionID

 			moaSessionID = AuthenticationSessionStoreage.changeSessionID(moaSession);

 			

@@ -226,7 +223,7 @@ public class PEPSConnectorServlet extends AuthServlet {
 				moaSession.setUseMandate("true");

 				

 				// and check if we have the gender value

-			PersonalAttribute gender = attributeList.get("gender");

+			PersonalAttribute gender = attributeList.get("gender");     // TODO Do we need to check gender value if there is no representation case?

 			if(null == gender) {

 				String gendervalue = (String) request.getParameter("gender");

 				if(null != gendervalue) {

@@ -247,7 +244,8 @@ public class PEPSConnectorServlet extends AuthServlet {
 			//extract signed doc element and citizen signature

 			String citizenSignature = null;

 			try {

-				String signatureInfo = authnResponse.getPersonalAttributeList().get("signedDoc").getValue().get(0);

+				String signatureInfo = authnResponse.getPersonalAttributeList().get("signedDoc").getValue().get(0); // TODO ERROR HANDLING

+								 

 				SignResponse dssSignResponse = (SignResponse) ApiUtils.unmarshal(new StreamSource(new java.io.StringReader(signatureInfo)));

 				

 				// fetch signed doc

@@ -272,7 +270,7 @@ public class PEPSConnectorServlet extends AuthServlet {
 						for(Object currentX509Data : ((JAXBElement<X509DataType>) current).getValue().getX509IssuerSerialOrX509SKIOrX509SubjectName()) {

 							JAXBElement<?> casted = ((JAXBElement<?>) currentX509Data);

 							if(casted.getName().getLocalPart().equals("X509Certificate")) {

-								moaSession.setSignerCertificate(new X509Certificate(((String)casted.getValue()).getBytes()));

+								moaSession.setSignerCertificate(new X509Certificate(((String)casted.getValue()).getBytes("UTF-8")));

 								break;

 							}

 						}

@@ -320,7 +318,7 @@ public class PEPSConnectorServlet extends AuthServlet {
 				identityLink = STORKResponseProcessor.connectToSZRGateway(authnResponse.getPersonalAttributeList(),

 																		  oaParam.getFriendlyName(), 

 																		  targetType, null, 

-																		  oaParam.getMandateProfiles());

+																		  oaParam.getMandateProfiles(), citizenSignature);

 			} catch (STORKException e) {

 				// this is really nasty but we work against the system here. We are supposed to get the gender attribute from

 				// stork. If we do not, we cannot register the person in the ERnP - we have to have the

@@ -338,7 +336,7 @@ public class PEPSConnectorServlet extends AuthServlet {
 						StringWriter writer = new StringWriter();

 						template.merge(context, writer);

 						

-						response.getOutputStream().write(writer.toString().getBytes());

+						response.getOutputStream().write(writer.toString().getBytes("UTF-8"));

 					} catch (Exception e1) {

 						Logger.error("Error sending gender retrival form.", e1);

 //						httpSession.invalidate();

@@ -356,7 +354,9 @@ public class PEPSConnectorServlet extends AuthServlet {
 			if (identityLink == null) {

 				Logger.error("SZR Gateway did not return an identity link.");

 				throw new MOAIDException("stork.10", null);	

-			}

+			}			

+			moaSession.setForeigner(true);

+			

 			Logger.info("Received Identity Link from SZR Gateway");

 			moaSession.setIdentityLink(identityLink);

 			

@@ -399,9 +399,10 @@ public class PEPSConnectorServlet extends AuthServlet {
 						ModulUtils.buildAuthURL(moaSession.getModul(), moaSession.getAction(), pendingRequestID), newMOASessionID);

 	    		redirectURL = response.encodeRedirectURL(redirectURL);

 	    	

-	    	response.setContentType("text/html");

-	    	response.setStatus(302);

-	    	response.addHeader("Location", redirectURL);

+//	    	response.setContentType("text/html");

+//	    	response.setStatus(302);

+//	    	response.addHeader("Location", redirectURL);

+	    		response.sendRedirect(redirectURL);

 	    	Logger.info("REDIRECT TO: " + redirectURL);