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

[noreply at shibboleth.net]

Author: tzeller
Date: Mon Oct 27 19:11:26 2014
New Revision: 6792

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6792&view=rev
Log:
Cleanup consent config slightly.

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

Modified: trunk/idp-conf/src/main/resources/conf/profile-intercept.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/profile-intercept.xml?rev=6792&r1=6791&r2=6792&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/profile-intercept.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/profile-intercept.xml Mon Oct 27 19:11:26 2014
@@ -26,33 +26,40 @@
 
     </util:list>
 
-    <!-- TODO doc -->
-    <bean id="shibboleth.consent.RelyingPartyPredicate" parent="shibboleth.Conditions.RelyingPartyId">
+    <!-- Condition to evaluate to interrupt SSO flows to obtain consent. -->
+    <bean id="shibboleth.consent.Condition" class="com.google.common.base.Predicates" factory-method="alwaysTrue" />
+    
+    <!-- TODO Per relying party condition will be moved elsewhere.
+    <bean id="shibboleth.consent.Condition" parent="shibboleth.Conditions.RelyingPartyId">
         <constructor-arg>
             <util:list>
                 <value>https://sp.example.org</value>
             </util:list>
         </constructor-arg>
     </bean>
-    
+    -->
+
+    <!-- The ID of the attribute to be used as the user identifier when storing consent records. -->
     <!-- TODO add property to properties file -->
     <!-- TODO doc -->
     <bean id="shibboleth.consent.UserIdentifierAttributeId" class="java.lang.String"
         c:_0="%{idp.consent.userIdentifierAttributeId:email}" />
 
-    <!-- Uncomment/configure to install attribute ID whitelist, blacklist, and/or match expressions. -->
+
+    <!-- Attribute release whitelist, blacklist, and match expression to determine 
+        whether consent should be obtained for an attribute based on the attribute ID. -->
     <util:list id="shibboleth.attribute-release.WhitelistedAttributeIDs">
         <!--
         <value>email</value>
         -->
     </util:list>
-    
+
     <util:list id="shibboleth.attribute-release.BlacklistedAttributeIDs">
         <value>transientId</value>
         <value>persistentId</value>
         <value>eduPersonTargetedID</value>
     </util:list>
-    
+
     <!-- 
     <bean id="shibboleth.attribute-release.MatchExpression" class="java.util.regex.Pattern" factory-method="compile" 
         c:regex="^exampleAttribute.*$" />
@@ -61,5 +68,5 @@
     <!-- Condition to evaluate to interrupt SSO flows to check the state of the transaction before allowing. -->
     <!-- TODO: turn into legit predicate checking attributes -->
     <bean id="shibboleth.context-check.Condition" class="com.google.common.base.Predicates" factory-method="alwaysTrue" />
-    
+
 </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=6792&r1=6791&r2=6792&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 Oct 27 19:11:26 2014
@@ -16,46 +16,49 @@
 
     <!-- Parent bean for intercept interceptor flows. -->
     <bean id="shibboleth.InterceptFlow" abstract="true"
-            class="net.shibboleth.idp.profile.interceptor.ProfileInterceptorFlowDescriptor" />
+        class="net.shibboleth.idp.profile.interceptor.ProfileInterceptorFlowDescriptor" />
 
-    <!-- Parent bean for attribute consent flows. -->
+    <!-- Parent bean for attribute release consent flows. -->
     <bean id="shibboleth.consent.AttributeReleaseFlow" abstract="true"
-            class="net.shibboleth.idp.consent.flow.ar.AttributeReleaseFlowDescriptor"
-            p:activationCondition-ref="shibboleth.consent.RelyingPartyPredicate"
-            p:storageService-ref="shibboleth.ClientStorageService"
-            p:doNotRememberConsentAllowed="false"
-            p:globalConsentAllowed="false"
-            p:perAttributeConsentEnabled="false"
-            p:compareValues="true"
-            p:lifetime="P1Y"
-            scope="prototype" />
+        class="net.shibboleth.idp.consent.flow.ar.AttributeReleaseFlowDescriptor"
+        p:activationCondition-ref="shibboleth.consent.Condition"
+        p:storageService-ref="shibboleth.ClientStorageService"
+        p:doNotRememberConsentAllowed="false"
+        p:globalConsentAllowed="false"
+        p:perAttributeConsentEnabled="false"
+        p:compareValues="true"
+        p:lifetime="P1Y"
+        scope="prototype" />
 
     <!-- Parent bean for terms of use consent flows. -->

[... 44 lines stripped ...]