[java-identity-provider COMMIT] in /trunk: idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/res...

[noreply at shibboleth.net]

Author: rdw
Date: Sat Oct 15 11:48:30 2016
New Revision: 8496

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8496&view=rev
Log:
IDP-1063 Allow StoredIdDataConnector to be configured with no salt

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

Change the schema and adjust the actual connectors so that the Stored Strategy gets a null computed strategy and the initialization doesn't fail for want of a salt.

Added:
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/storedNoSalt.xml   (with props)
Modified:
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/ComputedIDDataConnectorTest.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/StoredIDDataConnectorTest.java
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ComputedIDDataConnectorParserTest.java
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/StoredIDDataConnectorParserTest.java
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/computedNoSalt.xml
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/stored.xml
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/resolver/impl/ComputedIDDataConnector.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/resolver/impl/StoredIDDataConnector.java
    trunk/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver-dc.xsd
    trunk/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver.xsd

Modified: trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/ComputedIDDataConnectorTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/ComputedIDDataConnectorTest.java?rev=8496&r1=8495&r2=8496&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/ComputedIDDataConnectorTest.java	(original)
+++ trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/ComputedIDDataConnectorTest.java	Sat Oct 15 11:48:30 2016
@@ -148,17 +148,18 @@
     private AttributeResolver constructResolver(final int values) throws ComponentInitializationException {
         final ComputedIDDataConnector connector = new ComputedIDDataConnector();
 
-        return constructResolver(connector, values);
-    }
-
-    protected static AttributeResolver constructResolver(final ComputedIDDataConnector connector, final int values)
+        return constructResolver(connector, values, false);
+    }
+
+    protected static AttributeResolver constructResolver(final ComputedIDDataConnector connector, final int values, final boolean noSalt)
             throws ComponentInitializationException {
         connector.setId(TEST_CONNECTOR_NAME);
         connector.setDependencies(Collections.singleton(TestSources.makeResolverPluginDependency(
                 TestSources.STATIC_ATTRIBUTE_NAME, TestSources.DEPENDS_ON_ATTRIBUTE_NAME_ATTR)));
-        testInit(connector, "No source attr");
         connector.setSourceAttributeId(TestSources.STATIC_ATTRIBUTE_NAME);
-        connector.setSalt(salt);
+        if (!noSalt) {
+            connector.setSalt(salt);
+        }
 
         final SimpleAttributeDefinition simple = new SimpleAttributeDefinition();
         simple.setId(OUTPUT_ATTRIBUTE_NAME);
@@ -203,6 +204,10 @@
     protected static AbstractPersistentIdDataConnector connectorFromResolver(final AttributeResolver resolver) {
         return (AbstractPersistentIdDataConnector) resolver.getDataConnectors().get(TEST_CONNECTOR_NAME);
     }
+    
+    @Test(expectedExceptions={ComponentInitializationException.class,}) public void noSalt() throws ComponentInitializationException {
+        connectorFromResolver(constructResolver(new ComputedIDDataConnector(), 1, true)).initialize();
+    }
 
     @Test public void altDataConnector() throws ComponentInitializationException, ResolutionException {
         AttributeResolver resolver = constructResolver(1);

Modified: trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/StoredIDDataConnectorTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/StoredIDDataConnectorTest.java?rev=8496&r1=8495&r2=8496&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/StoredIDDataConnectorTest.java	(original)

[... 408 lines stripped ...]