[java-identity-provider] 06/06: Remove native Spring Attribute Filter Service Tests
Rod Widdowson
rdw at steadingsoftware.com
Sun Jan 31 14:04:42 UTC 2021
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch main
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=ff520576a849f9e5c7574e845764cc6f807961e9
commit ff520576a849f9e5c7574e845764cc6f807961e9
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sun Jan 31 11:57:18 2021 +0000
Remove native Spring Attribute Filter Service Tests
---
.../filter/spring/AttributeFilterServiceTest.java | 43 ++++---------
.../idp/attribute/filter/spring/native/deny1.xml | 62 -------------------
.../idp/attribute/filter/spring/native/deny2.xml | 69 ---------------------
.../idp/attribute/filter/spring/native/policy2.xml | 61 ------------------
.../idp/attribute/filter/spring/native/policy3.xml | 35 -----------
.../idp/attribute/filter/spring/native/policy4.xml | 65 -------------------
.../idp/attribute/filter/spring/native/policy5.xml | 72 ----------------------
7 files changed, 13 insertions(+), 394 deletions(-)
diff --git a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterServiceTest.java b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterServiceTest.java
index b9192bfd1..f8f192317 100644
--- a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterServiceTest.java
+++ b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterServiceTest.java
@@ -75,9 +75,9 @@ public class AttributeFilterServiceTest {
* @throws ServiceException if an error occurs loading the service
* @throws ComponentInitializationException ...
*/
- private AttributeFilter getFilter(String name, boolean nativeSpring) throws ServiceException,
+ private AttributeFilter getFilter(String name) throws ServiceException,
ComponentInitializationException {
- final Resource resource = new ClassPathResource(SERVICE_CONFIG_DIR + (nativeSpring ? "native/" : "") + name);
+ final Resource resource = new ClassPathResource(SERVICE_CONFIG_DIR + name);
if (null != testContext) {
tearDownTestContext();
}
@@ -120,13 +120,7 @@ public class AttributeFilterServiceTest {
}
@Test public void testPolicy2() throws ServiceException, AttributeFilterException, ComponentInitializationException {
- testPolicy2(true);
- testPolicy2(false);
- }
-
- public void testPolicy2(boolean nativeSpring) throws ServiceException, AttributeFilterException,
- ComponentInitializationException {
- final AttributeFilter filter = getFilter("policy2.xml", nativeSpring);
+ final AttributeFilter filter = getFilter("policy2.xml");
AttributeFilterContext filterContext = new AttributeFilterContext();
filterContext.setPrefilteredIdPAttributes(attributesToBeFiltered.values());
@@ -153,14 +147,7 @@ public class AttributeFilterServiceTest {
}
@Test public void testPolicy3() throws ServiceException, AttributeFilterException, ComponentInitializationException {
- testPolicy3(true);
- testPolicy3(false);
- }
-
- public void testPolicy3(boolean nativeSpring) throws ServiceException, AttributeFilterException,
- ComponentInitializationException {
-
- final AttributeFilter filter = getFilter("policy3.xml", nativeSpring);
+ final AttributeFilter filter = getFilter("policy3.xml");
AttributeFilterContext filterContext = new AttributeFilterContext();
filterContext.setPrefilteredIdPAttributes(attributesToBeFiltered.values());
@@ -187,18 +174,16 @@ public class AttributeFilterServiceTest {
@Test public void testPolicy4() throws ServiceException, AttributeFilterException, ComponentInitializationException {
- common45("policy4.xml", true);
- common45("policy4.xml", false);
+ common45("policy4.xml");
}
@Test public void testPolicy5() throws ServiceException, AttributeFilterException, ComponentInitializationException {
- common45("policy5.xml", true);
- common45("policy5.xml", false);
+ common45("policy5.xml");
}
@Test public void testAll() throws ServiceException, AttributeFilterException, ComponentInitializationException {
- final AttributeFilter filter = getFilter("policyAll.xml", false);
+ final AttributeFilter filter = getFilter("policyAll.xml");
AttributeFilterContext filterContext = new AttributeFilterContext();
filterContext.setPrefilteredIdPAttributes(attributesToBeFiltered.values());
@@ -223,10 +208,10 @@ public class AttributeFilterServiceTest {
assertNull(filteredAttributes.get("affiliation"));
}
- private void common45(String file, boolean nativeSpring) throws ServiceException, AttributeFilterException,
+ private void common45(String file) throws ServiceException, AttributeFilterException,
ComponentInitializationException {
- final AttributeFilter filter = getFilter(file, nativeSpring);
+ final AttributeFilter filter = getFilter(file);
AttributeFilterContext filterContext = new AttributeFilterContext();
filterContext.setPrefilteredIdPAttributes(attributesToBeFiltered.values());
@@ -253,18 +238,16 @@ public class AttributeFilterServiceTest {
}
@Test public void deny1() throws ServiceException, AttributeFilterException, ComponentInitializationException {
- denyTest("deny1.xml", true);
- denyTest("deny1.xml", false);
+ denyTest("deny1.xml");
}
@Test public void deny2() throws ServiceException, AttributeFilterException, ComponentInitializationException {
- denyTest("deny2.xml", false);
- denyTest("deny2.xml", true);
+ denyTest("deny2.xml");
}
- private void denyTest(String file, boolean nativeSpring) throws ServiceException, AttributeFilterException,
+ private void denyTest(String file) throws ServiceException, AttributeFilterException,
ComponentInitializationException {
- final AttributeFilter filter = getFilter(file, nativeSpring);
+ final AttributeFilter filter = getFilter(file);
AttributeFilterContext filterContext = new AttributeFilterContext();
filterContext.setPrefilteredIdPAttributes(attributesToBeFiltered.values());
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/native/deny1.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/native/deny1.xml
deleted file mode 100644
index 83f91f485..000000000
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/native/deny1.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:context="http://www.springframework.org/schema/context"
- xmlns:util="http://www.springframework.org/schema/util"
- xmlns:p="http://www.springframework.org/schema/p"
- xmlns:c="http://www.springframework.org/schema/c"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-
- default-init-method="initialize"
- default-destroy-method="destroy">
-<!--
- <afp:AttributeFilterPolicy id="InCommonRelease">
- <afp:PolicyRequirementRule xsi:type="basic:ANY" />
- <afp:AttributeRule attributeID="affiliation">
- <afp:DenyValueRule xmlns="urn:mace:shibboleth:2.0:afp:mf:basic"
- xsi:type="OR">
- <Rule xsi:type="AttributeValueString" value="staff" />
- <Rule xsi:type="AttributeValueString" value="student" />
- </afp:DenyValueRule>
- </afp:AttributeRule>
- </afp:AttributeFilterPolicy> -->
-
- <bean id="shibboleth.ANYPolicyRule" class="#{ T(net.shibboleth.idp.attribute.filter.PolicyRequirementRule).MATCHES_ALL.getClass().getName() }" />
- <bean id="shibboleth.ANYMatcher" class="#{ T(net.shibboleth.idp.attribute.filter.Matcher).MATCHES_ALL.getClass().getName() }" />
- <bean id="shibboleth.AttributeValueStringMatcher" class="net.shibboleth.idp.attribute.filter.matcher.impl.AttributeValueStringMatcher" abstract="true"/>
- <bean id="shibboleth.OrMatcher" class="net.shibboleth.idp.attribute.filter.matcher.logic.impl.OrMatcher" abstract="true"/>
-
- <bean class="net.shibboleth.idp.attribute.filter.AttributeFilterPolicy" c:policyId="InCommonRelease" c:requirementRule-ref="shibboleth.ANYPolicyRule">
- <constructor-arg name="attributeRules">
- <bean class="net.shibboleth.idp.attribute.filter.AttributeRule" p:isDenyRule="true" p:attributeId="affiliation">
- <property name="matcher">
- <bean parent="shibboleth.OrMatcher" >
- <property name="subsidiaries">
- <list>
- <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="staff"/>
- <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="student"/>
- </list>
- </property>
- </bean>
- </property>
- </bean>
- </constructor-arg>
- </bean>
-
- <!--
- <afp:AttributeFilterPolicy id="InCommonRelease2">
- <afp:PolicyRequirementRule xsi:type="basic:ANY" />
- <afp:AttributeRule attributeID="affiliation">
- <afp:PermitValueRule xsi:type="basic:ANY" />
- </afp:AttributeRule>
- </afp:AttributeFilterPolicy> -->
- <bean class="net.shibboleth.idp.attribute.filter.AttributeFilterPolicy" c:policyId="InCommonRelease2" c:requirementRule-ref="shibboleth.ANYPolicyRule">
- <constructor-arg name="attributeRules">
- <bean class="net.shibboleth.idp.attribute.filter.AttributeRule" p:isDenyRule="false" p:attributeId="affiliation" p:matcher-ref="shibboleth.ANYMatcher"/>
- </constructor-arg>
- </bean>
-
-<!-- </afp:AttributeFilterPolicyGroup> -->
-</beans>
\ No newline at end of file
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/native/deny2.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/native/deny2.xml
deleted file mode 100644
index 75e280b5f..000000000
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/native/deny2.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:context="http://www.springframework.org/schema/context"
- xmlns:util="http://www.springframework.org/schema/util"
- xmlns:p="http://www.springframework.org/schema/p"
- xmlns:c="http://www.springframework.org/schema/c"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-
- default-init-method="initialize"
- default-destroy-method="destroy">
-
-<!--
- <afp:DenyValueRule xmlns="urn:mace:shibboleth:2.0:afp:mf:basic"
- xsi:type="OR" id="deny">
- <Rule xsi:type="AttributeValueString" value="staff" />
- <Rule xsi:type="AttributeValueString" value="student" />
- </afp:DenyValueRule>
--->
- <bean id="shibboleth.ANYPolicyRule" class="#{ T(net.shibboleth.idp.attribute.filter.PolicyRequirementRule).MATCHES_ALL.getClass().getName() }" />
- <bean id="shibboleth.ANYMatcher" class="#{ T(net.shibboleth.idp.attribute.filter.Matcher).MATCHES_ALL.getClass().getName() }" />
- <bean id="shibboleth.AttributeValueStringMatcher" class="net.shibboleth.idp.attribute.filter.matcher.impl.AttributeValueStringMatcher" abstract="true"/>
- <bean id="shibboleth.OrMatcher" class="net.shibboleth.idp.attribute.filter.matcher.logic.impl.OrMatcher" abstract="true"/>
-
- <bean parent="shibboleth.OrMatcher" id="staffStudentMatcher">
- <property name="subsidiaries">
- <list>
- <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="staff"/>
- <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="student"/>
- </list>
- </property>
- </bean>
-
- <bean class="net.shibboleth.idp.attribute.filter.AttributeRule" p:isDenyRule="true" p:attributeId="affiliation" id="denyStaffStudent" p:matcher-ref="staffStudentMatcher"/>
-
-<!--
- <afp:AttributeFilterPolicy id="InCommonRelease">
- <afp:PolicyRequirementRule xsi:type="basic:ANY" />
-
- <afp:AttributeRule attributeID="affiliation">
- <afp:DenyValueRuleReference ref="deny" />
- </afp:AttributeRule>
-
- </afp:AttributeFilterPolicy>
- -->
- <bean class="net.shibboleth.idp.attribute.filter.AttributeFilterPolicy" c:policyId="InCommonRelease" c:requirementRule-ref="shibboleth.ANYPolicyRule"
- c:attributeRules="#{ {@denyStaffStudent}}"/>
-
-<!--
- <afp:AttributeFilterPolicy id="InCommonRelease2">
- <afp:PolicyRequirementRule xsi:type="basic:ANY" />
-
- <afp:AttributeRule attributeID="affiliation">
- <afp:PermitValueRule xsi:type="basic:ANY" />
- </afp:AttributeRule>
-
- </afp:AttributeFilterPolicy>
--->
- <bean class="net.shibboleth.idp.attribute.filter.AttributeFilterPolicy" c:policyId="InCommonRelease2" c:requirementRule-ref="shibboleth.ANYPolicyRule">
- <constructor-arg name="attributeRules">
- <bean class="net.shibboleth.idp.attribute.filter.AttributeRule" p:isDenyRule="false" p:attributeId="affiliation" p:matcher-ref="shibboleth.ANYMatcher"/>
- </constructor-arg>
- </bean>
-<!--
-</afp:AttributeFilterPolicyGroup>
- -->
- </beans>
\ No newline at end of file
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/native/policy2.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/native/policy2.xml
deleted file mode 100644
index b0f177ef4..000000000
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/native/policy2.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:context="http://www.springframework.org/schema/context"
- xmlns:util="http://www.springframework.org/schema/util"
- xmlns:p="http://www.springframework.org/schema/p"
- xmlns:c="http://www.springframework.org/schema/c"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-
- default-init-method="initialize"
- default-destroy-method="destroy">
-<!--
- <afp:AttributeFilterPolicy >
- <afp:PolicyRequirementRule xsi:type="basic:ANY"/>
-
- <afp:AttributeRule attributeID="affiliation">
- <afp:PermitValueRule xmlns="urn:mace:shibboleth:2.0:afp:mf:basic" xsi:type="OR">
- <Rule xsi:type="AttributeValueString" value="faculty"/>
- <Rule xsi:type="AttributeValueString" value="student"/>
- <Rule xsi:type="AttributeValueString" value="staff"/>
- <Rule xsi:type="AttributeValueString" value="alum"/>
- <Rule xsi:type="AttributeValueString" value="member"/>
- <Rule xsi:type="AttributeValueString" value="affiliate"/>
- <Rule xsi:type="AttributeValueString" value="employee"/>
- </afp:PermitValueRule>
- </afp:AttributeRule>
-
- </afp:AttributeFilterPolicy>
- -->
- <bean id="shibboleth.ANYPolicyRule" class="#{ T(net.shibboleth.idp.attribute.filter.PolicyRequirementRule).MATCHES_ALL.getClass().getName() }" />
- <bean id="shibboleth.ANYMatcher" class="#{ T(net.shibboleth.idp.attribute.filter.Matcher).MATCHES_ALL.getClass().getName() }" />
- <bean id="shibboleth.AttributeValueStringMatcher" class="net.shibboleth.idp.attribute.filter.matcher.impl.AttributeValueStringMatcher" abstract="true"/>
- <bean id="shibboleth.OrMatcher" class="net.shibboleth.idp.attribute.filter.matcher.logic.impl.OrMatcher" abstract="true"/>
-
- <bean class="net.shibboleth.idp.attribute.filter.AttributeFilterPolicy" c:policyId="AffiliationRelease" c:requirementRule-ref="shibboleth.ANYPolicyRule">
- <constructor-arg name="attributeRules">
- <bean class="net.shibboleth.idp.attribute.filter.AttributeRule" p:isDenyRule="false" p:attributeId="affiliation">
- <property name="matcher">
- <bean parent="shibboleth.OrMatcher">
- <property name="subsidiaries">
- <list>
- <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="faculty"/>
- <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="student"/>
- <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="staff"/>
- <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="alum"/>
- <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="member"/>
- <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="affiliate"/>
- <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="employee"/>
- </list>
- </property>
- </bean>
- </property>
- </bean>
- </constructor-arg>
- </bean>
-
-<!-- </afp:AttributeFilterPolicyGroup>
--->
-</beans>
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/native/policy3.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/native/policy3.xml
deleted file mode 100644
index 072513310..000000000
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/native/policy3.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:context="http://www.springframework.org/schema/context"
- xmlns:util="http://www.springframework.org/schema/util"
- xmlns:p="http://www.springframework.org/schema/p"
- xmlns:c="http://www.springframework.org/schema/c"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-
- default-init-method="initialize"
- default-destroy-method="destroy">
-
- <bean id="shibboleth.ANYPolicyRule" class="#{ T(net.shibboleth.idp.attribute.filter.PolicyRequirementRule).MATCHES_ALL.getClass().getName() }" />
- <bean id="shibboleth.ANYMatcher" class="#{ T(net.shibboleth.idp.attribute.filter.Matcher).MATCHES_ALL.getClass().getName() }" />
-
-<!--
- <afp:AttributeFilterPolicy id="MostBasicExample">
- <afp:PolicyRequirementRule xsi:type="basic:ANY"/>
-
- <afp:AttributeRule attributeID="email">
- <afp:PermitValueRule xsi:type="basic:ANY"/>
- </afp:AttributeRule>
- </afp:AttributeFilterPolicy>
--->
- <bean class="net.shibboleth.idp.attribute.filter.AttributeFilterPolicy" c:policyId="MostBasicExample" c:requirementRule-ref="shibboleth.ANYPolicyRule">
- <constructor-arg name="attributeRules">
- <bean class="net.shibboleth.idp.attribute.filter.AttributeRule" p:isDenyRule="false" p:attributeId="email" p:matcher-ref="shibboleth.ANYMatcher"/>
- </constructor-arg>
- </bean>
-<!--
-</afp:AttributeFilterPolicyGroup>
- -->
- </beans>
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/native/policy4.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/native/policy4.xml
deleted file mode 100644
index 30029083b..000000000
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/native/policy4.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:context="http://www.springframework.org/schema/context"
- xmlns:util="http://www.springframework.org/schema/util"
- xmlns:p="http://www.springframework.org/schema/p"
- xmlns:c="http://www.springframework.org/schema/c"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-
- default-init-method="initialize"
- default-destroy-method="destroy">
-
- <bean id="shibboleth.ANYPolicyRule" class="#{ T(net.shibboleth.idp.attribute.filter.PolicyRequirementRule).MATCHES_ALL.getClass().getName() }" />
- <bean id="shibboleth.ANYMatcher" class="#{ T(net.shibboleth.idp.attribute.filter.Matcher).MATCHES_ALL.getClass().getName() }" />
- <bean id="shibboleth.AttributeValueStringMatcher" class="net.shibboleth.idp.attribute.filter.matcher.impl.AttributeValueStringMatcher" abstract="true"/>
- <bean id="shibboleth.OrMatcher" class="net.shibboleth.idp.attribute.filter.matcher.logic.impl.OrMatcher" abstract="true"/>
-
-
- <bean parent="shibboleth.OrMatcher" id="wobbleMatcher">
- <property name="subsidiaries">
- <list>
- <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="faculty" id="fac"/>
- <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="student" id="stud"/>
- <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="staff" id="stadd"/>
- <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="alum" id="alum"/>
- <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="member" id="member"/>
- <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="affiliate" id="affilient"/>
- <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="employee" id = "emp"/>
- </list>
- </property>
- </bean>
-
- <bean class="net.shibboleth.idp.attribute.filter.AttributeRule" p:isDenyRule="false" id="wobble" p:attributeId="affiliation" p:matcher-ref="wobbleMatcher"/>
-<!--
- <afp:AttributeRule attributeID="affiliation" id="wobble">
- <afp:PermitValueRule xmlns="urn:mace:shibboleth:2.0:afp:mf:basic"
- id="Wibble" xsi:type="OR">
- <Rule xsi:type="AttributeValueString" value="faculty" id="fac"/>
- <Rule xsi:type="AttributeValueString" value="student" id="stud"/>
- <Rule xsi:type="AttributeValueString" value="staff" id="stadd"/>
- <Rule xsi:type="AttributeValueString" value="alum" id="alum"/>
- <Rule xsi:type="AttributeValueString" value="member" id="member"/>
- <Rule xsi:type="AttributeValueString" value="affiliate" id="affilient"/>
- <Rule xsi:type="AttributeValueString" value="employee" id = "emp"/>
- </afp:PermitValueRule>
- </afp:AttributeRule>
- -->
-
- <!-- Release affiliation to anyone in the InCommon group -->
-<!--
- <afp:AttributeFilterPolicy id="InCommonRelease">
- <afp:PolicyRequirementRule xsi:type="basic:ANY" id="pq"/>
-
- <afp:AttributeRuleReference ref="wobble"/>
-
- </afp:AttributeFilterPolicy>
- -->
- <bean class="net.shibboleth.idp.attribute.filter.AttributeFilterPolicy" c:policyId="InCommonRelease" c:requirementRule-ref="shibboleth.ANYPolicyRule"
- c:attributeRules="#{ {@wobble}}"/>
- <!--
- </afp:AttributeFilterPolicyGroup>
- -->
- </beans>
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/native/policy5.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/native/policy5.xml
deleted file mode 100644
index 96315c05d..000000000
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/native/policy5.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:context="http://www.springframework.org/schema/context"
- xmlns:util="http://www.springframework.org/schema/util"
- xmlns:p="http://www.springframework.org/schema/p"
- xmlns:c="http://www.springframework.org/schema/c"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-
- default-init-method="initialize"
- default-destroy-method="destroy">
-
- <bean id="shibboleth.ANYPolicyRule" class="#{ T(net.shibboleth.idp.attribute.filter.PolicyRequirementRule).MATCHES_ALL.getClass().getName() }" />
- <bean id="shibboleth.ANYMatcher" class="#{ T(net.shibboleth.idp.attribute.filter.Matcher).MATCHES_ALL.getClass().getName() }" />
- <bean id="shibboleth.AttributeValueStringMatcher" class="net.shibboleth.idp.attribute.filter.matcher.impl.AttributeValueStringMatcher" abstract="true"/>
- <bean id="shibboleth.OrMatcher" class="net.shibboleth.idp.attribute.filter.matcher.logic.impl.OrMatcher" abstract="true"/>
-
-<!--
- <afp:PermitValueRule xmlns="urn:mace:shibboleth:2.0:afp:mf:basic"
- id="wibbleMatcher" xsi:type="OR">
- <Rule xsi:type="AttributeValueString" value="faculty" id="fac"/>
- <Rule xsi:type="AttributeValueString" value="student" id="stud"/>
- <Rule xsi:type="AttributeValueString" value="staff" id="stadd"/>
- <Rule xsi:type="AttributeValueString" value="alum" id="alum"/>
- <Rule xsi:type="AttributeValueString" value="member" id="member"/>
- <Rule xsi:type="AttributeValueString" value="affiliate" id="affilient"/>
- <Rule xsi:type="AttributeValueString" value="employee" id = "emp"/>
- </afp:PermitValueRule>
-
--->
-
- <bean parent="shibboleth.OrMatcher" id="wibbleMatcher">
- <property name="subsidiaries">
- <list >
- <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="faculty" id="fac"/>
- <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="student" id="stud"/>
- <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="staff" id="stadd"/>
- <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="alum" id="alum"/>
- <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="member" id="member"/>
- <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="affiliate" id="affilient"/>
- <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="employee" id = "emp"/>
- </list>
- </property>
- </bean>
-<!--
- <afp:AttributeRule attributeID="affiliation" id="wibble">
- <afp:PermitValueRuleReference ref="wibbleMatcher"/>
- </afp:AttributeRule>
--->
-
- <bean class="net.shibboleth.idp.attribute.filter.AttributeRule" p:isDenyRule="false" id="wibble" p:attributeId="affiliation" p:matcher-ref="wibbleMatcher"/>
-
-<!-- <afp:AttributeFilterPolicy id="InCommonRelease">
- Turn on rule if an attribute call firstName has value "john"
- <afp:PolicyRequirementRule xsi:type="basic:AttributeValueString" value="john" attributeID="firstName"/>
-
- <afp:AttributeRuleReference ref="wobble"/>
-
- </afp:AttributeFilterPolicy>
--->
- <bean id="FirstNameJohnPolicy" class="net.shibboleth.idp.attribute.filter.PolicyFromMatcherId" c:attribute="firstName">
- <constructor-arg name="matcher">
- <bean parent="shibboleth.AttributeValueStringMatcher" p:matchString="john"/>
- </constructor-arg>
- </bean>
- <bean class="net.shibboleth.idp.attribute.filter.AttributeFilterPolicy" c:policyId="InCommonRelease" c:requirementRule-ref="FirstNameJohnPolicy" c:attributeRules="#{ {@wibble}}"/>
-<!--
-</afp:AttributeFilterPolicyGroup>
--->
-</beans>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list