[java-idp-plugin-oidc-rp] branch main updated: JOIDCRP-70 - Custom c14n flow descriptor bean needs to use parent bean

[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-oidc-rp.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-plugin-oidc-rp.git;a=commit;h=18baab688b2f5821156dc397092306e2d9a505d0

The following commit(s) were added to refs/heads/main by this push:
     new 18baab6  JOIDCRP-70 - Custom c14n flow descriptor bean needs to use parent bean
18baab6 is described below

commit 18baab688b2f5821156dc397092306e2d9a505d0
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Wed Feb 26 14:53:19 2025 +0000

    JOIDCRP-70 - Custom c14n flow descriptor bean needs to use parent bean
    
     - Add the parent bean shibboleth.PostLoginSubjectCanonicalizationFlow
    to the c14n/OIDCSubjectIdentifier bean
    
    https://shibboleth.atlassian.net/browse/JOIDCRP-70
---
 .../src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml     | 3 +--
 .../net/shibboleth/idp/plugin/authn/oidc/rp/impl/OIDCRPFlowTest.java  | 4 ++++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/idp-oidc-rp-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml b/idp-oidc-rp-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml
index c50588f..dc77dcc 100644
--- a/idp-oidc-rp-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml
+++ b/idp-oidc-rp-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml
@@ -264,8 +264,7 @@
     
     <!-- Inbuilt C14N flow -->
     
-    <bean id="c14n/OIDCSubjectIdentifier"
-        class="net.shibboleth.idp.authn.SubjectCanonicalizationFlowDescriptor" >
+    <bean id="c14n/OIDCSubjectIdentifier" parent="shibboleth.PostLoginSubjectCanonicalizationFlow" >
         <property name="activationCondition">
             <bean class="net.shibboleth.idp.plugin.authn.oidc.rp.impl.SimpleOIDCSubjectIdentifierCanonicalization.ActivationCondition" 
             c:disabled="%{idp.authn.oidc.rp.c14n.subjectidentifier.disabled:false}"/>
diff --git a/idp-oidc-rp-impl/src/test/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/OIDCRPFlowTest.java b/idp-oidc-rp-impl/src/test/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/OIDCRPFlowTest.java
index 260337f..b28f778 100644
--- a/idp-oidc-rp-impl/src/test/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/OIDCRPFlowTest.java
+++ b/idp-oidc-rp-impl/src/test/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/OIDCRPFlowTest.java
@@ -244,6 +244,10 @@ public class OIDCRPFlowTest extends AbstractAuthnXmlFlowExecutionTests {
                 genericBeanDefinition(org.opensaml.xmlsec.impl.BasicEncryptionConfiguration.class)
                 .setAbstract(true).getBeanDefinition());
         
+        addBeanDefinition(builderContext, "shibboleth.PostLoginSubjectCanonicalizationFlow",BeanDefinitionBuilder.
+                genericBeanDefinition(net.shibboleth.idp.authn.SubjectCanonicalizationFlowDescriptor.class)
+                .setAbstract(true).getBeanDefinition());
+        
         try {
             // Create a HttpClient which turns off hostname verification and trusts all certificates (for TESTS!)
         	final SSLContext sslcontext = SSLContexts.custom()

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