[java-identity-provider COMMIT] in /trunk: idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/fil...

[noreply at shibboleth.net]

Author: rdw
Date: Mon Sep 14 12:22:01 2015
New Revision: 7747

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7747&view=rev
Log:
IDP-774 Custom object injection for scripting contexts: Attributes

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

Back out ill-advised change which required a change to global.  We lose the default bean ID.

Modified:
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/basic/impl/ScriptedMatcherParser.java
    trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/basic/ScriptedTest.java
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/ScriptedAttributeDefinitionParser.java
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/ScriptDataConnectorParser.java
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/ScriptedAttributeParserTest.java
    trunk/idp-conf/src/main/resources/conf/global.xml
    trunk/idp-schema/src/main/resources/schema/shibboleth-afp.xsd
    trunk/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver-ad.xsd
    trunk/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver-dc.xsd

Modified: trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/basic/impl/ScriptedMatcherParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/basic/impl/ScriptedMatcherParser.java?rev=7747&r1=7746&r2=7747&view=diff
==============================================================================
--- trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/basic/impl/ScriptedMatcherParser.java	(original)
+++ trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/basic/impl/ScriptedMatcherParser.java	Mon Sep 14 12:22:01 2015
@@ -120,10 +120,9 @@
         }
         
         String customRef = StringSupport.trimOrNull(config.getAttributeNS(null, "customObjectRef"));
-        if (null == customRef) {
-            customRef = "shibboleth.CustomScriptObject";
+        if (null != customRef) {
+            builder.addPropertyReference("customObject", customRef);
         }
-        builder.addPropertyReference("customObject", customRef);
         builder.addPropertyValue("id", myId);
 
         builder.addConstructorArgValue(scriptBuilder.getBeanDefinition());

Modified: trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/basic/ScriptedTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/basic/ScriptedTest.java?rev=7747&r1=7746&r2=7747&view=diff
==============================================================================
--- trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/basic/ScriptedTest.java	(original)
+++ trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/basic/ScriptedTest.java	Mon Sep 14 12:22:01 2015
@@ -99,10 +99,7 @@
         
         final ScriptedMatcher what = (ScriptedMatcher) getMatcher(getScript(), false);
         
-        final Map custom = (Map) what.getCustomObject();
-     
-        Assert.assertEquals(custom.size(), 1);
-        Assert.assertEquals(custom.get("foo"), "bar");
+        Assert.assertNull(what.getCustomObject());
         
     }
 

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/ScriptedAttributeDefinitionParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/ScriptedAttributeDefinitionParser.java?rev=7747&r1=7746&r2=7747&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/ScriptedAttributeDefinitionParser.java	(original)
+++ trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/ScriptedAttributeDefinitionParser.java	Mon Sep 14 12:22:01 2015
@@ -94,10 +94,9 @@
         }
 
         String customRef = StringSupport.trimOrNull(config.getAttributeNS(null, "customObjectRef"));
-        if (null == customRef) {
-            customRef = "shibboleth.CustomScriptObject";
+        if (null != customRef) {
+            builder.addPropertyReference("customObject", customRef);
         }
-        builder.addPropertyReference("customObject", customRef);
 
         builder.addPropertyValue("script", scriptBuilder.getBeanDefinition());
     }

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/ScriptDataConnectorParser.java

[... 119 lines stripped ...]