[java-identity-provider COMMIT] in /branches/3.2: ./ idp-authn-api/pom.xml idp-conf/src/main/resources/system/flows/l...

[noreply at shibboleth.net]

Author: serac
Date: Fri Dec 18 17:05:39 2015
New Revision: 8048

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8048&view=rev
Log:
IDP-879 Port fix to 3.2 branch.

https://issues.shibboleth.net/jira/browse/IDP-879
Do all user-agent checking in webflow to avoid API breaking changes.
Also, caught something that slipped through 3.3.0 fix, namely setting
setting content type on SAML2 SLO propagation JSON result.

Modified:
    branches/3.2/   (props changed)
    branches/3.2/idp-authn-api/pom.xml
    branches/3.2/idp-conf/src/main/resources/system/flows/logout/logout-propagation-flow.xml
    branches/3.2/idp-conf/src/main/resources/system/flows/saml/saml2/slo-front-abstract-flow.xml
    branches/3.2/idp-conf/src/main/resources/system/views/logout/saml-result.vm

Modified: branches/3.2/idp-authn-api/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/branches/3.2/idp-authn-api/pom.xml?rev=8048&r1=8047&r2=8048&view=diff
==============================================================================
--- branches/3.2/idp-authn-api/pom.xml	(original)
+++ branches/3.2/idp-authn-api/pom.xml	Fri Dec 18 17:05:39 2015
@@ -45,6 +45,11 @@
             <groupId>joda-time</groupId>
             <artifactId>joda-time</artifactId>
         </dependency>
+        <dependency>
+            <groupId>eu.bitwalker</groupId>
+            <artifactId>UserAgentUtils</artifactId>
+            <version>1.18</version>
+        </dependency>
 
         <!-- Provided Dependencies -->
 

Modified: branches/3.2/idp-conf/src/main/resources/system/flows/logout/logout-propagation-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/branches/3.2/idp-conf/src/main/resources/system/flows/logout/logout-propagation-flow.xml?rev=8048&r1=8047&r2=8048&view=diff
==============================================================================
--- branches/3.2/idp-conf/src/main/resources/system/flows/logout/logout-propagation-flow.xml	(original)
+++ branches/3.2/idp-conf/src/main/resources/system/flows/logout/logout-propagation-flow.xml	Fri Dec 18 17:05:39 2015
@@ -26,7 +26,10 @@
 
     <end-state id="RenderResult" view="logout/result">
         <on-entry>
-            <evaluate expression="flowRequestContext.getExternalContext().getNativeResponse().setContentType('application/json')" />
+            <evaluate expression="T(eu.bitwalker.useragentutils.UserAgent).parseUserAgentString(externalContext.nativeRequest.getHeader('User-Agent')).browser" result="requestScope.browser" />
+            <evaluate expression="browser.getGroup().equals(T(eu.bitwalker.useragentutils.Browser).IE)
+                ? externalContext.nativeResponse.setContentType('text/plain')
+                : externalContext.nativeResponse.setContentType('application/json')" />
             <evaluate expression="T(net.shibboleth.utilities.java.support.codec.HTMLEncoder)" result="requestScope.encoder" />
             <evaluate expression="WriteAuditLog" />
         </on-entry>

Modified: branches/3.2/idp-conf/src/main/resources/system/flows/saml/saml2/slo-front-abstract-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/branches/3.2/idp-conf/src/main/resources/system/flows/saml/saml2/slo-front-abstract-flow.xml?rev=8048&r1=8047&r2=8048&view=diff
==============================================================================
--- branches/3.2/idp-conf/src/main/resources/system/flows/saml/saml2/slo-front-abstract-flow.xml	(original)
+++ branches/3.2/idp-conf/src/main/resources/system/flows/saml/saml2/slo-front-abstract-flow.xml	Fri Dec 18 17:05:39 2015
@@ -211,6 +211,10 @@
             <evaluate expression="flowRequestContext.getExternalContext().getNativeRequest()" result="requestScope.request" />
             <evaluate expression="flowRequestContext.getExternalContext().getNativeResponse()" result="requestScope.response" />
             <evaluate expression="flowRequestContext.getActiveFlow().getApplicationContext().containsBean('shibboleth.CustomViewContext') ? flowRequestContext.getActiveFlow().getApplicationContext().getBean('shibboleth.CustomViewContext') : null" result="requestScope.custom" />
+            <evaluate expression="T(eu.bitwalker.useragentutils.UserAgent).parseUserAgentString(externalContext.nativeRequest.getHeader('User-Agent')).browser" result="requestScope.browser" />
+            <evaluate expression="browser.getGroup().equals(T(eu.bitwalker.useragentutils.Browser).IE)
+                ? externalContext.nativeResponse.setContentType('text/plain')
+                : externalContext.nativeResponse.setContentType('application/json')" />
         </on-entry>
     </end-state>
 

Modified: branches/3.2/idp-conf/src/main/resources/system/views/logout/saml-result.vm
URL: http://svn.shibboleth.net/view/java-identity-provider/branches/3.2/idp-conf/src/main/resources/system/views/logout/saml-result.vm?rev=8048&r1=8047&r2=8048&view=diff
==============================================================================
--- branches/3.2/idp-conf/src/main/resources/system/views/logout/saml-result.vm	(original)

[... 10 lines stripped ...]