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

[noreply at shibboleth.net]

Author: putmanb
Date: Wed Feb  6 21:10:32 2013
New Revision: 3213

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3213&view=rev
Log:
Clean up some encoder and decoder base class stuff no longer used.

Modified:
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/decoding/BaseSAMLMessageDecoder.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/decoding/BaseSAML1MessageDecoder.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/encoding/BaseSAML1MessageEncoder.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/decoding/BaseSAML2MessageDecoder.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/BaseSAML2MessageEncoder.java

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/encoding/BaseSAML1MessageEncoder.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/encoding/BaseSAML1MessageEncoder.java?rev=3213&r1=3212&r2=3213&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/encoding/BaseSAML1MessageEncoder.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/encoding/BaseSAML1MessageEncoder.java Wed Feb  6 21:10:32 2013
@@ -26,11 +26,8 @@
 import org.opensaml.saml.common.binding.BindingException;
 import org.opensaml.saml.common.binding.SAMLBindingSupport;
 import org.opensaml.saml.common.binding.encoding.SAMLMessageEncoder;
-import org.opensaml.saml.common.messaging.SamlMessageSecuritySupport;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
-//TODO pull allowed URL scheme check out in to a separate class
 
 /**
  * Base class for SAML 1 message encoders.
@@ -51,19 +48,11 @@
      * @throws MessageEncodingException throw if no relying party endpoint is available
      */
     protected URI getEndpointURL(MessageContext<SAMLObject> messageContext) throws MessageEncodingException {
-        URI endpointUrl;
         try {
-            endpointUrl = SAMLBindingSupport.getEndpointURL(messageContext);
+            return SAMLBindingSupport.getEndpointURL(messageContext);
         } catch (BindingException e) {
             throw new MessageEncodingException("Could not obtain message endpoint URL", e);
         }
-
-        //TODO
-        if (!SamlMessageSecuritySupport.checkUrlScheme(endpointUrl.getScheme())) {
-            throw new MessageEncodingException("Relying party endpoint used the untrusted URL scheme "
-                    + endpointUrl.getScheme());
-        }
-        return endpointUrl;
     }
     
 }

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/BaseSAML2MessageEncoder.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/BaseSAML2MessageEncoder.java?rev=3213&r1=3212&r2=3213&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/BaseSAML2MessageEncoder.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/BaseSAML2MessageEncoder.java Wed Feb  6 21:10:32 2013
@@ -26,11 +26,8 @@
 import org.opensaml.saml.common.binding.BindingException;
 import org.opensaml.saml.common.binding.SAMLBindingSupport;
 import org.opensaml.saml.common.binding.encoding.SAMLMessageEncoder;
-import org.opensaml.saml.common.messaging.SamlMessageSecuritySupport;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
-//TODO pull allowed URL scheme check out in to a separate class
 
 /**
  * Base class for SAML 2 message encoders.
@@ -51,20 +48,11 @@
      * @throws MessageEncodingException throw if no relying party endpoint is available
      */
     protected URI getEndpointURL(MessageContext<SAMLObject> messageContext) throws MessageEncodingException {
-        URI endpointUrl;
         try {
-            endpointUrl = SAMLBindingSupport.getEndpointURL(messageContext);
+            return SAMLBindingSupport.getEndpointURL(messageContext);
         } catch (BindingException e) {
             throw new MessageEncodingException("Could not obtain message endpoint URL", e);
         }
-
-        //TODO
-        if (!SamlMessageSecuritySupport.checkUrlScheme(endpointUrl.getScheme())) {
-            throw new MessageEncodingException("Relying party endpoint used the untrusted URL scheme "
-                    + endpointUrl.getScheme());
-        }
-        return endpointUrl;
     }
 
-
 }