[java-opensaml COMMIT] in /trunk: opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/security/SAML2HTTP...

[noreply at shibboleth.net]

Author: putmanb
Date: Thu Feb  7 00:29:42 2013
New Revision: 3216

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3216&view=rev
Log:
Get rid of some defunct -temp cruft.

Modified:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/security/SAML2HTTPRedirectDeflateSignatureRule.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/HTTPRedirectDeflateEncoderTest.java
    trunk/opensaml-temp/src/main/java/org/opensaml/ws/transport/InputStreamInTransportAdapter.java
    trunk/opensaml-temp/src/main/java/org/opensaml/ws/transport/OutputStreamOutTransportAdapter.java
    trunk/opensaml-temp/src/main/java/org/opensaml/ws/transport/http/HTTPTransportUtils.java

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/security/SAML2HTTPRedirectDeflateSignatureRule.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/security/SAML2HTTPRedirectDeflateSignatureRule.java?rev=3216&r1=3215&r2=3216&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/security/SAML2HTTPRedirectDeflateSignatureRule.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/security/SAML2HTTPRedirectDeflateSignatureRule.java Thu Feb  7 00:29:42 2013
@@ -21,10 +21,11 @@
 
 import javax.servlet.http.HttpServletRequest;
 
+import net.shibboleth.utilities.java.support.net.UriSupport;
+
 import org.opensaml.saml.common.binding.SAMLMessageContext;
 import org.opensaml.saml.common.binding.security.BaseSAMLSimpleSignatureSecurityPolicyRule;
 import org.opensaml.ws.security.SecurityPolicyException;
-import org.opensaml.ws.transport.http.HTTPTransportUtils;
 import org.opensaml.xmlsec.signature.support.SignatureTrustEngine;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -115,7 +116,7 @@
      * @return true if parameter was found, false otherwise
      */
     private boolean appendParameter(StringBuilder builder, String queryString, String paramName) {
-        String rawParam = HTTPTransportUtils.getRawQueryStringParameter(queryString, paramName);
+        String rawParam = UriSupport.getRawQueryStringParameter(queryString, paramName);
         if (rawParam == null) {
             return false;
         }

Modified: trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/HTTPRedirectDeflateEncoderTest.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/HTTPRedirectDeflateEncoderTest.java?rev=3216&r1=3215&r2=3216&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/HTTPRedirectDeflateEncoderTest.java (original)
+++ trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/HTTPRedirectDeflateEncoderTest.java Thu Feb  7 00:29:42 2013
@@ -17,8 +17,11 @@
 
 package org.opensaml.saml.saml2.binding.encoding;
 
+import java.net.URI;
 import java.net.URL;
 import java.security.KeyPair;
+
+import net.shibboleth.utilities.java.support.net.UriSupport;
 
 import org.joda.time.DateTime;
 import org.opensaml.core.xml.XMLObjectBaseTestCase;
@@ -37,7 +40,6 @@
 import org.opensaml.saml.saml2.metadata.Endpoint;
 import org.opensaml.security.credential.CredentialSupport;
 import org.opensaml.security.crypto.KeySupport;
-import org.opensaml.ws.transport.http.HTTPTransportUtils;
 import org.opensaml.xmlsec.mock.MockSignatureSigningConfiguration;
 import org.springframework.mock.web.MockHttpServletResponse;
 import org.testng.Assert;
@@ -154,11 +156,13 @@
         encoder.prepareContext();
         encoder.encode();
         
-        String queryString = new URL(response.getRedirectedUrl()).getQuery();
+        //String queryString = new URL(response.getRedirectedUrl()).getQuery();
+        String queryString = new URI(response.getRedirectedUrl()).getRawQuery();
+        System.out.println(queryString);
         
-        Assert.assertNotNull(HTTPTransportUtils.getRawQueryStringParameter(queryString, "Signature"), 
+        Assert.assertNotNull(UriSupport.getRawQueryStringParameter(queryString, "Signature"), 
                 "Signature parameter was not found");
-        Assert.assertNotNull(HTTPTransportUtils.getRawQueryStringParameter(queryString, "SigAlg"), 
+        Assert.assertNotNull(UriSupport.getRawQueryStringParameter(queryString, "SigAlg"), 
                 "SigAlg parameter was not found");
         
         // Note: to test that actual signature is cryptographically correct, really need a known good test vector.