refactor PVP21 inbound message processing

1 files changed, 37 insertions, 39 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/binding/PostBinding.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/binding/PostBinding.java
index b190ca24e..a7633952a 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/binding/PostBinding.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/binding/PostBinding.java
@@ -34,6 +34,7 @@ import org.opensaml.saml2.binding.encoding.HTTPPostEncoder;
 import org.opensaml.saml2.core.RequestAbstractType;
 import org.opensaml.saml2.core.Response;
 import org.opensaml.saml2.core.StatusResponseType;
+import org.opensaml.saml2.metadata.IDPSSODescriptor;
 import org.opensaml.saml2.metadata.SPSSODescriptor;
 import org.opensaml.saml2.metadata.SingleSignOnService;
 import org.opensaml.saml2.metadata.impl.SingleSignOnServiceBuilder;
@@ -48,6 +49,10 @@ import org.opensaml.xml.security.x509.KeyStoreX509CredentialAdapter;
 import org.opensaml.xml.security.x509.X509Credential;
 
 import at.gv.egovernment.moa.id.protocols.pvp2x.exceptions.PVP2Exception;
+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.metadata.MOAMetadataProvider;
 import at.gv.egovernment.moa.id.protocols.pvp2x.signer.CredentialProvider;
 import at.gv.egovernment.moa.id.protocols.pvp2x.signer.CredentialsNotAvailableException;
@@ -129,58 +134,51 @@ public class PostBinding implements IDecoder, IEncoder {
 		}
 	}
 
-	public MOARequest decodeRequest(HttpServletRequest req,
+	public InboundMessageInterface decode(HttpServletRequest req,
 			HttpServletResponse resp) throws MessageDecodingException,
 			SecurityException {
 
 		HTTPPostDecoder decode = new HTTPPostDecoder(new BasicParserPool());
-		BasicSAMLMessageContext<RequestAbstractType, ?, ?> messageContext = new BasicSAMLMessageContext<RequestAbstractType, SAMLObject, SAMLObject>();
+		BasicSAMLMessageContext<SAMLObject, ?, ?> messageContext = new BasicSAMLMessageContext<SAMLObject, SAMLObject, SAMLObject>();
 		messageContext
 				.setInboundMessageTransport(new HttpServletRequestAdapter(req));
 		decode.setURIComparator(new MOAURICompare());
-		messageContext.setPeerEntityRole(SPSSODescriptor.DEFAULT_ELEMENT_NAME);
-
-		messageContext.setMetadataProvider(MOAMetadataProvider.getInstance());
-
-		decode.decode(messageContext);
-
-		RequestAbstractType inboundMessage = (RequestAbstractType) messageContext
-				.getInboundMessage();
+		
+		decode.decode(messageContext);		
 				
-		MOARequest request = new MOARequest(inboundMessage);
-		request.setVerified(false);
+		messageContext.setMetadataProvider(MOAMetadataProvider.getInstance());
+		
+		InboundMessage msg = null;
 		
+		if (messageContext.getInboundMessage() instanceof RequestAbstractType) {
+			messageContext.setPeerEntityRole(SPSSODescriptor.DEFAULT_ELEMENT_NAME);			
+			
+			RequestAbstractType inboundMessage = (RequestAbstractType) messageContext
+					.getInboundMessage();			
+			msg = new MOARequest(inboundMessage);
+			
+		} else if (messageContext.getInboundMessage() instanceof Response){
+			messageContext.setPeerEntityRole(IDPSSODescriptor.DEFAULT_ELEMENT_NAME);
+			
+			Response inboundMessage = (Response) messageContext.getInboundMessage();			
+			msg = new MOAResponse(inboundMessage);
+			
+		} else
+			//create empty container if request type is unknown
+			msg = new InboundMessage();
+		
+		msg.setVerified(false);
+		
+		decode.decode(messageContext);
 		if (messageContext.getPeerEntityMetadata() != null)
-			request.setEntityID(messageContext.getPeerEntityMetadata().getEntityID());
+			msg.setEntityID(messageContext.getPeerEntityMetadata().getEntityID());
 		
 		else
-			Logger.info("No Metadata found for OA with EntityID " + inboundMessage.getIssuer().getValue());
+			Logger.info("No Metadata found for OA with EntityID " + messageContext.getInboundMessageIssuer());
 				
-		request.setRelayState(messageContext.getRelayState());
-		return request;
-
-	}
-
-	public MOAResponse decodeRespone(HttpServletRequest req,
-			HttpServletResponse resp) throws MessageDecodingException,
-			SecurityException {
-
-		HTTPPostDecoder decode = new HTTPPostDecoder(new BasicParserPool());
-		BasicSAMLMessageContext<Response, ?, ?> messageContext = new BasicSAMLMessageContext<Response, SAMLObject, SAMLObject>();
-		messageContext
-				.setInboundMessageTransport(new HttpServletRequestAdapter(req));
-
-		messageContext.setPeerEntityRole(SPSSODescriptor.DEFAULT_ELEMENT_NAME);
-
-		decode.decode(messageContext);
-
-		Response inboundMessage = (Response) messageContext.getInboundMessage();
-
-		MOAResponse moaResponse = new MOAResponse(inboundMessage);
-		moaResponse.setVerified(false);
-		moaResponse.setEntityMetadata(messageContext.getPeerEntityMetadata());
-		return moaResponse;
-
+		msg.setRelayState(messageContext.getRelayState());
+		
+		return msg;
 	}
 
 	public boolean handleDecode(String action, HttpServletRequest req) {