[java-opensaml COMMIT] in /trunk: opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/SAMLBindingSupport...

[noreply at shibboleth.net]

Author: putmanb
Date: Wed Apr 24 18:28:09 2013
New Revision: 3316

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3316&view=rev
Log:
Move relay state storage from SamlProtocolContext to SamlBindingContext.
But mostly only get/set through a support method.

Modified:
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/SAMLBindingSupport.java
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/context/SamlBindingContext.java
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/context/SamlProtocolContext.java
    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/saml1/binding/encoding/HTTPPostEncoderTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/encoding/HTTPSOAP11EncoderTest.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
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/HTTPPostEncoderTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/HTTPPostSimpleSignEncoderTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/HTTPRedirectDeflateEncoderTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/HTTPSOAP11EncoderTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/SAML2HTTPPostSimpleSignSecurityPolicyRuleTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/SAML2HTTPRedirectDeflateSignatureSecurityPolicyRuleTest.java

Modified: trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/SAMLBindingSupport.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/SAMLBindingSupport.java?rev=3316&r1=3315&r2=3316&view=diff
==============================================================================
--- trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/SAMLBindingSupport.java (original)
+++ trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/SAMLBindingSupport.java Wed Apr 24 18:28:09 2013
@@ -36,7 +36,7 @@
 import org.opensaml.saml.common.messaging.context.SamlBindingContext;
 import org.opensaml.saml.common.messaging.context.SamlEndpointContext;
 import org.opensaml.saml.common.messaging.context.SamlPeerEntityContext;
-import org.opensaml.saml.common.messaging.context.SamlProtocolContext;
+import org.opensaml.saml.saml2.core.StatusResponseType;
 import org.opensaml.saml.saml2.metadata.Endpoint;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -59,11 +59,26 @@
      * @return the relay state or null
      */
     @Nullable public static String getRelayState(@Nonnull final MessageContext<SAMLObject> messageContext) {
-        SamlProtocolContext protocolContext = messageContext.getSubcontext(SamlProtocolContext.class);
-        if (protocolContext == null) { 
+        SamlBindingContext bindingContext = messageContext.getSubcontext(SamlBindingContext.class);
+        if (bindingContext == null) { 
             return null;
         } else {
-            return protocolContext.getRelayState();
+            return bindingContext.getRelayState();
+        }
+    }
+    
+    /**
+     * Set the SAML protocol relay state on a message context.
+     * 
+     * @param messageContext the message context on which to operate
+     * @return the relay state or null
+     */
+    public static void setRelayState(@Nonnull final MessageContext<SAMLObject> messageContext, 
+            @Nullable String relayState) {
+        String trimmedState = StringSupport.trimOrNull(relayState);
+        if (trimmedState != null) {
+            SamlBindingContext bindingContext = messageContext.getSubcontext(SamlBindingContext.class, true);
+            bindingContext.setRelayState(trimmedState);
         }
     }
     

Modified: trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/context/SamlBindingContext.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/context/SamlBindingContext.java?rev=3316&r1=3315&r2=3316&view=diff

[... 583 lines stripped ...]