[java-identity-provider] branch master updated: Rename view-state, add some logging.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=86fc68d8490fad2d9b70cda87fce09957b2084f9

The following commit(s) were added to refs/heads/master by this push:
       new  86fc68d   Rename view-state, add some logging.
86fc68d is described below

commit 86fc68d8490fad2d9b70cda87fce09957b2084f9
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Nov 21 14:09:20 2019 -0500

    Rename view-state, add some logging.
---
 .../shibboleth/idp/authn/impl/SelectAuthenticationFlow.java  | 12 ++++++++++--
 .../idp/authn/impl/TransitionMultiFactorAuthentication.java  |  4 ++--
 .../resources/system/flows/authn/proxy/saml-proxy-flow.xml   |  4 ++--
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/SelectAuthenticationFlow.java b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/SelectAuthenticationFlow.java
index 4a93b07..ff4e646 100644
--- a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/SelectAuthenticationFlow.java
+++ b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/SelectAuthenticationFlow.java
@@ -190,6 +190,8 @@ public class SelectAuthenticationFlow extends AbstractAuthenticationAction {
         if (!authenticationContext.isForceAuthn()) {
             activeResult = authenticationContext.getActiveResults().get(flow.getId());
             if (!activeResult.getReuseCondition().test(profileRequestContext)) {
+                log.debug("{} Active result for flow {} not reusable, ignoring", getLogPrefix(),
+                        activeResult.getAuthenticationFlowId());
                 activeResult = null;
             }
         }
@@ -283,6 +285,9 @@ public class SelectAuthenticationFlow extends AbstractAuthenticationAction {
                 if (preferredPrincipalCtx == null || preferredPrincipalCtx.isAcceptable(activeResult)) {
                     break;
                 }
+            } else {
+                log.debug("{} Active result for flow {} not reusable, ignoring", getLogPrefix(),
+                        activeResult.getAuthenticationFlowId());
             }
         }
         
@@ -458,6 +463,8 @@ public class SelectAuthenticationFlow extends AbstractAuthenticationAction {
                             selectActiveResult(profileRequestContext, authenticationContext, result);
                             return;
                         }
+                        log.debug("{} Active result for flow {} not usable, ignoring", getLogPrefix(),
+                                result.getAuthenticationFlowId());
                     }
                 } else {
                     log.warn("{} Configuration does not support requested principal evaluation with "
@@ -492,8 +499,9 @@ public class SelectAuthenticationFlow extends AbstractAuthenticationAction {
                         final AuthenticationResult result = activeResults.get(descriptor.getId());
                         if (result == null || !result.getReuseCondition().test(profileRequestContext)
                                 || !predicate.test(result)) {
-                            if (!authenticationContext.isPassive()
-                                    || descriptor.isPassiveAuthenticationSupported()) {
+                            log.debug("{} Active result for flow {} not usable, ignoring", getLogPrefix(),
+                                    result.getAuthenticationFlowId());
+                            if (!authenticationContext.isPassive() || descriptor.isPassiveAuthenticationSupported()) {
                                 selectInactiveFlow(profileRequestContext, authenticationContext, descriptor);
                                 return;
                             }
diff --git a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/TransitionMultiFactorAuthentication.java b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/TransitionMultiFactorAuthentication.java
index 59654c9..53b2b6d 100644
--- a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/TransitionMultiFactorAuthentication.java
+++ b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/TransitionMultiFactorAuthentication.java
@@ -273,14 +273,14 @@ public class TransitionMultiFactorAuthentication extends AbstractAuthenticationA
         final AuthenticationResult activeResult = mfaContext.getActiveResults().get(flowId);
         if (activeResult != null) {
             if (activeResult.getReuseCondition().test(profileRequestContext)) {
-                log.debug("{} Reusing active result for '{}' flow", getLogPrefix(), flowId);
+                log.debug("{} Reusing active result for flow {}", getLogPrefix(), flowId);
                 activeResult.setLastActivityInstantToNow();
                 previousEvent = EventIds.PROCEED_EVENT_ID;
                 ActionSupport.buildProceedEvent(profileRequestContext);
                 doExecute(profileRequestContext, authenticationContext);
                 return;
             }
-            log.debug("{} Condition blocked reuse of active result for '{}' flow", getLogPrefix(), flowId);
+            log.debug("{} Active result for flow {} not reusable, ignoring", getLogPrefix(), flowId);
             mfaContext.getActiveResults().remove(flowId);
         }
      
diff --git a/idp-conf/src/main/resources/system/flows/authn/proxy/saml-proxy-flow.xml b/idp-conf/src/main/resources/system/flows/authn/proxy/saml-proxy-flow.xml
index 5f88eb0..26f0bdf 100644
--- a/idp-conf/src/main/resources/system/flows/authn/proxy/saml-proxy-flow.xml
+++ b/idp-conf/src/main/resources/system/flows/authn/proxy/saml-proxy-flow.xml
@@ -31,10 +31,10 @@
         <evaluate expression="WriteAuditLog" />
         <evaluate expression="'proceed'" />
         
-        <transition on="proceed" to="EncodeMessage" />
+        <transition on="proceed" to="EncodeSAMLRequest" />
     </action-state>
     
-    <view-state id="EncodeMessage" view="externalRedirect:#{T(net.shibboleth.idp.authn.ExternalAuthentication).getExternalRedirect(flowRequestContext.getActiveFlow().getApplicationContext().getBean('shibboleth.authn.SAML.externalAuthnPathStrategy').apply(opensamlProfileRequestContext) + '/start', flowExecutionContext.getKey().toString())}">
+    <view-state id="EncodeSAMLRequest" view="externalRedirect:#{T(net.shibboleth.idp.authn.ExternalAuthentication).getExternalRedirect(flowRequestContext.getActiveFlow().getApplicationContext().getBean('shibboleth.authn.SAML.externalAuthnPathStrategy').apply(opensamlProfileRequestContext) + '/start', flowExecutionContext.getKey().toString())}">
         <on-render>
             <evaluate expression="opensamlProfileRequestContext.getSubcontext(T(net.shibboleth.idp.authn.context.AuthenticationContext)).addSubcontext(new net.shibboleth.idp.authn.context.ExternalAuthenticationContext(new net.shibboleth.idp.authn.impl.ExternalAuthenticationImpl(false)), true).setFlowExecutionUrl(flowExecutionUrl + '&_eventId_proceed=1')" />
             <evaluate expression="opensamlProfileRequestContext.getSubcontext(T(net.shibboleth.idp.authn.context.AuthenticationContext)).addSubcontext(new net.shibboleth.idp.saml.saml2.profile.impl.SAMLAuthnContext(EncodeMessage, messageDecoderFactory))" result="flowScope.samlContext" />

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.