[java-identity-provider] branch master updated: Alter EntityAttributes filter test to include value addition.
Scott Cantor
cantor.2 at osu.edu
Fri Jul 10 16:20:45 UTC 2020
This is an automated email from the git hooks/post-receive script.
scantor 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=6131dc92c14d66b56dffae730e888a7fdf988202
The following commit(s) were added to refs/heads/master by this push:
new 6131dc92c Alter EntityAttributes filter test to include value addition.
6131dc92c is described below
commit 6131dc92c14d66b56dffae730e888a7fdf988202
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Fri Jul 10 12:20:57 2020 -0400
Alter EntityAttributes filter test to include value addition.
---
.../filter/EntityAttributesFilterParserTest.java | 6 ++-
.../src/test/resources/logback-test.xml | 2 +-
.../metadata/filter/entityAttributes.xml | 52 ++--------------------
.../metadata/filter/entityAttributesBeans.xml | 14 +++++-
.../metadata/filter/entityAttributesMetadata.xml | 52 ++++++++++++++++++++++
.../metadata/filter/entityAttributesWithScript.xml | 49 +-------------------
.../filter/entityAttributesWithScriptResource.xml | 50 +--------------------
7 files changed, 76 insertions(+), 149 deletions(-)
diff --git a/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/EntityAttributesFilterParserTest.java b/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/EntityAttributesFilterParserTest.java
index ad9aa957d..5ab97f3ae 100644
--- a/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/EntityAttributesFilterParserTest.java
+++ b/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/EntityAttributesFilterParserTest.java
@@ -44,12 +44,12 @@ public class EntityAttributesFilterParserTest extends AbstractMetadataParserTest
@Test
public void testFilterScript() throws ResolverException, IOException {
- doTest("filter/entityAttributesWithScript.xml");
+ doTest("filter/entityAttributesWithScript.xml", "filter/entityAttributesBeans.xml");
}
@Test
public void testFilterScriptResource() throws ResolverException, IOException {
- doTest("filter/entityAttributesWithScriptResource.xml");
+ doTest("filter/entityAttributesWithScriptResource.xml", "filter/entityAttributesBeans.xml");
}
private void doTest(final String... files) throws ResolverException, IOException {
@@ -71,7 +71,9 @@ public class EntityAttributesFilterParserTest extends AbstractMetadataParserTest
Assert.assertNotNull(extTags);
Assert.assertEquals(extTags.getAttributes().size(), 2);
Assert.assertEquals(extTags.getAttributes().get(0).getName(), "foo");
+ Assert.assertEquals(extTags.getAttributes().get(0).getAttributeValues().size(), 2);
Assert.assertEquals(extTags.getAttributes().get(1).getName(), "bar");
+ Assert.assertEquals(extTags.getAttributes().get(1).getAttributeValues().size(), 1);
key = new EntityIdCriterion("https://sp2.example.org/sp/shibboleth");
entity = resolver.resolveSingle(new CriteriaSet(key));
diff --git a/idp-profile-spring/src/test/resources/logback-test.xml b/idp-profile-spring/src/test/resources/logback-test.xml
index ac1deefad..3c4e74ab0 100644
--- a/idp-profile-spring/src/test/resources/logback-test.xml
+++ b/idp-profile-spring/src/test/resources/logback-test.xml
@@ -14,7 +14,7 @@
</appender>
<root>
- <level value="warn" />
+ <level value="INFO" />
<appender-ref ref="STDOUT" />
</root>
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/entityAttributes.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/entityAttributes.xml
index f2a919d53..bec2af9d8 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/entityAttributes.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/entityAttributes.xml
@@ -2,18 +2,14 @@
<metadata:MetadataProvider xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
xmlns:metadata="urn:mace:shibboleth:2.0:metadata"
xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
- xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
- urn:oasis:names:tc:SAML:2.0:assertion http://docs.oasis-open.org/security/saml/v2.0/saml-schema-assertion-2.0.xsd
- urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
-
+ urn:oasis:names:tc:SAML:2.0:assertion http://docs.oasis-open.org/security/saml/v2.0/saml-schema-assertion-2.0.xsd"
failFastInitialization="false" requireValidMetadata="false"
-
- id="entityAttributes" xsi:type="metadata:InlineMetadataProvider">
+ id="entityAttributes" xsi:type="metadata:ResourceBackedMetadataProvider" resourceRef="MetadataResource">
<metadata:MetadataFilter xsi:type="metadata:EntityAttributes">
- <metadata:AttributeFilterRef>predicate.AlwaysFalse</metadata:AttributeFilterRef>
+ <metadata:AttributeFilterRef>predicate.NotRandS</metadata:AttributeFilterRef>
<saml:Attribute Name="foo">
<saml:AttributeValue>fooValue</saml:AttributeValue>
</saml:Attribute>
@@ -24,46 +20,4 @@
<metadata:Entity>https://sp3.example.org/sp/shibboleth</metadata:Entity>
<metadata:Entity>https://sp4.example.org/sp/shibboleth</metadata:Entity>
</metadata:MetadataFilter>
-
- <EntitiesDescriptor Name="ukgroup">
- <EntityDescriptor
- entityID="https://sp.example.org/sp/shibboleth">
- <Extensions>
- <mdattr:EntityAttributes>
- <saml:Attribute Name="http://macedir.org/entity-category"
- NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
- </saml:Attribute>
- </mdattr:EntityAttributes>
- </Extensions>
- <SPSSODescriptor
- protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <AssertionConsumerService
- Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://sp.example.org/Shibboleth.sso/SAML2/POST-SimpleSign"
- index="5" />
- </SPSSODescriptor>
- </EntityDescriptor>
-
- <EntityDescriptor
- entityID="https://sp2.example.org/sp/shibboleth">
- <Extensions>
- <mdattr:EntityAttributes>
- <saml:Attribute Name="http://macedir.org/entity-category"
- NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
- </saml:Attribute>
- </mdattr:EntityAttributes>
- </Extensions>
- <SPSSODescriptor
- protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <AssertionConsumerService
- Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://sp2.example.org/Shibboleth.sso/SAML2/POST-SimpleSign"
- index="5" />
- </SPSSODescriptor>
- </EntityDescriptor>
- </EntitiesDescriptor>
</metadata:MetadataProvider>
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/entityAttributesBeans.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/entityAttributesBeans.xml
index 41c31476b..241811e30 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/entityAttributesBeans.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/entityAttributesBeans.xml
@@ -8,7 +8,17 @@
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
default-init-method="initialize" default-destroy-method="destroy" default-lazy-init="true">
-
- <bean id="predicate.AlwaysFalse" class="com.google.common.base.Predicates" factory-method="alwaysFalse" />
+ <bean id="predicate.NotRandS" class="net.shibboleth.ext.spring.util.SpringExpressionPredicate"
+ c:_0="!#input.getName().equals('http://macedir.org/entity-category')" />
+
+ <bean id="MetadataResource" class="org.springframework.core.io.ClassPathResource"
+ c:_0="net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/entityAttributesMetadata.xml" />
+
+ <bean id="shibboleth.ParserPool"
+ class="net.shibboleth.utilities.java.support.xml.BasicParserPool"
+ p:maxPoolSize="100"
+ p:coalescing="true" p:ignoreComments="true"
+ p:ignoreElementContentWhitespace="true" p:namespaceAware="true" />
+
</beans>
\ No newline at end of file
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/entityAttributesMetadata.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/entityAttributesMetadata.xml
new file mode 100644
index 000000000..d30ccd504
--- /dev/null
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/entityAttributesMetadata.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntitiesDescriptor Name="ukgroup" xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+ xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
+ xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:oasis:names:tc:SAML:2.0:assertion http://docs.oasis-open.org/security/saml/v2.0/saml-schema-assertion-2.0.xsd
+ urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd">
+
+ <EntityDescriptor ID="uk001502"
+ entityID="https://sp.example.org/sp/shibboleth">
+ <Extensions>
+ <mdattr:EntityAttributes>
+ <saml:Attribute Name="http://macedir.org/entity-category"
+ NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+ </saml:Attribute>
+ <saml:Attribute Name="foo">
+ <saml:AttributeValue>oldValue</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ </Extensions>
+ <SPSSODescriptor
+ protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+
+ <AssertionConsumerService
+ Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
+ Location="https://sp.example.org/Shibboleth.sso/SAML2/POST-SimpleSign"
+ index="5" />
+ </SPSSODescriptor>
+ </EntityDescriptor>
+
+ <EntityDescriptor ID="uk001503"
+ entityID="https://sp2.example.org/sp/shibboleth">
+ <Extensions>
+ <mdattr:EntityAttributes>
+ <saml:Attribute Name="http://macedir.org/entity-category"
+ NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+ </saml:Attribute>
+ </mdattr:EntityAttributes>
+ </Extensions>
+ <SPSSODescriptor
+ protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+
+ <AssertionConsumerService
+ Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
+ Location="https://sp2.example.org/Shibboleth.sso/SAML2/POST-SimpleSign"
+ index="5" />
+ </SPSSODescriptor>
+ </EntityDescriptor>
+
+</EntitiesDescriptor>
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/entityAttributesWithScript.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/entityAttributesWithScript.xml
index b66fdc60e..4dd627659 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/entityAttributesWithScript.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/entityAttributesWithScript.xml
@@ -2,15 +2,11 @@
<metadata:MetadataProvider xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
xmlns:metadata="urn:mace:shibboleth:2.0:metadata"
xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
- xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
- urn:oasis:names:tc:SAML:2.0:assertion http://docs.oasis-open.org/security/saml/v2.0/saml-schema-assertion-2.0.xsd
- urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
-
+ urn:oasis:names:tc:SAML:2.0:assertion http://docs.oasis-open.org/security/saml/v2.0/saml-schema-assertion-2.0.xsd"
failFastInitialization="false" requireValidMetadata="false"
-
- id="entityAttributes" xsi:type="metadata:InlineMetadataProvider">
+ id="entityAttributes" xsi:type="metadata:ResourceBackedMetadataProvider" resourceRef="MetadataResource">
<metadata:MetadataFilter xsi:type="metadata:EntityAttributes">
<metadata:AttributeFilterScript>
@@ -26,46 +22,5 @@
<metadata:Script>input.getEntityID().equals("https://sp.example.org/sp/shibboleth");</metadata:Script>
</metadata:ConditionScript>
</metadata:MetadataFilter>
-
- <EntitiesDescriptor Name="ukgroup">
- <EntityDescriptor ID="uk001502"
- entityID="https://sp.example.org/sp/shibboleth">
- <Extensions>
- <mdattr:EntityAttributes>
- <saml:Attribute Name="http://macedir.org/entity-category"
- NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
- </saml:Attribute>
- </mdattr:EntityAttributes>
- </Extensions>
- <SPSSODescriptor
- protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <AssertionConsumerService
- Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://sp.example.org/Shibboleth.sso/SAML2/POST-SimpleSign"
- index="5" />
- </SPSSODescriptor>
- </EntityDescriptor>
-
- <EntityDescriptor ID="uk001503"
- entityID="https://sp2.example.org/sp/shibboleth">
- <Extensions>
- <mdattr:EntityAttributes>
- <saml:Attribute Name="http://macedir.org/entity-category"
- NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
- </saml:Attribute>
- </mdattr:EntityAttributes>
- </Extensions>
- <SPSSODescriptor
- protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <AssertionConsumerService
- Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://sp2.example.org/Shibboleth.sso/SAML2/POST-SimpleSign"
- index="5" />
- </SPSSODescriptor>
- </EntityDescriptor>
- </EntitiesDescriptor>
</metadata:MetadataProvider>
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/entityAttributesWithScriptResource.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/entityAttributesWithScriptResource.xml
index 989a445ae..c629fa5a6 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/entityAttributesWithScriptResource.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/entityAttributesWithScriptResource.xml
@@ -2,15 +2,11 @@
<metadata:MetadataProvider xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
xmlns:metadata="urn:mace:shibboleth:2.0:metadata"
xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
- xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
- urn:oasis:names:tc:SAML:2.0:assertion http://docs.oasis-open.org/security/saml/v2.0/saml-schema-assertion-2.0.xsd
- urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
-
+ urn:oasis:names:tc:SAML:2.0:assertion http://docs.oasis-open.org/security/saml/v2.0/saml-schema-assertion-2.0.xsd"
failFastInitialization="false" requireValidMetadata="false"
-
- id="entityAttributes" xsi:type="metadata:InlineMetadataProvider">
+ id="entityAttributes" xsi:type="metadata:ResourceBackedMetadataProvider" resourceRef="MetadataResource">
<metadata:MetadataFilter xsi:type="metadata:EntityAttributes">
<metadata:AttributeFilterScript>
@@ -26,46 +22,4 @@
<metadata:ScriptFile>classpath:/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/entityAttributesConditionScript.js</metadata:ScriptFile>
</metadata:ConditionScript>
</metadata:MetadataFilter>
-
- <EntitiesDescriptor Name="ukgroup">
- <EntityDescriptor ID="uk001502"
- entityID="https://sp.example.org/sp/shibboleth">
- <Extensions>
- <mdattr:EntityAttributes>
- <saml:Attribute Name="http://macedir.org/entity-category"
- NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
- </saml:Attribute>
- </mdattr:EntityAttributes>
- </Extensions>
- <SPSSODescriptor
- protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <AssertionConsumerService
- Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://sp.example.org/Shibboleth.sso/SAML2/POST-SimpleSign"
- index="5" />
- </SPSSODescriptor>
- </EntityDescriptor>
-
- <EntityDescriptor ID="uk001503"
- entityID="https://sp2.example.org/sp/shibboleth">
- <Extensions>
- <mdattr:EntityAttributes>
- <saml:Attribute Name="http://macedir.org/entity-category"
- NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
- </saml:Attribute>
- </mdattr:EntityAttributes>
- </Extensions>
- <SPSSODescriptor
- protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <AssertionConsumerService
- Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://sp2.example.org/Shibboleth.sso/SAML2/POST-SimpleSign"
- index="5" />
- </SPSSODescriptor>
- </EntityDescriptor>
- </EntitiesDescriptor>
</metadata:MetadataProvider>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list