[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources/system/flows/authn: external-authn-flow.xml rem...

[noreply at shibboleth.net]

Author: scantor
Date: Thu Nov  5 12:37:59 2015
New Revision: 7943

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7943&view=rev
Log:
IDP-851 - External authentication methods can't be called more than once

Modified:
    trunk/idp-conf/src/main/resources/system/flows/authn/external-authn-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/remoteuser-authn-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/spnego-authn-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/x509-authn-flow.xml

Modified: trunk/idp-conf/src/main/resources/system/flows/authn/external-authn-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/authn/external-authn-flow.xml?rev=7943&r1=7942&r2=7943&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/authn/external-authn-flow.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/authn/external-authn-flow.xml	Thu Nov  5 12:37:59 2015
@@ -14,7 +14,7 @@
     
     <view-state id="ExternalTransfer" view="externalRedirect:#{T(net.shibboleth.idp.authn.ExternalAuthentication).getExternalRedirect(flowRequestContext.getActiveFlow().getApplicationContext().getBean('shibboleth.authn.External.externalAuthnPath'), flowExecutionContext.getKey().toString())}">
         <on-render>
-            <evaluate expression="opensamlProfileRequestContext.getSubcontext(T(net.shibboleth.idp.authn.context.AuthenticationContext)).getSubcontext(T(net.shibboleth.idp.authn.context.ExternalAuthenticationContext), true).setFlowExecutionUrl(flowExecutionUrl + '&_eventId_proceed=1')" />
+            <evaluate expression="opensamlProfileRequestContext.getSubcontext(T(net.shibboleth.idp.authn.context.AuthenticationContext)).addSubcontext(new net.shibboleth.idp.authn.context.ExternalAuthenticationContext(), true).setFlowExecutionUrl(flowExecutionUrl + '&_eventId_proceed=1')" />
             <evaluate expression="externalContext.getNativeRequest().getSession().setAttribute('conversation' + flowExecutionContext.getKey().toString(), new net.shibboleth.idp.authn.impl.ExternalAuthenticationImpl(opensamlProfileRequestContext, calledAsExtendedFlow?:false))" />
         </on-render>
         <transition to="ValidateExternalAuthentication" />

Modified: trunk/idp-conf/src/main/resources/system/flows/authn/remoteuser-authn-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/authn/remoteuser-authn-flow.xml?rev=7943&r1=7942&r2=7943&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/authn/remoteuser-authn-flow.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/authn/remoteuser-authn-flow.xml	Thu Nov  5 12:37:59 2015
@@ -14,7 +14,7 @@
     
     <view-state id="ExternalTransfer" view="externalRedirect:#{T(net.shibboleth.idp.authn.ExternalAuthentication).getExternalRedirect(flowRequestContext.getActiveFlow().getApplicationContext().getBean('shibboleth.authn.RemoteUser.externalAuthnPath'), flowExecutionContext.getKey().toString())}">
         <on-render>
-            <evaluate expression="opensamlProfileRequestContext.getSubcontext(T(net.shibboleth.idp.authn.context.AuthenticationContext)).getSubcontext(T(net.shibboleth.idp.authn.context.ExternalAuthenticationContext), true).setFlowExecutionUrl(flowExecutionUrl + '&_eventId_proceed=1')" />
+            <evaluate expression="opensamlProfileRequestContext.getSubcontext(T(net.shibboleth.idp.authn.context.AuthenticationContext)).addSubcontext(new net.shibboleth.idp.authn.context.ExternalAuthenticationContext(), true).setFlowExecutionUrl(flowExecutionUrl + '&_eventId_proceed=1')" />
             <evaluate expression="externalContext.getNativeRequest().getSession().setAttribute('conversation' + flowExecutionContext.getKey().toString(), new net.shibboleth.idp.authn.impl.ExternalAuthenticationImpl(opensamlProfileRequestContext, calledAsExtendedFlow?:false))" />
         </on-render>
         <transition to="ValidateExternalAuthentication" />

Modified: trunk/idp-conf/src/main/resources/system/flows/authn/spnego-authn-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/authn/spnego-authn-flow.xml?rev=7943&r1=7942&r2=7943&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/authn/spnego-authn-flow.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/authn/spnego-authn-flow.xml	Thu Nov  5 12:37:59 2015
@@ -53,8 +53,8 @@
 
     <view-state id="RunSPNEGO" view="externalRedirect:#{flowRequestContext.getActiveFlow().getApplicationContext().getBean('shibboleth.authn.SPNEGO.externalAuthnPath')}/#{flowExecutionContext.getKey().toString()}?conversation=#{flowExecutionContext.getKey().toString()}">
         <on-render>

[... 23 lines stripped ...]