[java-idp-plugin-duo] branch main updated: JDUO-63 - Add internal HttpServletXXX proxies

[Phil Smart]

This is an automated email from the git hooks/post-receive script.

philsmart pushed a commit to branch main
in repository java-idp-plugin-duo.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-plugin-duo.git;a=commit;h=200d4022253cb68ab1baed2fa92e4a514b906bd7

The following commit(s) were added to refs/heads/main by this push:
     new 200d402  JDUO-63 - Add internal HttpServletXXX proxies
200d402 is described below

commit 200d4022253cb68ab1baed2fa92e4a514b906bd7
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Thu Nov 17 10:26:17 2022 +0000

    JDUO-63 - Add internal HttpServletXXX proxies
    
     - Added and update bean references
    
    https://shibboleth.atlassian.net/browse/JDUO-63
---
 .../main/resources/META-INF/net.shibboleth.idp/postconfig.xml    | 9 +++++++++
 .../shibboleth/idp/flows/authn/DuoOIDC/duo-oidc-authn-beans.xml  | 6 +++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/idp-duo-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml b/idp-duo-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml
index 208d944..a540bfa 100644
--- a/idp-duo-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml
+++ b/idp-duo-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml
@@ -30,6 +30,15 @@
                 c:_0="#{'%{idp.authn.DuoOIDC.supportedPrincipals:%{idp.authn.Duo.supportedPrincipals:}}'.trim()}" />
         </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.authn.DuoOIDC.internal.HttpServletRequest"
+        class="net.shibboleth.utilities.java.support.net.ThreadLocalHttpServletRequestProxy" lazy-init="true" />
+    <bean id="shibboleth.authn.DuoOIDC.internal.HttpServletResponse"
+        class="net.shibboleth.utilities.java.support.net.ThreadLocalHttpServletResponseProxy" lazy-init="true" />
 
     <!-- Controller implementation -->
     <bean id="shibboleth.DuoOIDCAuthnController"
diff --git a/idp-duo-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/DuoOIDC/duo-oidc-authn-beans.xml b/idp-duo-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/DuoOIDC/duo-oidc-authn-beans.xml
index abf80da..700169a 100644
--- a/idp-duo-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/DuoOIDC/duo-oidc-authn-beans.xml
+++ b/idp-duo-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/DuoOIDC/duo-oidc-authn-beans.xml
@@ -89,7 +89,7 @@
     -->
     <bean id="ExtractDuoAuthenticationFromHeaders" scope="prototype"
         class="net.shibboleth.idp.authn.duo.impl.ExtractDuoAuthenticationFromHeaders"
-        p:httpServletRequest-ref="shibboleth.HttpServletRequest"
+        p:httpServletRequest-ref="shibboleth.authn.DuoOIDC.internal.HttpServletRequest"
         p:autoAuthenticationSupported="%{idp.duo.oidc.nonbrowser.auto:true}"
         p:clientAdddressTrusted="%{idp.duo.oidc.nonbrowser.clientAddressTrusted:true}"
         p:factorHeader="%{idp.duo.oidc.nonbrowser.header.factor:X-Shibboleth-Duo-Factor}"
@@ -122,7 +122,7 @@
     <!-- Duo OIDC AuthAPI beans -->
     <bean id="PopulateDuoAuthenticationContext" scope="prototype"
         class="net.shibboleth.idp.plugin.authn.duo.impl.PopulateDuoAuthenticationContext"
-        p:httpServletRequest-ref="shibboleth.HttpServletRequest"
+        p:httpServletRequest-ref="shibboleth.authn.DuoOIDC.internal.HttpServletRequest"
         p:duoIntegrationLookupStrategy-ref="shibboleth.authn.DuoOIDC.DuoIntegrationStrategy"
         p:redirectURICreationStrategy-ref="shibboleth.authn.DuoOIDC.RedirectURICreationStrategy"
         p:usernameLookupStrategy-ref="shibboleth.authn.DuoOIDC.UsernameLookupStrategy"
@@ -265,7 +265,7 @@
         p:formattingMap="#{getObject('shibboleth.authn.DuoOIDC.AuditFormattingMap') ?: getObject('shibboleth.authn.DuoOIDC.DefaultAuditFormattingMap')}"
         p:dateTimeFormat="#{getObject('shibboleth.AuditDateTimeFormat')}"
         p:useDefaultTimeZone="#{getObject('shibboleth.AuditDefaultTimeZone') ?: false}"
-        p:httpServletRequest-ref="shibboleth.HttpServletRequest" 
+        p:httpServletRequest-ref="shibboleth.authn.DuoOIDC.internal.HttpServletRequest" 
         p:activationCondition="%{idp.duo.oidc.audit.enabled:false}"
         p:auditContextLookupStrategy-ref="shibboleth.authn.DuoOIDC.ChildLookup.AuditContext"/>
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.