Author: rdw
Date: Sat Jul 13 05:38:32 2013
New Revision: 4568
URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4568&view=rev
Log:
IDP-209 References only grab data from the "ref" attribute, rather than look at the attribute and fhe body text
Modified:
trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterPolicyParser.java
trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/BaseFilterParser.java
trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/matcher/AttributeValueStringMatcherParser.java
trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/policy4.xml
Modified: trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterPolicyParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterPolicyParser.java?rev=4568&r1=4567&r2=4568&view=diff
==============================================================================
--- trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterPolicyParser.java (original)
+++ trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterPolicyParser.java Sat Jul 13 05:38:32 2013
@@ -112,7 +112,7 @@
final List<Element> rulesRef = ElementSupport.getChildElements(config, ATTRIBUTE_RULE_REF);
if (rulesRef != null && rulesRef.size() > 0) {
for (Element ruleRef : rulesRef) {
- final String reference = getAbsoluteReference(config, "AttributeRule", ruleRef.getTextContent());
+ final String reference = getAbsoluteReference(config, "AttributeRule", getReferenceText(ruleRef));
attributeRules.add(new RuntimeBeanReference(reference));
}
}
Modified: trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/BaseFilterParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/BaseFilterParser.java?rev=4568&r1=4567&r2=4568&view=diff
==============================================================================
--- trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/BaseFilterParser.java (original)
+++ trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/BaseFilterParser.java Sat Jul 13 05:38:32 2013
@@ -87,18 +87,9 @@
* @param element the element to look at.
* @return the text.
*
- * <br/>
- * TODO The V2 implementation used the text context but the schema suggest using the attribute "ref". This
- * does both (for now)
- *
- *
*/
@Nullable protected String getReferenceText(Element element) {
String reference = StringSupport.trimOrNull(element.getAttributeNS(null, "ref"));
-
- if (null == reference) {
- reference = StringSupport.trimOrNull(element.getTextContent());
- }
return reference;
}
Modified: trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/matcher/AttributeValueStringMatcherParser.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/AttributeValueStringMatcherParser.java?rev=4568&r1=4567&r2=4568&view=diff
==============================================================================
--- trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/matcher/AttributeValueStringMatcherParser.java (original)
+++ trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/matcher/AttributeValueStringMatcherParser.java Sat Jul 13 05:38:32 2013
@@ -19,7 +19,7 @@
import javax.xml.namespace.QName;
-import net.shibboleth.idp.attribute.filter.impl.matcher.attributevalue.AttributeValueStringMatcher;
+import net.shibboleth.idp.attribute.filter.impl.matcher.AttributeValueStringMatcher;
import net.shibboleth.idp.attribute.filter.spring.basic.AttributeFilterBasicNamespaceHandler;
/**
Modified: trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/policy4.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/policy4.xml?rev=4568&r1=4567&r2=4568&view=diff
==============================================================================
--- trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/policy4.xml (original)
[... 11 lines stripped ...]