[java-identity-provider COMMIT] in /branches/3.1: idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribut...

[noreply at shibboleth.net]

Author: rdw
Date: Mon Jun 22 06:58:44 2015
New Revision: 7583

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7583&view=rev
Log:
IDP-682 Fixes for PRC location 

https://issues.shibboleth.net/jira/browse/IDP-682 

Merge forward fixes for Incorrect PRC location in scripted data connector, attribute resolver & tests.
Add warning in Scripted attribute matcher and attribute Policy Rule if PRC is unfindable

Modified:
    branches/3.1/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/impl/ScriptedMatcher.java
    branches/3.1/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/impl/ScriptedPolicyRule.java
    branches/3.1/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedAttributeDefinition.java
    branches/3.1/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/impl/ScriptedDataConnector.java
    branches/3.1/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedAttributeTest.java
    branches/3.1/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/ScriptedDataConnectorTest.java
    branches/3.1/idp-attribute-resolver-impl/src/test/resources/data/net/shibboleth/idp/attribute/resolver/impl/ad/context.script
    branches/3.1/idp-attribute-resolver-impl/src/test/resources/data/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/context.script
    branches/3.1/idp-attribute-resolver-impl/src/test/resources/data/net/shibboleth/idp/attribute/resolver/impl/dc/scriptedConnector.js
    branches/3.1/idp-attribute-resolver-impl/src/test/resources/data/net/shibboleth/idp/attribute/resolver/impl/dc/v8/scriptedConnector.js

Modified: branches/3.1/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/impl/ScriptedMatcher.java
URL: http://svn.shibboleth.net/view/java-identity-provider/branches/3.1/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/impl/ScriptedMatcher.java?rev=7583&r1=7582&r2=7583&view=diff
==============================================================================
--- branches/3.1/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/impl/ScriptedMatcher.java	(original)
+++ branches/3.1/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/impl/ScriptedMatcher.java	Mon Jun 22 06:58:44 2015
@@ -143,8 +143,13 @@
         final EvaluableScript currentScript = script;
         final SimpleScriptContext scriptContext = new SimpleScriptContext();
         scriptContext.setAttribute("filterContext", filterContext, ScriptContext.ENGINE_SCOPE);
-        scriptContext
-                .setAttribute("profileContext", prcLookupStrategy.apply(filterContext), ScriptContext.ENGINE_SCOPE);
+        
+        final ProfileRequestContext prc = prcLookupStrategy.apply(filterContext);
+        if (null == prc) {
+            log.error("{} Could not locate ProfileRequestContext", getLogPrefix());
+        }
+        scriptContext.setAttribute("profileContext", prc, ScriptContext.ENGINE_SCOPE);
+        
         scriptContext.setAttribute("attribute", attribute, ScriptContext.ENGINE_SCOPE);
 
         try {

Modified: branches/3.1/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/impl/ScriptedPolicyRule.java
URL: http://svn.shibboleth.net/view/java-identity-provider/branches/3.1/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/impl/ScriptedPolicyRule.java?rev=7583&r1=7582&r2=7583&view=diff
==============================================================================
--- branches/3.1/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/impl/ScriptedPolicyRule.java	(original)
+++ branches/3.1/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/impl/ScriptedPolicyRule.java	Mon Jun 22 06:58:44 2015
@@ -131,8 +131,12 @@
 
         final SimpleScriptContext scriptContext = new SimpleScriptContext();
         scriptContext.setAttribute("filterContext", filterContext, ScriptContext.ENGINE_SCOPE);
-        scriptContext
-                .setAttribute("profileContext", prcLookupStrategy.apply(filterContext), ScriptContext.ENGINE_SCOPE);
+        
+        final ProfileRequestContext prc = prcLookupStrategy.apply(filterContext);
+        if (null == prc) {
+            log.error("{} Could not locate ProfileRequestContext", getLogPrefix());
+        }
+        scriptContext.setAttribute("profileContext", prc, ScriptContext.ENGINE_SCOPE);
 
         try {
             final Object result = currentScript.eval(scriptContext);

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

[... 242 lines stripped ...]