[java-identity-provider COMMIT] in /branches/3.3: ./ idp-conf/src/main/resources/flows/authn/conditions/conditions-fl...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Mar  7 20:43:58 2017
New Revision: 8662

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8662&view=rev
Log:
BPr8585 - IDP-1101 - SubjectC14N is not being performed for expiring-password condition

Modified:
    branches/3.3/   (props changed)
    branches/3.3/idp-conf/src/main/resources/flows/authn/conditions/conditions-flow.xml
    branches/3.3/idp-conf/src/main/resources/system/flows/authn/password-authn-flow.xml

Modified: branches/3.3/idp-conf/src/main/resources/flows/authn/conditions/conditions-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/branches/3.3/idp-conf/src/main/resources/flows/authn/conditions/conditions-flow.xml?rev=8662&r1=8661&r2=8662&view=diff
==============================================================================
--- branches/3.3/idp-conf/src/main/resources/flows/authn/conditions/conditions-flow.xml	(original)
+++ branches/3.3/idp-conf/src/main/resources/flows/authn/conditions/conditions-flow.xml	Tue Mar  7 20:43:58 2017
@@ -19,7 +19,7 @@
 
     <subflow-state id="CallExpiringPassword" subflow="authn/conditions/expiring-password">
         <input name="calledAsSubflow" value="true" />
-        <transition on="proceed" to="proceed" />
+        <transition on="proceed" to="ContinueSuccessfulAuthentication" />
     </subflow-state>
 
     <subflow-state id="CallExpiredPassword" subflow="authn/conditions/expired-password">

Modified: branches/3.3/idp-conf/src/main/resources/system/flows/authn/password-authn-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/branches/3.3/idp-conf/src/main/resources/system/flows/authn/password-authn-flow.xml?rev=8662&r1=8661&r2=8662&view=diff
==============================================================================
--- branches/3.3/idp-conf/src/main/resources/system/flows/authn/password-authn-flow.xml	(original)
+++ branches/3.3/idp-conf/src/main/resources/system/flows/authn/password-authn-flow.xml	Tue Mar  7 20:43:58 2017
@@ -81,15 +81,21 @@
     
     <action-state id="ValidateUsernamePassword" parent="authn/conditions#ValidateUsernamePassword">
         <evaluate expression="ValidateUsernamePassword" />
-        <evaluate expression="PopulateSubjectCanonicalizationContext" />
         <evaluate expression="'proceed'" />
 
-        <transition on="proceed" to="CallSubjectCanonicalization" />
+        <transition on="proceed" to="ContinueSuccessfulAuthentication" />
         
         <!-- Fall through to a different flow if login fails on a passive or non-browser request. -->
         <transition on="#{ opensamlProfileRequestContext.getSubcontext(T(net.shibboleth.idp.authn.context.AuthenticationContext)).isPassive() || !opensamlProfileRequestContext.isBrowserProfile() }" to="ReselectFlow" />
 
         <!-- Other event transitions are determined by deployer in /flows/authn/conditions/conditions-flow.xml -->
+    </action-state>
+
+    <action-state id="ContinueSuccessfulAuthentication">
+        <evaluate expression="PopulateSubjectCanonicalizationContext" />
+        <evaluate expression="'proceed'" />
+        
+        <transition on="proceed" to="CallSubjectCanonicalization" />
     </action-state>
 
     <!-- This runs a c14n step on the result of the authentication. -->