[java-identity-provider] branch main updated: IDP-1729 - Extend attribute-sourced c14n to IdPAttributePrincipal

[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=97528d8fb87538db5eb2cab8494ca2fc6defb315

The following commit(s) were added to refs/heads/main by this push:
       new  97528d8fb IDP-1729 - Extend attribute-sourced c14n to IdPAttributePrincipal
97528d8fb is described below

commit 97528d8fb87538db5eb2cab8494ca2fc6defb315
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Dec 30 17:42:15 2020 -0500

    IDP-1729 - Extend attribute-sourced c14n to IdPAttributePrincipal
    
    https://issues.shibboleth.net/jira/browse/IDP-1729
    
    Adjust condition configuration to a property.
---
 .../shibboleth/idp/flows/c14n/attribute-sourced-subject-c14n-beans.xml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/c14n/attribute-sourced-subject-c14n-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/c14n/attribute-sourced-subject-c14n-beans.xml
index d9840ac64..4adb521e7 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/c14n/attribute-sourced-subject-c14n-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/c14n/attribute-sourced-subject-c14n-beans.xml
@@ -28,7 +28,7 @@
     
     <bean id="ResolveAttributes" class="net.shibboleth.idp.profile.impl.ResolveAttributes" scope="prototype"
             c:resolverService-ref="shibboleth.AttributeResolverService"
-            p:activationCondition="#{getObject('shibboleth.c14n.attribute.ResolutionCondition') ?: getObject('shibboleth.Conditions.TRUE')}"
+            p:activationCondition-ref="#{'%{idp.c14n.attribute.resolutionCondition:shibboleth.Conditions.TRUE}'.trim()}"
             p:attributesToResolve-ref="shibboleth.c14n.attribute.AttributesToResolve"
             p:maskFailures="%{idp.service.attribute.resolver.maskFailures:true}"
             p:principalNameLookupStrategy="#{getObject('shibboleth.c14n.attribute.PrincipalNameLookupStrategy')}">

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