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

[noreply at shibboleth.net]

Author: rdw
Date: Sat Aug  1 10:40:13 2015
New Revision: 7661

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7661&view=rev
Log:
IDP-771 property replacement in Computed data connectors

https://issues.shibboleth.net/jira/browse/IDP-771.  The parser was doing the
conversion to byte[] on the XML contents rather than passing it through 
Spring to allow property replacement..

Enable (&fix) supressed test.
Fix impedance mismatch between @Nullable/@NonNullable in the
connector and the strategy

Modified:
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/BaseComputedIDDataConnectorParser.java
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ComputedIDDataConnectorParserTest.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/resolver/impl/ComputedIDDataConnector.java

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/BaseComputedIDDataConnectorParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/BaseComputedIDDataConnectorParser.java?rev=7661&r1=7660&r2=7661&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/BaseComputedIDDataConnectorParser.java	(original)
+++ trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/BaseComputedIDDataConnectorParser.java	Sat Aug  1 10:40:13 2015
@@ -73,20 +73,17 @@
         final String sourceAttribute = StringSupport.trimOrNull(config.getAttributeNS(null, "sourceAttributeID"));
 
         final String salt = StringSupport.trimOrNull(config.getAttributeNS(null, "salt"));
-        final byte[] saltBytes;
         if (null == salt) {
-            saltBytes = null;
-            log.debug("{} Generated Attribute: '{}', sourceAttribute = '{}', no salt provided", new Object[] {
-                    getLogPrefix(), generatedAttribute, sourceAttribute,});
+            log.debug("{} Generated Attribute: '{}', sourceAttribute = '{}', no salt provided", 
+                    getLogPrefix(), generatedAttribute, sourceAttribute);
         } else {
-            saltBytes = salt.getBytes();
-            log.debug("{} Generated Attribute: '{}', sourceAttribute = '{}', salt: '{}'", new Object[] {
-                    getLogPrefix(), generatedAttribute, sourceAttribute, saltBytes,});
+            log.debug("{} Generated Attribute: '{}', sourceAttribute = '{}', salt (or property): '{}'", 
+                    getLogPrefix(), generatedAttribute, sourceAttribute, salt);
         }
 
         builder.addPropertyValue("generatedAttributeId", generatedAttribute);
         builder.addPropertyValue("sourceAttributeId", sourceAttribute);
-        builder.addPropertyValue("salt", saltBytes);
+        builder.addPropertyValue("salt", salt);
     }
     /**
      * return a string which is to be prepended to all log messages.

Modified: trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ComputedIDDataConnectorParserTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ComputedIDDataConnectorParserTest.java?rev=7661&r1=7660&r2=7661&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ComputedIDDataConnectorParserTest.java	(original)
+++ trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ComputedIDDataConnectorParserTest.java	Sat Aug  1 10:40:13 2015
@@ -17,15 +17,17 @@
 
 package net.shibboleth.idp.attribute.resolver.spring.dc;
 
-import java.util.Collections;
-
+import net.shibboleth.ext.spring.context.FilesystemGenericApplicationContext;
+import net.shibboleth.ext.spring.util.SchemaTypeAwareXMLBeanDefinitionReader;
 import net.shibboleth.idp.attribute.resolver.spring.BaseAttributeDefinitionParserTest;
 import net.shibboleth.idp.saml.attribute.resolver.impl.ComputedIDDataConnector;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 
 import org.springframework.context.support.GenericApplicationContext;
-import org.springframework.core.env.ConfigurableEnvironment;
-import org.springframework.core.env.MapPropertySource;
+import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
+import org.springframework.core.env.MutablePropertySources;
+import org.springframework.core.env.StandardEnvironment;
+import org.springframework.mock.env.MockPropertySource;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
@@ -62,16 +64,36 @@
         }
     }
 
-    @Test(enabled=false) public void propertySalt()  {

[... 78 lines stripped ...]