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

[noreply at shibboleth.net]

Author: scantor
Date: Wed Nov  5 14:38:35 2014
New Revision: 6846

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6846&view=rev
Log:
Remove consent activation conditions in favor of using profile config.

Modified:
    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/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=6846&r1=6845&r2=6846&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 Wed Nov  5 14:38:35 2014
@@ -35,7 +35,8 @@
     Condition to evaluate to interrupt SSO flows to check the state of the transaction before allowing.
     
     Typically the flow itself will be activated based on configuration in relying-party.xml, and this controls
-    whether to proceed if the flow is activated.
+    whether to proceed if the flow is activated. The most common use for this flow is to check the set of
+    resolved/filtered attributes and values to see if the user is authorized or provisioned into a service.
     -->
     <bean id="shibboleth.context-check.Condition" parent="shibboleth.Conditions.AND">
         <constructor-arg>
@@ -55,19 +56,6 @@
             </list>
         </constructor-arg>
     </bean>
-
-    <!-- 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>
-            <list>
-                <value>https://sp.example.org</value>
-            </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 -->

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=6846&r1=6845&r2=6846&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 Wed Nov  5 14:38:35 2014
@@ -21,7 +21,6 @@
     <!-- 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.Condition"
         p:storageService-ref="shibboleth.ClientStorageService"
         p:doNotRememberConsentAllowed="false"
         p:globalConsentAllowed="false"
@@ -33,7 +32,6 @@
     <!-- Parent bean for terms of use consent flows. -->
     <bean id="shibboleth.consent.TermsOfUseFlow" abstract="true"
         class="net.shibboleth.idp.consent.flow.ConsentFlowDescriptor"
-        p:activationCondition-ref="shibboleth.consent.Condition"
         p:storageService-ref="shibboleth.ClientStorageService"
         p:compareValues="true"
         p:lifetime="P1Y"