[java-opensaml] branch main updated: Fix test cut/paste mistake.
Scott Cantor
cantor.2 at osu.edu
Fri Apr 7 20:41:08 UTC 2023
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-opensaml.
View the commit online:
http://git.shibboleth.net/view/?p=java-opensaml.git;a=commit;h=9f61ec33c697f07aea994ef71d7d92d02525c61d
The following commit(s) were added to refs/heads/main by this push:
new 9f61ec33c Fix test cut/paste mistake.
9f61ec33c is described below
commit 9f61ec33c697f07aea994ef71d7d92d02525c61d
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Fri Apr 7 16:41:06 2023 -0400
Fix test cut/paste mistake.
---
.../encoding/impl/HTTPRedirectDeflateEncoder.java | 1 -
.../impl/HTTPRedirectDeflateEncoderTest.java | 71 +++++++++++-----------
2 files changed, 35 insertions(+), 37 deletions(-)
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPRedirectDeflateEncoder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPRedirectDeflateEncoder.java
index 8163d71c3..478a5d0fb 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPRedirectDeflateEncoder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPRedirectDeflateEncoder.java
@@ -42,7 +42,6 @@ import org.opensaml.saml.saml2.core.RequestAbstractType;
import org.opensaml.saml.saml2.core.StatusResponseType;
import org.opensaml.security.SecurityException;
import org.opensaml.security.credential.Credential;
-import org.opensaml.security.credential.CredentialSupport;
import org.opensaml.xmlsec.SignatureSigningParameters;
import org.opensaml.xmlsec.crypto.XMLSigningUtil;
import org.slf4j.Logger;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPRedirectDeflateEncoderTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPRedirectDeflateEncoderTest.java
index 7bb24d4d0..1f046bcd0 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPRedirectDeflateEncoderTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPRedirectDeflateEncoderTest.java
@@ -123,12 +123,12 @@ public class HTTPRedirectDeflateEncoderTest extends XMLObjectBaseTestCase {
Assert.assertTrue(queryParams.containsKey("RelayState"));
Assert.assertEquals(queryParams.get("RelayState"), "relay");
Assert.assertTrue(queryParams.containsKey("SAMLResponse"));
- try (InflaterInputStream inflater =
+ try (final InflaterInputStream inflater =
new InflaterInputStream(
new ByteArrayInputStream(
Base64Support.decode(queryParams.get("SAMLResponse"))), new Inflater(true))) {
- Document outboundResponse = parserPool.parse(inflater);
+ final Document outboundResponse = parserPool.parse(inflater);
assertXMLEquals(outboundResponse, samlMessage);
}
@@ -205,12 +205,12 @@ public class HTTPRedirectDeflateEncoderTest extends XMLObjectBaseTestCase {
Assert.assertTrue(queryParams.containsKey("RelayState"));
Assert.assertEquals(queryParams.get("RelayState"), "relay");
Assert.assertTrue(queryParams.containsKey("SAMLResponse"));
- try (InflaterInputStream inflater =
+ try (final InflaterInputStream inflater =
new InflaterInputStream(
new ByteArrayInputStream(
Base64Support.decode(queryParams.get("SAMLResponse"))), new Inflater(true))) {
- Document outboundResponse = parserPool.parse(inflater);
+ final Document outboundResponse = parserPool.parse(inflater);
assertXMLEquals(outboundResponse, samlMessage);
}
}
@@ -224,17 +224,17 @@ public class HTTPRedirectDeflateEncoderTest extends XMLObjectBaseTestCase {
public void testResponseEncodingWithDisallowedEndpointQueryParams() throws Exception {
final SAMLObjectBuilder<StatusCode> statusCodeBuilder = (SAMLObjectBuilder<StatusCode>) builderFactory
.<StatusCode>ensureBuilder(StatusCode.DEFAULT_ELEMENT_NAME);
- StatusCode statusCode = statusCodeBuilder.buildObject();
+ final StatusCode statusCode = statusCodeBuilder.buildObject();
statusCode.setValue(StatusCode.SUCCESS);
final SAMLObjectBuilder<Status> statusBuilder = (SAMLObjectBuilder<Status>) builderFactory
.<Status>ensureBuilder(Status.DEFAULT_ELEMENT_NAME);
- Status responseStatus = statusBuilder.buildObject();
+ final Status responseStatus = statusBuilder.buildObject();
responseStatus.setStatusCode(statusCode);
final SAMLObjectBuilder<Response> responseBuilder = (SAMLObjectBuilder<Response>) builderFactory
.<Response>ensureBuilder(Response.DEFAULT_ELEMENT_NAME);
- Response samlMessage = responseBuilder.buildObject();
+ final Response samlMessage = responseBuilder.buildObject();
samlMessage.setID("foo");
samlMessage.setVersion(SAMLVersion.VERSION_20);
samlMessage.setIssueInstant(Instant.ofEpochMilli(0));
@@ -242,22 +242,22 @@ public class HTTPRedirectDeflateEncoderTest extends XMLObjectBaseTestCase {
final SAMLObjectBuilder<Endpoint> endpointBuilder = (SAMLObjectBuilder<Endpoint>) builderFactory
.<Endpoint>ensureBuilder(AssertionConsumerService.DEFAULT_ELEMENT_NAME);
- Endpoint samlEndpoint = endpointBuilder.buildObject();
+ final Endpoint samlEndpoint = endpointBuilder.buildObject();
samlEndpoint.setLocation("http://example.org");
samlEndpoint.setResponseLocation("http://example.org/response?foo=bar&abc=123&SAMLEncoding=blah&SAMLRequest=blah&SAMLResponse=blah&RelayState=blah&SigAlg=blah&Signature=blah");
- MessageContext messageContext = new MessageContext();
+ final MessageContext messageContext = new MessageContext();
messageContext.setMessage(samlMessage);
SAMLBindingSupport.setRelayState(messageContext, "relay");
messageContext.ensureSubcontext(SAMLPeerEntityContext.class)
.ensureSubcontext(SAMLEndpointContext.class).setEndpoint(samlEndpoint);
- SAMLOutboundDestinationHandler handler = new SAMLOutboundDestinationHandler();
+ final SAMLOutboundDestinationHandler handler = new SAMLOutboundDestinationHandler();
handler.invoke(messageContext);
- MockHttpServletResponse response = new MockHttpServletResponse();
+ final MockHttpServletResponse response = new MockHttpServletResponse();
- HTTPRedirectDeflateEncoder encoder = new HTTPRedirectDeflateEncoder();
+ final HTTPRedirectDeflateEncoder encoder = new HTTPRedirectDeflateEncoder();
encoder.setMessageContext(messageContext);
encoder.setHttpServletResponseSupplier(new ConstantSupplier<>(response));
@@ -290,12 +290,12 @@ public class HTTPRedirectDeflateEncoderTest extends XMLObjectBaseTestCase {
Assert.assertTrue(queryParams.containsKey("SAMLResponse"));
Assert.assertNotEquals(queryParams.get("SAMLResponse"), "blah");
- try (InflaterInputStream inflater =
+ try (final InflaterInputStream inflater =
new InflaterInputStream(
new ByteArrayInputStream(
Base64Support.decode(queryParams.get("SAMLResponse"))), new Inflater(true))) {
- Document outboundResponse = parserPool.parse(inflater);
+ final Document outboundResponse = parserPool.parse(inflater);
assertXMLEquals(outboundResponse, samlMessage);
}
}
@@ -306,21 +306,20 @@ public class HTTPRedirectDeflateEncoderTest extends XMLObjectBaseTestCase {
* @throws Exception if something goes wrong
*/
@Test
- @SuppressWarnings("unchecked")
public void testResponseEncodingWithSimpleSign() throws Exception {
final SAMLObjectBuilder<StatusCode> statusCodeBuilder = (SAMLObjectBuilder<StatusCode>) builderFactory
.<StatusCode>ensureBuilder(StatusCode.DEFAULT_ELEMENT_NAME);
- StatusCode statusCode = statusCodeBuilder.buildObject();
+ final StatusCode statusCode = statusCodeBuilder.buildObject();
statusCode.setValue(StatusCode.SUCCESS);
final SAMLObjectBuilder<Status> statusBuilder = (SAMLObjectBuilder<Status>) builderFactory
.<Status>ensureBuilder(Status.DEFAULT_ELEMENT_NAME);
- Status responseStatus = statusBuilder.buildObject();
+ final Status responseStatus = statusBuilder.buildObject();
responseStatus.setStatusCode(statusCode);
final SAMLObjectBuilder<Response> responseBuilder = (SAMLObjectBuilder<Response>) builderFactory
.<Response>ensureBuilder(Response.DEFAULT_ELEMENT_NAME);
- Response samlMessage = responseBuilder.buildObject();
+ final Response samlMessage = responseBuilder.buildObject();
samlMessage.setID("foo");
samlMessage.setVersion(SAMLVersion.VERSION_20);
samlMessage.setIssueInstant(Instant.ofEpochMilli(0));
@@ -328,28 +327,28 @@ public class HTTPRedirectDeflateEncoderTest extends XMLObjectBaseTestCase {
final SAMLObjectBuilder<Endpoint> endpointBuilder = (SAMLObjectBuilder<Endpoint>) builderFactory
.<Endpoint>ensureBuilder(AssertionConsumerService.DEFAULT_ELEMENT_NAME);
- Endpoint samlEndpoint = endpointBuilder.buildObject();
+ final Endpoint samlEndpoint = endpointBuilder.buildObject();
samlEndpoint.setLocation("http://example.org");
samlEndpoint.setResponseLocation("http://example.org/response");
- MessageContext messageContext = new MessageContext();
+ final MessageContext messageContext = new MessageContext();
messageContext.setMessage(samlMessage);
SAMLBindingSupport.setRelayState(messageContext, "relay");
messageContext.ensureSubcontext(SAMLPeerEntityContext.class)
.ensureSubcontext(SAMLEndpointContext.class).setEndpoint(samlEndpoint);
- KeyPair kp = KeySupport.generateKeyPair("RSA", 1024, null);
+ final KeyPair kp = KeySupport.generateKeyPair("RSA", 1024, null);
- SignatureSigningParameters signingParameters = new SignatureSigningParameters();
+ final SignatureSigningParameters signingParameters = new SignatureSigningParameters();
signingParameters.setSigningCredential(CredentialSupport.getSimpleCredential(kp.getPublic(), kp.getPrivate()));
signingParameters.setSignatureAlgorithm(SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA1);
messageContext.ensureSubcontext(SecurityParametersContext.class).setSignatureSigningParameters(signingParameters);
- SAMLOutboundDestinationHandler handler = new SAMLOutboundDestinationHandler();
+ final SAMLOutboundDestinationHandler handler = new SAMLOutboundDestinationHandler();
handler.invoke(messageContext);
- MockHttpServletResponse response = new MockHttpServletResponse();
+ final MockHttpServletResponse response = new MockHttpServletResponse();
- HTTPRedirectDeflateEncoder encoder = new HTTPRedirectDeflateEncoder();
+ final HTTPRedirectDeflateEncoder encoder = new HTTPRedirectDeflateEncoder();
encoder.setMessageContext(messageContext);
encoder.setHttpServletResponseSupplier(new ConstantSupplier<>(response));
@@ -364,7 +363,7 @@ public class HTTPRedirectDeflateEncoderTest extends XMLObjectBaseTestCase {
Assert.assertEquals(urlBuilder.getHost(), "example.org");
Assert.assertEquals(urlBuilder.getPath(), "/response");
- Map<String,String> queryParams = URISupport.buildQueryMap(urlBuilder.getQueryParams());
+ final Map<String,String> queryParams = URISupport.buildQueryMap(urlBuilder.getQueryParams());
Assert.assertTrue(queryParams.containsKey("Signature"));
Assert.assertNotNull(queryParams.get("Signature"));
Assert.assertTrue(queryParams.containsKey("SigAlg"));
@@ -372,12 +371,12 @@ public class HTTPRedirectDeflateEncoderTest extends XMLObjectBaseTestCase {
Assert.assertTrue(queryParams.containsKey("RelayState"));
Assert.assertEquals(queryParams.get("RelayState"), "relay");
Assert.assertTrue(queryParams.containsKey("SAMLResponse"));
- try (InflaterInputStream inflater =
+ try (final InflaterInputStream inflater =
new InflaterInputStream(
new ByteArrayInputStream(
Base64Support.decode(queryParams.get("SAMLResponse"))), new Inflater(true))) {
- Document outboundResponse = parserPool.parse(inflater);
+ final Document outboundResponse = parserPool.parse(inflater);
assertXMLEquals(outboundResponse, samlMessage);
}
@@ -397,17 +396,17 @@ public class HTTPRedirectDeflateEncoderTest extends XMLObjectBaseTestCase {
final SAMLObjectBuilder<StatusCode> statusCodeBuilder = (SAMLObjectBuilder<StatusCode>) builderFactory
.<StatusCode>ensureBuilder(StatusCode.DEFAULT_ELEMENT_NAME);
- StatusCode statusCode = statusCodeBuilder.buildObject();
+ final StatusCode statusCode = statusCodeBuilder.buildObject();
statusCode.setValue(StatusCode.SUCCESS);
final SAMLObjectBuilder<Status> statusBuilder = (SAMLObjectBuilder<Status>) builderFactory
.<Status>ensureBuilder(Status.DEFAULT_ELEMENT_NAME);
- Status responseStatus = statusBuilder.buildObject();
+ final Status responseStatus = statusBuilder.buildObject();
responseStatus.setStatusCode(statusCode);
final SAMLObjectBuilder<Response> responseBuilder = (SAMLObjectBuilder<Response>) builderFactory
.<Response>ensureBuilder(Response.DEFAULT_ELEMENT_NAME);
- Response samlMessage = responseBuilder.buildObject();
+ final Response samlMessage = responseBuilder.buildObject();
samlMessage.setID("foo");
samlMessage.setVersion(SAMLVersion.VERSION_20);
samlMessage.setIssueInstant(Instant.ofEpochMilli(0));
@@ -415,7 +414,7 @@ public class HTTPRedirectDeflateEncoderTest extends XMLObjectBaseTestCase {
final SAMLObjectBuilder<Endpoint> endpointBuilder = (SAMLObjectBuilder<Endpoint>) builderFactory
.<Endpoint>ensureBuilder(AssertionConsumerService.DEFAULT_ELEMENT_NAME);
- Endpoint samlEndpoint = endpointBuilder.buildObject();
+ final Endpoint samlEndpoint = endpointBuilder.buildObject();
samlEndpoint.setLocation("http://example.org");
samlEndpoint.setResponseLocation("http://example.org/response");
@@ -424,9 +423,9 @@ public class HTTPRedirectDeflateEncoderTest extends XMLObjectBaseTestCase {
SAMLBindingSupport.setRelayState(messageContext, "relay");
messageContext.ensureSubcontext(SAMLPeerEntityContext.class)
.ensureSubcontext(SAMLEndpointContext.class).setEndpoint(samlEndpoint);
- KeyPair kp = KeySupport.generateKeyPair("RSA", 1024, null);
+ final KeyPair kp = KeySupport.generateKeyPair("RSA", 1024, null);
- SignatureSigningParameters signingParameters = new SignatureSigningParameters();
+ final SignatureSigningParameters signingParameters = new SignatureSigningParameters();
signingParameters.setSigningCredential(CredentialSupport.getSimpleCredential(kp.getPublic(), kp.getPrivate()));
signingParameters.setSignatureAlgorithm(SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA1);
messageContext.ensureSubcontext(SecurityParametersContext.class).setSignatureSigningParameters(signingParameters);
@@ -437,7 +436,7 @@ public class HTTPRedirectDeflateEncoderTest extends XMLObjectBaseTestCase {
final MockHttpServletResponse response = new MockHttpServletResponse();
- HTTPRedirectDeflateEncoder encoder = new HTTPRedirectDeflateEncoder();
+ HTTPRedirectDeflateEncoder encoder = new HTTPRedirectDeflateEncoder();
encoder.setMessageContext(messageContext);
encoder.setHttpServletResponseSupplier(new ConstantSupplier<>(response));
@@ -496,7 +495,7 @@ public class HTTPRedirectDeflateEncoderTest extends XMLObjectBaseTestCase {
encoder.prepareContext();
encoder.encode();
- redirectedUrl = response.getRedirectedUrl();
+ redirectedUrl = response2.getRedirectedUrl();
assert redirectedUrl != null;
urlBuilder = new URLBuilder(redirectedUrl);
Assert.assertEquals(urlBuilder.getScheme(), "http");
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list