[java-idp-oidc] branch main updated: JOIDC-140 - Add internal proxies for HttpServletRequest and Response
Henri Mikkonen
henri.mikkonen at iki.fi
Fri Nov 25 07:27:31 UTC 2022
This is an automated email from the git hooks/post-receive script.
hjmikkon pushed a commit to branch main
in repository java-idp-oidc.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-oidc.git;a=commit;h=9e377a27a1b911612a5763ea7610b7be55febeaf
The following commit(s) were added to refs/heads/main by this push:
new 9e377a27 JOIDC-140 - Add internal proxies for HttpServletRequest and Response
9e377a27 is described below
commit 9e377a27a1b911612a5763ea7610b7be55febeaf
Author: Henri Mikkonen <henri.mikkonen at iki.fi>
AuthorDate: Fri Nov 25 09:26:00 2022 +0200
JOIDC-140 - Add internal proxies for HttpServletRequest and Response
https://shibboleth.atlassian.net/browse/JOIDC-140
Two new global beans 'shibboleth.oidc.internal.HttpServletRequest' and
'shibboleth.oidc.internal.HttpServletResponse' are used in place of
'shibboleth.HttpServletRequest' and 'shibboleth.HttpServletResponse'.
---
.../main/resources/META-INF/net.shibboleth.idp/postconfig.xml | 8 ++++++++
.../shibboleth/idp/flows/admin/oidc/clients/clients-beans.xml | 6 +++---
.../issue-registration-access-token-beans.xml | 10 +++++-----
.../idp/flows/authn/OAuth2Client/OAuth2Client-beans.xml | 2 +-
.../idp/flows/oauth2/introspection/introspection-beans.xml | 4 ++--
.../idp/flows/oauth2/revocation/revocation-beans.xml | 4 ++--
.../oidc/abstract-api-info/oidc-abstract-api-info-beans.xml | 2 +-
.../shibboleth/idp/flows/oidc/abstract/oidc-abstract-beans.xml | 6 +++---
.../shibboleth/idp/flows/oidc/authorize/authorize-beans.xml | 10 +++++-----
.../idp/flows/oidc/configuration/configuration-beans.xml | 2 +-
.../net/shibboleth/idp/flows/oidc/register/register-beans.xml | 8 ++++----
.../net/shibboleth/idp/flows/oidc/token/token-beans.xml | 4 ++--
.../net/shibboleth/idp/flows/oidc/userinfo/userinfo-beans.xml | 4 ++--
.../net/shibboleth/idp/service/relying-party/postconfig.xml | 2 +-
14 files changed, 40 insertions(+), 32 deletions(-)
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml
index bafc64dd..5ec42f3e 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml
@@ -677,5 +677,13 @@
</property>
</bean>
+ <!--
+ Internal versions of the Http Request/Reponse proxies to easy the transition to IdP 5.0.
+ Will be removed in IdP 5.0.
+ -->
+ <bean id="shibboleth.oidc.internal.HttpServletRequest"
+ class="net.shibboleth.utilities.java.support.net.ThreadLocalHttpServletRequestProxy" lazy-init="true" />
+ <bean id="shibboleth.oidc.internal.HttpServletResponse"
+ class="net.shibboleth.utilities.java.support.net.ThreadLocalHttpServletResponseProxy" lazy-init="true" />
</beans>
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/oidc/clients/clients-beans.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/oidc/clients/clients-beans.xml
index e1e00cc6..70acc236 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/oidc/clients/clients-beans.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/oidc/clients/clients-beans.xml
@@ -23,7 +23,7 @@
<bean id="shibboleth.AdminOperationLookupStrategy" parent="shibboleth.ContextFunctions.Expression"
c:outputType="#{T(java.lang.String)}"
c:expression="#custom.getMethod()"
- p:customObject-ref="shibboleth.HttpServletRequest" />
+ p:customObject-ref="shibboleth.oidc.internal.HttpServletRequest" />
<bean id="shibboleth.AdminResourceLookupStrategy" parent="shibboleth.ContextFunctions.Expression"
c:outputType="#{T(java.lang.String)}"
@@ -33,8 +33,8 @@
<bean id="DoClientManagementOperation"
class="net.shibboleth.idp.plugin.oidc.op.admin.impl.DoClientManagementOperation" scope="prototype"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest"
- p:httpServletResponse-ref="shibboleth.HttpServletResponse"
+ p:httpServletRequest-ref="shibboleth.oidc.internal.HttpServletRequest"
+ p:httpServletResponse-ref="shibboleth.oidc.internal.HttpServletResponse"
p:objectMapper-ref="shibboleth.JSONObjectMapper"
p:clientInformationResolver-ref="shibboleth.ClientInformationResolver"
p:clientInformationManager-ref="#{'%{idp.oidc.dynreg.clientInformationManager:shibboleth.oidc.ClientInformationManager}'.trim()}" />
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/oidc/issue-registration-access-token/issue-registration-access-token-beans.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/oidc/issue-registration-access-token/issue-registration-access-token-beans.xml
index 0c54a0e6..7b0788f5 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/oidc/issue-registration-access-token/issue-registration-access-token-beans.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/oidc/issue-registration-access-token/issue-registration-access-token-beans.xml
@@ -30,8 +30,8 @@
<bean id="IssueRegistrationAccessToken"
class="net.shibboleth.idp.plugin.oidc.op.admin.impl.IssueRegistrationAccessToken" scope="prototype"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest"
- p:httpServletResponse-ref="shibboleth.HttpServletResponse"
+ p:httpServletRequest-ref="shibboleth.oidc.internal.HttpServletRequest"
+ p:httpServletResponse-ref="shibboleth.oidc.internal.HttpServletResponse"
p:sealer-ref="#{'%{idp.oidc.dynreg.tokenSealer:shibboleth.oidc.TokenSealer}'.trim()}"
p:objectMapper-ref="shibboleth.oidc.JSONObjectMapper"
p:accessControlService-ref="shibboleth.AccessControlService"
@@ -77,7 +77,7 @@
</constructor-arg>
<constructor-arg name="f">
<bean parent="shibboleth.Functions.Expression"
- p:customObject-ref="shibboleth.HttpServletRequest"
+ p:customObject-ref="shibboleth.oidc.internal.HttpServletRequest"
c:expression="#custom.getAttribute('opensamlProfileRequestContext')" />
</constructor-arg>
</bean>
@@ -103,11 +103,11 @@
p:messageEncoder-ref="oidc.nimbusEncoder" scope="prototype" />
<bean id="oidc.nimbusEncoder" class="net.shibboleth.idp.plugin.oidc.op.encoding.impl.NimbusResponseEncoder"
- scope="prototype" p:httpServletResponse-ref="shibboleth.HttpServletResponse" init-method=""
+ scope="prototype" p:httpServletResponse-ref="shibboleth.oidc.internal.HttpServletResponse" init-method=""
p:velocityEngine-ref="shibboleth.VelocityEngine" />
<bean id="EncodeMessage" class="org.opensaml.profile.action.impl.EncodeMessage" scope="prototype"
p:messageEncoderFactory-ref="oidc.messageEncoderFactory"
- p:httpServletResponse-ref="shibboleth.HttpServletResponse" />
+ p:httpServletResponse-ref="shibboleth.oidc.internal.HttpServletResponse" />
</beans>
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/OAuth2Client/OAuth2Client-beans.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/OAuth2Client/OAuth2Client-beans.xml
index 989c5ef2..abaf4bbb 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/OAuth2Client/OAuth2Client-beans.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/OAuth2Client/OAuth2Client-beans.xml
@@ -31,7 +31,7 @@
<bean id="ExtractClientAuthenticationFromRequest"
class="net.shibboleth.idp.plugin.oidc.op.authn.impl.ExtractClientAuthenticationFromRequest" scope="prototype"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest" />
+ p:httpServletRequest-ref="shibboleth.oidc.internal.HttpServletRequest" />
<bean id="PopulateTokenEndpointJwtSignatureValidationParameters"
class="net.shibboleth.idp.plugin.oidc.op.profile.impl.PopulateOIDCSignatureSigningParameters"
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oauth2/introspection/introspection-beans.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oauth2/introspection/introspection-beans.xml
index 9a43aa2d..a8cc1b6e 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oauth2/introspection/introspection-beans.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oauth2/introspection/introspection-beans.xml
@@ -15,7 +15,7 @@
<bean id="DecodeMessage" class="org.opensaml.profile.action.impl.DecodeMessage" scope="prototype">
<constructor-arg>
<bean class="net.shibboleth.idp.plugin.oidc.op.oauth2.decoding.impl.OAuth2IntrospectionRequestDecoder"
- scope="prototype" p:httpServletRequest-ref="shibboleth.HttpServletRequest" />
+ scope="prototype" p:httpServletRequest-ref="shibboleth.oidc.internal.HttpServletRequest" />
</constructor-arg>
</bean>
@@ -42,7 +42,7 @@
<bean id="BuildErrorResponseFromEvent"
class="net.shibboleth.idp.plugin.oidc.op.oauth2.profile.impl.BuildIntrospectionErrorResponseFromEvent"
scope="prototype"
- p:httpServletResponse-ref="shibboleth.HttpServletResponse"
+ p:httpServletResponse-ref="shibboleth.oidc.internal.HttpServletResponse"
p:mappedErrors="#{getObject('shibboleth.oauth2.introspection.MappedErrors') ?: getObject('shibboleth.oidc.DefaultApiMappedErrors')}">
<property name="eventContextLookupStrategy">
<bean class="net.shibboleth.idp.profile.context.navigate.WebFlowCurrentEventLookupFunction" />
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oauth2/revocation/revocation-beans.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oauth2/revocation/revocation-beans.xml
index 94e9c18e..7f97879f 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oauth2/revocation/revocation-beans.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oauth2/revocation/revocation-beans.xml
@@ -15,7 +15,7 @@
<bean id="DecodeMessage" class="org.opensaml.profile.action.impl.DecodeMessage" scope="prototype">
<constructor-arg>
<bean class="net.shibboleth.idp.plugin.oidc.op.oauth2.decoding.impl.OAuth2RevocationRequestDecoder"
- scope="prototype" p:httpServletRequest-ref="shibboleth.HttpServletRequest" />
+ scope="prototype" p:httpServletRequest-ref="shibboleth.oidc.internal.HttpServletRequest" />
</constructor-arg>
</bean>
@@ -54,7 +54,7 @@
<bean id="BuildErrorResponseFromEvent"
class="net.shibboleth.idp.plugin.oidc.op.oauth2.profile.impl.BuildRevokeTokenErrorResponseFromEvent"
scope="prototype"
- p:httpServletResponse-ref="shibboleth.HttpServletResponse"
+ p:httpServletResponse-ref="shibboleth.oidc.internal.HttpServletResponse"
p:mappedErrors="#{getObject('shibboleth.oauth2.revocation.MappedErrors') ?: getObject('shibboleth.oidc.DefaultApiMappedErrors')}">
<property name="eventContextLookupStrategy">
<bean class="net.shibboleth.idp.profile.context.navigate.WebFlowCurrentEventLookupFunction" />
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/abstract-api-info/oidc-abstract-api-info-beans.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/abstract-api-info/oidc-abstract-api-info-beans.xml
index c19b8331..a2b1c591 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/abstract-api-info/oidc-abstract-api-info-beans.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/abstract-api-info/oidc-abstract-api-info-beans.xml
@@ -16,7 +16,7 @@
<bean id="BuildErrorResponseFromEvent"
class="net.shibboleth.idp.plugin.oidc.op.profile.impl.BuildJSONErrorResponseFromEvent" scope="prototype"
p:defaultStatusCode="500" p:defaultCode="server_error"
- p:httpServletResponse-ref="shibboleth.HttpServletResponse">
+ p:httpServletResponse-ref="shibboleth.oidc.internal.HttpServletResponse">
<property name="eventContextLookupStrategy">
<bean class="net.shibboleth.idp.profile.context.navigate.WebFlowCurrentEventLookupFunction" />
</property>
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/abstract/oidc-abstract-beans.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/abstract/oidc-abstract-beans.xml
index 5ad5361f..7d03e4c6 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/abstract/oidc-abstract-beans.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/abstract/oidc-abstract-beans.xml
@@ -62,12 +62,12 @@
p:messageEncoder-ref="oidc.nimbusEncoder" scope="prototype" />
<bean id="oidc.nimbusEncoder" class="net.shibboleth.idp.plugin.oidc.op.encoding.impl.NimbusResponseEncoder"
- scope="prototype" p:httpServletResponse-ref="shibboleth.HttpServletResponse" init-method=""
+ scope="prototype" p:httpServletResponse-ref="shibboleth.oidc.internal.HttpServletResponse" init-method=""
p:velocityEngine-ref="shibboleth.VelocityEngine" />
<bean id="EncodeMessage" class="org.opensaml.profile.action.impl.EncodeMessage" scope="prototype"
p:messageEncoderFactory-ref="oidc.messageEncoderFactory"
- p:httpServletResponse-ref="shibboleth.HttpServletResponse" />
+ p:httpServletResponse-ref="shibboleth.oidc.internal.HttpServletResponse" />
<bean id="RecordResponseComplete" class="net.shibboleth.idp.profile.impl.RecordResponseComplete"
scope="prototype" />
@@ -92,7 +92,7 @@
p:formattingMap-ref="shibboleth.AuditFormattingMap"
p:dateTimeFormat="#{getObject('shibboleth.AuditDateTimeFormat')}"
p:useDefaultTimeZone="#{getObject('shibboleth.AuditDefaultTimeZone') ?: false}"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest" />
+ p:httpServletRequest-ref="shibboleth.oidc.internal.HttpServletRequest" />
<bean id="PopulateMetricContext"
class="org.opensaml.profile.action.impl.PopulateMetricContext" scope="prototype"
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/authorize/authorize-beans.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/authorize/authorize-beans.xml
index b4a23762..a445851b 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/authorize/authorize-beans.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/authorize/authorize-beans.xml
@@ -17,14 +17,14 @@
<bean id="DecodeOIDCMessage" class="org.opensaml.profile.action.impl.DecodeMessage" scope="prototype">
<constructor-arg>
<bean class="net.shibboleth.idp.plugin.oidc.op.decoding.impl.OIDCAuthenticationRequestDecoder"
- scope="prototype" p:httpServletRequest-ref="shibboleth.HttpServletRequest" />
+ scope="prototype" p:httpServletRequest-ref="shibboleth.oidc.internal.HttpServletRequest" />
</constructor-arg>
</bean>
<bean id="DecodeOAuthMessage" class="org.opensaml.profile.action.impl.DecodeMessage" scope="prototype">
<constructor-arg>
<bean class="net.shibboleth.idp.plugin.oidc.op.oauth2.decoding.impl.OAuth2AuthorizationRequestDecoder"
- scope="prototype" p:httpServletRequest-ref="shibboleth.HttpServletRequest" />
+ scope="prototype" p:httpServletRequest-ref="shibboleth.oidc.internal.HttpServletRequest" />
</constructor-arg>
</bean>
@@ -39,7 +39,7 @@
class="net.shibboleth.idp.plugin.oidc.op.profile.impl.ProcessRequestedAuthnContext" scope="prototype" />
<bean id="PopulateUserAgentContext" class="net.shibboleth.idp.profile.impl.PopulateUserAgentContext"
- scope="prototype" p:httpServletRequest-ref="shibboleth.HttpServletRequest" />
+ scope="prototype" p:httpServletRequest-ref="shibboleth.oidc.internal.HttpServletRequest" />
<bean id="shibboleth.ClientIDLookupStrategy"
class="net.shibboleth.idp.plugin.oidc.op.profile.context.navigate.DefaultClientIDLookupFunction"
@@ -600,7 +600,7 @@
<bean id="BuildErrorResponseFromEvent"
class="net.shibboleth.idp.plugin.oidc.op.profile.impl.BuildAuthenticationErrorResponseFromEvent" scope="prototype"
- p:httpServletResponse-ref="shibboleth.HttpServletResponse"
+ p:httpServletResponse-ref="shibboleth.oidc.internal.HttpServletResponse"
p:mappedErrors="#{getObject('shibboleth.oidc.authorize.MappedErrors') ?: getObject('shibboleth.oidc.authorize.DefaultMappedErrors')}">
<property name="eventContextLookupStrategy">
<bean class="net.shibboleth.idp.profile.context.navigate.WebFlowCurrentEventLookupFunction" />
@@ -637,7 +637,7 @@
</constructor-arg>
</bean>
- <bean id="ScopeContainsOpenid" parent="shibboleth.Conditions.Expression" p:customObject-ref="shibboleth.HttpServletRequest">
+ <bean id="ScopeContainsOpenid" parent="shibboleth.Conditions.Expression" p:customObject-ref="shibboleth.oidc.internal.HttpServletRequest">
<constructor-arg>
<value>
#custom.getParameter('scope') != null and #custom.getParameter('scope').contains('openid')
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/configuration/configuration-beans.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/configuration/configuration-beans.xml
index c7d65287..af34dab0 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/configuration/configuration-beans.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/configuration/configuration-beans.xml
@@ -16,7 +16,7 @@
<bean id="BuildErrorResponseFromEvent"
class="net.shibboleth.idp.plugin.oidc.op.profile.impl.BuildJSONErrorResponseFromEvent" scope="prototype"
p:defaultStatusCode="500" p:defaultCode="server_error"
- p:httpServletResponse-ref="shibboleth.HttpServletResponse">
+ p:httpServletResponse-ref="shibboleth.oidc.internal.HttpServletResponse">
<property name="eventContextLookupStrategy">
<bean class="net.shibboleth.idp.profile.context.navigate.WebFlowCurrentEventLookupFunction" />
</property>
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/register/register-beans.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/register/register-beans.xml
index a907910a..d0752eba 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/register/register-beans.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/register/register-beans.xml
@@ -26,7 +26,7 @@
<bean
class="net.shibboleth.idp.plugin.oidc.op.decoding.impl.OIDCClientRegistrationRequestDecoder"
scope="prototype"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest" />
+ p:httpServletRequest-ref="shibboleth.oidc.internal.HttpServletRequest" />
</constructor-arg>
</bean>
@@ -164,7 +164,7 @@
<bean id="BuildErrorResponseFromEvent"
class="net.shibboleth.idp.plugin.oidc.op.profile.impl.BuildRegistrationErrorResponseFromEvent"
scope="prototype"
- p:httpServletResponse-ref="shibboleth.HttpServletResponse"
+ p:httpServletResponse-ref="shibboleth.oidc.internal.HttpServletResponse"
p:mappedErrors="#{getObject('shibboleth.oidc.register.MappedErrors') ?: getObject('shibboleth.oidc.register.DefaultMappedErrors')}">
<property name="eventContextLookupStrategy">
<bean
@@ -183,14 +183,14 @@
<bean id="oidc.nimbusEncoder"
class="net.shibboleth.idp.plugin.oidc.op.encoding.impl.NimbusResponseEncoder"
scope="prototype"
- p:httpServletResponse-ref="shibboleth.HttpServletResponse"
+ p:httpServletResponse-ref="shibboleth.oidc.internal.HttpServletResponse"
init-method="" />
<bean id="EncodeMessage"
class="org.opensaml.profile.action.impl.EncodeMessage"
scope="prototype"
p:messageEncoderFactory-ref="oidc.messageEncoderFactory"
- p:httpServletResponse-ref="shibboleth.HttpServletResponse" />
+ p:httpServletResponse-ref="shibboleth.oidc.internal.HttpServletResponse" />
<bean id="PostResponsePopulateAuditContext" parent="shibboleth.AbstractPopulateAuditContext"
p:fieldExtractors="#{getObject('shibboleth.oidc.RegistrationPostResponseAuditExtractors') ?: getObject('shibboleth.oidc.DefaultRegistrationPostResponseAuditExtractors')}" />
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/token/token-beans.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/token/token-beans.xml
index 88b95460..6ac9f143 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/token/token-beans.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/token/token-beans.xml
@@ -18,7 +18,7 @@
<bean id="DecodeMessage" class="org.opensaml.profile.action.impl.DecodeMessage" scope="prototype">
<constructor-arg>
<bean class="net.shibboleth.idp.plugin.oidc.op.decoding.impl.OIDCTokenRequestDecoder" scope="prototype"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest" />
+ p:httpServletRequest-ref="shibboleth.oidc.internal.HttpServletRequest" />
</constructor-arg>
</bean>
@@ -429,7 +429,7 @@
<bean id="BuildErrorResponseFromEvent"
class="net.shibboleth.idp.plugin.oidc.op.profile.impl.BuildTokenErrorResponseFromEvent" scope="prototype"
- p:httpServletResponse-ref="shibboleth.HttpServletResponse"
+ p:httpServletResponse-ref="shibboleth.oidc.internal.HttpServletResponse"
p:mappedErrors="#{getObject('shibboleth.oidc.token.MappedErrors') ?: getObject('shibboleth.oidc.DefaultApiMappedErrors')}">
<property name="eventContextLookupStrategy">
<bean class="net.shibboleth.idp.profile.context.navigate.WebFlowCurrentEventLookupFunction" />
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/userinfo/userinfo-beans.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/userinfo/userinfo-beans.xml
index fc80ace2..61c894bf 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/userinfo/userinfo-beans.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/userinfo/userinfo-beans.xml
@@ -18,7 +18,7 @@
<bean id="DecodeMessage" class="org.opensaml.profile.action.impl.DecodeMessage" scope="prototype">
<constructor-arg>
<bean class="net.shibboleth.idp.plugin.oidc.op.decoding.impl.OIDCUserInfoRequestDecoder" scope="prototype"
- p:httpServletRequest-ref="shibboleth.HttpServletRequest" />
+ p:httpServletRequest-ref="shibboleth.oidc.internal.HttpServletRequest" />
</constructor-arg>
</bean>
@@ -149,7 +149,7 @@
<bean id="BuildErrorResponseFromEvent"
class="net.shibboleth.idp.plugin.oidc.op.userinfo.profile.impl.BuildUserInfoErrorResponseFromEvent" scope="prototype"
- p:httpServletResponse-ref="shibboleth.HttpServletResponse"
+ p:httpServletResponse-ref="shibboleth.oidc.internal.HttpServletResponse"
p:mappedErrors="#{getObject('shibboleth.oidc.userinfo.MappedErrors') ?: getObject('shibboleth.oidc.DefaultApiMappedErrors')}">
<property name="eventContextLookupStrategy">
<bean class="net.shibboleth.idp.profile.context.navigate.WebFlowCurrentEventLookupFunction" />
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml
index f8a9717c..85fbc41e 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml
@@ -535,7 +535,7 @@
<property name="audienceLookupStrategy">
<bean parent="shibboleth.BiFunctions.Expression"
c:expression="#custom.getRequestURL().toString()"
- p:customObject-ref="shibboleth.HttpServletRequest" />
+ p:customObject-ref="shibboleth.oidc.internal.HttpServletRequest" />
</property>
</bean>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list