[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/system/flows/logout/logout-beans.xml idp-conf/...

[noreply at shibboleth.net]

Author: serac
Date: Wed Jan 20 14:57:55 2016
New Revision: 8080

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8080&view=rev
Log:
IDP-879 Use activation condition to execute PopulateUserAgentContext.

https://issues.shibboleth.net/jira/browse/IDP-879
Use an activation condition that defaults to BrowserProfilePredicate to get
browser-profile-specific execution instead of conditional flow logic.

Modified:
    trunk/idp-conf/src/main/resources/system/flows/logout/logout-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/logout/logout-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/PopulateUserAgentContext.java

Modified: trunk/idp-conf/src/main/resources/system/flows/logout/logout-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/logout/logout-beans.xml?rev=8080&r1=8079&r2=8080&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/logout/logout-beans.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/logout/logout-beans.xml	Wed Jan 20 14:57:55 2016
@@ -26,6 +26,10 @@
         p:profileId="http://shibboleth.net/ns/profiles/logout"
         p:loggingId="%{idp.service.logging.logout:Logout}"
         p:browserProfile="true" />
+
+    <bean id="PopulateUserAgentContext"
+          class="net.shibboleth.idp.profile.impl.PopulateUserAgentContext" scope="prototype"
+          p:httpServletRequest-ref="shibboleth.HttpServletRequest" />
 
     <bean id="PopulateClientStorageLoadContext"
         class="org.opensaml.storage.impl.client.PopulateClientStorageLoadContext" scope="prototype"

Modified: trunk/idp-conf/src/main/resources/system/flows/logout/logout-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/logout/logout-flow.xml?rev=8080&r1=8079&r2=8080&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/logout/logout-flow.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/logout/logout-flow.xml	Wed Jan 20 14:57:55 2016
@@ -4,6 +4,7 @@
 
     <action-state id="InitializeProfileRequestContext">
         <evaluate expression="InitializeProfileRequestContext" />
+        <evaluate expression="PopulateUserAgentContext" />
         <evaluate expression="'proceed'" />
         
         <transition on="proceed" to="PopulateClientStorageLoadContext" />

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml?rev=8080&r1=8079&r2=8080&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml	Wed Jan 20 14:57:55 2016
@@ -28,23 +28,13 @@
         <evaluate expression="PopulateSignatureValidationParameters" />
         <evaluate expression="PopulateClientTLSValidationParameters" />
         
-        <evaluate expression="PopulateInboundInterceptContext" />        
+        <evaluate expression="PopulateInboundInterceptContext" />
+        <evaluate expression="PopulateUserAgentContext" />
         <evaluate expression="'proceed'" />
         
-        <transition on="proceed" to="CheckBrowserProfile" />
+        <transition on="proceed" to="CheckInboundInterceptContext" />
     </action-state>
 
-    <decision-state id="CheckBrowserProfile">
-        <if test="opensamlProfileRequestContext.browserProfile"
-            then="PopulateUserAgentContext" else="CheckInboundInterceptContext" />
-    </decision-state>
-
-    <action-state id="PopulateUserAgentContext">
-        <evaluate expression="PopulateUserAgentContext" />
-        <evaluate expression="'proceed'" />
-        <transition on="proceed" to="CheckInboundInterceptContext" />
-    </action-state>
-    
     <decision-state id="CheckInboundInterceptContext">
         <if test="opensamlProfileRequestContext.getSubcontext(T(net.shibboleth.idp.profile.context.ProfileInterceptorContext)).getAvailableFlows().isEmpty()"
             then="OutboundContextsAndSecurityParameters" else="DoInboundInterceptSubflow" />

Modified: trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/PopulateUserAgentContext.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/PopulateUserAgentContext.java?rev=8080&r1=8079&r2=8080&view=diff
==============================================================================
--- trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/PopulateUserAgentContext.java	(original)

[... 24 lines stripped ...]