[java-identity-provider COMMIT] /trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolve...

[noreply at shibboleth.net]

Author: rdw
Date: Mon Apr  6 06:08:21 2015
New Revision: 7468

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7468&view=rev
Log:
IDP-682 Correct PRC strategy for scripted Attribute Definition

Modified:
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedAttributeDefinition.java

Modified: trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedAttributeDefinition.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedAttributeDefinition.java?rev=7468&r1=7467&r2=7468&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedAttributeDefinition.java (original)
+++ trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedAttributeDefinition.java Mon Apr  6 06:08:21 2015
@@ -35,7 +35,6 @@
 import net.shibboleth.idp.attribute.resolver.ResolutionException;
 import net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext;
 import net.shibboleth.idp.attribute.resolver.context.AttributeResolverWorkContext;
-import net.shibboleth.idp.profile.context.RelyingPartyContext;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.component.ComponentSupport;
@@ -48,7 +47,6 @@
 import org.slf4j.LoggerFactory;
 
 import com.google.common.base.Function;
-import com.google.common.base.Functions;
 
 import edu.internet2.middleware.shibboleth.common.attribute.provider.V2SAMLProfileRequestContext;
 
@@ -87,10 +85,8 @@
 
     /** Constructor. */
     public ScriptedAttributeDefinition() {
-        // Defaults to ProfileRequestContext -> RelyingPartyContext -> AttributeContext.
-        prcLookupStrategy =
-                Functions.compose(new ParentContextLookup<RelyingPartyContext, ProfileRequestContext>(),
-                        new ParentContextLookup<AttributeResolutionContext, RelyingPartyContext>());
+        // Defaults to ProfileRequestContext -> AttributeContext.
+        prcLookupStrategy = new ParentContextLookup<>();
     }
 
     /**
@@ -199,8 +195,11 @@
         log.debug("{} adding contexts to script context", getLogPrefix());
         scriptContext.setAttribute("resolutionContext", resolutionContext, ScriptContext.ENGINE_SCOPE);
         scriptContext.setAttribute("workContext", workContext, ScriptContext.ENGINE_SCOPE);
-        scriptContext.setAttribute("profileContext", prcLookupStrategy.apply(resolutionContext),
-                ScriptContext.ENGINE_SCOPE);
+        final ProfileRequestContext prc = prcLookupStrategy.apply(resolutionContext);
+        if (null == prc) {
+            log.error("{} ProfileRequestContext could not be located", getLogPrefix());
+        }
+        scriptContext.setAttribute("profileContext", prc, ScriptContext.ENGINE_SCOPE);
 
         log.debug("{} adding emulated V2 request context to script context", getLogPrefix());
         scriptContext.setAttribute("requestContext", new V2SAMLProfileRequestContext(resolutionContext, getId()),