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

[noreply at shibboleth.net]

Author: tzeller
Date: Tue Nov 25 02:46:27 2014
New Revision: 7008

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7008&view=rev
Log:
IDP-519 Skip consent flow execution in non-browser profiles by filtering flows via the profile interceptor dispatcher.
Return a Map of available flows in the profile interceptor context rather than a List, similar to the authentication context.

Added:
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/interceptor/impl/FilterFlowsByNonBrowserSupport.java
      - copied, changed from r7001, trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/FilterFlowsByNonBrowserSupport.java
    trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/interceptor/impl/FilterFlowsByNonBrowserSupportTest.java   (with props)
Modified:
    trunk/idp-conf/src/main/resources/system/conf/profile-intercept-system.xml
    trunk/idp-conf/src/main/resources/system/flows/intercept/attribute-release-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/intercept/intercept-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/intercept/intercept-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/intercept/terms-of-use-flow.xml
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/context/ProfileInterceptorContext.java
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/interceptor/ProfileInterceptorFlowDescriptor.java
    trunk/idp-profile-api/src/test/java/net/shibboleth/idp/profile/interceptor/ProfileInterceptorFlowDescriptorTest.java
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/interceptor/impl/PopulateProfileInterceptorContext.java
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/interceptor/impl/SelectProfileInterceptorFlow.java
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/interceptor/impl/WriteProfileInterceptorResultToStorage.java
    trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/interceptor/impl/PopulateProfileInterceptorContextTest.java
    trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/interceptor/impl/SelectProfileInterceptorFlowTest.java

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=7008&r1=7007&r2=7008&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 Tue Nov 25 02:46:27 2014
@@ -41,6 +41,7 @@
         p:perAttributeConsentEnabled="false"
         p:compareValues="true"
         p:lifetime="P1Y"
+        p:nonBrowserSupported="false"
         scope="prototype" />
 
     <!-- Parent bean for terms of use consent flows. -->
@@ -49,6 +50,7 @@
         p:storageService-ref="%{idp.consent.StorageService:shibboleth.ClientPersistentStorageService}"
         p:compareValues="true"
         p:lifetime="P1Y"
+        p:nonBrowserSupported="false"
         scope="prototype" />
 
 </beans>

Modified: trunk/idp-conf/src/main/resources/system/flows/intercept/attribute-release-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/intercept/attribute-release-flow.xml?rev=7008&r1=7007&r2=7008&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/intercept/attribute-release-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/intercept/attribute-release-flow.xml Tue Nov 25 02:46:27 2014
@@ -154,8 +154,6 @@
         <transition on="proceed" to="proceed" />
     </action-state>
 
-    <!-- TODO non-browser skip view -->
-
     <end-state id="proceed" />
     
     <bean-import resource="../../../system/flows/intercept/attribute-release-beans.xml" />

Modified: trunk/idp-conf/src/main/resources/system/flows/intercept/intercept-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/intercept/intercept-beans.xml?rev=7008&r1=7007&r2=7008&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/intercept/intercept-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/intercept/intercept-beans.xml Tue Nov 25 02:46:27 2014
@@ -17,6 +17,9 @@
 
     <bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
     <bean class="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor" />
+    
+    <bean id="FilterFlowsByNonBrowserSupport"
+        class="net.shibboleth.idp.profile.interceptor.impl.FilterFlowsByNonBrowserSupport" scope="prototype" />
 
     <bean id="SelectInterceptFlow"
         class="net.shibboleth.idp.profile.interceptor.impl.SelectProfileInterceptorFlow" scope="prototype" />


[... 523 lines stripped ...]