[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: Fri May  6 05:48:56 2016
New Revision: 8230

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8230&view=rev
Log:
IDP-982 Do not strip spaces from the salt

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

Modified:
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/BaseComputedIDDataConnectorParser.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/resources/logback-test.xml
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/computed.xml
    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/impl/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/impl/BaseComputedIDDataConnectorParser.java?rev=8230&r1=8229&r2=8230&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/BaseComputedIDDataConnectorParser.java	(original)
+++ trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/BaseComputedIDDataConnectorParser.java	Fri May  6 05:48:56 2016
@@ -53,7 +53,7 @@
      * @param generatedIdDefaultName the name to give the generated Attribute if none was provided.
      */
     protected void doParse(@Nonnull final Element config, @Nonnull final ParserContext parserContext,
-            @Nonnull final BeanDefinitionBuilder builder, @Nullable String generatedIdDefaultName) {
+            @Nonnull final BeanDefinitionBuilder builder, @Nullable final String generatedIdDefaultName) {
         super.doParse(config, parserContext, builder);
         final String generatedAttribute;
         if (config.hasAttributeNS(null, "generatedAttributeID")) {
@@ -65,14 +65,14 @@
         final List<Element> failoverConnector = ElementSupport.getChildElements(config, 
                 AbstractDataConnectorParser.FAILOVER_DATA_CONNECTOR_ELEMENT_NAME);
         if (failoverConnector != null && !failoverConnector.isEmpty()) {
-            String connectorId = StringSupport.trimOrNull(failoverConnector.get(0).getAttributeNS(null, "ref"));
+            final String connectorId = StringSupport.trimOrNull(failoverConnector.get(0).getAttributeNS(null, "ref"));
             log.debug("{} Setting the following failover data connector dependencies: {}", getLogPrefix(), connectorId);
             builder.addPropertyValue("failoverDataConnectorId", connectorId);
         }
 
         final String sourceAttribute = StringSupport.trimOrNull(config.getAttributeNS(null, "sourceAttributeID"));
 
-        final String salt = StringSupport.trimOrNull(config.getAttributeNS(null, "salt"));
+        final String salt = config.getAttributeNS(null, "salt");
         if (null == salt) {
             log.debug("{} Generated Attribute: '{}', sourceAttribute = '{}', no salt provided", 
                     getLogPrefix(), generatedAttribute, sourceAttribute);
@@ -90,8 +90,9 @@
      * 
      * @return "Attribute Definition: '<definitionID>' :"
      */
+    @Override
     @Nonnull @NotEmpty protected String getLogPrefix() {
-        StringBuilder builder = new StringBuilder("Data Connector '").append(getDefinitionId()).append("':");
+        final StringBuilder builder = new StringBuilder("Data Connector '").append(getDefinitionId()).append("':");
         return builder.toString();
     }
     

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=8230&r1=8229&r2=8230&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	Fri May  6 05:48:56 2016
@@ -38,19 +38,19 @@
 public class ComputedIDDataConnectorParserTest extends BaseAttributeDefinitionParserTest {
     
     @Test public void withSalt() throws ComponentInitializationException {
-        ComputedIDDataConnector connector = getDataConnector("computed.xml", ComputedIDDataConnector.class);
+        final ComputedIDDataConnector connector = getDataConnector("computed.xml", ComputedIDDataConnector.class);
         

[... 128 lines stripped ...]