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

[noreply at shibboleth.net]

Author: rdw
Date: Thu Jul  9 09:08:05 2015
New Revision: 7625

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7625&view=rev
Log:
IDP-730 Trim values from (DOM) attributes

https://issues.shibboleth.net/jira/browse/IDP-730 If a property is used in elements of the custom syntax there is always a change that trailing or leading spaces may get injected, resulting in odd behaviours.

This checkin selectively adds StringSupport.TrimOrNull in these cases (notably regexps are left untouched, but e.g. things which are destined to be URIs are trimmed)

Modified:
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/basic/ScriptedMatcherParser.java
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/matcher/AbstractStringMatcherParser.java
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/policyrule/PredicateRuleParser.java
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/AbstractEntityAttributeRuleParser.java
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeInMetadataRuleParser.java
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeRequesterNameIdFormatRuleParser.java
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/MappedAttributeInMetadataRuleParser.java
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/RegistrationAuthorityRuleParser.java

Modified: trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/basic/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/ScriptedMatcherParser.java?rev=7625&r1=7624&r2=7625&view=diff
==============================================================================
--- trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/basic/ScriptedMatcherParser.java	(original)
+++ trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/basic/ScriptedMatcherParser.java	Thu Jul  9 09:08:05 2015
@@ -26,6 +26,7 @@
 import net.shibboleth.idp.attribute.filter.matcher.impl.ScriptedMatcher;
 import net.shibboleth.idp.attribute.filter.policyrule.impl.ScriptedPolicyRule;
 import net.shibboleth.idp.attribute.filter.spring.BaseFilterParser;
+import net.shibboleth.utilities.java.support.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.xml.ElementSupport;
 
 import org.slf4j.Logger;
@@ -75,7 +76,7 @@
                 BeanDefinitionBuilder.genericBeanDefinition(EvaluableScriptFactoryBean.class);
         scriptBuilder.addPropertyValue("sourceId",  logPrefix);
         if (config.hasAttributeNS(null, "language")) {
-            final String scriptLanguage = config.getAttributeNS(null, "language");
+            final String scriptLanguage =  StringSupport.trimOrNull(config.getAttributeNS(null, "language"));
             log.debug("{} scripting language: {}.",  logPrefix , scriptLanguage);
             scriptBuilder.addPropertyValue("engineName", scriptLanguage);
         }

Modified: trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/matcher/AbstractStringMatcherParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/matcher/AbstractStringMatcherParser.java?rev=7625&r1=7624&r2=7625&view=diff
==============================================================================
--- trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/matcher/AbstractStringMatcherParser.java	(original)
+++ trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/matcher/AbstractStringMatcherParser.java	Thu Jul  9 09:08:05 2015
@@ -38,7 +38,8 @@
         builder.addPropertyValue("matchString", StringSupport.trimOrNull(element.getAttributeNS(null, "value")));
 
         if (element.hasAttributeNS(null, "ignoreCase")) {
-            builder.addPropertyValue("ignoreCase", element.getAttributeNS(null, "ignoreCase"));
+            builder.addPropertyValue("ignoreCase", 
+                    StringSupport.trimOrNull(element.getAttributeNS(null, "ignoreCase")));
         }
     }
 }

Modified: trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/policyrule/PredicateRuleParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/policyrule/PredicateRuleParser.java?rev=7625&r1=7624&r2=7625&view=diff
==============================================================================

[... 195 lines stripped ...]