[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources/system: flows/saml/saml2/slo-front-abstract-flo...

[noreply at shibboleth.net]

Author: serac
Date: Mon Dec 28 07:38:27 2015
New Revision: 8060

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8060&view=rev
Log:
IDP-879 Vary content type by user agent.

https://issues.shibboleth.net/jira/browse/IDP-879
SAML2 SLO front-channel JSON view requires user agent switching
logic for content type.

Modified:
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/slo-front-abstract-flow.xml
    trunk/idp-conf/src/main/resources/system/views/logout/saml-result.vm

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml2/slo-front-abstract-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml2/slo-front-abstract-flow.xml?rev=8060&r1=8059&r2=8060&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml2/slo-front-abstract-flow.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml2/slo-front-abstract-flow.xml	Mon Dec 28 07:38:27 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="opensamlProfileRequestContext.getSubcontext(T(net.shibboleth.idp.authn.context.UserAgentContext))" result="requestScope.userAgentContext" />
+            <evaluate expression="userAgentContext.isInstance(T(eu.bitwalker.useragentutils.Browser).IE)
+                ? externalContext.nativeResponse.setContentType('text/plain')
+                : externalContext.nativeResponse.setContentType('application/json')" />
         </on-entry>
     </end-state>
 

Modified: trunk/idp-conf/src/main/resources/system/views/logout/saml-result.vm
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/views/logout/saml-result.vm?rev=8060&r1=8059&r2=8060&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/views/logout/saml-result.vm	(original)
+++ trunk/idp-conf/src/main/resources/system/views/logout/saml-result.vm	Mon Dec 28 07:38:27 2015
@@ -9,7 +9,6 @@
 ## environment - Spring Environment object for property resolution
 ## custom - arbitrary object injected by deployer
 ##
-$response.setContentType('application/json')
 #set ( $success = false )
 #set ( $detail = "" )
 #set ( $logout = $profileRequestContext.getInboundMessageContext().getMessage() )