[java-identity-provider] branch main updated: IDP-1703 - More options for "direct" NameID consumption

[Scott Cantor]

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

scantor pushed a commit to branch main
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=75691d84c37858a649f54ed9097de075c574da66

The following commit(s) were added to refs/heads/main by this push:
       new  75691d84c IDP-1703 - More options for "direct" NameID consumption
75691d84c is described below

commit 75691d84c37858a649f54ed9097de075c574da66
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Dec 22 19:44:58 2020 -0500

    IDP-1703 - More options for "direct" NameID consumption
    
    https://issues.shibboleth.net/jira/browse/IDP-1703
    
    Add override of decoder beans.
---
 .../flows/c14n/subject-c14n-saml-default-beans.xml | 47 +++++++++++-----------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/c14n/subject-c14n-saml-default-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/c14n/subject-c14n-saml-default-beans.xml
index d9907f6c1..ca7fec92c 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/c14n/subject-c14n-saml-default-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/c14n/subject-c14n-saml-default-beans.xml
@@ -40,25 +40,24 @@
         </property>
     </bean>
 
+    <bean id="TransformingNameIDDecoder" lazy-init="true"
+        class="net.shibboleth.idp.saml.nameid.impl.TransformingNameIDDecoder"
+        p:lowercase="%{idp.c14n.saml.lowercase:false}"
+        p:uppercase="%{idp.c14n.saml.uppercase:false}"
+        p:transforms-ref="shibboleth.NameTransforms" />
+
     <bean id="Shibboleth.C14N.SAML2Transform"
-            class="net.shibboleth.idp.saml.nameid.impl.NameIDCanonicalization" scope="prototype">
-        <property name="decoder">
-            <bean class="net.shibboleth.idp.saml.nameid.impl.TransformingNameIDDecoder"
-                p:lowercase="%{idp.c14n.saml.lowercase:false}"
-                p:uppercase="%{idp.c14n.saml.uppercase:false}"
-                p:transforms-ref="shibboleth.NameTransforms" />
-        </property>
-    </bean>
+        class="net.shibboleth.idp.saml.nameid.impl.NameIDCanonicalization" scope="prototype"
+        p:decoder="#{getObject('shibboleth.SAML2Transform.NameIDDecoder') ?: getObject('TransformingNameIDDecoder')}" />
+
+    <bean class="ProxyTransformingNameIDDecoder" lazy-init="true"
+        p:lowercase="%{idp.c14n.saml.proxy.lowercase:false}"
+        p:uppercase="%{idp.c14n.saml.proxy.uppercase:false}"
+        p:transforms-ref="shibboleth.ProxyNameTransforms" />
 
     <bean id="Shibboleth.C14N.SAML2ProxyTransform"
-            class="net.shibboleth.idp.saml.nameid.impl.NameIDCanonicalization" scope="prototype">
-        <property name="decoder">
-            <bean class="net.shibboleth.idp.saml.nameid.impl.TransformingNameIDDecoder"
-                p:lowercase="%{idp.c14n.saml.lowercase:false}"
-                p:uppercase="%{idp.c14n.saml.uppercase:false}"
-                p:transforms-ref="shibboleth.ProxyNameTransforms" />
-        </property>
-    </bean>
+        class="net.shibboleth.idp.saml.nameid.impl.NameIDCanonicalization" scope="prototype"
+        p:decoder="#{getObject('shibboleth.SAML2ProxyTransform.NameIDDecoder') ?: getObject('ProxyTransformingNameIDDecoder')}" />
 
     <bean id="Shibboleth.C14N.SAML1Transient"
             class="net.shibboleth.idp.saml.nameid.impl.NameIdentifierCanonicalization" scope="prototype">
@@ -76,14 +75,14 @@
         </property>
     </bean>
 
+    <bean id="TransformingNameIdentifierDecoder" lazy-init="true"
+        class="net.shibboleth.idp.saml.nameid.impl.TransformingNameIdentifierDecoder"
+        p:lowercase="%{idp.c14n.saml.lowercase:false}"
+        p:uppercase="%{idp.c14n.saml.uppercase:false}"
+        p:transforms-ref="shibboleth.NameTransforms" />
+
     <bean id="Shibboleth.C14N.SAML1Transform"
-            class="net.shibboleth.idp.saml.nameid.impl.NameIdentifierCanonicalization" scope="prototype">
-        <property name="decoder">
-            <bean class="net.shibboleth.idp.saml.nameid.impl.TransformingNameIdentifierDecoder"
-                p:lowercase="%{idp.c14n.saml.lowercase:false}"
-                p:uppercase="%{idp.c14n.saml.uppercase:false}"
-                p:transforms-ref="shibboleth.NameTransforms" />
-        </property>
-    </bean>
+        class="net.shibboleth.idp.saml.nameid.impl.NameIdentifierCanonicalization" scope="prototype"
+        p:decoder="#{getObject('shibboleth.SAML1Transform.NameIdentifierDecoder') ?: getObject('TransformingNameIdentifierDecoder')}" />
 
 </beans>

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