[java-identity-provider] 06/19: IDP-1793 Use Suppliers for HttpRequest/Response
Rod Widdowson
rdw at steadingsoftware.com
Wed Aug 10 13:16:58 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=dc081df08bb5b1352e628a8b40f8d3bdaf76ec0b
commit dc081df08bb5b1352e628a8b40f8d3bdaf76ec0b
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sat Jul 30 16:29:01 2022 +0100
IDP-1793 Use Suppliers for HttpRequest/Response
https://shibboleth.atlassian.net/browse/IDP-1793
AbstractProfileAction now has a setter for Suppliers for
HttpServletRequest & Repsonse
Inject the Supplier rather than the bean directly (and review
all usages)
---
.../resources/net/shibboleth/idp/flows/admin/lockout-beans.xml | 4 ++--
.../resources/net/shibboleth/idp/flows/admin/metrics-beans.xml | 2 +-
.../net/shibboleth/idp/flows/admin/reload-metadata-beans.xml | 2 +-
.../net/shibboleth/idp/flows/admin/reload-service-beans.xml | 2 +-
.../resources/net/shibboleth/idp/flows/admin/storage-beans.xml | 4 ++--
.../net/shibboleth/idp/flows/admin/unlock-keys-beans.xml | 4 ++--
.../resources/net/shibboleth/idp/flows/authn/authn-beans.xml | 4 ++--
.../net/shibboleth/idp/flows/authn/discovery-beans.xml | 2 +-
.../net/shibboleth/idp/flows/authn/duo-authn-beans.xml | 4 ++--
.../net/shibboleth/idp/flows/authn/ipaddress-authn-beans.xml | 2 +-
.../net/shibboleth/idp/flows/authn/password-authn-beans.xml | 6 +++---
.../idp/flows/authn/remoteuser-internal-authn-beans.xml | 2 +-
.../net/shibboleth/idp/flows/authn/saml-authn-beans.xml | 4 ++--
.../shibboleth/idp/flows/authn/x509-internal-authn-beans.xml | 2 +-
.../net/shibboleth/idp/flows/cas/cas-abstract-beans.xml | 2 +-
.../resources/net/shibboleth/idp/flows/cas/login-beans.xml | 2 +-
.../resources/net/shibboleth/idp/flows/cas/validate-beans.xml | 4 ++--
.../idp/flows/client-storage/client-storage-read-beans.xml | 2 +-
.../idp/flows/client-storage/client-storage-write-beans.xml | 2 +-
.../shibboleth/idp/flows/intercept/attribute-release-beans.xml | 4 ++--
.../net/shibboleth/idp/flows/intercept/impersonate-beans.xml | 4 ++--
.../net/shibboleth/idp/flows/intercept/terms-of-use-beans.xml | 4 ++--
.../resources/net/shibboleth/idp/flows/logout/logout-beans.xml | 10 +++++-----
.../shibboleth/idp/flows/logout/logout-propagation-beans.xml | 4 ++--
.../net/shibboleth/idp/flows/saml/saml-abstract-beans.xml | 4 ++--
.../idp/flows/saml/saml1/artifact-resolution-beans.xml | 2 +-
.../shibboleth/idp/flows/saml/saml1/attribute-query-beans.xml | 2 +-
.../net/shibboleth/idp/flows/saml/saml1/common-beans.xml | 2 +-
.../idp/flows/saml/saml2/artifact-resolution-beans.xml | 2 +-
.../shibboleth/idp/flows/saml/saml2/attribute-query-beans.xml | 2 +-
.../net/shibboleth/idp/flows/saml/saml2/common-beans.xml | 2 +-
.../net/shibboleth/idp/flows/saml/saml2/slo-back-beans.xml | 2 +-
.../idp/flows/saml/saml2/slo-front-abstract-beans.xml | 4 ++--
.../net/shibboleth/idp/flows/saml/saml2/sso-abstract-beans.xml | 8 ++++----
34 files changed, 56 insertions(+), 56 deletions(-)
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/lockout-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/lockout-beans.xml
index 4889defeb..18b0c26c2 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/lockout-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/lockout-beans.xml
@@ -32,8 +32,8 @@
<!-- Work beans. -->
<bean id="DoLockoutManagerOperation" class="net.shibboleth.idp.authn.impl.DoLockoutManagerOperation" scope="prototype"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest"
- p:httpServletResponse-ref="shibboleth.HttpServletResponse"
+ p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier"
+ p:httpServletResponseSupplier-ref="shibboleth.HttpServletResponseSupplier"
p:objectMapper-ref="shibboleth.JSONObjectMapper" />
<bean id="RecordResponseComplete" class="net.shibboleth.idp.profile.impl.RecordResponseComplete" scope="prototype" />
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/metrics-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/metrics-beans.xml
index 46e3d9fb5..ece9d1fbf 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/metrics-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/metrics-beans.xml
@@ -31,7 +31,7 @@
<bean id="OutputMetrics"
class="net.shibboleth.idp.admin.impl.OutputMetrics" scope="prototype"
- p:httpServletResponse-ref="shibboleth.HttpServletResponse"
+ p:httpServletResponseSupplier-ref="shibboleth.HttpServletResponseSupplier"
p:metricFilter-ref="shibboleth.metrics.LoggerDrivenMetricFilter"
p:metricRegistry-ref="shibboleth.metrics.MetricRegistry"
p:metricFilterMap-ref="shibboleth.metrics.MetricGroups"
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/reload-metadata-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/reload-metadata-beans.xml
index c8bcd97f5..45ab595e8 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/reload-metadata-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/reload-metadata-beans.xml
@@ -33,7 +33,7 @@
<bean id="ReloadMetadata"
class="net.shibboleth.idp.saml.profile.impl.ReloadMetadata" scope="prototype"
- p:httpServletResponse-ref="shibboleth.HttpServletResponse"
+ p:httpServletResponseSupplier-ref="shibboleth.HttpServletResponseSupplier"
p:metadataResolver-ref="shibboleth.MetadataResolverService" />
<bean id="RecordResponseComplete" class="net.shibboleth.idp.profile.impl.RecordResponseComplete" scope="prototype" />
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/reload-service-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/reload-service-beans.xml
index df1b5b969..eb503bb7b 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/reload-service-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/reload-service-beans.xml
@@ -33,7 +33,7 @@
<bean id="ReloadServiceConfiguration"
class="net.shibboleth.idp.profile.impl.ReloadServiceConfiguration" scope="prototype"
- p:httpServletResponse-ref="shibboleth.HttpServletResponse" />
+ p:httpServletResponseSupplier-ref="shibboleth.HttpServletResponseSupplier" />
<bean id="RecordResponseComplete" class="net.shibboleth.idp.profile.impl.RecordResponseComplete" scope="prototype" />
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/storage-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/storage-beans.xml
index a3415fa3d..a31469281 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/storage-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/storage-beans.xml
@@ -32,8 +32,8 @@
<!-- Work beans. -->
<bean id="DoStorageOperation" class="net.shibboleth.idp.admin.impl.DoStorageOperation" scope="prototype"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest"
- p:httpServletResponse-ref="shibboleth.HttpServletResponse"
+ p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier"
+ p:httpServletResponseSupplier-ref="shibboleth.HttpServletResponseSupplier"
p:objectMapper-ref="shibboleth.JSONObjectMapper" />
<bean id="RecordResponseComplete" class="net.shibboleth.idp.profile.impl.RecordResponseComplete" scope="prototype" />
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/unlock-keys-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/unlock-keys-beans.xml
index 41a0dc4fd..9378038be 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/unlock-keys-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/unlock-keys-beans.xml
@@ -27,11 +27,11 @@
<!-- Work beans. -->
<bean id="UnlockDataSealers" class="net.shibboleth.idp.admin.impl.UnlockDataSealers" scope="prototype"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest"
+ p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier"
p:keyStrategies="#{getObject('shibboleth.unlock-keys.KeyStrategies')}" />
<bean id="UnlockPrivateKeys" class="net.shibboleth.idp.admin.impl.UnlockPrivateKeys" scope="prototype"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest"
+ p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier"
p:credentials="#{getObject('shibboleth.unlock-keys.Credentials')}"
p:keyResources="#{getObject('shibboleth.unlock-keys.PrivateKeys')}" />
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/authn-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/authn-beans.xml
index c6329a9cf..2277bcd4c 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/authn-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/authn-beans.xml
@@ -34,14 +34,14 @@
<bean id="PopulateSessionContext"
class="net.shibboleth.idp.session.impl.PopulateSessionContext" scope="prototype"
p:activationCondition="%{idp.session.enabled:true}"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest"
+ p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier"
p:sessionResolver-ref="shibboleth.SessionManager"
p:addressLookupStrategy="#{getObject('shibboleth.SessionAddressLookupStrategy')}" />
<bean id="SetRPUIInformation"
class="net.shibboleth.idp.ui.impl.SetRPUIInformation" scope="prototype"
p:activationCondition="%{idp.authn.rpui:true}"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest">
+ p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier">
<property name="fallbackLanguages">
<bean parent="shibboleth.CommaDelimStringArray" c:_0="#{'%{idp.ui.fallbackLanguages:}'.trim()}" />
</property>
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/discovery-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/discovery-beans.xml
index ffa7a1dc9..0042ccdeb 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/discovery-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/discovery-beans.xml
@@ -33,6 +33,6 @@
<bean id="ExtractDiscoveryResponse"
class="net.shibboleth.idp.authn.proxy.impl.ExtractDiscoveryResponse" scope="prototype"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest" />
+ p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier" />
</beans>
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/duo-authn-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/duo-authn-beans.xml
index fcb54726d..a7bb08149 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/duo-authn-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/duo-authn-beans.xml
@@ -53,7 +53,7 @@
<bean id="ValidateDuoWebResponse" scope="prototype"
class="net.shibboleth.idp.authn.duo.impl.ValidateDuoWebResponse"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest"
+ p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier"
p:usernameLookupStrategy-ref="shibboleth.authn.Duo.UsernameLookupStrategy"
p:duoIntegrationLookupStrategy-ref="shibboleth.authn.Duo.DuoIntegrationStrategy"
p:addDefaultPrincipals="#{getObject('shibboleth.authn.Duo.addDefaultPrincipals') ?: %{idp.authn.Duo.addDefaultPrincipals:true}}"
@@ -61,7 +61,7 @@
<bean id="ExtractDuoAuthenticationFromHeaders" scope="prototype"
class="net.shibboleth.idp.authn.duo.impl.ExtractDuoAuthenticationFromHeaders"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest"
+ p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier"
p:autoAuthenticationSupported="%{idp.duo.nonbrowser.auto:true}"
p:clientAdddressTrusted="%{idp.duo.nonbrowser.clientAddressTrusted:true}"
p:factorHeader="%{idp.duo.nonbrowser.header.factor:X-Shibboleth-Duo-Factor}"
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/ipaddress-authn-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/ipaddress-authn-beans.xml
index 88c977bf2..33ad87957 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/ipaddress-authn-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/ipaddress-authn-beans.xml
@@ -21,7 +21,7 @@
<import resource="conditional:%{idp.home}/conf/authn/ipaddress-authn-config.xml" />
<bean id="ExtractUserAgentAddress" class="net.shibboleth.idp.authn.impl.ExtractUserAgentAddress" scope="prototype"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest"
+ p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier"
p:trim="true"
p:transforms="#{getObject('shibboleth.authn.IPAddress.Transforms')}" />
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/password-authn-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/password-authn-beans.xml
index 2d2517ef4..6f6e88f2e 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/password-authn-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/password-authn-beans.xml
@@ -56,16 +56,16 @@
<bean id="ExtractUsernamePasswordFromBasicAuth"
class="net.shibboleth.idp.authn.impl.ExtractUsernamePasswordFromBasicAuth" scope="prototype"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest" />
+ p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier" />
<bean id="PreserveAuthenticationFlowState"
class="net.shibboleth.idp.authn.impl.PreserveAuthenticationFlowState" scope="prototype"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest"
+ p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier"
p:parameterNames="#{getObject('shibboleth.authn.Password.ExtendedFlowParameters')}" />
<bean id="ExtractUsernamePasswordFromFormRequest"
class="net.shibboleth.idp.authn.impl.ExtractUsernamePasswordFromFormRequest" scope="prototype"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest"
+ p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier"
p:usernameFieldName="#{getObject('shibboleth.authn.Password.UsernameFieldName') ?: '%{idp.authn.Password.usernameFieldName:j_username}'.trim()}"
p:passwordFieldName="#{getObject('shibboleth.authn.Password.PasswordFieldName') ?: '%{idp.authn.Password.passwordFieldName:j_password}'.trim()}"
p:SSOBypassFieldName="#{getObject('shibboleth.authn.Password.SSOBypassFieldName') ?: '%{idp.authn.Password.ssoBypassFieldName:donotcache}'.trim()}" />
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/remoteuser-internal-authn-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/remoteuser-internal-authn-beans.xml
index 606fc2a17..08064f96a 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/remoteuser-internal-authn-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/remoteuser-internal-authn-beans.xml
@@ -40,7 +40,7 @@
</bean>
<bean id="ExtractRemoteUser" class="net.shibboleth.idp.authn.impl.ExtractRemoteUser" scope="prototype"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest"
+ p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier"
p:checkRemoteUser="#{getObject('shibboleth.authn.RemoteUser.checkRemoteUser') ?: %{idp.authn.RemoteUserInternal.checkRemoteUser:true}}"
p:checkHeaders="#{getObject('shibboleth.authn.RemoteUser.checkHeaders')}"
p:checkAttributes="#{getObject('shibboleth.authn.RemoteUser.checkAttributes')}"
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 a82d5c1f7..216663afb 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
@@ -171,7 +171,7 @@
p:formattingMap-ref="shibboleth.AuditFormattingMap"
p:dateTimeFormat="#{getObject('shibboleth.AuditDateTimeFormat')}"
p:useDefaultTimeZone="#{getObject('shibboleth.AuditDefaultTimeZone') ?: false}"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest" />
+ p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier" />
<!-- These beans are stashed into the context tree to be picked up and run outside SWF by the SAML controller. -->
@@ -415,7 +415,7 @@
<constructor-arg>
<bean class="org.opensaml.saml.saml2.profile.impl.ValidateAssertions" scope="prototype"
p:invalidFatal="false"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest"
+ p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier"
p:validationContextBuilder-ref="AssertionValidationContextBuilder"
p:assertionValidator-ref="AssertionValidator" />
</constructor-arg>
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/x509-internal-authn-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/x509-internal-authn-beans.xml
index a101bbe0e..c2baae8e7 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/x509-internal-authn-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/x509-internal-authn-beans.xml
@@ -22,7 +22,7 @@
<bean id="ExtractX509CertificateFromRequest"
class="net.shibboleth.idp.authn.impl.ExtractX509CertificateFromRequest" scope="prototype"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest" />
+ p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier" />
<bean id="ValidateX509Certificate"
class="net.shibboleth.idp.authn.impl.ValidateCredentials" scope="prototype"
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/cas-abstract-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/cas-abstract-beans.xml
index 86c0ea389..cfb7120d8 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/cas-abstract-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/cas-abstract-beans.xml
@@ -103,7 +103,7 @@
p:formattingMap-ref="shibboleth.AuditFormattingMap"
p:dateTimeFormat="#{getObject('shibboleth.AuditDateTimeFormat')}"
p:useDefaultTimeZone="#{getObject('shibboleth.AuditDefaultTimeZone') ?: false}"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest" />
+ p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier" />
<bean id="ErrorViewPopulateAuditContext" parent="shibboleth.AbstractPopulateAuditContext"
p:fieldExtractors="#{getObject('shibboleth.ErrorViewAuditExtractors') ?: getObject('shibboleth.DefaultErrorViewAuditExtractors')}" />
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/login-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/login-beans.xml
index 3dd664070..e11e7331a 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/login-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/login-beans.xml
@@ -17,7 +17,7 @@
<bean id="PopulateUserAgentContext"
class="net.shibboleth.idp.profile.impl.PopulateUserAgentContext" scope="prototype"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest" />
+ p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier" />
<bean id="PopulateClientStorageLoadContext"
class="org.opensaml.storage.impl.client.PopulateClientStorageLoadContext" scope="prototype"
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/validate-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/validate-beans.xml
index 88290271b..5e541af0f 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/validate-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/validate-beans.xml
@@ -11,12 +11,12 @@
<bean id="WriteValidateSuccess"
class="net.shibboleth.idp.cas.flow.impl.WriteValidateResponseAction" scope="prototype"
c:successFlag="true"
- p:httpServletResponse-ref="shibboleth.HttpServletResponse" />
+ p:httpServletResponseSupplier-ref="shibboleth.HttpServletResponseSupplier" />
<bean id="WriteValidateFailure"
class="net.shibboleth.idp.cas.flow.impl.WriteValidateResponseAction" scope="prototype"
c:successFlag="false"
- p:httpServletResponse-ref="shibboleth.HttpServletResponse" />
+ p:httpServletResponseSupplier-ref="shibboleth.HttpServletResponseSupplier" />
<bean id="RecordResponseComplete"
class="net.shibboleth.idp.profile.impl.RecordResponseComplete" scope="prototype" />
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/client-storage/client-storage-read-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/client-storage/client-storage-read-beans.xml
index a09571276..d8be591b9 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/client-storage/client-storage-read-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/client-storage/client-storage-read-beans.xml
@@ -25,7 +25,7 @@
<bean id="LoadClientStorageServices"
class="org.opensaml.storage.impl.client.LoadClientStorageServices" scope="prototype"
p:useLocalStorage="%{idp.storage.htmlLocalStorage:false}"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest"
+ p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier"
p:storageServices="#{ getObject('shibboleth.ClientStorageServices') ?: getObject('shibboleth.DefaultClientStorageServices') }" />
</beans>
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/client-storage/client-storage-write-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/client-storage/client-storage-write-beans.xml
index 8787dc1c8..4eb3a6c87 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/client-storage/client-storage-write-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/client-storage/client-storage-write-beans.xml
@@ -28,6 +28,6 @@
<bean id="LogLocalStorageSaveResults"
class="org.opensaml.storage.impl.client.LogLocalStorageSaveResults" scope="prototype"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest" />
+ p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier" />
</beans>
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/attribute-release-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/attribute-release-beans.xml
index 6aa1907d3..099e351cd 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/attribute-release-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/attribute-release-beans.xml
@@ -153,7 +153,7 @@
<bean id="ExtractConsent"
class="net.shibboleth.idp.consent.flow.impl.ExtractConsent" scope="prototype"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest" />
+ p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier" />
<bean id="CreateResult"
class="net.shibboleth.idp.consent.flow.storage.impl.CreateResult" scope="prototype"
@@ -175,6 +175,6 @@
p:formattingMap="#{getObject('shibboleth.consent.attribute-release.AuditFormattingMap') ?: getObject('DefaultAuditFormattingMap')}"
p:dateTimeFormat="#{getObject('shibboleth.AuditDateTimeFormat')}"
p:useDefaultTimeZone="#{getObject('shibboleth.AuditDefaultTimeZone') ?: false}"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest" />
+ p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier" />
</beans>
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/impersonate-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/impersonate-beans.xml
index b36031fec..4a7096d15 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/impersonate-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/impersonate-beans.xml
@@ -23,14 +23,14 @@
<bean id="CheckGeneralAccess"
class="org.opensaml.profile.action.impl.CheckAccess" scope="prototype"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest"
+ p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier"
p:accessControlService-ref="shibboleth.AccessControlService"
p:policyName="#{getObject('shibboleth.impersonate.GeneralPolicy') ?: '%{idp.impersonate.generalPolicy:GeneralImpersonationPolicy}'.trim()}"
p:operation="impersonate" />
<bean id="CheckSpecificAccess"
class="org.opensaml.profile.action.impl.CheckAccess" scope="prototype"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest"
+ p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier"
p:accessControlService-ref="shibboleth.AccessControlService"
p:policyName="#{getObject('shibboleth.impersonate.SpecificPolicy') ?: '%{idp.impersonate.specificPolicy:SpecificImpersonationPolicy}'.trim()}"
p:operation="impersonate"
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/terms-of-use-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/terms-of-use-beans.xml
index e580c082c..0790fbb61 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/terms-of-use-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/terms-of-use-beans.xml
@@ -92,7 +92,7 @@
<bean id="ExtractConsent"
class="net.shibboleth.idp.consent.flow.impl.ExtractConsent" scope="prototype"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest" />
+ p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier" />
<bean id="CreateResult"
class="net.shibboleth.idp.consent.flow.storage.impl.CreateResult" scope="prototype"
@@ -109,6 +109,6 @@
p:formattingMap="#{getObject('shibboleth.consent.terms-of-use.AuditFormattingMap') ?: getObject('DefaultAuditFormattingMap')}"
p:dateTimeFormat="#{getObject('shibboleth.AuditDateTimeFormat')}"
p:useDefaultTimeZone="#{getObject('shibboleth.AuditDefaultTimeZone') ?: false}"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest" />
+ p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier" />
</beans>
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/logout/logout-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/logout/logout-beans.xml
index 23fe25f44..4b231ab7a 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/logout/logout-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/logout/logout-beans.xml
@@ -22,7 +22,7 @@
<bean id="InitializeProfileRequestContext"
class="net.shibboleth.idp.profile.impl.InitializeProfileRequestContext" scope="prototype"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest"
+ p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier"
p:profileId="http://shibboleth.net/ns/profiles/logout"
p:loggingId="%{idp.service.logging.logout:Logout}"
p:browserProfile="true"
@@ -37,7 +37,7 @@
<bean id="PopulateUserAgentContext"
class="net.shibboleth.idp.profile.impl.PopulateUserAgentContext" scope="prototype"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest" />
+ p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier" />
<bean id="PopulateClientStorageLoadContext"
class="org.opensaml.storage.impl.client.PopulateClientStorageLoadContext" scope="prototype"
@@ -45,7 +45,7 @@
<bean id="ProcessLogout"
class="net.shibboleth.idp.session.impl.ProcessLogout" scope="prototype"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest"
+ p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier"
p:sessionResolver-ref="shibboleth.SessionManager"
p:addressLookupStrategy="#{getObject('shibboleth.SessionAddressLookupStrategy')}" />
@@ -68,7 +68,7 @@
<bean id="SetRPUIInformation"
class="net.shibboleth.idp.ui.impl.SetRPUIInformation" scope="prototype"
p:activationCondition="%{idp.logout.elaboration:false}"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest">
+ p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier">
<property name="fallbackLanguages">
<bean parent="shibboleth.CommaDelimStringArray" c:_0="#{'%{idp.ui.fallbackLanguages:}'.trim()}" />
</property>
@@ -118,7 +118,7 @@
<bean id="WriteAuditLog" class="net.shibboleth.idp.profile.audit.impl.WriteAuditLog" scope="prototype"
p:dateTimeFormat="#{getObject('shibboleth.AuditDateTimeFormat')}"
p:useDefaultTimeZone="#{getObject('shibboleth.AuditDefaultTimeZone') ?: false}"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest"
+ p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier"
p:formattingMap-ref="shibboleth.AuditFormattingMap" />
<bean id="ErrorViewPopulateAuditContext" parent="shibboleth.AbstractPopulateAuditContext"
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/logout/logout-propagation-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/logout/logout-propagation-beans.xml
index 3f7998d51..c76fcdff4 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/logout/logout-propagation-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/logout/logout-propagation-beans.xml
@@ -38,7 +38,7 @@
<bean id="PopulateUserAgentContext"
class="net.shibboleth.idp.profile.impl.PopulateUserAgentContext" scope="prototype"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest" />
+ p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier" />
<bean id="SelectPropagationFlow"
class="net.shibboleth.idp.session.impl.SelectLogoutPropagationFlow" scope="prototype"
@@ -48,7 +48,7 @@
p:dateTimeFormat="#{getObject('shibboleth.AuditDateTimeFormat')}"
p:useDefaultTimeZone="#{getObject('shibboleth.AuditDefaultTimeZone') ?: false}"
p:formattingMap-ref="shibboleth.AuditFormattingMap"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest" />
+ p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier" />
<bean id="RecordResponseComplete"
class="net.shibboleth.idp.profile.impl.RecordResponseComplete" scope="prototype" />
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml-abstract-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml-abstract-beans.xml
index bf6156ad9..7128ff34e 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml-abstract-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml-abstract-beans.xml
@@ -318,7 +318,7 @@
p:formattingMap-ref="shibboleth.AuditFormattingMap"
p:dateTimeFormat="#{getObject('shibboleth.AuditDateTimeFormat')}"
p:useDefaultTimeZone="#{getObject('shibboleth.AuditDefaultTimeZone') ?: false}"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest" />
+ p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier" />
<bean id="WriteFTICKSLog" class="net.shibboleth.idp.saml.audit.impl.WriteFTICKSLog" scope="prototype"
p:activationCondition-ref="#{'%{idp.fticks.federation:null}' != 'null' ? '%{idp.fticks.condition:shibboleth.Conditions.TRUE}'.trim() : 'shibboleth.Conditions.FALSE'}"
@@ -350,7 +350,7 @@
<bean id="PopulateUserAgentContext"
class="net.shibboleth.idp.profile.impl.PopulateUserAgentContext" scope="prototype"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest" />
+ p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier" />
<!-- Non-ProfileRequestContext oriented beans, for example for us in SOAPClient. -->
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 e1768bac9..9f25f5aa4 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
@@ -33,7 +33,7 @@
<bean id="InitializeMessageChannelSecurityContext"
class="org.opensaml.profile.action.impl.HttpServletRequestMessageChannelSecurity" scope="prototype"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest"
+ p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier"
p:defaultPortInsecure="%{idp.security.defaultPortInsecure:true}" />
<bean id="shibboleth.OutgoingBindingsLookupStrategy"
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 e52a9871c..e0713e462 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
@@ -34,7 +34,7 @@
<bean id="InitializeMessageChannelSecurityContext"
class="org.opensaml.profile.action.impl.HttpServletRequestMessageChannelSecurity" scope="prototype"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest"
+ p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier"
p:defaultPortInsecure="%{idp.security.defaultPortInsecure:true}" />
<bean id="shibboleth.OutgoingBindingsLookupStrategy"
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml1/common-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml1/common-beans.xml
index 1086b9e6a..f7ef149bb 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml1/common-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml1/common-beans.xml
@@ -29,7 +29,7 @@
<bean id="AddAuthenticationStatementToAssertion"
class="net.shibboleth.idp.saml.saml1.profile.impl.AddAuthenticationStatementToAssertion" scope="prototype"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest"
+ p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier"
p:addressLookupStrategy="#{getObject('shibboleth.SubjectLocalityAddressStrategy')}">
<property name="identifierGeneratorLookupStrategy">
<bean class="net.shibboleth.idp.profile.config.navigate.IdentifierGenerationStrategyLookupFunction"
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 05e45f12b..717870c8c 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
@@ -33,7 +33,7 @@
<bean id="InitializeMessageChannelSecurityContext"
class="org.opensaml.profile.action.impl.HttpServletRequestMessageChannelSecurity" scope="prototype"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest"
+ p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier"
p:defaultPortInsecure="%{idp.security.defaultPortInsecure:true}" />
<bean id="shibboleth.OutgoingBindingsLookupStrategy"
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 96ce81b84..f9083b79a 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
@@ -34,7 +34,7 @@
<bean id="InitializeMessageChannelSecurityContext"
class="org.opensaml.profile.action.impl.HttpServletRequestMessageChannelSecurity" scope="prototype"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest"
+ p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier"
p:defaultPortInsecure="%{idp.security.defaultPortInsecure:true}" />
<bean id="shibboleth.OutgoingBindingsLookupStrategy"
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/common-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/common-beans.xml
index 62452ac7b..274e36286 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/common-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/common-beans.xml
@@ -30,7 +30,7 @@
<bean id="AddAuthnStatementToAssertion"
class="net.shibboleth.idp.saml.saml2.profile.impl.AddAuthnStatementToAssertion" scope="prototype"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest"
+ p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier"
p:addressLookupStrategy="#{getObject('shibboleth.SubjectLocalityAddressStrategy')}">
<property name="identifierGeneratorLookupStrategy">
<bean class="net.shibboleth.idp.profile.config.navigate.IdentifierGenerationStrategyLookupFunction"
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 c777a01dc..b4b0b1e79 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
@@ -41,7 +41,7 @@
<bean id="InitializeMessageChannelSecurityContext"
class="org.opensaml.profile.action.impl.HttpServletRequestMessageChannelSecurity" scope="prototype"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest"
+ p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier"
p:defaultPortInsecure="%{idp.security.defaultPortInsecure:true}" />
<bean id="ProcessLogoutRequest"
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/slo-front-abstract-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/slo-front-abstract-beans.xml
index 5ee862cd8..547581b20 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/slo-front-abstract-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/slo-front-abstract-beans.xml
@@ -54,7 +54,7 @@
<bean id="SetIssuerRPUIInformation"
class="net.shibboleth.idp.ui.impl.SetRPUIInformation" scope="prototype"
p:activationCondition="%{idp.logout.elaboration:false}"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest">
+ p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier">
<property name="fallbackLanguages">
<bean parent="shibboleth.CommaDelimStringArray" c:_0="#{'%{idp.ui.fallbackLanguages:}'.trim()}" />
</property>
@@ -78,7 +78,7 @@
<bean id="SetRPUIInformation"
class="net.shibboleth.idp.ui.impl.SetRPUIInformation" scope="prototype"
p:activationCondition="%{idp.logout.elaboration:false}"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest">
+ p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier">
<property name="fallbackLanguages">
<bean parent="shibboleth.CommaDelimStringArray" c:_0="#{'%{idp.ui.fallbackLanguages:}'.trim()}" />
</property>
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/sso-abstract-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/sso-abstract-beans.xml
index eca780ad6..9dd6550a4 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/sso-abstract-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/sso-abstract-beans.xml
@@ -85,7 +85,7 @@
<bean id="AddSubjectConfirmationToSubjects"
class="org.opensaml.saml.saml2.profile.impl.AddSubjectConfirmationToSubjects" scope="prototype"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest"
+ p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier"
p:method="urn:oasis:names:tc:SAML:2.0:cm:bearer"
p:addressLookupStrategy="#{getObject('shibboleth.SubjectLocalityAddressStrategy')}" />
@@ -98,7 +98,7 @@
<bean id="DecorateDelegatedAssertion"
class="net.shibboleth.idp.saml.saml2.profile.delegation.impl.DecorateDelegatedAssertion" scope="prototype"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest"
+ p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier"
p:libertySSOSEndpointURL="%{idp.delegation.saml2.libertySSOSEndpointURL:#{null}}">
<property name="keyInfoGeneratorManager">
<bean factory-method="buildBasicKeyInfoGeneratorManager" class="org.opensaml.xmlsec.config.impl.DefaultSecurityConfigurationBootstrap" />
@@ -177,7 +177,7 @@
<bean id="AddAuthnStatementToAssertionFromInboundAssertionToken"
class="net.shibboleth.idp.saml.saml2.profile.delegation.impl.AddAuthnStatementToAssertionFromInboundAssertionToken"
scope="prototype"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest">
+ p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier">
<property name="identifierGeneratorLookupStrategy">
<bean class="net.shibboleth.idp.profile.config.navigate.IdentifierGenerationStrategyLookupFunction"
p:defaultIdentifierGenerationStrategy-ref="shibboleth.DefaultIdentifierGenerationStrategy" />
@@ -213,4 +213,4 @@
p:activationCondition-ref="shibboleth.Conditions.IssuingDelegatedAssertion">
</bean>
-</beans>
\ No newline at end of file
+</beans>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list