[java-identity-provider] 10/19: IDP-1793 Use Suppliers for HttpRequest/Response
Rod Widdowson
rdw at steadingsoftware.com
Wed Aug 10 13:17:02 UTC 2022
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch maint-4
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=8d454e02b6fb3d416c13fbe1fec27dfe0f585e95
commit 8d454e02b6fb3d416c13fbe1fec27dfe0f585e95
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sun Jul 31 15:15:28 2022 +0100
IDP-1793 Use Suppliers for HttpRequest/Response
https://shibboleth.atlassian.net/browse/IDP-1793
It is now preferred for all Decoders to take a Supplier<HttpServletRequest>
not the raw object.
---
.../main/resources/net/shibboleth/idp/flows/admin/mdquery-beans.xml | 2 +-
.../resources/net/shibboleth/idp/flows/admin/resolvertest-beans.xml | 2 +-
.../resources/net/shibboleth/idp/flows/authn/saml-authn-beans.xml | 2 +-
.../resources/net/shibboleth/idp/flows/cas/samlValidate-beans.xml | 2 +-
.../shibboleth/idp/flows/saml/saml1/artifact-resolution-beans.xml | 2 +-
.../net/shibboleth/idp/flows/saml/saml1/attribute-query-beans.xml | 2 +-
.../net/shibboleth/idp/flows/saml/saml1/sso-unsolicited-beans.xml | 2 +-
.../shibboleth/idp/flows/saml/saml2/artifact-resolution-beans.xml | 2 +-
.../net/shibboleth/idp/flows/saml/saml2/attribute-query-beans.xml | 2 +-
.../net/shibboleth/idp/flows/saml/saml2/idwsf-ssos-beans.xml | 2 +-
.../net/shibboleth/idp/flows/saml/saml2/slo-artifact-beans.xml | 2 +-
.../net/shibboleth/idp/flows/saml/saml2/slo-back-beans.xml | 2 +-
.../net/shibboleth/idp/flows/saml/saml2/slo-post-beans.xml | 2 +-
.../shibboleth/idp/flows/saml/saml2/slo-post-simplesign-beans.xml | 2 +-
.../net/shibboleth/idp/flows/saml/saml2/slo-redirect-beans.xml | 2 +-
.../net/shibboleth/idp/flows/saml/saml2/sso-artifact-beans.xml | 2 +-
.../resources/net/shibboleth/idp/flows/saml/saml2/sso-ecp-beans.xml | 2 +-
.../net/shibboleth/idp/flows/saml/saml2/sso-post-beans.xml | 2 +-
.../shibboleth/idp/flows/saml/saml2/sso-post-simplesign-beans.xml | 2 +-
.../net/shibboleth/idp/flows/saml/saml2/sso-redirect-beans.xml | 2 +-
.../net/shibboleth/idp/flows/saml/saml2/sso-unsolicited-beans.xml | 2 +-
.../profile/impl/IdPInitiatedSSORequestMessageDecoderTest.java | 5 ++++-
.../delegation/messaging/impl/LibertyHTTPSOAP11DecoderTest.java | 6 +++++-
.../profile/impl/IdPInitiatedSSORequestMessageDecoderTest.java | 5 ++++-
24 files changed, 34 insertions(+), 24 deletions(-)
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/mdquery-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/mdquery-beans.xml
index 970eaffb6..aedfe0226 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/mdquery-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/mdquery-beans.xml
@@ -32,7 +32,7 @@
<bean id="DecodeMessage" class="org.opensaml.profile.action.impl.DecodeMessage" scope="prototype">
<constructor-arg>
<bean class="net.shibboleth.idp.profile.impl.MetadataQueryRequestDecoder" scope="prototype">
- <property name="httpServletRequest" ref="shibboleth.HttpServletRequest" />
+ <property name="httpServletRequestSupplier" ref="shibboleth.HttpServletRequestSupplier" />
</bean>
</constructor-arg>
</bean>
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/resolvertest-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/resolvertest-beans.xml
index 7d31e7c4a..f1309e399 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/resolvertest-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/resolvertest-beans.xml
@@ -33,7 +33,7 @@
<constructor-arg>
<bean class="%{idp.resolvertest.decoderClass:net.shibboleth.idp.profile.impl.ResolverTestRequestDecoder}"
scope="prototype">
- <property name="httpServletRequest" ref="shibboleth.HttpServletRequest" />
+ <property name="httpServletRequestSupplier" ref="shibboleth.HttpServletRequestSupplier" />
</bean>
</constructor-arg>
</bean>
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/saml-authn-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/saml-authn-beans.xml
index dad185f39..b43289dc3 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/saml-authn-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/saml-authn-beans.xml
@@ -215,7 +215,7 @@
<bean id="SAMLAuthnPostDecoder"
class="org.opensaml.saml.saml2.binding.decoding.impl.HTTPPostDecoder" scope="prototype" init-method=""
p:parserPool-ref="shibboleth.ParserPool"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest"
+ p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier"
p:bindingDescriptor-ref="shibboleth.Binding.SAML2POST" />
<bean id="ContinueSAMLAuthentication"
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/samlValidate-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/samlValidate-beans.xml
index d2f0278ce..73df8f70d 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/samlValidate-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/samlValidate-beans.xml
@@ -14,7 +14,7 @@
<bean id="SoapDecoder"
class="org.opensaml.saml.saml1.binding.decoding.impl.HTTPSOAP11Decoder" scope="prototype"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest" />
+ p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier" />
<bean id="ProcessSamlMessage"
class="net.shibboleth.idp.cas.flow.impl.ProcessSamlMessageAction" scope="prototype" />
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml1/artifact-resolution-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml1/artifact-resolution-beans.xml
index 9f25f5aa4..4abb98158 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml1/artifact-resolution-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml1/artifact-resolution-beans.xml
@@ -26,7 +26,7 @@
<constructor-arg>
<bean class="org.opensaml.saml.saml1.binding.decoding.impl.HTTPSOAP11Decoder" scope="prototype"
p:parserPool-ref="shibboleth.ParserPool"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest"
+ p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier"
p:bindingDescriptor-ref="shibboleth.Binding.SAML1SOAP" />
</constructor-arg>
</bean>
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml1/attribute-query-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml1/attribute-query-beans.xml
index e0713e462..eca5ccaef 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml1/attribute-query-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml1/attribute-query-beans.xml
@@ -27,7 +27,7 @@
<constructor-arg>
<bean class="org.opensaml.saml.saml1.binding.decoding.impl.HTTPSOAP11Decoder" scope="prototype"
p:parserPool-ref="shibboleth.ParserPool"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest"
+ p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier"
p:bindingDescriptor-ref="shibboleth.Binding.SAML1SOAP" />
</constructor-arg>
</bean>
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml1/sso-unsolicited-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml1/sso-unsolicited-beans.xml
index 3f603b21e..c39069a89 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml1/sso-unsolicited-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml1/sso-unsolicited-beans.xml
@@ -14,7 +14,7 @@
<bean id="DecodeMessage" class="org.opensaml.profile.action.impl.DecodeMessage" scope="prototype">
<constructor-arg>
<bean class="net.shibboleth.idp.saml.saml1.profile.impl.IdPInitiatedSSORequestMessageDecoder" scope="prototype"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest"
+ p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier"
p:bindingDescriptor-ref="shibboleth.Binding.LegacyShibboleth" />
</constructor-arg>
</bean>
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/artifact-resolution-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/artifact-resolution-beans.xml
index 717870c8c..8d7acfb9a 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/artifact-resolution-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/artifact-resolution-beans.xml
@@ -26,7 +26,7 @@
<constructor-arg>
<bean class="org.opensaml.saml.saml2.binding.decoding.impl.HTTPSOAP11Decoder" scope="prototype"
p:parserPool-ref="shibboleth.ParserPool"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest"
+ p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier"
p:bindingDescriptor-ref="shibboleth.Binding.SAML2SOAP" />
</constructor-arg>
</bean>
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/attribute-query-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/attribute-query-beans.xml
index f9083b79a..0f1fc95b0 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/attribute-query-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/attribute-query-beans.xml
@@ -27,7 +27,7 @@
<constructor-arg>
<bean class="org.opensaml.saml.saml2.binding.decoding.impl.HTTPSOAP11Decoder" scope="prototype"
p:parserPool-ref="shibboleth.ParserPool"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest"
+ p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier"
p:bindingDescriptor-ref="shibboleth.Binding.SAML2SOAP" />
</constructor-arg>
</bean>
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/idwsf-ssos-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/idwsf-ssos-beans.xml
index 3def23862..8f4b6cabe 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/idwsf-ssos-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/idwsf-ssos-beans.xml
@@ -21,7 +21,7 @@
<constructor-arg>
<bean class="net.shibboleth.idp.saml.saml2.profile.delegation.messaging.impl.LibertyHTTPSOAP11Decoder" scope="prototype"
p:parserPool-ref="shibboleth.ParserPool"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest"
+ p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier"
p:bindingDescriptor-ref="shibboleth.Binding.LibertySOAP" />
</constructor-arg>
</bean>
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/slo-artifact-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/slo-artifact-beans.xml
index 9e8dbfe55..ce35095f2 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/slo-artifact-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/slo-artifact-beans.xml
@@ -15,7 +15,7 @@
<constructor-arg>
<bean class="org.opensaml.saml.saml2.binding.decoding.impl.HTTPArtifactDecoder" scope="prototype"
p:parserPool-ref="shibboleth.ParserPool"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest"
+ p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier"
p:bindingDescriptor-ref="shibboleth.Binding.SAML2Artifact"
p:peerEntityRole="#{T(org.opensaml.saml.saml2.metadata.SPSSODescriptor).DEFAULT_ELEMENT_NAME}"
p:roleDescriptorResolver-ref="shibboleth.RoleDescriptorResolver"
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/slo-back-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/slo-back-beans.xml
index b4b0b1e79..55bdf40d1 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/slo-back-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/slo-back-beans.xml
@@ -30,7 +30,7 @@
<constructor-arg>
<bean class="org.opensaml.saml.saml2.binding.decoding.impl.HTTPSOAP11Decoder" scope="prototype"
p:parserPool-ref="shibboleth.ParserPool"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest"
+ p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier"
p:bindingDescriptor-ref="shibboleth.Binding.SAML2SOAP" />
</constructor-arg>
</bean>
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/slo-post-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/slo-post-beans.xml
index d6775c20b..69b93c659 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/slo-post-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/slo-post-beans.xml
@@ -15,7 +15,7 @@
<constructor-arg>
<bean class="org.opensaml.saml.saml2.binding.decoding.impl.HTTPPostDecoder" scope="prototype"
p:parserPool-ref="shibboleth.ParserPool"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest"
+ p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier"
p:bindingDescriptor-ref="shibboleth.Binding.SAML2POST" />
</constructor-arg>
</bean>
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/slo-post-simplesign-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/slo-post-simplesign-beans.xml
index 0f7a04f15..787f31b49 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/slo-post-simplesign-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/slo-post-simplesign-beans.xml
@@ -15,7 +15,7 @@
<constructor-arg>
<bean class="org.opensaml.saml.saml2.binding.decoding.impl.HTTPPostSimpleSignDecoder" scope="prototype"
p:parserPool-ref="shibboleth.ParserPool"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest"
+ p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier"
p:bindingDescriptor-ref="shibboleth.Binding.SAML2POSTSimpleSign" />
</constructor-arg>
</bean>
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/slo-redirect-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/slo-redirect-beans.xml
index 8e2078281..6115e6b51 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/slo-redirect-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/slo-redirect-beans.xml
@@ -15,7 +15,7 @@
<constructor-arg>
<bean class="org.opensaml.saml.saml2.binding.decoding.impl.HTTPRedirectDeflateDecoder" scope="prototype"
p:parserPool-ref="shibboleth.ParserPool"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest"
+ p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier"
p:bindingDescriptor-ref="shibboleth.Binding.SAML2Redirect" />
</constructor-arg>
</bean>
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/sso-artifact-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/sso-artifact-beans.xml
index 4d2bb54a9..01894a848 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/sso-artifact-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/sso-artifact-beans.xml
@@ -21,7 +21,7 @@
<constructor-arg>
<bean class="org.opensaml.saml.saml2.binding.decoding.impl.HTTPArtifactDecoder" scope="prototype"
p:parserPool-ref="shibboleth.ParserPool"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest"
+ p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier"
p:bindingDescriptor-ref="shibboleth.Binding.SAML2Artifact"
p:peerEntityRole="#{T(org.opensaml.saml.saml2.metadata.SPSSODescriptor).DEFAULT_ELEMENT_NAME}"
p:roleDescriptorResolver-ref="shibboleth.RoleDescriptorResolver"
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/sso-ecp-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/sso-ecp-beans.xml
index 30e4b3dbe..664195335 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/sso-ecp-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/sso-ecp-beans.xml
@@ -21,7 +21,7 @@
<constructor-arg>
<bean class="org.opensaml.saml.saml2.binding.decoding.impl.HTTPSOAP11Decoder" scope="prototype"
p:parserPool-ref="shibboleth.ParserPool"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest"
+ p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier"
p:bindingDescriptor-ref="shibboleth.Binding.SAML2SOAP" />
</constructor-arg>
</bean>
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/sso-post-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/sso-post-beans.xml
index 9e9684090..37c0bda86 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/sso-post-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/sso-post-beans.xml
@@ -21,7 +21,7 @@
<constructor-arg>
<bean class="org.opensaml.saml.saml2.binding.decoding.impl.HTTPPostDecoder" scope="prototype"
p:parserPool-ref="shibboleth.ParserPool"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest"
+ p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier"
p:bindingDescriptor-ref="shibboleth.Binding.SAML2POST" />
</constructor-arg>
</bean>
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/sso-post-simplesign-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/sso-post-simplesign-beans.xml
index a3cc77323..733cecc34 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/sso-post-simplesign-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/sso-post-simplesign-beans.xml
@@ -22,7 +22,7 @@
<constructor-arg>
<bean class="org.opensaml.saml.saml2.binding.decoding.impl.HTTPPostSimpleSignDecoder" scope="prototype"
p:parserPool-ref="shibboleth.ParserPool"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest"
+ p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier"
p:bindingDescriptor-ref="shibboleth.Binding.SAML2POSTSimpleSign" />
</constructor-arg>
</bean>
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/sso-redirect-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/sso-redirect-beans.xml
index dab50ca35..69c3f4d44 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/sso-redirect-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/sso-redirect-beans.xml
@@ -21,7 +21,7 @@
<constructor-arg>
<bean class="org.opensaml.saml.saml2.binding.decoding.impl.HTTPRedirectDeflateDecoder" scope="prototype"
p:parserPool-ref="shibboleth.ParserPool"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest"
+ p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier"
p:bindingDescriptor-ref="shibboleth.Binding.SAML2Redirect" />
</constructor-arg>
</bean>
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/sso-unsolicited-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/sso-unsolicited-beans.xml
index c1d5ec25c..524e7da16 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/sso-unsolicited-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/sso-unsolicited-beans.xml
@@ -20,7 +20,7 @@
<bean id="DecodeMessage" class="org.opensaml.profile.action.impl.DecodeMessage" scope="prototype">
<constructor-arg>
<bean class="net.shibboleth.idp.saml.saml2.profile.impl.IdPInitiatedSSORequestMessageDecoder" scope="prototype"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest"
+ p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier"
p:bindingDescriptor-ref="shibboleth.Binding.SAML2Unsolicited" />
</constructor-arg>
</bean>
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml1/profile/impl/IdPInitiatedSSORequestMessageDecoderTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml1/profile/impl/IdPInitiatedSSORequestMessageDecoderTest.java
index bd3e92c2c..1e9965305 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml1/profile/impl/IdPInitiatedSSORequestMessageDecoderTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml1/profile/impl/IdPInitiatedSSORequestMessageDecoderTest.java
@@ -23,6 +23,9 @@ import net.shibboleth.utilities.java.support.component.ComponentInitializationEx
import java.time.Instant;
import java.time.temporal.ChronoUnit;
+import java.util.function.Supplier;
+
+import javax.servlet.http.HttpServletRequest;
import org.opensaml.messaging.context.MessageContext;
import org.opensaml.messaging.decoder.MessageDecodingException;
@@ -65,7 +68,7 @@ public class IdPInitiatedSSORequestMessageDecoderTest {
request.setRequestedSessionId(sessionID);
decoder = new IdPInitiatedSSORequestMessageDecoder();
- decoder.setHttpServletRequest(request);
+ decoder.setHttpServletRequestSupplier(new Supplier<>() {public HttpServletRequest get() { return request;}});
decoder.initialize();
}
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/messaging/impl/LibertyHTTPSOAP11DecoderTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/messaging/impl/LibertyHTTPSOAP11DecoderTest.java
index 9a4a7e349..19de46500 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/messaging/impl/LibertyHTTPSOAP11DecoderTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/messaging/impl/LibertyHTTPSOAP11DecoderTest.java
@@ -19,6 +19,10 @@ package net.shibboleth.idp.saml.saml2.profile.delegation.messaging.impl;
import net.shibboleth.utilities.java.support.xml.SerializeSupport;
+import java.util.function.Supplier;
+
+import javax.servlet.http.HttpServletRequest;
+
import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.io.MarshallingException;
@@ -46,7 +50,7 @@ public class LibertyHTTPSOAP11DecoderTest extends XMLObjectBaseTestCase {
decoder = new LibertyHTTPSOAP11Decoder();
decoder.setParserPool(parserPool);
- decoder.setHttpServletRequest(httpRequest);
+ decoder.setHttpServletRequestSupplier(new Supplier<>() {public HttpServletRequest get() { return httpRequest;}});
decoder.initialize();
}
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/IdPInitiatedSSORequestMessageDecoderTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/IdPInitiatedSSORequestMessageDecoderTest.java
index ab9768a4f..b469499ef 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/IdPInitiatedSSORequestMessageDecoderTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/IdPInitiatedSSORequestMessageDecoderTest.java
@@ -22,6 +22,9 @@ import net.shibboleth.utilities.java.support.component.ComponentInitializationEx
import java.time.Instant;
import java.time.temporal.ChronoUnit;
+import java.util.function.Supplier;
+
+import javax.servlet.http.HttpServletRequest;
import org.opensaml.core.testing.XMLObjectBaseTestCase;
import org.opensaml.messaging.context.MessageContext;
@@ -66,7 +69,7 @@ public class IdPInitiatedSSORequestMessageDecoderTest extends XMLObjectBaseTestC
request.setRequestedSessionId(sessionID);
decoder = new IdPInitiatedSSORequestMessageDecoder();
- decoder.setHttpServletRequest(request);
+ decoder.setHttpServletRequestSupplier(new Supplier<>() {public HttpServletRequest get() { return request;}});
decoder.initialize();
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list