[java-opensaml] branch main updated: IDP-1793 Use Suppliers for HttpRequest/Response
Rod Widdowson
rdw at steadingsoftware.com
Sun Aug 14 13:17:22 UTC 2022
This is an automated email from the git hooks/post-receive script.
rdw 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=cddc28dc689cddfd76175a048a7e41cede5ee31f
The following commit(s) were added to refs/heads/main by this push:
new cddc28dc6 IDP-1793 Use Suppliers for HttpRequest/Response
cddc28dc6 is described below
commit cddc28dc689cddfd76175a048a7e41cede5ee31f
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sun Jul 31 13:35:38 2022 +0100
IDP-1793 Use Suppliers for HttpRequest/Response
https://shibboleth.atlassian.net/browse/IDP-1793
org.opensaml.saml.common.binding.security.impl.BaseSAMLSimpleSignatureSecurityHandler
loses the setter for the HttpServletRequest and gains a setter for
a Supplier<HttpServletRequest>
---
.../BaseSAMLSimpleSignatureSecurityHandler.java | 38 ++++++++++++++--------
...SAML2HTTPPostSimpleSignSecurityHandlerTest.java | 17 ++++++----
...edirectDeflateSignatureSecurityHandlerTest.java | 6 +++-
3 files changed, 40 insertions(+), 21 deletions(-)
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/BaseSAMLSimpleSignatureSecurityHandler.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/BaseSAMLSimpleSignatureSecurityHandler.java
index e83dca71a..a7ef056af 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/BaseSAMLSimpleSignatureSecurityHandler.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/BaseSAMLSimpleSignatureSecurityHandler.java
@@ -19,6 +19,7 @@ package org.opensaml.saml.common.binding.security.impl;
import java.util.Collections;
import java.util.List;
+import java.util.function.Supplier;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
@@ -50,7 +51,6 @@ import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.codec.Base64Support;
import net.shibboleth.utilities.java.support.codec.DecodingException;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
/**
@@ -63,7 +63,7 @@ public abstract class BaseSAMLSimpleSignatureSecurityHandler extends AbstractMes
@Nonnull private final Logger log = LoggerFactory.getLogger(BaseSAMLSimpleSignatureSecurityHandler.class);
/** The HttpServletRequest being processed. */
- @NonnullAfterInit private HttpServletRequest httpServletRequest;
+ @NonnullAfterInit private Supplier<HttpServletRequest> httpServletRequestSupplier;
/** The context representing the SAML peer entity. */
@Nullable private SAMLPeerEntityContext peerContext;
@@ -84,23 +84,35 @@ public abstract class BaseSAMLSimpleSignatureSecurityHandler extends AbstractMes
}
/**
- * Get the HTTP servlet request being processed.
+ * Get the current HTTP request if available.
*
- * @return Returns the request.
+ * @return current HTTP request
*/
- @NonnullAfterInit public HttpServletRequest getHttpServletRequest() {
- return httpServletRequest;
+ @Nullable public HttpServletRequest getHttpServletRequest() {
+ if (httpServletRequestSupplier == null) {
+ return null;
+ }
+ return httpServletRequestSupplier.get();
}
/**
- * Set the HTTP servlet request being processed.
- *
- * @param request The to set.
+ * Get the supplier for HTTP request if available.
+ *
+ * @return current HTTP request
*/
- public void setHttpServletRequest(@Nonnull final HttpServletRequest request) {
+ @Nullable public Supplier<HttpServletRequest> getHttpServletRequestSupplier() {
+ return httpServletRequestSupplier;
+ }
+
+ /**
+ * Set the current HTTP request Supplier.
+ *
+ * @param requestSupplier Supplier for the current HTTP request
+ */
+ public void setHttpServletRequestSupplier(@Nullable final Supplier<HttpServletRequest> requestSupplier) {
checkSetterPreconditions();
-
- httpServletRequest = Constraint.isNotNull(request, "HttpServletRequest cannot be null");
+
+ httpServletRequestSupplier = requestSupplier;
}
/** {@inheritDoc} */
@@ -108,7 +120,7 @@ public abstract class BaseSAMLSimpleSignatureSecurityHandler extends AbstractMes
protected void doInitialize() throws ComponentInitializationException {
super.doInitialize();
- if (httpServletRequest == null) {
+ if (getHttpServletRequest() == null) {
throw new ComponentInitializationException("HttpServletRequest cannot be null");
}
}
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/SAML2HTTPPostSimpleSignSecurityHandlerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/SAML2HTTPPostSimpleSignSecurityHandlerTest.java
index 513d8d8d4..aded71329 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/SAML2HTTPPostSimpleSignSecurityHandlerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/SAML2HTTPPostSimpleSignSecurityHandlerTest.java
@@ -25,15 +25,10 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
+import java.util.function.Supplier;
import javax.xml.XMLConstants;
-import net.shibboleth.utilities.java.support.codec.DecodingException;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.xml.BasicParserPool;
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
-import net.shibboleth.utilities.java.support.xml.XMLParserException;
-
import org.apache.velocity.app.VelocityEngine;
import org.apache.velocity.runtime.RuntimeConstants;
import org.opensaml.core.testing.XMLObjectBaseTestCase;
@@ -71,6 +66,13 @@ import org.testng.annotations.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+import jakarta .servlet.http.HttpServletRequest;
+import net.shibboleth.utilities.java.support.codec.DecodingException;
+import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.utilities.java.support.xml.BasicParserPool;
+import net.shibboleth.utilities.java.support.xml.ElementSupport;
+import net.shibboleth.utilities.java.support.xml.XMLParserException;
+
/**
* Test SAML simple signature via HTTP POST-SimpleSign binding
*/
@@ -220,7 +222,8 @@ public class SAML2HTTPPostSimpleSignSecurityHandlerTest extends XMLObjectBaseTes
sigValParams.setSignatureTrustEngine(signatureTrustEngine);
handler = new SAML2HTTPPostSimpleSignSecurityHandler();
- handler.setHttpServletRequest(buildServletRequest());
+ final HttpServletRequest request = buildServletRequest();
+ handler.setHttpServletRequestSupplier(new Supplier<>() {public HttpServletRequest get() { return request;}});
handler.setParser(parserPool);
handler.setKeyInfoResolver(kiResolver);
handler.initialize();
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/SAML2HTTPRedirectDeflateSignatureSecurityHandlerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/SAML2HTTPRedirectDeflateSignatureSecurityHandlerTest.java
index 3f9cc0f14..e6e304623 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/SAML2HTTPRedirectDeflateSignatureSecurityHandlerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/SAML2HTTPRedirectDeflateSignatureSecurityHandlerTest.java
@@ -25,6 +25,9 @@ import java.security.cert.X509Certificate;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import java.util.function.Supplier;
+
+import jakarta.servlet.http.HttpServletRequest;
import net.shibboleth.utilities.java.support.collection.Pair;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
@@ -201,7 +204,8 @@ public class SAML2HTTPRedirectDeflateSignatureSecurityHandlerTest extends XMLObj
sigValParams.setSignatureTrustEngine(signatureTrustEngine);
handler = new SAML2HTTPRedirectDeflateSignatureSecurityHandler();
- handler.setHttpServletRequest(buildServletRequest());
+ final HttpServletRequest request = buildServletRequest();
+ handler.setHttpServletRequestSupplier(new Supplier<>() {public HttpServletRequest get() { return request;}});
handler.initialize();
messageContext = new MessageContext();
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list