[java-opensaml COMMIT] in /trunk/opensaml-saml-impl/src: main/java/org/opensaml/saml/saml1/binding/decoding/HTTPArtif...

[noreply at shibboleth.net]

Author: putmanb
Date: Fri May 25 20:09:15 2012
New Revision: 3049

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3049&view=rev
Log:
Implement relay state handling in the SAML decoder impls.

Modified:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/decoding/HTTPArtifactDecoder.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/decoding/HTTPPostDecoder.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/decoding/HTTPArtifactDecoder.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/decoding/HTTPPostDecoder.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/decoding/HTTPRedirectDeflateDecoder.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/decoding/HTTPPostDecoderTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/decoding/HTTPPostDecoderTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/decoding/HTTPRedirectDeflateDecoderTest.java

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/decoding/HTTPArtifactDecoder.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/decoding/HTTPArtifactDecoder.java?rev=3049&r1=3048&r2=3049&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/decoding/HTTPArtifactDecoder.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/decoding/HTTPArtifactDecoder.java Fri May 25 20:09:15 2012
@@ -26,6 +26,7 @@
 import org.opensaml.messaging.decoder.servlet.BaseHttpServletRequestXmlMessageDecoder;
 import org.opensaml.saml.common.SAMLObject;
 import org.opensaml.saml.common.binding.decoding.SAMLMessageDecoder;
+import org.opensaml.saml.common.context.SamlProtocolContext;
 import org.opensaml.saml.common.xml.SAMLConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -75,8 +76,7 @@
             log.error("URL TARGET parameter was missing or did not contain a value.");
             throw new MessageDecodingException("URL TARGET parameter was missing or did not contain a value.");
         }
-        //TODO
-        //samlMsgCtx.setRelayState(target);
+        messageContext.getSubcontext(SamlProtocolContext.class, true).setRelayState(target);
     }
 
     /**

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/decoding/HTTPPostDecoder.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/decoding/HTTPPostDecoder.java?rev=3049&r1=3048&r2=3049&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/decoding/HTTPPostDecoder.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/decoding/HTTPPostDecoder.java Fri May 25 20:09:15 2012
@@ -27,10 +27,9 @@
 import org.opensaml.messaging.decoder.MessageDecodingException;
 import org.opensaml.messaging.decoder.servlet.BaseHttpServletRequestXmlMessageDecoder;
 import org.opensaml.saml.common.SAMLObject;
-import org.opensaml.saml.common.binding.SAMLMessageContext;
 import org.opensaml.saml.common.binding.decoding.SAMLMessageDecoder;
+import org.opensaml.saml.common.context.SamlProtocolContext;
 import org.opensaml.saml.common.xml.SAMLConstants;
-import org.opensaml.saml.saml1.core.ResponseAbstractType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -57,8 +56,8 @@
         }
 
         String relayState = request.getParameter("TARGET");
-        //TODO what to do with storing RelayState
         log.debug("Decoded SAML relay state (TARGET parameter) of: {}", relayState);
+        messageContext.getSubcontext(SamlProtocolContext.class, true).setRelayState(relayState);
 
         String base64Message = request.getParameter("SAMLResponse");
         byte[] decodedBytes = Base64Support.decode(base64Message);

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/decoding/HTTPArtifactDecoder.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/decoding/HTTPArtifactDecoder.java?rev=3049&r1=3048&r2=3049&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/decoding/HTTPArtifactDecoder.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/decoding/HTTPArtifactDecoder.java Fri May 25 20:09:15 2012
@@ -27,6 +27,7 @@
 import org.opensaml.messaging.decoder.servlet.BaseHttpServletRequestXmlMessageDecoder;
 import org.opensaml.saml.common.SAMLObject;
 import org.opensaml.saml.common.binding.decoding.SAMLMessageDecoder;

[... 155 lines stripped ...]