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

[noreply at shibboleth.net]

Author: putmanb
Date: Fri Jun 22 19:58:04 2012
New Revision: 3067

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3067&view=rev
Log:
Further work on SAML encoders, decoders and related messaging code.

Added:
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/context/SamlArtifactContext.java   (with props)
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/context/SamlEndpointContext.java   (with props)
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/context/SamlLocalEntityContext.java   (with props)
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/context/SamlPeerEntityContext.java   (with props)
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/context/SamlSigningContext.java   (with props)
    trunk/opensaml-soap-api/src/main/java/org/opensaml/soap/messaging/
    trunk/opensaml-soap-api/src/main/java/org/opensaml/soap/messaging/context/
    trunk/opensaml-soap-api/src/main/java/org/opensaml/soap/messaging/context/Soap11Context.java   (with props)
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/saml1/binding/artifact/SAML1ArtifactType0001Builder.java
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/binding/artifact/SAML1ArtifactType0002Builder.java
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/binding/artifact/SAML2ArtifactType0004Builder.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/decoding/HTTPSOAP11Decoder.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/encoding/HTTPArtifactEncoder.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/encoding/HTTPSOAP11Encoder.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/decoding/HTTPSOAP11Decoder.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/BaseSAML2MessageEncoder.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/HTTPArtifactEncoder.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/HTTPSOAP11Encoder.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/decoding/HTTPSOAP11DecoderTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/decoding/HTTPSOAP11DecoderTest.java
    trunk/opensaml-soap-api/pom.xml

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=3067&r1=3066&r2=3067&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 Fri Jun 22 19:58:04 2012
@@ -20,8 +20,12 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 
+import net.shibboleth.utilities.java.support.logic.Constraint;
+
 import org.opensaml.messaging.context.MessageContext;
 import org.opensaml.saml.common.SAMLObject;
+import org.opensaml.saml.common.context.SamlPeerEntityContext;
+import org.opensaml.saml.common.context.SamlEndpointContext;
 import org.opensaml.saml.common.context.SamlProtocolContext;
 import org.opensaml.saml.saml1.core.Response;
 import org.opensaml.saml.saml2.core.StatusResponseType;
@@ -86,9 +90,13 @@
      * @throws BindingException throw if no relying party endpoint is available
      */
     public static URI getEndpointURL(MessageContext<SAMLObject> messageContext) throws BindingException {
-        //TODO
-        //Endpoint endpoint = messageContext.getPeerEntityEndpoint();
-        Endpoint endpoint = null;
+        SamlPeerEntityContext peerContext = messageContext.getSubcontext(SamlPeerEntityContext.class, false);
+        Constraint.isNotNull(peerContext, "Message context contained no PeerEntityContext");
+        SamlEndpointContext endpointContext = peerContext.getSubcontext(SamlEndpointContext.class, false);
+        Constraint.isNotNull(endpointContext, "PeerEntityContext contained no SamlEndpointContext");
+        
+        Endpoint endpoint = endpointContext.getEndpoint();
+        
         if (endpoint == null) {
             throw new BindingException("Endpoint for relying party was null.");
         }

Modified: trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/binding/artifact/SAML1ArtifactType0001Builder.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/binding/artifact/SAML1ArtifactType0001Builder.java?rev=3067&r1=3066&r2=3067&view=diff
==============================================================================

[... 662 lines stripped ...]