[java-identity-provider] branch main updated: Wire in activationCondition properties for consent flows.

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

The following commit(s) were added to refs/heads/main by this push:
       new  df5c95799 Wire in activationCondition properties for consent flows.
df5c95799 is described below

commit df5c95799473cea48f5734a03f06ab4336a26232
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Oct 29 13:08:14 2020 -0400

    Wire in activationCondition properties for consent flows.
---
 .../shibboleth/idp/conf/profile-intercept-system.xml | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/profile-intercept-system.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/profile-intercept-system.xml
index 8742bb67a..11b7305b8 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/profile-intercept-system.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/profile-intercept-system.xml
@@ -60,14 +60,21 @@
             p:expandedStorageThreshold="%{idp.consent.expandedStorageThreshold:1048576}"
             p:nonBrowserSupported="false">
         <property name="activationCondition">
-            <bean parent="shibboleth.Conditions.OR">
+            <bean parent="shibboleth.Conditions.AND">
                 <constructor-arg>
-                    <bean parent="shibboleth.Conditions.NOT">
-                        <constructor-arg value="%{idp.consent.allowPerAttribute:false}" />
-                    </bean>
+                    <ref bean="#{'%{idp.consent.attribute-release.activationCondition:shibboleth.Conditions.TRUE}'.trim()}" />
                 </constructor-arg>
                 <constructor-arg>
-                    <bean class="net.shibboleth.idp.saml.profile.config.logic.IncludeAttributeStatementPredicate" />
+                    <bean parent="shibboleth.Conditions.OR">
+                        <constructor-arg>
+                            <bean parent="shibboleth.Conditions.NOT">
+                                <constructor-arg value="%{idp.consent.allowPerAttribute:false}" />
+                            </bean>
+                        </constructor-arg>
+                        <constructor-arg>
+                            <bean class="net.shibboleth.idp.saml.profile.config.logic.IncludeAttributeStatementPredicate" />
+                        </constructor-arg>
+                    </bean>
                 </constructor-arg>
             </bean>
         </property>
@@ -85,7 +92,8 @@
         p:maximumNumberOfStoredRecords="%{idp.consent.maxStoredRecords:10}"
         p:expandedNumberOfStoredRecords="%{idp.consent.expandedMaxStoredRecords:0}"
         p:expandedStorageThreshold="%{idp.consent.expandedStorageThreshold:1048576}"
-        p:nonBrowserSupported="false" />
+        p:nonBrowserSupported="false"
+        p:activationCondition-ref="#{'%{idp.consent.terms-of-use.activationCondition:shibboleth.Conditions.TRUE}'.trim()}" />
 
     <!-- Function to lookup consent-specific audit context as a child of the consent context. -->
     <bean id="shibboleth.consent.ChildLookup.ConsentAuditContext" parent="shibboleth.Functions.Compose">

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