[java-shib-attribute] 03/03: IDP-2375 Aliased decoded IdPAttributes are lost during subsequent use
Rod Widdowson
rdw at steadingsoftware.com
Tue Apr 22 09:21:17 UTC 2025
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch main
in repository java-shib-attribute.
View the commit online:
http://git.shibboleth.net/view/?p=java-shib-attribute.git;a=commit;h=677f2a628ed1c37496fa66ac1c77a0cfa230b9c8
commit 677f2a628ed1c37496fa66ac1c77a0cfa230b9c8
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Apr 22 10:16:42 2025 +0100
IDP-2375 Aliased decoded IdPAttributes are lost during subsequent use
https://shibboleth.atlassian.net/browse/IDP-2375
Move to using non deprecated methods
---
.../attribute/filter/BaseBridgingClassTester.java | 8 +++++---
.../impl/TargettedAttributeValueFilterTest.java | 18 ++++++++--------
.../impl/UntargettedAttributeValueFilterTest.java | 12 +++++------
.../filter/impl/AttributeFilterImplTest.java | 20 ++++++++++--------
.../impl/NumOfAttributeValuesPolicyRuleTest.java | 2 +-
.../filter/tests/AttributeFilterPolicyTest.java | 6 ++++--
.../tests/AttributeValueFilterPolicyTest.java | 5 +++--
.../filter/spring/AttributeFilterServiceTest.java | 10 ++++-----
.../filter/spring/basic/ScriptedTest.java | 8 ++++----
.../matcher/AttributeValueMatcherParserTest.java | 24 +++++++++++-----------
.../policy/AttributeRequesterRuleParserTest.java | 4 ++--
.../policy/ProxiedRequesterRuleParserTest.java | 2 +-
12 files changed, 63 insertions(+), 56 deletions(-)
diff --git a/shib-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/BaseBridgingClassTester.java b/shib-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/BaseBridgingClassTester.java
index 88414fe10..785acdebc 100644
--- a/shib-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/BaseBridgingClassTester.java
+++ b/shib-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/BaseBridgingClassTester.java
@@ -15,7 +15,9 @@
package net.shibboleth.idp.attribute.filter;
import java.util.Arrays;
+import java.util.HashMap;
import java.util.LinkedHashSet;
+import java.util.Map;
import javax.annotation.Nonnull;
@@ -42,16 +44,16 @@ public class BaseBridgingClassTester {
protected final String NAME2 = "bar";
@Nonnull protected AttributeFilterContext setUpCtx() {
- final LinkedHashSet<IdPAttribute> attributes = new LinkedHashSet<>(2);
+ final Map<String, IdPAttribute> attributes = new HashMap<>();
IdPAttribute attribute = new IdPAttribute(NAME1);
attribute.setValues(Arrays.asList(VALUE1, VALUE2));
- attributes.add(attribute);
+ attributes.put(NAME1,attribute);
attribute = new IdPAttribute(NAME2);
attribute.setValues(Arrays.asList(VALUE1, VALUE3));
- attributes.add(attribute);
+ attributes.put(NAME2, attribute);
final AttributeFilterContext filterContext = new AttributeFilterContext();
filterContext.setPrefilteredIdPAttributes(attributes);
diff --git a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/complex/impl/TargettedAttributeValueFilterTest.java b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/complex/impl/TargettedAttributeValueFilterTest.java
index 286599c20..d4c9159a4 100644
--- a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/complex/impl/TargettedAttributeValueFilterTest.java
+++ b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/complex/impl/TargettedAttributeValueFilterTest.java
@@ -101,20 +101,20 @@ public class TargettedAttributeValueFilterTest extends BaseComplexAttributeFilte
engine.initialize();
AttributeFilterContext context = new AttributeFilterContext();
- context.setPrefilteredIdPAttributes(getIdPAttributes("epa-uidwithjsmith.xml").values());
+ context.setPrefilteredIdPAttributes(getIdPAttributes("epa-uidwithjsmith.xml"));
engine.filterAttributes(context);
Map<String, IdPAttribute> attributes = context.getFilteredIdPAttributes();
final IdPAttribute attribute = attributes.get("eduPersonAffiliation");
assertEquals(attribute.getValues().size(), 3);
context = new AttributeFilterContext();
- context.setPrefilteredIdPAttributes(getIdPAttributes("uid-epawithjsmith.xml").values());
+ context.setPrefilteredIdPAttributes(getIdPAttributes("uid-epawithjsmith.xml"));
engine.filterAttributes(context);
attributes = context.getFilteredIdPAttributes();
assertNull(attributes.get("eduPersonAffiliation"));
context = new AttributeFilterContext();
- context.setPrefilteredIdPAttributes(getIdPAttributes("epa-uid.xml").values());
+ context.setPrefilteredIdPAttributes(getIdPAttributes("epa-uid.xml"));
engine.filterAttributes(context);
attributes = context.getFilteredIdPAttributes();
assertNull(attributes.get("eduPersonAffiliation"));
@@ -168,20 +168,20 @@ public class TargettedAttributeValueFilterTest extends BaseComplexAttributeFilte
engine.initialize();
AttributeFilterContext context = new AttributeFilterContext();
- context.setPrefilteredIdPAttributes(getIdPAttributes("epa-uidwithjsmith.xml").values());
+ context.setPrefilteredIdPAttributes(getIdPAttributes("epa-uidwithjsmith.xml"));
engine.filterAttributes(context);
Map<String, IdPAttribute> attributes = context.getFilteredIdPAttributes();
final IdPAttribute attribute = attributes.get("eduPersonAffiliation");
assertEquals(attribute.getValues().size(), 3);
context = new AttributeFilterContext();
- context.setPrefilteredIdPAttributes(getIdPAttributes("uid-epawithjsmith.xml").values());
+ context.setPrefilteredIdPAttributes(getIdPAttributes("uid-epawithjsmith.xml"));
engine.filterAttributes(context);
attributes = context.getFilteredIdPAttributes();
assertEquals(attribute.getValues().size(), 3);
context = new AttributeFilterContext();
- context.setPrefilteredIdPAttributes(getIdPAttributes("epa-uid.xml").values());
+ context.setPrefilteredIdPAttributes(getIdPAttributes("epa-uid.xml"));
engine.filterAttributes(context);
attributes = context.getFilteredIdPAttributes();
assertEquals(attribute.getValues().size(), 3);
@@ -226,20 +226,20 @@ public class TargettedAttributeValueFilterTest extends BaseComplexAttributeFilte
engine.initialize();
AttributeFilterContext context = new AttributeFilterContext();
- context.setPrefilteredIdPAttributes(getIdPAttributes("epa-uidwithjsmith.xml").values());
+ context.setPrefilteredIdPAttributes(getIdPAttributes("epa-uidwithjsmith.xml"));
engine.filterAttributes(context);
Map<String, IdPAttribute> attributes = context.getFilteredIdPAttributes();
final IdPAttribute attribute = attributes.get("eduPersonAffiliation");
assertEquals(attribute.getValues().size(), 3);
context = new AttributeFilterContext();
- context.setPrefilteredIdPAttributes(getIdPAttributes("uid-epawithjsmith.xml").values());
+ context.setPrefilteredIdPAttributes(getIdPAttributes("uid-epawithjsmith.xml"));
engine.filterAttributes(context);
attributes = context.getFilteredIdPAttributes();
assertNull(attributes.get("eduPersonAffiliation"));
context = new AttributeFilterContext();
- context.setPrefilteredIdPAttributes(getIdPAttributes("epa-uid.xml").values());
+ context.setPrefilteredIdPAttributes(getIdPAttributes("epa-uid.xml"));
engine.filterAttributes(context);
attributes = context.getFilteredIdPAttributes();
assertNull(attributes.get("eduPersonAffiliation"));
diff --git a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/complex/impl/UntargettedAttributeValueFilterTest.java b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/complex/impl/UntargettedAttributeValueFilterTest.java
index 14d415a24..4bbfd0543 100644
--- a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/complex/impl/UntargettedAttributeValueFilterTest.java
+++ b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/complex/impl/UntargettedAttributeValueFilterTest.java
@@ -94,20 +94,20 @@ public class UntargettedAttributeValueFilterTest extends BaseComplexAttributeFil
engine.initialize();
AttributeFilterContext context = new AttributeFilterContext();
- context.setPrefilteredIdPAttributes(getIdPAttributes("epa-uidwithjsmith.xml").values());
+ context.setPrefilteredIdPAttributes(getIdPAttributes("epa-uidwithjsmith.xml"));
engine.filterAttributes(context);
Map<String, IdPAttribute> attributes = context.getFilteredIdPAttributes();
assertNull(attributes.get("eduPersonAffiliation"));
context = new AttributeFilterContext();
- context.setPrefilteredIdPAttributes(getIdPAttributes("uid-epawithjsmith.xml").values());
+ context.setPrefilteredIdPAttributes(getIdPAttributes("uid-epawithjsmith.xml"));
engine.filterAttributes(context);
attributes = context.getFilteredIdPAttributes();
IdPAttribute attribute = attributes.get("eduPersonAffiliation");
assertEquals(attribute.getValues().size(), 1);
context = new AttributeFilterContext();
- context.setPrefilteredIdPAttributes(getIdPAttributes("epa-uid.xml").values());
+ context.setPrefilteredIdPAttributes(getIdPAttributes("epa-uid.xml"));
engine.filterAttributes(context);
attributes = context.getFilteredIdPAttributes();
assertNull(attributes.get("eduPersonAffiliation"));
@@ -150,21 +150,21 @@ public class UntargettedAttributeValueFilterTest extends BaseComplexAttributeFil
policy.initialize();
engine.initialize();
AttributeFilterContext context = new AttributeFilterContext();
- context.setPrefilteredIdPAttributes(getIdPAttributes("epa-uidwithjsmith.xml").values());
+ context.setPrefilteredIdPAttributes(getIdPAttributes("epa-uidwithjsmith.xml"));
engine.filterAttributes(context);
Map<String, IdPAttribute> attributes = context.getFilteredIdPAttributes();
IdPAttribute attribute = attributes.get("eduPersonAffiliation");
assertEquals(attribute.getValues().size(), 3);
context = new AttributeFilterContext();
- context.setPrefilteredIdPAttributes(getIdPAttributes("uid-epawithjsmith.xml").values());
+ context.setPrefilteredIdPAttributes(getIdPAttributes("uid-epawithjsmith.xml"));
engine.filterAttributes(context);
attributes = context.getFilteredIdPAttributes();
attribute = attributes.get("eduPersonAffiliation");
assertEquals(attribute.getValues().size(), 3);
context = new AttributeFilterContext();
- context.setPrefilteredIdPAttributes(getIdPAttributes("epa-uid.xml").values());
+ context.setPrefilteredIdPAttributes(getIdPAttributes("epa-uid.xml"));
engine.filterAttributes(context);
attributes = context.getFilteredIdPAttributes();
assertNull(attributes.get("eduPersonAffiliation"));
diff --git a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/impl/AttributeFilterImplTest.java b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/impl/AttributeFilterImplTest.java
index 1c23a99a7..3ef4a7f83 100644
--- a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/impl/AttributeFilterImplTest.java
+++ b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/impl/AttributeFilterImplTest.java
@@ -25,6 +25,7 @@ import org.testng.Assert;
import org.testng.annotations.Test;
import net.shibboleth.idp.attribute.IdPAttribute;
+import net.shibboleth.idp.attribute.IdPAttributeSupport;
import net.shibboleth.idp.attribute.IdPAttributeValue;
import net.shibboleth.idp.attribute.StringAttributeValue;
import net.shibboleth.idp.attribute.filter.AttributeFilter;
@@ -124,7 +125,8 @@ public class AttributeFilterImplTest {
final IdPAttribute attribute4 = new IdPAttribute("attribute4");
attribute4.setValues(CollectionSupport.listOf(new StringAttributeValue("ein"), new StringAttributeValue("svo")));
- final List<IdPAttribute> attributes = CollectionSupport.listOf(attribute1, attribute2, attribute3, attribute4);
+ final Map<String, IdPAttribute> attributes = IdPAttributeSupport.toMapMergeDuplicates(
+ CollectionSupport.listOf(attribute1, attribute2, attribute3, attribute4));
//
// Always on policy attribute 1 which only releases one value
@@ -270,11 +272,11 @@ public class AttributeFilterImplTest {
final IdPAttribute attribute1 = new IdPAttribute("attribute1");
attribute1.setValues(CollectionSupport.listOf(new StringAttributeValue("one"), new StringAttributeValue("two")));
- filterContext.setPrefilteredIdPAttributes(CollectionSupport.singleton(attribute1));
+ filterContext.setPrefilteredIdPAttributes(CollectionSupport.singletonMap(attribute1.getId(),attribute1));
final IdPAttribute attribute2 = new IdPAttribute("attribute2");
attribute2.setValues(CollectionSupport.listOf(new StringAttributeValue("a"), new StringAttributeValue("b")));
- filterContext.setPrefilteredIdPAttributes(CollectionSupport.singleton(attribute1));
+ filterContext.setPrefilteredIdPAttributes(CollectionSupport.singletonMap(attribute1.getId(),attribute1));
final AttributeFilterImpl filter = new AttributeFilterImpl("engine", CollectionSupport.singletonList(policy));
@@ -307,7 +309,7 @@ public class AttributeFilterImplTest {
final IdPAttribute attribute1 = new IdPAttribute("attribute1");
attribute1.setValues(CollectionSupport.listOf(new StringAttributeValue("one"), new StringAttributeValue("two")));
- filterContext.setPrefilteredIdPAttributes(CollectionSupport.singleton(attribute1));
+ filterContext.setPrefilteredIdPAttributes(CollectionSupport.singletonMap(attribute1.getId(),attribute1));
attribute1Policy.initialize();
policy.initialize();
@@ -339,7 +341,7 @@ public class AttributeFilterImplTest {
final IdPAttribute attribute1 = new IdPAttribute("attribute1");
attribute1.setValues(CollectionSupport.listOf(new StringAttributeValue("one"), new StringAttributeValue("two")));
- filterContext.setPrefilteredIdPAttributes(CollectionSupport.singleton(attribute1));
+ filterContext.setPrefilteredIdPAttributes(CollectionSupport.singletonMap(attribute1.getId(),attribute1));
attribute2Policy.initialize();
policy.initialize();
@@ -368,7 +370,7 @@ public class AttributeFilterImplTest {
final IdPAttribute attribute1 = new IdPAttribute("attribute1");
attribute1.setValues(CollectionSupport.listOf(new StringAttributeValue("one"), new StringAttributeValue("two")));
- filterContext.setPrefilteredIdPAttributes(CollectionSupport.singleton(attribute1));
+ filterContext.setPrefilteredIdPAttributes(CollectionSupport.singletonMap(attribute1.getId(),attribute1));
final AttributeFilterImpl filter = new AttributeFilterImpl("engine", CollectionSupport.singletonList(policy));
@@ -405,7 +407,7 @@ public class AttributeFilterImplTest {
final IdPAttribute attribute1 = new IdPAttribute("attribute1");
attribute1.setValues(CollectionSupport.listOf(new StringAttributeValue("one"), new StringAttributeValue("two")));
- filterContext.setPrefilteredIdPAttributes(CollectionSupport.singleton(attribute1));
+ filterContext.setPrefilteredIdPAttributes(CollectionSupport.singletonMap(attribute1.getId(),attribute1));
final AttributeFilterImpl filter = new AttributeFilterImpl("engine", CollectionSupport.singletonList(policy));
@@ -437,7 +439,7 @@ public class AttributeFilterImplTest {
final IdPAttribute attribute1 = new IdPAttribute("attribute1");
attribute1.setValues(CollectionSupport.listOf(new StringAttributeValue("one"), new StringAttributeValue("two")));
- filterContext.setPrefilteredIdPAttributes(CollectionSupport.singleton(attribute1));
+ filterContext.setPrefilteredIdPAttributes(CollectionSupport.singletonMap(attribute1.getId(),attribute1));
final AttributeFilterImpl filter = new AttributeFilterImpl("engine", CollectionSupport.singletonList(policy));
@@ -469,7 +471,7 @@ public class AttributeFilterImplTest {
final IdPAttribute attribute1 = new IdPAttribute("attribute1");
attribute1.setValues(CollectionSupport.listOf(new StringAttributeValue("one"), new StringAttributeValue("two")));
- filterContext.setPrefilteredIdPAttributes(CollectionSupport.singleton(attribute1));
+ filterContext.setPrefilteredIdPAttributes(CollectionSupport.singletonMap(attribute1.getId(),attribute1));
final AttributeFilterImpl filter = new AttributeFilterImpl("engine", CollectionSupport.singletonList(policy));
diff --git a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/NumOfAttributeValuesPolicyRuleTest.java b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/NumOfAttributeValuesPolicyRuleTest.java
index d06c2f710..96114a362 100644
--- a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/NumOfAttributeValuesPolicyRuleTest.java
+++ b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/NumOfAttributeValuesPolicyRuleTest.java
@@ -119,7 +119,7 @@ public class NumOfAttributeValuesPolicyRuleTest {
}
attr.setValues(hs);
final AttributeFilterContext context = new AttributeFilterContext();
- context.setPrefilteredIdPAttributes(CollectionSupport.singleton(attr));
+ context.setPrefilteredIdPAttributes(CollectionSupport.singletonMap(attr.getId(),attr));
return context;
}
diff --git a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/tests/AttributeFilterPolicyTest.java b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/tests/AttributeFilterPolicyTest.java
index 119c71239..76ac856e8 100644
--- a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/tests/AttributeFilterPolicyTest.java
+++ b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/tests/AttributeFilterPolicyTest.java
@@ -20,6 +20,7 @@ import java.util.List;
import javax.annotation.Nonnull;
import net.shibboleth.idp.attribute.IdPAttribute;
+import net.shibboleth.idp.attribute.IdPAttributeSupport;
import net.shibboleth.idp.attribute.StringAttributeValue;
import net.shibboleth.idp.attribute.filter.AttributeFilterException;
import net.shibboleth.idp.attribute.filter.AttributeFilterPolicy;
@@ -186,7 +187,8 @@ public class AttributeFilterPolicyTest {
IdPAttribute attribute2 = new IdPAttribute(ATTR_NAME_2);
attribute2.setValues(CollectionSupport.singletonList(new StringAttributeValue("45")));
- context.setPrefilteredIdPAttributes(CollectionSupport.listOf(attribute, attribute2));
+ context.setPrefilteredIdPAttributes(IdPAttributeSupport.toMapMergeDuplicates(
+ CollectionSupport.listOf(attribute, attribute2)));
localPolicyMatcher.setRetVal(state);
valueMatcher.setMatchingAttribute(ATTR_NAME);
@@ -235,7 +237,7 @@ public class AttributeFilterPolicyTest {
final IdPAttribute attribute = new IdPAttribute(ATTR_NAME);
attribute.setValues(CollectionSupport.emptyList());
- ctx.setPrefilteredIdPAttributes(CollectionSupport.listOf(attribute));
+ ctx.setPrefilteredIdPAttributes(CollectionSupport.singletonMap(attribute.getId(), attribute));
policy.initialize();
policy.apply(ctx);
Assert.assertTrue(workCtx.getPermittedIdPAttributeValues().isEmpty());
diff --git a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/tests/AttributeValueFilterPolicyTest.java b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/tests/AttributeValueFilterPolicyTest.java
index 0e3fb6f2c..f4b95bbac 100644
--- a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/tests/AttributeValueFilterPolicyTest.java
+++ b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/tests/AttributeValueFilterPolicyTest.java
@@ -26,6 +26,7 @@ import net.shibboleth.idp.attribute.filter.Matcher;
import net.shibboleth.idp.attribute.filter.context.AttributeFilterContext;
import net.shibboleth.idp.attribute.filter.context.AttributeFilterWorkContext;
import net.shibboleth.idp.attribute.filter.testing.MockMatcher;
+import net.shibboleth.shared.collection.CollectionSupport;
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.component.DestroyedComponentException;
import net.shibboleth.shared.component.UnmodifiableComponentException;
@@ -203,7 +204,7 @@ public class AttributeValueFilterPolicyTest {
policy.initialize();
AttributeFilterContext context = new AttributeFilterContext();
- context.setPrefilteredIdPAttributes(Arrays.asList(attribute1));
+ context.setPrefilteredIdPAttributes(CollectionSupport.singletonMap(attribute1.getId(), attribute1));
AttributeFilterWorkContext workCtx = context.ensureSubcontext(AttributeFilterWorkContext.class);
policy.apply(attribute1, context);
@@ -222,7 +223,7 @@ public class AttributeValueFilterPolicyTest {
context = new AttributeFilterContext();
workCtx = context.ensureSubcontext(AttributeFilterWorkContext.class);
- context.setPrefilteredIdPAttributes(Arrays.asList(attribute1));
+ context.setPrefilteredIdPAttributes(CollectionSupport.singletonMap(attribute1.getId(), attribute1));
policy.apply(attribute1, context);
diff --git a/shib-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterServiceTest.java b/shib-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterServiceTest.java
index 8815708f3..703ee4301 100644
--- a/shib-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterServiceTest.java
+++ b/shib-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterServiceTest.java
@@ -123,7 +123,7 @@ public class AttributeFilterServiceTest {
final AttributeFilter filter = getFilter("policy2.xml");
AttributeFilterContext filterContext = new AttributeFilterContext();
- filterContext.setPrefilteredIdPAttributes(attributesToBeFiltered.values());
+ filterContext.setPrefilteredIdPAttributes(attributesToBeFiltered);
filter.filterAttributes(filterContext);
@@ -150,7 +150,7 @@ public class AttributeFilterServiceTest {
final AttributeFilter filter = getFilter("policy3.xml");
AttributeFilterContext filterContext = new AttributeFilterContext();
- filterContext.setPrefilteredIdPAttributes(attributesToBeFiltered.values());
+ filterContext.setPrefilteredIdPAttributes(attributesToBeFiltered);
filter.filterAttributes(filterContext);
Map<String, IdPAttribute> filteredAttributes = filterContext.getFilteredIdPAttributes();
@@ -186,7 +186,7 @@ public class AttributeFilterServiceTest {
final AttributeFilter filter = getFilter("policyAll.xml");
AttributeFilterContext filterContext = new AttributeFilterContext();
- filterContext.setPrefilteredIdPAttributes(attributesToBeFiltered.values());
+ filterContext.setPrefilteredIdPAttributes(attributesToBeFiltered);
filter.filterAttributes(filterContext);
Map<String, IdPAttribute> filteredAttributes = filterContext.getFilteredIdPAttributes();
@@ -214,7 +214,7 @@ public class AttributeFilterServiceTest {
final AttributeFilter filter = getFilter(file);
AttributeFilterContext filterContext = new AttributeFilterContext();
- filterContext.setPrefilteredIdPAttributes(attributesToBeFiltered.values());
+ filterContext.setPrefilteredIdPAttributes(attributesToBeFiltered);
filter.filterAttributes(filterContext);
@@ -250,7 +250,7 @@ public class AttributeFilterServiceTest {
final AttributeFilter filter = getFilter(file);
AttributeFilterContext filterContext = new AttributeFilterContext();
- filterContext.setPrefilteredIdPAttributes(attributesToBeFiltered.values());
+ filterContext.setPrefilteredIdPAttributes(attributesToBeFiltered);
filter.filterAttributes(filterContext);
diff --git a/shib-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/basic/ScriptedTest.java b/shib-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/basic/ScriptedTest.java
index 0d3cfb808..e1b3c80de 100644
--- a/shib-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/basic/ScriptedTest.java
+++ b/shib-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/basic/ScriptedTest.java
@@ -68,7 +68,7 @@ public class ScriptedTest extends BaseAttributeFilterParserTest {
final ScriptedPolicyRule rule = (ScriptedPolicyRule) getPolicyRule(NASHORN_SCRIPT);
final AttributeFilterContext filterContext = new AttributeFilterContext();
- filterContext.setPrefilteredIdPAttributes(epaUid.values());
+ filterContext.setPrefilteredIdPAttributes(epaUid);
assertEquals(rule.matches(filterContext), Tristate.FALSE);
}
@@ -76,7 +76,7 @@ public class ScriptedTest extends BaseAttributeFilterParserTest {
final ScriptedPolicyRule rule = (ScriptedPolicyRule) getPolicyRule(RHINO_SCRIPT);
final AttributeFilterContext filterContext = new AttributeFilterContext();
- filterContext.setPrefilteredIdPAttributes(epaUid.values());
+ filterContext.setPrefilteredIdPAttributes(epaUid);
assertEquals(rule.matches(filterContext), Tristate.FALSE);
}
@@ -90,7 +90,7 @@ public class ScriptedTest extends BaseAttributeFilterParserTest {
final ScriptedMatcher matcher = (ScriptedMatcher) getMatcher(NASHORN_SCRIPT);
final AttributeFilterContext filterContext = new AttributeFilterContext();
- filterContext.setPrefilteredIdPAttributes(epaUid.values());
+ filterContext.setPrefilteredIdPAttributes(epaUid);
final Set<IdPAttributeValue> x = matcher.getMatchingValues(getUidAttribute(), filterContext);
assert x != null;
assertEquals(x.size(), 1);
@@ -102,7 +102,7 @@ public class ScriptedTest extends BaseAttributeFilterParserTest {
final ScriptedMatcher matcher = (ScriptedMatcher) getMatcher(RHINO_SCRIPT);
final AttributeFilterContext filterContext = new AttributeFilterContext();
- filterContext.setPrefilteredIdPAttributes(epaUid.values());
+ filterContext.setPrefilteredIdPAttributes(epaUid);
final Set<IdPAttributeValue> x = matcher.getMatchingValues(getUidAttribute(), filterContext);
assert x != null;
assertEquals(x.size(), 1);
diff --git a/shib-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/matcher/AttributeValueMatcherParserTest.java b/shib-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/matcher/AttributeValueMatcherParserTest.java
index 03b26eefb..124539823 100644
--- a/shib-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/matcher/AttributeValueMatcherParserTest.java
+++ b/shib-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/matcher/AttributeValueMatcherParserTest.java
@@ -88,15 +88,15 @@ public class AttributeValueMatcherParserTest extends BaseAttributeFilterParserTe
final PolicyRequirementRule rule = getPolicyRule("attributeValueId.xml");
AttributeFilterContext filterContext = new AttributeFilterContext();
- filterContext.setPrefilteredIdPAttributes(epaUid.values());
+ filterContext.setPrefilteredIdPAttributes(epaUid);
assertEquals(rule.matches(filterContext), Tristate.FALSE);
filterContext = new AttributeFilterContext();
- filterContext.setPrefilteredIdPAttributes(epaUidJS.values());
+ filterContext.setPrefilteredIdPAttributes(epaUidJS);
assertEquals(rule.matches(filterContext), Tristate.TRUE);
filterContext = new AttributeFilterContext();
- filterContext.setPrefilteredIdPAttributes(uidEpaJS.values());
+ filterContext.setPrefilteredIdPAttributes(uidEpaJS);
assertEquals(rule.matches(filterContext), Tristate.FALSE);
}
@@ -104,15 +104,15 @@ public class AttributeValueMatcherParserTest extends BaseAttributeFilterParserTe
final PolicyRequirementRule rule = getPolicyRule("attributeValueNoId.xml");
AttributeFilterContext filterContext = new AttributeFilterContext();
- filterContext.setPrefilteredIdPAttributes(epaUid.values());
+ filterContext.setPrefilteredIdPAttributes(epaUid);
assertEquals(rule.matches(filterContext), Tristate.FALSE);
filterContext = new AttributeFilterContext();
- filterContext.setPrefilteredIdPAttributes(epaUidJS.values());
+ filterContext.setPrefilteredIdPAttributes(epaUidJS);
assertEquals(rule.matches(filterContext), Tristate.TRUE);
filterContext = new AttributeFilterContext();
- filterContext.setPrefilteredIdPAttributes(uidEpaJS.values());
+ filterContext.setPrefilteredIdPAttributes(uidEpaJS);
assertEquals(rule.matches(filterContext), Tristate.TRUE);
}
@@ -120,19 +120,19 @@ public class AttributeValueMatcherParserTest extends BaseAttributeFilterParserTe
final Matcher matcher = getMatcher("attributeValueNoId.xml");
AttributeFilterContext filterContext = new AttributeFilterContext();
- filterContext.setPrefilteredIdPAttributes(epaUid.values());
+ filterContext.setPrefilteredIdPAttributes(epaUid);
Set<IdPAttributeValue> result = matcher.getMatchingValues(getUidAttribute(epaUid), filterContext);
assert result != null;
assertTrue(result.isEmpty());
filterContext = new AttributeFilterContext();
- filterContext.setPrefilteredIdPAttributes(epaUidJS.values());
+ filterContext.setPrefilteredIdPAttributes(epaUidJS);
result = matcher.getMatchingValues(getUidAttribute(epaUidJS), filterContext);
assert result != null;
assertEquals(result.size(), 1);
filterContext = new AttributeFilterContext();
- filterContext.setPrefilteredIdPAttributes(uidEpaJS.values());
+ filterContext.setPrefilteredIdPAttributes(uidEpaJS);
result = matcher.getMatchingValues(getUidAttribute(uidEpaJS), filterContext);
assert result != null;
assertTrue(result.isEmpty());
@@ -147,19 +147,19 @@ public class AttributeValueMatcherParserTest extends BaseAttributeFilterParserTe
final Matcher matcher = getMatcher("attributeValueId.xml");
AttributeFilterContext filterContext = new AttributeFilterContext();
- filterContext.setPrefilteredIdPAttributes(epaUid.values());
+ filterContext.setPrefilteredIdPAttributes(epaUid);
Set<IdPAttributeValue> result = matcher.getMatchingValues(getUidAttribute(epaUid), filterContext);
assert result != null;
assertTrue(result.isEmpty());
filterContext = new AttributeFilterContext();
- filterContext.setPrefilteredIdPAttributes(epaUidJS.values());
+ filterContext.setPrefilteredIdPAttributes(epaUidJS);
result = matcher.getMatchingValues(getUidAttribute(epaUidJS), filterContext);
assert result != null;
assertEquals(result.size(), 2);
filterContext = new AttributeFilterContext();
- filterContext.setPrefilteredIdPAttributes(uidEpaJS.values());
+ filterContext.setPrefilteredIdPAttributes(uidEpaJS);
result = matcher.getMatchingValues(getUidAttribute(uidEpaJS), filterContext);
assert result != null;
assertTrue(result.isEmpty());
diff --git a/shib-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/AttributeRequesterRuleParserTest.java b/shib-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/AttributeRequesterRuleParserTest.java
index c8308a785..acc551536 100644
--- a/shib-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/AttributeRequesterRuleParserTest.java
+++ b/shib-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/AttributeRequesterRuleParserTest.java
@@ -98,13 +98,13 @@ public class AttributeRequesterRuleParserTest extends BaseAttributeFilterParserT
final Matcher matcher = getMatcher("attributeRequester.xml");
AttributeFilterContext filterContext = DataSources.populatedFilterContext("principal", "issuer", "http://example.org");
- filterContext.setPrefilteredIdPAttributes(epaUid.values());
+ filterContext.setPrefilteredIdPAttributes(epaUid);
Set<IdPAttributeValue> result = matcher.getMatchingValues(getUidAttribute(), filterContext);
assert result != null;
assertTrue(result.isEmpty());
filterContext = DataSources.populatedFilterContext("principal", "issuer", "https://service.example.edu/shibboleth-sp");
- filterContext.setPrefilteredIdPAttributes(epaUid.values());
+ filterContext.setPrefilteredIdPAttributes(epaUid);
result = matcher.getMatchingValues(getUidAttribute(), filterContext);
assert result != null;
assertEquals(result.size(), 1);
diff --git a/shib-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/ProxiedRequesterRuleParserTest.java b/shib-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/ProxiedRequesterRuleParserTest.java
index a2bb93a01..3129e1f70 100644
--- a/shib-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/ProxiedRequesterRuleParserTest.java
+++ b/shib-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/ProxiedRequesterRuleParserTest.java
@@ -88,7 +88,7 @@ public class ProxiedRequesterRuleParserTest extends BaseAttributeFilterParserTes
final ProxiedRequesterContext prc = filterContext.ensureSubcontext(ProxiedRequesterContext.class);
prc.getRequesters().addAll(Arrays.asList("foo", "bar"));
- filterContext.setPrefilteredIdPAttributes(epaUid.values());
+ filterContext.setPrefilteredIdPAttributes(epaUid);
Set<IdPAttributeValue> result = matcher.getMatchingValues(getUidAttribute(), filterContext);
assert result != null;
assertTrue(result.isEmpty());
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list