[java-idp-plugin-duo] branch main updated: Rename cookie manager bean for consistency and fix message chaining.

[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=b0db1e7e2ca05d153005bf6eac4eafca27722dc9

The following commit(s) were added to refs/heads/main by this push:
     new b0db1e7e Rename cookie manager bean for consistency and fix message chaining.
b0db1e7e is described below

commit b0db1e7e2ca05d153005bf6eac4eafca27722dc9
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Apr 18 15:18:54 2024 -0400

    Rename cookie manager bean for consistency and fix message chaining.
---
 .../META-INF/net.shibboleth.idp/postconfig.xml     |  2 +-
 .../flows/authn/DuoOIDC/duo-oidc-authn-beans.xml   | 22 ++++++++++++++++------
 2 files changed, 17 insertions(+), 7 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 fb8ce364..61e88e1a 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
@@ -53,7 +53,7 @@
         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"
+    <bean id="shibboleth.authn.DuoOIDC.Passwordless.CookieManager" lazy-init="true"
             class="net.shibboleth.idp.plugin.authn.duo.PasswordlessCookieManager"
             p:dataSealer="#{%{idp.duo.oidc.passwordless.enabled:false} ? getObject('shibboleth.DataSealer') : null}"
             p:cookieName="%{idp.duo.oidc.passwordless.guardCookieName:__Host-shib_idp_duo_passwordless}">
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 9fe32667..3a6b2107 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
@@ -8,10 +8,20 @@
                            http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
 
     default-init-method="initialize" default-destroy-method="destroy">
-    
+
+    <!-- This extends the original user-space resource list with the plugin-embedded messages. -->
+    <bean id ="ExtendedMessageSourceResources" parent="shibboleth.ListCombiner"
+          p:firstList-ref="#{'%{idp.message.resources:shibboleth.MessageSourceResources}'.trim()}" >
+        <property name="secondList">
+            <util:list >
+                <value>classpath:/net/shibboleth/idp/plugin/authn/duo/messages</value>
+            </util:list>
+        </property>
+    </bean>
+
     <bean id="messageSource" class="org.springframework.context.support.ReloadableResourceBundleMessageSource"
         p:cacheSeconds="%{idp.message.cacheSeconds:300}"
-        p:basenames="classpath:/net/shibboleth/idp/plugin/authn/duo/messages"
+        p:basenames-ref="ExtendedMessageSourceResources"
         p:defaultEncoding="UTF-8" />
     
     <!-- Used in views to calculate CSP hashes and nonces, remove and adjust beans in flow when compatibility bumped past 5.0 -->
@@ -157,15 +167,15 @@
     <!-- Passwordless beans  -->
     <bean id="PopulatePasswordlessContext" scope="prototype"
         class="net.shibboleth.idp.plugin.authn.duo.impl.PopulatePasswordlessContext"
-        p:cookieManager-ref="shibboleth.PasswordlessCookieManager" />
+        p:cookieManager-ref="shibboleth.authn.DuoOIDC.Passwordless.CookieManager" />
 
     <bean id="ClearPasswordlessCookie" scope="prototype"
         class="net.shibboleth.idp.plugin.authn.duo.impl.ClearPasswordlessCookie"
-        p:cookieManager-ref="shibboleth.PasswordlessCookieManager" />
+        p:cookieManager-ref="shibboleth.authn.DuoOIDC.Passwordless.CookieManager" />
 
     <bean id="CreatePasswordlessCookie"
         class="net.shibboleth.idp.plugin.authn.duo.impl.CreatePasswordlessCookie" scope="prototype"
-        p:cookieManager-ref="shibboleth.PasswordlessCookieManager"
+        p:cookieManager-ref="shibboleth.authn.DuoOIDC.Passwordless.CookieManager"
         p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier" />
         
     <!-- Duo OIDC beans -->
@@ -308,7 +318,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="shibboleth.PasswordlessCookieManager"
+        p:cookieManager-ref="shibboleth.authn.DuoOIDC.Passwordless.CookieManager"
         p:cleanupHook="#{getObject('shibboleth.authn.DuoOIDC.CleanUpHook') ?: getObject('shibboleth.authn.DuoOIDC.DefaultCleanupHook')}"
         p:requireResultCacheable="%{idp.duo.oidc.passwordless.requireResultCacheable:true}"
         p:detectUsernameMismatch="%{idp.duo.oidc.passwordless.detectUsernameMismatch:true}" />

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