[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/idp.properties conf/intercept/profile-int...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Dec 15 17:16:42 2014
New Revision: 7103

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7103&view=rev
Log:
Move remaining attribute-release flow settings into properties, and polish activation conditon.

Modified:
    trunk/idp-conf/src/main/resources/conf/idp.properties
    trunk/idp-conf/src/main/resources/conf/intercept/profile-intercept.xml
    trunk/idp-conf/src/main/resources/system/conf/profile-intercept-system.xml

Modified: trunk/idp-conf/src/main/resources/conf/idp.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/idp.properties?rev=7103&r1=7102&r2=7103&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/idp.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/idp.properties Mon Dec 15 17:16:42 2014
@@ -122,6 +122,11 @@
 #idp.consent.userStorageKey = shibboleth.consent.PrincipalConsentStorageKey
 #idp.consent.userStorageKeyAttribute = uid
 
+# Flags controlling how built-in attribute consent feature operates 
+#idp.consent.allowDoNotRemember = true
+#idp.consent.allowGlobal = true
+idp.consent.allowPerAttribute = true
+
 # Whether to lookup metadata, etc. for every SP involved in a logout
 # for use by user interface logic; adds overhead so off by default.
 #idp.logout.elaboration = false

Modified: trunk/idp-conf/src/main/resources/conf/intercept/profile-intercept.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/intercept/profile-intercept.xml?rev=7103&r1=7102&r2=7103&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/intercept/profile-intercept.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/intercept/profile-intercept.xml Mon Dec 15 17:16:42 2014
@@ -28,17 +28,9 @@
         
                 <bean id="intercept/terms-of-use" parent="shibboleth.consent.TermsOfUseFlow" />
         
-                <bean id="intercept/attribute-release" parent="shibboleth.consent.AttributeReleaseFlow"
-                         p:doNotRememberConsentAllowed="true" 
-                         p:globalConsentAllowed="true"
-                         p:perAttributeConsentEnabled="true">
-                    <!-- If perAttributeConsentEnabled is on, you should enable the condition. -->
-                    <property name="activationCondition">
-                        <bean class="net.shibboleth.idp.saml.profile.config.logic.IncludeAttributeStatementPredicate" />
-                    </property>
-                </bean>
+                <bean id="intercept/attribute-release" parent="shibboleth.consent.AttributeReleaseFlow" />
             </list>
         </property>
     </bean>
 
-</beans>
+</beans>

Modified: trunk/idp-conf/src/main/resources/system/conf/profile-intercept-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/profile-intercept-system.xml?rev=7103&r1=7102&r2=7103&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/profile-intercept-system.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/profile-intercept-system.xml Mon Dec 15 17:16:42 2014
@@ -34,14 +34,27 @@
 
     <!-- Parent bean for attribute release consent flows. -->
     <bean id="shibboleth.consent.AttributeReleaseFlow" abstract="true"
-        class="net.shibboleth.idp.consent.flow.ar.AttributeReleaseFlowDescriptor"
-        p:storageService-ref="%{idp.consent.StorageService:shibboleth.ClientPersistentStorageService}"
-        p:doNotRememberConsentAllowed="false"
-        p:globalConsentAllowed="false"
-        p:perAttributeConsentEnabled="false"
-        p:compareValues="true"
-        p:lifetime="P1Y"
-        p:nonBrowserSupported="false" />
+            class="net.shibboleth.idp.consent.flow.ar.AttributeReleaseFlowDescriptor"
+            p:storageService-ref="%{idp.consent.StorageService:shibboleth.ClientPersistentStorageService}"
+            p:doNotRememberConsentAllowed="%{idp.consent.allowDoNotRemember:true}"
+            p:globalConsentAllowed="%{idp.consent.allowGlobal:true}"
+            p:perAttributeConsentEnabled="%{idp.consent.allowPerAttribute:false}"
+            p:compareValues="true"
+            p:lifetime="P1Y"
+            p:nonBrowserSupported="false">
+        <property name="activationCondition">
+            <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>
+        </property>
+    </bean>
 

[... 3 lines stripped ...]