[java-idp-plugin-duo] branch main updated: Move cookie manager bean out to root context and rename it.

[Scott Cantor]

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

scantor 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=0c26442866b87959b5de28fabd2d102ac655f883

The following commit(s) were added to refs/heads/main by this push:
     new 0c264428 Move cookie manager bean out to root context and rename it.
0c264428 is described below

commit 0c26442866b87959b5de28fabd2d102ac655f883
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Apr 9 11:11:35 2024 -0400

    Move cookie manager bean out to root context and rename it.
---
 .../resources/META-INF/net.shibboleth.idp/postconfig.xml   |  7 +++++++
 .../idp/flows/authn/DuoOIDC/duo-oidc-authn-beans.xml       | 14 ++++----------
 2 files changed, 11 insertions(+), 10 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 b7810afc..63d73ba9 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
@@ -52,6 +52,13 @@
     <bean id="shibboleth.DuoOIDCAuthnController"
         class="net.shibboleth.idp.plugin.authn.duo.impl.DuoOIDCAuthnController" />
 
+    <!-- Management bean allowing control over opt-in/opt-out cookie for Passwordless. -->
+    <bean id="shibboleth.PasswordlessCookieManager" lazy-init="true"
+        class="net.shibboleth.idp.plugin.authn.duo.PasswordlessCookieManager"
+        p:dataSealer="#{%{idp.duo.oidc.passwordless.enabled:false} ? getObject('shibboleth.DataSealer') : null}"
+        p:cookieManager="#{%{idp.duo.oidc.passwordless.enabled:false} ? getObject('shibboleth.PersistentCookieManager') : null}"
+        p:cookieName="%{idp.duo.oidc.passwordless.guardCookieName:__Host-shib_idp_duo_passwordless}" />
+
     <!-- Default Duo Admin API Integration for IdP-wide use. -->
     <bean id="shibboleth.authn.DuoOIDC.Admin.DuoIntegration" lazy-init="true"
         class="net.shibboleth.idp.authn.duo.BasicDuoIntegration"
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 74aea3b0..db19be6a 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
@@ -155,23 +155,17 @@
         p:resultCachingPredicate="#{getObject('shibboleth.authn.DuoOIDC.resultCachingPredicate')}" />
 
     <!-- Passwordless beans  -->
-    <bean id="PasswordlessCookieManager" lazy-init="true"
-        class="net.shibboleth.idp.plugin.authn.duo.PasswordlessCookieManager"
-        p:dataSealer="#{%{idp.duo.oidc.passwordless.enabled:false} ? getObject('shibboleth.DataSealer') : null}"
-        p:cookieManager="#{%{idp.duo.oidc.passwordless.enabled:false} ? getObject('shibboleth.PersistentCookieManager') : null}"
-        p:cookieName="%{idp.duo.oidc.passwordless.guardCookieName:__Host-shib_idp_duo_passwordless}" />
-    
     <bean id="PopulatePasswordlessContext" scope="prototype"
         class="net.shibboleth.idp.plugin.authn.duo.impl.PopulatePasswordlessContext"
-        p:cookieManager-ref="PasswordlessCookieManager" />
+        p:cookieManager-ref="shibboleth.PasswordlessCookieManager" />
 
     <bean id="ClearPasswordlessCookie" scope="prototype"
         class="net.shibboleth.idp.plugin.authn.duo.impl.ClearPasswordlessCookie"
-        p:cookieManager-ref="PasswordlessCookieManager" />
+        p:cookieManager-ref="shibboleth.PasswordlessCookieManager" />
 
     <bean id="CreatePasswordlessCookie"
         class="net.shibboleth.idp.plugin.authn.duo.impl.CreatePasswordlessCookie" scope="prototype"
-        p:cookieManager-ref="PasswordlessCookieManager"
+        p:cookieManager-ref="shibboleth.PasswordlessCookieManager"
         p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier" />
         
     <!-- Duo OIDC beans -->
@@ -314,7 +308,7 @@
     <bean id="PostValidatePasswordlessEvaluation"
         class="net.shibboleth.idp.plugin.authn.duo.impl.PostValidatePasswordlessEvaluation" scope="prototype"
         p:passwordlessCondition-ref="#{%{idp.duo.oidc.passwordless.enabled:false} ? '%{idp.duo.oidc.passwordless.guardCondition:shibboleth.authn.DuoOIDC.Passwordless.DefaultCondition}'.trim() : 'shibboleth.Conditions.FALSE'}"
-        p:cookieManager-ref="PasswordlessCookieManager"
+        p:cookieManager-ref="shibboleth.PasswordlessCookieManager"
         p:cleanupHook="#{getObject('shibboleth.authn.DuoOIDC.CleanUpHook') ?: getObject('shibboleth.authn.DuoOIDC.DefaultCleanupHook')}"
         p:requireResultCacheable="%{idp.duo.oidc.passwordless.requireResultCacheable:true}" />
 

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