[java-opensaml COMMIT] in /trunk/opensaml-saml-impl: pom.xml src/main/java/org/opensaml/saml/saml1/binding/encoding/i...

[noreply at shibboleth.net]

Author: tzeller
Date: Wed Apr 16 23:40:56 2014
New Revision: 3800

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3800&view=rev
Log:
OSJ-69 Replace OWASP ESAPI Encoder with the java-support HTMLEncoder in OpenSAML HTTP encoders.

Modified:
    trunk/opensaml-saml-impl/pom.xml
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/encoding/impl/HTTPPostEncoder.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPArtifactEncoder.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPPostEncoder.java

Modified: trunk/opensaml-saml-impl/pom.xml
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/pom.xml?rev=3800&r1=3799&r2=3800&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/pom.xml (original)
+++ trunk/opensaml-saml-impl/pom.xml Wed Apr 16 23:40:56 2014
@@ -50,10 +50,6 @@
         <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.owasp.esapi</groupId>
-            <artifactId>esapi</artifactId>
         </dependency>
         <dependency>
             <groupId>${httpclient.groupId}</groupId>

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/encoding/impl/HTTPPostEncoder.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/encoding/impl/HTTPPostEncoder.java?rev=3800&r1=3799&r2=3800&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/encoding/impl/HTTPPostEncoder.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/encoding/impl/HTTPPostEncoder.java Wed Apr 16 23:40:56 2014
@@ -26,6 +26,7 @@
 import net.shibboleth.utilities.java.support.codec.Base64Support;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.component.ComponentSupport;
+import net.shibboleth.utilities.java.support.encoder.HTMLEncoder;
 import net.shibboleth.utilities.java.support.net.HttpServletSupport;
 import net.shibboleth.utilities.java.support.xml.SerializeSupport;
 
@@ -36,8 +37,6 @@
 import org.opensaml.saml.common.SAMLObject;
 import org.opensaml.saml.common.binding.SAMLBindingSupport;
 import org.opensaml.saml.common.xml.SAMLConstants;
-import org.owasp.esapi.ESAPI;
-import org.owasp.esapi.Encoder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -168,10 +167,9 @@
 
         try {
             VelocityContext context = new VelocityContext();
-            Encoder esapiEncoder = ESAPI.encoder();
             SAMLObject message = messageContext.getMessage();
 
-            String encodedEndpointURL = esapiEncoder.encodeForHTMLAttribute(endpointURL);
+            String encodedEndpointURL = HTMLEncoder.encodeForHTMLAttribute(endpointURL);
             log.debug("Encoding action url of '{}' with encoded value '{}'", endpointURL, encodedEndpointURL);
             context.put("action", encodedEndpointURL);
             context.put("binding", getBindingURI());
@@ -183,7 +181,7 @@
 
             String relayState = SAMLBindingSupport.getRelayState(messageContext);
             if (relayState != null) {
-                String encodedRelayState = esapiEncoder.encodeForHTMLAttribute(relayState);
+                String encodedRelayState = HTMLEncoder.encodeForHTMLAttribute(relayState);
                 log.debug("Setting TARGET parameter to: '{}', encoded as '{}'", relayState, encodedRelayState);
                 context.put("TARGET", encodedRelayState);
             }

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPArtifactEncoder.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPArtifactEncoder.java?rev=3800&r1=3799&r2=3800&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPArtifactEncoder.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPArtifactEncoder.java Wed Apr 16 23:40:56 2014
@@ -27,6 +27,7 @@
 import net.shibboleth.utilities.java.support.collection.Pair;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.component.ComponentSupport;
+import net.shibboleth.utilities.java.support.encoder.HTMLEncoder;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.net.UrlBuilder;
 
@@ -45,8 +46,6 @@
 import org.opensaml.saml.saml2.binding.artifact.AbstractSAML2Artifact;

[... 71 lines stripped ...]