1 files changed, 104 insertions, 85 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/PVP2XProtocol.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/PVP2XProtocol.java
index e81b23d41..46cf7dfec 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/PVP2XProtocol.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/PVP2XProtocol.java
@@ -56,7 +56,10 @@ import at.gv.egovernment.moa.id.moduls.IRequest;
 import at.gv.egovernment.moa.id.moduls.NoPassivAuthenticationException;
 import at.gv.egovernment.moa.id.protocols.pvp2x.binding.IDecoder;
 import at.gv.egovernment.moa.id.protocols.pvp2x.binding.IEncoder;
-import at.gv.egovernment.moa.id.protocols.pvp2x.binding.MOARequest;
+import at.gv.egovernment.moa.id.protocols.pvp2x.messages.InboundMessage;
+import at.gv.egovernment.moa.id.protocols.pvp2x.messages.InboundMessageInterface;
+import at.gv.egovernment.moa.id.protocols.pvp2x.messages.MOARequest;
+import at.gv.egovernment.moa.id.protocols.pvp2x.messages.MOAResponse;
 import at.gv.egovernment.moa.id.protocols.pvp2x.binding.PostBinding;
 import at.gv.egovernment.moa.id.protocols.pvp2x.binding.RedirectBinding;
 import at.gv.egovernment.moa.id.protocols.pvp2x.exceptions.AuthnRequestValidatorException;
@@ -133,7 +136,7 @@ public class PVP2XProtocol implements IModulInfo, MOAIDAuthConstants {
 	public PVP2XProtocol() {
 		super();
 	}
-
+	
 	public IRequest preProcess(HttpServletRequest request,
 			HttpServletResponse response, String action) throws MOAIDException {
 
@@ -154,100 +157,30 @@ public class PVP2XProtocol implements IModulInfo, MOAIDAuthConstants {
 			return null;
 		}
 		try {
-			PVPTargetConfiguration config = new PVPTargetConfiguration();
-
-
-			MOARequest moaRequest = decoder.decodeRequest(request, response);
-			
-			RequestAbstractType samlReq =  moaRequest.getSamlRequest();
 
-			//String xml = PrettyPrinter.prettyPrint(SAML2Utils.asDOMDocument(samlReq));
-			//Logger.info("SAML : " + xml);
+			InboundMessage msg = (InboundMessage) decoder.decode(request, response);
 			
-			if(!moaRequest.isVerified()) {
+			if(!msg.isVerified()) {
 				SAMLVerificationEngine engine = new SAMLVerificationEngine();
-				engine.verifyRequest(samlReq, TrustEngineFactory.getSignatureKnownKeysTrustEngine());
-				moaRequest.setVerified(true);
-			}
-			
-			if(!(samlReq instanceof AuthnRequest)) {
-				throw new MOAIDException("Unsupported request", new Object[] {});
-			}
-						
-			EntityDescriptor metadata = moaRequest.getEntityMetadata();
-			if(metadata == null) {
-				throw new NoMetadataInformationException();
-			}
-			SPSSODescriptor spSSODescriptor = metadata.getSPSSODescriptor(SAMLConstants.SAML20P_NS);
-			
-			AuthnRequest authnRequest = (AuthnRequest)samlReq;
-			
-			Integer aIdx = authnRequest.getAssertionConsumerServiceIndex();
-			int assertionidx = 0;
-			
-			if(aIdx != null) {
-				assertionidx = aIdx.intValue();
+				engine.verify(msg, TrustEngineFactory.getSignatureKnownKeysTrustEngine());
+				msg.setVerified(true);
 				
-			} else {				
-				assertionidx = SAML2Utils.getDefaultAssertionConsumerServiceIndex(spSSODescriptor);
 			}
 			
-			aIdx = authnRequest.getAttributeConsumingServiceIndex();
-			int attributeIdx = 0;
-			
-			if(aIdx != null) {
-				attributeIdx = aIdx.intValue();
-			}
-			
-			AssertionConsumerService consumerService  = spSSODescriptor.getAssertionConsumerServices().get(assertionidx);
-			
-			AttributeConsumingService attributeConsumer = null;
+			if (msg instanceof MOARequest)
+				return preProcessAuthRequest(request, response, (MOARequest) msg);
 			
-			if (spSSODescriptor.getAttributeConsumingServices() != null  && 
-					spSSODescriptor.getAttributeConsumingServices().size() > 0) {
-				attributeConsumer  = spSSODescriptor.getAttributeConsumingServices().get(attributeIdx);
-			} 
-						
-			String oaURL = moaRequest.getEntityMetadata().getEntityID();
-			String binding = consumerService.getBinding();
-//			String entityID = moaRequest.getEntityMetadata().getEntityID();
-			
-			Logger.info("Dispatch PVP2 Request: OAURL=" + oaURL + " Binding=" + binding);
-			
-			oaURL = StringEscapeUtils.escapeHtml(oaURL);
-			
-			config.setOAURL(oaURL);
-			config.setBinding(binding);
-			config.setRequest(moaRequest);
-			config.setConsumerURL(consumerService.getLocation());
-						
-			String useMandate = request.getParameter(PARAM_USEMANDATE);
-			if(useMandate != null) {
-				if(useMandate.equals("true") && attributeConsumer != null) {
-					if(!CheckMandateAttributes.canHandleMandate(attributeConsumer)) {
-						throw new MandateAttributesNotHandleAbleException();
-					}
-				}
+			else if (msg instanceof MOAResponse) {
+				return null;
+				
 			}
-
-			//validate AuthnRequest
-			try {
-				AuthnRequestValidator.validate((AuthnRequestImpl) samlReq);
 				
-			} catch (AuthnRequestValidatorException e) {
-				if (generateErrorMessage(e, request, response, config)) {
-					throw new AuthnRequestValidatorException(e.getMessage(), 
-							new Object[] {}, config);
-					
-				} else {
-					throw new MOAIDException(e.getMessage(), new Object[] {});
-	
-				}			
+			
+			else {
+				Logger.error("Receive unsupported PVP21 message");
+				throw new MOAIDException("Unsupported PVP21 message", new Object[] {});
 			}
-
-			//request.getSession().setAttribute(PARAM_OA, oaURL);
 			
-			return config;
 
 		} catch (PVP2Exception e) {
 			throw e;
@@ -356,4 +289,90 @@ public class PVP2XProtocol implements IModulInfo, MOAIDAuthConstants {
 		return true;
 	}
 
+	private IRequest preProcessAuthRequest(HttpServletRequest request,
+			HttpServletResponse response, MOARequest moaRequest) throws Throwable {
+		
+		RequestAbstractType samlReq =  moaRequest.getSamlRequest();
+
+		if(!(samlReq instanceof AuthnRequest)) {
+			throw new MOAIDException("Unsupported request", new Object[] {});
+		}
+					
+		EntityDescriptor metadata = moaRequest.getEntityMetadata();
+		if(metadata == null) {
+			throw new NoMetadataInformationException();
+		}
+		SPSSODescriptor spSSODescriptor = metadata.getSPSSODescriptor(SAMLConstants.SAML20P_NS);
+		
+		AuthnRequest authnRequest = (AuthnRequest)samlReq;
+		
+		Integer aIdx = authnRequest.getAssertionConsumerServiceIndex();
+		int assertionidx = 0;
+		
+		if(aIdx != null) {
+			assertionidx = aIdx.intValue();
+			
+		} else {				
+			assertionidx = SAML2Utils.getDefaultAssertionConsumerServiceIndex(spSSODescriptor);
+		}
+		
+		aIdx = authnRequest.getAttributeConsumingServiceIndex();
+		int attributeIdx = 0;
+		
+		if(aIdx != null) {
+			attributeIdx = aIdx.intValue();
+		}
+		
+		AssertionConsumerService consumerService  = spSSODescriptor.getAssertionConsumerServices().get(assertionidx);
+		
+		AttributeConsumingService attributeConsumer = null;
+		
+		if (spSSODescriptor.getAttributeConsumingServices() != null  && 
+				spSSODescriptor.getAttributeConsumingServices().size() > 0) {
+			attributeConsumer  = spSSODescriptor.getAttributeConsumingServices().get(attributeIdx);
+		} 
+		
+		
+		
+		PVPTargetConfiguration config = new PVPTargetConfiguration();
+		
+		
+		String oaURL = moaRequest.getEntityMetadata().getEntityID();
+		String binding = consumerService.getBinding();
+		
+		Logger.info("Dispatch PVP2 Request: OAURL=" + oaURL + " Binding=" + binding);
+		
+		oaURL = StringEscapeUtils.escapeHtml(oaURL);
+		
+		config.setOAURL(oaURL);
+		config.setBinding(binding);
+		config.setRequest(moaRequest);
+		config.setConsumerURL(consumerService.getLocation());
+		
+		String useMandate = request.getParameter(PARAM_USEMANDATE);
+		if(useMandate != null) {
+			if(useMandate.equals("true") && attributeConsumer != null) {
+				if(!CheckMandateAttributes.canHandleMandate(attributeConsumer)) {
+					throw new MandateAttributesNotHandleAbleException();
+				}
+			}
+		}
+
+		//validate AuthnRequest
+		try {
+			AuthnRequestValidator.validate((AuthnRequestImpl) samlReq);
+			
+		} catch (AuthnRequestValidatorException e) {			
+			if (generateErrorMessage(e, request, response, config)) {
+				throw new AuthnRequestValidatorException(e.getMessage(), 
+						new Object[] {}, config);
+				
+			} else {
+				throw new MOAIDException(e.getMessage(), new Object[] {});
+
+			}			
+		}
+
+		return config;
+	}
 }