[java-identity-provider] branch master updated: IDP-1624 - Preventing exporting DataConnectors from running during c14n

[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=fb1927a44fd449cdccdb3a8de4e40ae8d9c57004

The following commit(s) were added to refs/heads/master by this push:
       new  fb1927a44 IDP-1624 - Preventing exporting DataConnectors from running during c14n
fb1927a44 is described below

commit fb1927a44fd449cdccdb3a8de4e40ae8d9c57004
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Jun 23 12:56:19 2020 -0400

    IDP-1624 - Preventing exporting DataConnectors from running during c14n
    
    https://issues.shibboleth.net/jira/browse/IDP-1624
    
    Back out earlier change and generalize by populating
    resolutionLabel by active flow ID.
---
 .../idp/attribute/resolver/impl/AttributeResolverImpl.java     |  3 ++-
 .../system/flows/c14n/attribute-sourced-subject-c14n-beans.xml |  1 -
 .../net/shibboleth/idp/profile/impl/ResolveAttributes.java     | 10 +++++++++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java
index 76a51c5f9..26c47437f 100644
--- a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java
+++ b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java
@@ -219,7 +219,8 @@ public class AttributeResolverImpl extends AbstractServiceableComponent<Attribut
 
         final boolean timerStarted = startTimer(resolutionContext);
         try {
-            log.debug("{} Initiating attribute resolution", logPrefix);
+            log.debug("{} Initiating attribute resolution with label: {}", logPrefix,
+                    resolutionContext.getResolutionLabel());
 
             if (!preRequestedAttributes.isEmpty()) {
                 log.debug("Resolving pre-requested Attributes");
diff --git a/idp-conf/src/main/resources/system/flows/c14n/attribute-sourced-subject-c14n-beans.xml b/idp-conf/src/main/resources/system/flows/c14n/attribute-sourced-subject-c14n-beans.xml
index 3a1af0d62..7576996bd 100644
--- a/idp-conf/src/main/resources/system/flows/c14n/attribute-sourced-subject-c14n-beans.xml
+++ b/idp-conf/src/main/resources/system/flows/c14n/attribute-sourced-subject-c14n-beans.xml
@@ -24,7 +24,6 @@
             c:resolverService-ref="shibboleth.AttributeResolverService"
             p:attributesToResolve-ref="shibboleth.c14n.attribute.AttributesToResolve"
             p:maskFailures="%{idp.service.attribute.resolver.maskFailures:true}"
-            p:resolutionLabel="c14n/attribute"
             p:principalNameLookupStrategy="#{getObject('shibboleth.c14n.attribute.PrincipalNameLookupStrategy')}">
         <property name="attributeContextCreationStrategy">
             <bean parent="shibboleth.Functions.Compose"
diff --git a/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ResolveAttributes.java b/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ResolveAttributes.java
index 4f2a657ba..cfdf95378 100644
--- a/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ResolveAttributes.java
+++ b/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ResolveAttributes.java
@@ -40,6 +40,7 @@ import net.shibboleth.idp.authn.context.navigate.SubjectContextPrincipalLookupFu
 import net.shibboleth.idp.profile.AbstractProfileAction;
 import net.shibboleth.idp.profile.IdPEventIds;
 import net.shibboleth.idp.profile.context.RelyingPartyContext;
+import net.shibboleth.idp.profile.context.SpringRequestContext;
 import net.shibboleth.idp.profile.context.navigate.RelyingPartyIdLookupFunction;
 import net.shibboleth.idp.profile.context.navigate.ResponderIdLookupFunction;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
@@ -247,6 +248,13 @@ public final class ResolveAttributes extends AbstractProfileAction {
             return false;
         }
 
+        if (resolutionLabel == null) {
+            final SpringRequestContext springContext = profileRequestContext.getSubcontext(SpringRequestContext.class);
+            if (springContext != null && springContext.getRequestContext() != null) {
+                resolutionLabel = springContext.getRequestContext().getActiveFlow().getId();
+            }
+        }
+        
         return true;
     }
 
@@ -309,7 +317,7 @@ public final class ResolveAttributes extends AbstractProfileAction {
      */
     private void populateResolutionContext(@Nonnull final ProfileRequestContext profileRequestContext,
             @Nonnull final AttributeResolutionContext resolutionContext) {
-        
+
         resolutionContext
             .setResolutionLabel(resolutionLabel)
             .setTranscoderRegistry(transcoderRegistry);

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