[java-identity-provider] branch master updated: IDP-1330 Remove more needless use of old namespaces from test files
Rod Widdowson
rdw at steadingsoftware.com
Mon Dec 3 05:33:49 EST 2018
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch master
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=299769cf0bc71c1c86c868f656b8162617205f0c
The following commit(s) were added to refs/heads/master by this push:
new 299769c IDP-1330 Remove more needless use of old namespaces from test files
299769c is described below
commit 299769cf0bc71c1c86c868f656b8162617205f0c
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Mon Dec 3 10:07:55 2018 +0000
IDP-1330 Remove more needless use of old namespaces from test files
https://issues.shibboleth.net/jira/browse/IDP-1330
---
.../saml/AttributeInMetadataRuleParserTest.java | 4 +-
...teIssuerEntityAttributeExactRuleParserTest.java | 4 +-
...teIssuerEntityAttributeRegexRuleParserTest.java | 4 +-
...AttributeIssuerInEntityGroupRuleParserTest.java | 4 +-
.../AttributeIssuerNameIdFormatRuleParserTest.java | 4 +-
...equesterEntityAttributeRegexRuleParserTest.java | 2 +-
...ributeRequesterInEntityGroupRuleParserTest.java | 2 +-
.../idp/attribute/filter/spring/deny1.xml | 41 ++++++++---------
.../idp/attribute/filter/spring/deny2.xml | 43 +++++++++---------
.../idp/attribute/filter/spring/policy2.xml | 38 ++++++++--------
.../idp/attribute/filter/spring/policy3.xml | 22 +++++-----
.../idp/attribute/filter/spring/policy4.xml | 39 ++++++++---------
.../idp/attribute/filter/spring/policy5.xml | 41 +++++++++--------
.../idp/attribute/filter/spring/policyAll.xml | 18 ++++----
.../resources/mapping/configs/attribute-filter.xml | 51 ++++++++++------------
.../mapping/configs/attribute-filter2.xml | 23 +++++-----
.../resources/test/test-attribute-filter-cas.xml | 44 +++++++++----------
.../main/resources/schema/shibboleth-metadata.xsd | 4 +-
18 files changed, 182 insertions(+), 206 deletions(-)
diff --git a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeInMetadataRuleParserTest.java b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeInMetadataRuleParserTest.java
index 5079499..68b9ea9 100644
--- a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeInMetadataRuleParserTest.java
+++ b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeInMetadataRuleParserTest.java
@@ -36,8 +36,8 @@ import org.testng.annotations.Test;
public class AttributeInMetadataRuleParserTest extends BaseAttributeFilterParserTest {
@Test public void requested() throws ComponentInitializationException {
- requested(false);
-// requested(true);
+// requested(false);
+ requested(true);
}
public void requested(boolean isAfp) throws ComponentInitializationException {
diff --git a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeIssuerEntityAttributeExactRuleParserTest.java b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeIssuerEntityAttributeExactRuleParserTest.java
index 930d6cc..84d0ab9 100644
--- a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeIssuerEntityAttributeExactRuleParserTest.java
+++ b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeIssuerEntityAttributeExactRuleParserTest.java
@@ -25,11 +25,11 @@ import org.springframework.beans.factory.BeanDefinitionStoreException;
import org.testng.annotations.Test;
/**
- * test for {@link AttributeIssuerEntityAttributeExactRuleParser}.
+ * test for (removed) {@link AttributeIssuerEntityAttributeExactRuleParser}.
*/
public class AttributeIssuerEntityAttributeExactRuleParserTest extends BaseAttributeFilterParserTest {
- @Test(expectedExceptions = {BeanDefinitionStoreException.class}) public void basic()
+ @Test(expectedExceptions = {BeanDefinitionStoreException.class}) public void removed()
throws ComponentInitializationException {
getPolicyRule("issuerEA.xml", false);
diff --git a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeIssuerEntityAttributeRegexRuleParserTest.java b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeIssuerEntityAttributeRegexRuleParserTest.java
index f98479c..e7850b3 100644
--- a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeIssuerEntityAttributeRegexRuleParserTest.java
+++ b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeIssuerEntityAttributeRegexRuleParserTest.java
@@ -25,11 +25,11 @@ import org.springframework.beans.factory.BeanDefinitionStoreException;
import org.testng.annotations.Test;
/**
- * test for {@link AttributeIssuerEntityAttributeRegexRuleParser}.
+ * test for (removed) {@link AttributeIssuerEntityAttributeRegexRuleParser}.
*/
public class AttributeIssuerEntityAttributeRegexRuleParserTest extends BaseAttributeFilterParserTest {
- @Test(expectedExceptions = {BeanDefinitionStoreException.class}) public void basic()
+ @Test(expectedExceptions = {BeanDefinitionStoreException.class}) public void removed()
throws ComponentInitializationException {
getPolicyRule("issuerEARegex.xml", false);
}
diff --git a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeIssuerInEntityGroupRuleParserTest.java b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeIssuerInEntityGroupRuleParserTest.java
index 255bb76..e561f33 100644
--- a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeIssuerInEntityGroupRuleParserTest.java
+++ b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeIssuerInEntityGroupRuleParserTest.java
@@ -25,11 +25,11 @@ import org.springframework.beans.factory.BeanDefinitionStoreException;
import org.testng.annotations.Test;
/**
- * test for {@link AttributeRequesterInEntityGroupRuleParser}.
+ * test for (removed) {@link AttributeRequesterInEntityGroupRuleParser}.
*/
public class AttributeIssuerInEntityGroupRuleParserTest extends BaseAttributeFilterParserTest {
- @Test(expectedExceptions = {BeanDefinitionStoreException.class}) public void basic()
+ @Test(expectedExceptions = {BeanDefinitionStoreException.class}) public void removed()
throws ComponentInitializationException {
getPolicyRule("issuerEG.xml", false);
}
diff --git a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeIssuerNameIdFormatRuleParserTest.java b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeIssuerNameIdFormatRuleParserTest.java
index bc17df1..b2771e5 100644
--- a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeIssuerNameIdFormatRuleParserTest.java
+++ b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeIssuerNameIdFormatRuleParserTest.java
@@ -25,11 +25,11 @@ import org.springframework.beans.factory.BeanDefinitionStoreException;
import org.testng.annotations.Test;
/**
- * test for {@link AttributeIssuerNameIdFormatRuleParser}.
+ * test for (removed) {@link AttributeIssuerNameIdFormatRuleParser}.
*/
public class AttributeIssuerNameIdFormatRuleParserTest extends BaseAttributeFilterParserTest {
- @Test(expectedExceptions = {BeanDefinitionStoreException.class}) public void basic()
+ @Test(expectedExceptions = {BeanDefinitionStoreException.class}) public void removed()
throws ComponentInitializationException {
getPolicyRule("issuerNameId.xml", false);
diff --git a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeRequesterEntityAttributeRegexRuleParserTest.java b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeRequesterEntityAttributeRegexRuleParserTest.java
index e3ef4d9..7820f1d 100644
--- a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeRequesterEntityAttributeRegexRuleParserTest.java
+++ b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeRequesterEntityAttributeRegexRuleParserTest.java
@@ -31,7 +31,7 @@ import org.testng.annotations.Test;
public class AttributeRequesterEntityAttributeRegexRuleParserTest extends BaseAttributeFilterParserTest {
@Test public void basic() throws ComponentInitializationException {
- AttributeRequesterEntityAttributeRegexPolicyRule rule = (AttributeRequesterEntityAttributeRegexPolicyRule) getPolicyRule("requesterEARegex2.xml", false);
+ AttributeRequesterEntityAttributeRegexPolicyRule rule = (AttributeRequesterEntityAttributeRegexPolicyRule) getPolicyRule("requesterEARegex2.xml", true);
Assert.assertEquals(rule.getValueRegex().pattern(), "^urn:example\\.org:policy:[^:]*$");
Assert.assertEquals(rule.getAttributeName(), "urn:example.org:policy");
diff --git a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeRequesterInEntityGroupRuleParserTest.java b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeRequesterInEntityGroupRuleParserTest.java
index 21d71db..59224d4 100644
--- a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeRequesterInEntityGroupRuleParserTest.java
+++ b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeRequesterInEntityGroupRuleParserTest.java
@@ -38,7 +38,7 @@ public class AttributeRequesterInEntityGroupRuleParserTest extends BaseAttribut
}
@Test public void basic() throws ComponentInitializationException {
- AttributeRequesterInEntityGroupPolicyRule rule = (AttributeRequesterInEntityGroupPolicyRule) getPolicyRule("requesterEG2.xml", false);
+ AttributeRequesterInEntityGroupPolicyRule rule = (AttributeRequesterInEntityGroupPolicyRule) getPolicyRule("requesterEG2.xml", true);
Assert.assertEquals(rule.getEntityGroup(), "urn:example.org");
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/deny1.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/deny1.xml
index fe29035..5f3d864 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/deny1.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/deny1.xml
@@ -1,26 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
-<afp:AttributeFilterPolicyGroup id="PolicyExample2"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:afp="urn:mace:shibboleth:2.0:afp"
- xmlns:basic="urn:mace:shibboleth:2.0:afp:mf:basic"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
- urn:mace:shibboleth:2.0:afp:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd">
+<AttributeFilterPolicyGroup id="PolicyExample2"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:mace:shibboleth:2.0:afp"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
- <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>
+ <AttributeFilterPolicy id="InCommonRelease">
+ <PolicyRequirementRule xsi:type="ANY" />
+ <AttributeRule attributeID="affiliation">
+ <DenyValueRule xsi:type="OR">
+ <Rule xsi:type="Value" value="staff" />
+ <Rule xsi:type="Value" value="student" />
+ </DenyValueRule>
+ </AttributeRule>
+ </AttributeFilterPolicy>
- <afp:AttributeFilterPolicy id="InCommonRelease2">
- <afp:PolicyRequirementRule xsi:type="basic:ANY" />
- <afp:AttributeRule attributeID="affiliation">
- <afp:PermitValueRule xsi:type="basic:ANY" />
- </afp:AttributeRule>
- </afp:AttributeFilterPolicy>
+ <AttributeFilterPolicy id="InCommonRelease2">
+ <PolicyRequirementRule xsi:type="ANY" />
+ <AttributeRule attributeID="affiliation">
+ <PermitValueRule xsi:type="ANY" />
+ </AttributeRule>
+ </AttributeFilterPolicy>
-</afp:AttributeFilterPolicyGroup>
+</AttributeFilterPolicyGroup>
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/deny2.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/deny2.xml
index f3bf1fd..e643903 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/deny2.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/deny2.xml
@@ -1,32 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
-<afp:AttributeFilterPolicyGroup id="PolicyExample2"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:afp="urn:mace:shibboleth:2.0:afp"
- xmlns:basic="urn:mace:shibboleth:2.0:afp:mf:basic"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
- urn:mace:shibboleth:2.0:afp:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd">
+<AttributeFilterPolicyGroup id="PolicyExample2"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:mace:shibboleth:2.0:afp"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
- <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>
+ <DenyValueRule xsi:type="OR" id="deny">
+ <Rule xsi:type="Value" value="staff" />
+ <Rule xsi:type="Value" value="student" />
+ </DenyValueRule>
- <afp:AttributeFilterPolicy id="InCommonRelease">
- <afp:PolicyRequirementRule xsi:type="basic:ANY" />
+ <AttributeFilterPolicy id="InCommonRelease">
+ <PolicyRequirementRule xsi:type="ANY" />
- <afp:AttributeRule attributeID="affiliation">
- <afp:DenyValueRuleReference ref="deny" />
- </afp:AttributeRule>
+ <AttributeRule attributeID="affiliation">
+ <DenyValueRuleReference ref="deny" />
+ </AttributeRule>
- </afp:AttributeFilterPolicy>
+ </AttributeFilterPolicy>
- <afp:AttributeFilterPolicy id="InCommonRelease2">
- <afp:PolicyRequirementRule xsi:type="basic:ANY" />
+ <AttributeFilterPolicy id="InCommonRelease2">
+ <PolicyRequirementRule xsi:type="ANY" />
- <afp:AttributeRule attributeID="affiliation">
- <afp:PermitValueRule xsi:type="basic:ANY" />
- </afp:AttributeRule>
+ <AttributeRule attributeID="affiliation">
+ <PermitValueRule xsi:type="ANY" />
+ </AttributeRule>
- </afp:AttributeFilterPolicy>
+ </AttributeFilterPolicy>
-</afp:AttributeFilterPolicyGroup>
+</AttributeFilterPolicyGroup>
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/policy2.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/policy2.xml
index 8964d58..a1a2de3 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/policy2.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/policy2.xml
@@ -1,26 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
-<afp:AttributeFilterPolicyGroup id="PolicyExample2"
+<AttributeFilterPolicyGroup id="PolicyExample2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:afp="urn:mace:shibboleth:2.0:afp"
- xmlns:basic="urn:mace:shibboleth:2.0:afp:mf:basic"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
- urn:mace:shibboleth:2.0:afp:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd">
+ xmlns="urn:mace:shibboleth:2.0:afp"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
- <afp:AttributeFilterPolicy >
- <afp:PolicyRequirementRule xsi:type="basic:ANY"/>
+ <AttributeFilterPolicy >
+ <PolicyRequirementRule xsi:type="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>
+ <AttributeRule attributeID="affiliation">
+ <PermitValueRule xsi:type="OR">
+ <Rule xsi:type="Value" value="faculty"/>
+ <Rule xsi:type="Value" value="student"/>
+ <Rule xsi:type="Value" value="staff"/>
+ <Rule xsi:type="Value" value="alum"/>
+ <Rule xsi:type="Value" value="member"/>
+ <Rule xsi:type="Value" value="affiliate"/>
+ <Rule xsi:type="Value" value="employee"/>
+ </PermitValueRule>
+ </AttributeRule>
- </afp:AttributeFilterPolicy>
+ </AttributeFilterPolicy>
-</afp:AttributeFilterPolicyGroup>
+</AttributeFilterPolicyGroup>
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/policy3.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/policy3.xml
index e5f6ba1..4441bca 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/policy3.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/policy3.xml
@@ -1,17 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
-<afp:AttributeFilterPolicyGroup id="PolicyExample3"
+<AttributeFilterPolicyGroup id="PolicyExample3"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:afp="urn:mace:shibboleth:2.0:afp"
- xmlns:basic="urn:mace:shibboleth:2.0:afp:mf:basic"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
- urn:mace:shibboleth:2.0:afp:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd">
+ xmlns="urn:mace:shibboleth:2.0:afp"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
- <afp:AttributeFilterPolicy id="MostBasicExample">
- <afp:PolicyRequirementRule xsi:type="basic:ANY"/>
+ <AttributeFilterPolicy id="MostBasicExample">
+ <PolicyRequirementRule xsi:type="ANY"/>
- <afp:AttributeRule attributeID="email">
- <afp:PermitValueRule xsi:type="basic:ANY"/>
- </afp:AttributeRule>
- </afp:AttributeFilterPolicy>
+ <AttributeRule attributeID="email">
+ <PermitValueRule xsi:type="ANY"/>
+ </AttributeRule>
+ </AttributeFilterPolicy>
-</afp:AttributeFilterPolicyGroup>
+</AttributeFilterPolicyGroup>
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/policy4.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/policy4.xml
index bab1bcd..920eab9 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/policy4.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/policy4.xml
@@ -1,29 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
-<afp:AttributeFilterPolicyGroup id="PolicyExample4"
+<AttributeFilterPolicyGroup id="PolicyExample4"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:afp="urn:mace:shibboleth:2.0:afp" xmlns:basic="urn:mace:shibboleth:2.0:afp:mf:basic"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
- urn:mace:shibboleth:2.0:afp:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd">
+ xmlns="urn:mace:shibboleth:2.0:afp"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
- <afp:AttributeRule attributeID="affiliation" id="wobble">
- <afp:PermitValueRule xmlns="urn:mace:shibboleth:2.0:afp:mf:basic"
+ <AttributeRule attributeID="affiliation" id="wobble">
+ <PermitValueRule
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>
+ <Rule xsi:type="Value" value="faculty" id="fac"/>
+ <Rule xsi:type="Value" value="student" id="stud"/>
+ <Rule xsi:type="Value" value="staff" id="stadd"/>
+ <Rule xsi:type="Value" value="alum" id="alum"/>
+ <Rule xsi:type="Value" value="member" id="member"/>
+ <Rule xsi:type="Value" value="affiliate" id="affilient"/>
+ <Rule xsi:type="Value" value="employee" id = "emp"/>
+ </PermitValueRule>
+ </AttributeRule>
<!-- Release affiliation to anyone in the InCommon group -->
- <afp:AttributeFilterPolicy id="InCommonRelease">
- <afp:PolicyRequirementRule xsi:type="basic:ANY" id="pq"/>
+ <AttributeFilterPolicy id="InCommonRelease">
+ <PolicyRequirementRule xsi:type="ANY" id="pq"/>
- <afp:AttributeRuleReference ref="wobble"/>
+ <AttributeRuleReference ref="wobble"/>
- </afp:AttributeFilterPolicy>
+ </AttributeFilterPolicy>
-</afp:AttributeFilterPolicyGroup>
+</AttributeFilterPolicyGroup>
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/policy5.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/policy5.xml
index a46107f..58263e6 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/policy5.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/policy5.xml
@@ -1,32 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
-<afp:AttributeFilterPolicyGroup id="PolicyExample4"
+<AttributeFilterPolicyGroup id="PolicyExample4"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:afp="urn:mace:shibboleth:2.0:afp" xmlns:basic="urn:mace:shibboleth:2.0:afp:mf:basic"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
- urn:mace:shibboleth:2.0:afp:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd">
+ xmlns="urn:mace:shibboleth:2.0:afp"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
- <afp:PermitValueRule xmlns="urn:mace:shibboleth:2.0:afp:mf:basic"
+ <PermitValueRule
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>
+ <Rule xsi:type="Value" value="faculty" id="fac"/>
+ <Rule xsi:type="Value" value="student" id="stud"/>
+ <Rule xsi:type="Value" value="staff" id="stadd"/>
+ <Rule xsi:type="Value" value="alum" id="alum"/>
+ <Rule xsi:type="Value" value="member" id="member"/>
+ <Rule xsi:type="Value" value="affiliate" id="affilient"/>
+ <Rule xsi:type="Value" value="employee" id = "emp"/>
+ </PermitValueRule>
- <afp:AttributeRule attributeID="affiliation" id="wobble">
- <afp:PermitValueRuleReference ref="Wibble"/>
- </afp:AttributeRule>
+ <AttributeRule attributeID="affiliation" id="wobble">
+ <PermitValueRuleReference ref="Wibble"/>
+ </AttributeRule>
<!-- Release affiliation to anyone in the InCommon group -->
- <afp:AttributeFilterPolicy id="InCommonRelease">
+ <AttributeFilterPolicy id="InCommonRelease">
<!-- Turn on rule if an attribute call firstName has value "john" -->
- <afp:PolicyRequirementRule xsi:type="basic:AttributeValueString" value="john" attributeID="firstName"/>
+ <PolicyRequirementRule xsi:type="Value" value="john" attributeID="firstName"/>
- <afp:AttributeRuleReference ref="wobble"/>
+ <AttributeRuleReference ref="wobble"/>
- </afp:AttributeFilterPolicy>
+ </AttributeFilterPolicy>
-</afp:AttributeFilterPolicyGroup>
+</AttributeFilterPolicyGroup>
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/policyAll.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/policyAll.xml
index 6fc5443..7334650 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/policyAll.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/policyAll.xml
@@ -1,15 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<afp:AttributeFilterPolicyGroup id="PolicyExample3"
+<AttributeFilterPolicyGroup id="PolicyExample3"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:afp="urn:mace:shibboleth:2.0:afp"
- xmlns:basic="urn:mace:shibboleth:2.0:afp:mf:basic"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
- urn:mace:shibboleth:2.0:afp:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd">
+ xmlns="urn:mace:shibboleth:2.0:afp"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
- <afp:AttributeFilterPolicy id="MostBasicExample">
- <afp:PolicyRequirementRule xsi:type="basic:ANY"/>
+ <AttributeFilterPolicy id="MostBasicExample">
+ <PolicyRequirementRule xsi:type="ANY"/>
- <afp:AttributeRule attributeID="email" permitAny="true"/>
- </afp:AttributeFilterPolicy>
+ <AttributeRule attributeID="email" permitAny="true"/>
+ </AttributeFilterPolicy>
-</afp:AttributeFilterPolicyGroup>
+</AttributeFilterPolicyGroup>
diff --git a/idp-conf/src/test/resources/mapping/configs/attribute-filter.xml b/idp-conf/src/test/resources/mapping/configs/attribute-filter.xml
index 9bb5b14..c690913 100644
--- a/idp-conf/src/test/resources/mapping/configs/attribute-filter.xml
+++ b/idp-conf/src/test/resources/mapping/configs/attribute-filter.xml
@@ -1,46 +1,43 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Part one of a two part Attribute Filter Policy. -->
-<afp:AttributeFilterPolicyGroup id="ShibbolethFilterPolicy"
- xmlns:afp="urn:mace:shibboleth:2.0:afp" xmlns:basic="urn:mace:shibboleth:2.0:afp:mf:basic"
- xmlns:saml="urn:mace:shibboleth:2.0:afp:mf:saml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
- urn:mace:shibboleth:2.0:afp:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd
- urn:mace:shibboleth:2.0:afp:mf:saml http://shibboleth.net/schema/idp/shibboleth-afp-mf-saml.xsd">
+<AttributeFilterPolicyGroup id="ShibbolethFilterPolicy"
+ xmlns="urn:mace:shibboleth:2.0:afp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
<!-- Release OK if RA map -->
- <afp:AttributeFilterPolicy id="RAOKFILTER">
- <afp:PolicyRequirementRule id="prrRA1"
- xsi:type="basic:ANY" />
+ <AttributeFilterPolicy id="RAOKFILTER">
+ <PolicyRequirementRule id="prrRA1"
+ xsi:type="ANY" />
- <afp:AttributeRule attributeID="IdPRA1" id="ra1release">
- <afp:PermitValueRule xsi:type="saml:MappedAttributeInMetadata" />
- </afp:AttributeRule>
+ <AttributeRule attributeID="IdPRA1" id="ra1release">
+ <PermitValueRule xsi:type="MappedAttributeInMetadata" />
+ </AttributeRule>
- </afp:AttributeFilterPolicy>
+ </AttributeFilterPolicy>
<!-- Release OK if RA map, but it doesn't -->
- <afp:AttributeFilterPolicy id="RANOTFILTER">
- <afp:PolicyRequirementRule id="prrRA2"
- xsi:type="basic:ANY" />
+ <AttributeFilterPolicy id="RANOTFILTER">
+ <PolicyRequirementRule id="prrRA2"
+ xsi:type="ANY" />
- <afp:AttributeRule attributeID="IdPEA1" id="ra2release">
- <afp:PermitValueRule xsi:type="saml:MappedAttributeInMetadata" />
- </afp:AttributeRule>
+ <AttributeRule attributeID="IdPEA1" id="ra2release">
+ <PermitValueRule xsi:type="MappedAttributeInMetadata" />
+ </AttributeRule>
- </afp:AttributeFilterPolicy>
+ </AttributeFilterPolicy>
<!-- Release is EA map -->
- <afp:AttributeFilterPolicy id="EAOKFILTER">
- <afp:PolicyRequirementRule id="prrEA1" xsi:type="saml:EntityAttributeExactMatch"
+ <AttributeFilterPolicy id="EAOKFILTER">
+ <PolicyRequirementRule id="prrEA1" xsi:type="EntityAttributeExactMatch"
attributeName="http://macedir.org/entity-category"
attributeValue="http://refeds.org/category/research-and-scholarship" />
- <afp:AttributeRule attributeID="IdPOK">
- <afp:PermitValueRule xsi:type="basic:ANY"/>
- </afp:AttributeRule>
+ <AttributeRule attributeID="IdPOK">
+ <PermitValueRule xsi:type="ANY"/>
+ </AttributeRule>
- </afp:AttributeFilterPolicy>
+ </AttributeFilterPolicy>
-</afp:AttributeFilterPolicyGroup>
+</AttributeFilterPolicyGroup>
diff --git a/idp-conf/src/test/resources/mapping/configs/attribute-filter2.xml b/idp-conf/src/test/resources/mapping/configs/attribute-filter2.xml
index 4124fce..51fd234 100644
--- a/idp-conf/src/test/resources/mapping/configs/attribute-filter2.xml
+++ b/idp-conf/src/test/resources/mapping/configs/attribute-filter2.xml
@@ -1,21 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Part two of a two part filter files. -->
-<afp:AttributeFilterPolicyGroup id="ShibbolethFilterPolicy"
- xmlns:afp="urn:mace:shibboleth:2.0:afp" xmlns:basic="urn:mace:shibboleth:2.0:afp:mf:basic"
- xmlns:saml="urn:mace:shibboleth:2.0:afp:mf:saml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
- urn:mace:shibboleth:2.0:afp:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd
- urn:mace:shibboleth:2.0:afp:mf:saml http://shibboleth.net/schema/idp/shibboleth-afp-mf-saml.xsd">
+<AttributeFilterPolicyGroup id="ShibbolethFilterPolicy"
+ xmlns="urn:mace:shibboleth:2.0:afp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
- <afp:AttributeFilterPolicy id="EANOTKFILTER">
- <afp:PolicyRequirementRule id="prrEA2" xsi:type="saml:EntityAttributeExactMatch"
+ <AttributeFilterPolicy id="EANOTKFILTER">
+ <PolicyRequirementRule id="prrEA2" xsi:type="EntityAttributeExactMatch"
attributeName="http://macedir.org/entity-category"
attributeValue="http://example.org/category" />
- <afp:AttributeRule attributeID="IdPNotOK">
- <afp:PermitValueRule xsi:type="basic:ANY"/>
- </afp:AttributeRule>
+ <AttributeRule attributeID="IdPNotOK">
+ <PermitValueRule xsi:type="ANY"/>
+ </AttributeRule>
- </afp:AttributeFilterPolicy>
+ </AttributeFilterPolicy>
-</afp:AttributeFilterPolicyGroup>
+</AttributeFilterPolicyGroup>
diff --git a/idp-conf/src/test/resources/test/test-attribute-filter-cas.xml b/idp-conf/src/test/resources/test/test-attribute-filter-cas.xml
index 793f238..b390247 100644
--- a/idp-conf/src/test/resources/test/test-attribute-filter-cas.xml
+++ b/idp-conf/src/test/resources/test/test-attribute-filter-cas.xml
@@ -1,31 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
-<afp:AttributeFilterPolicyGroup id="ShibbolethFilterPolicy"
- xmlns:afp="urn:mace:shibboleth:2.0:afp"
- xmlns:basic="urn:mace:shibboleth:2.0:afp:mf:basic"
- xmlns:saml="urn:mace:shibboleth:2.0:afp:mf:saml"
+<AttributeFilterPolicyGroup id="ShibbolethFilterPolicy"
+ xmlns="urn:mace:shibboleth:2.0:afp"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
- urn:mace:shibboleth:2.0:afp:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd
- urn:mace:shibboleth:2.0:afp:mf:saml http://shibboleth.net/schema/idp/shibboleth-afp-mf-saml.xsd">
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
- <afp:AttributeFilterPolicy id="test-policy">
- <afp:PolicyRequirementRule xsi:type="basic:OR">
- <basic:Rule xsi:type="basic:AttributeRequesterString" value="https://test.example.org/" />
- <basic:Rule xsi:type="basic:AttributeRequesterString" value="https://alt-username.example.org/" />
- <basic:Rule xsi:type="basic:AttributeRequesterString" value="https://no-attrs.example.org/" />
- </afp:PolicyRequirementRule>
+ <AttributeFilterPolicy id="test-policy">
+ <PolicyRequirementRule xsi:type="OR">
+ <Rule xsi:type="Requester" value="https://test.example.org/" />
+ <Rule xsi:type="Requester" value="https://alt-username.example.org/" />
+ <Rule xsi:type="Requester" value="https://no-attrs.example.org/" />
+ </PolicyRequirementRule>
- <afp:AttributeRule attributeID="eduPersonPrincipalName">
- <afp:PermitValueRule xsi:type="basic:ANY" />
- </afp:AttributeRule>
+ <AttributeRule attributeID="eduPersonPrincipalName">
+ <PermitValueRule xsi:type="ANY" />
+ </AttributeRule>
- <afp:AttributeRule attributeID="uid">
- <afp:PermitValueRule xsi:type="basic:ANY" />
- </afp:AttributeRule>
+ <AttributeRule attributeID="uid">
+ <PermitValueRule xsi:type="ANY" />
+ </AttributeRule>
- <afp:AttributeRule attributeID="mail">
- <afp:PermitValueRule xsi:type="basic:ANY" />
- </afp:AttributeRule>
- </afp:AttributeFilterPolicy>
+ <AttributeRule attributeID="mail">
+ <PermitValueRule xsi:type="ANY" />
+ </AttributeRule>
+ </AttributeFilterPolicy>
-</afp:AttributeFilterPolicyGroup>
+</AttributeFilterPolicyGroup>
diff --git a/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd b/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd
index 1bb3adf..986bc0a 100644
--- a/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd
+++ b/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd
@@ -142,7 +142,7 @@
<documentation>
TrustEngine used to evaluate HTTPS server TLS certificates.
- This element conflicts with and is overridden by the tlsTrustEngineRef attribute.
+ This element conflicts with and overriddes the tlsTrustEngineRef attribute.
</documentation>
</annotation>
<complexType>
@@ -482,7 +482,7 @@
<documentation>
TrustEngine used to evaluate HTTPS server TLS certificates.
- This element conflicts with and is overridden by the tlsTrustEngineRef attribute.
+ This element conflicts with and overrides the tlsTrustEngineRef attribute.
</documentation>
</annotation>
<complexType>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list