[java-metadata-aggregator] branch master updated: MDA-240 - Move QName constants out of EntityRoleFilterStage
Ian Young
ian at iay.org.uk
Tue Apr 14 06:31:51 EDT 2020
This is an automated email from the git hooks/post-receive script.
iay pushed a commit to branch master
in repository java-metadata-aggregator.
View the commit online:
http://git.shibboleth.net/view/?p=java-metadata-aggregator.git;a=commit;h=60de5a91726a5682735a1233b1061c68ab562755
The following commit(s) were added to refs/heads/master by this push:
new 60de5a9 MDA-240 - Move QName constants out of EntityRoleFilterStage
60de5a9 is described below
commit 60de5a91726a5682735a1233b1061c68ab562755
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Tue Apr 14 11:31:42 2020 +0100
MDA-240 - Move QName constants out of EntityRoleFilterStage
https://issues.shibboleth.net/jira/browse/MDA-240
---
.../metadata/dom/saml/EntityRoleFilterStage.java | 35 ++++++----------------
.../metadata/dom/saml/SAMLMetadataSupport.java | 20 +++++++++++++
.../dom/saml/EntityRoleFilterStageTest.java | 32 ++++++++++----------
3 files changed, 45 insertions(+), 42 deletions(-)
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/EntityRoleFilterStage.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/EntityRoleFilterStage.java
index da9204c..d75d741 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/EntityRoleFilterStage.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/EntityRoleFilterStage.java
@@ -49,37 +49,20 @@ import net.shibboleth.utilities.java.support.xml.QNameSupport;
@ThreadSafe
public class EntityRoleFilterStage extends AbstractFilteringStage<Element> {
- /** QName of the RoleDescriptor element. */
- public static final QName ROLE_DESCRIPTOR_NAME = new QName(SAMLMetadataSupport.MD_NS, "RoleDescriptor");
-
- /** QName of the IDPSSODescriptor element. */
- public static final QName IDP_SSO_DESCRIPTOR_NAME = new QName(SAMLMetadataSupport.MD_NS, "IDPSSODescriptor");
-
- /** QName of the SPSSODescriptor element. */
- public static final QName SP_SSO_DESCRIPTOR_NAME = new QName(SAMLMetadataSupport.MD_NS, "SPSSODescriptor");
-
- /** QName of the AuthnAuthorityDescriptor element. */
- public static final QName AUTHN_AUTHORITY_DESCRIPTOR_NAME = new QName(SAMLMetadataSupport.MD_NS,
- "AuthnAuthorityDescriptor");
-
- /** QName of the AttributeAuthorityDescriptor element. */
- public static final QName ATTRIBUTE_AUTHORITY_DESCRIPTOR_NAME = new QName(SAMLMetadataSupport.MD_NS,
- "AttributeAuthorityDescriptor");
-
- /** QName of the PDPDescriptor element. */
- public static final QName PDP_DESCRIPTOR_NAME = new QName(SAMLMetadataSupport.MD_NS, "PDPDescriptor");
-
/** Class logger. */
private final Logger log = LoggerFactory.getLogger(EntityRoleFilterStage.class);
/**
- * Set containing the SAML-defined, named role descriptors: {@link #IDP_SSO_DESCRIPTOR_NAME},
- * {@link #SP_SSO_DESCRIPTOR_NAME}, {@link #AUTHN_AUTHORITY_DESCRIPTOR_NAME},
- * {@link #ATTRIBUTE_AUTHORITY_DESCRIPTOR_NAME}, {@link #PDP_DESCRIPTOR_NAME}.
+ * Set containing the SAML-defined, named role descriptors: {@link SAMLMetadataSupport#IDP_SSO_DESCRIPTOR_NAME},
+ * {@link SAMLMetadataSupport#SP_SSO_DESCRIPTOR_NAME}, {@link SAMLMetadataSupport#AUTHN_AUTHORITY_DESCRIPTOR_NAME},
+ * {@link SAMLMetadataSupport#ATTRIBUTE_AUTHORITY_DESCRIPTOR_NAME}, {@link SAMLMetadataSupport#PDP_DESCRIPTOR_NAME}.
*/
@Nonnull @NonnullElements @Unmodifiable
- private final Set<QName> namedRoles = Set.of(IDP_SSO_DESCRIPTOR_NAME, SP_SSO_DESCRIPTOR_NAME,
- AUTHN_AUTHORITY_DESCRIPTOR_NAME, ATTRIBUTE_AUTHORITY_DESCRIPTOR_NAME, PDP_DESCRIPTOR_NAME);
+ private final Set<QName> namedRoles = Set.of(SAMLMetadataSupport.IDP_SSO_DESCRIPTOR_NAME,
+ SAMLMetadataSupport.SP_SSO_DESCRIPTOR_NAME,
+ SAMLMetadataSupport.AUTHN_AUTHORITY_DESCRIPTOR_NAME,
+ SAMLMetadataSupport.ATTRIBUTE_AUTHORITY_DESCRIPTOR_NAME,
+ SAMLMetadataSupport.PDP_DESCRIPTOR_NAME);
/** Role element or type names which are white/black listed depending on the value of {@link #whitelistingRoles}. */
@Nonnull @NonnullElements @Unmodifiable
@@ -295,7 +278,7 @@ public class EntityRoleFilterStage extends AbstractFilteringStage<Element> {
childQName = QNameSupport.getNodeQName(child);
roleIdentifier = null;
- if (Objects.equals(childQName, ROLE_DESCRIPTOR_NAME)) {
+ if (Objects.equals(childQName, SAMLMetadataSupport.ROLE_DESCRIPTOR_NAME)) {
roleIdentifier = DOMTypeSupport.getXSIType(child);
} else if (namedRoles.contains(childQName)) {
roleIdentifier = childQName;
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/SAMLMetadataSupport.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/SAMLMetadataSupport.java
index 43ff651..6b2556d 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/SAMLMetadataSupport.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/SAMLMetadataSupport.java
@@ -56,6 +56,26 @@ public final class SAMLMetadataSupport {
/** cacheDuration attribute name. */
public static final QName CACHE_DURATION_ATTRIB_NAME = new QName("cacheDuration");
+ /** QName of the RoleDescriptor element. */
+ public static final QName ROLE_DESCRIPTOR_NAME = new QName(MD_NS, "RoleDescriptor");
+
+ /** QName of the IDPSSODescriptor element. */
+ public static final QName IDP_SSO_DESCRIPTOR_NAME = new QName(MD_NS, "IDPSSODescriptor");
+
+ /** QName of the SPSSODescriptor element. */
+ public static final QName SP_SSO_DESCRIPTOR_NAME = new QName(MD_NS, "SPSSODescriptor");
+
+ /** QName of the AuthnAuthorityDescriptor element. */
+ public static final QName AUTHN_AUTHORITY_DESCRIPTOR_NAME = new QName(MD_NS,
+ "AuthnAuthorityDescriptor");
+
+ /** QName of the AttributeAuthorityDescriptor element. */
+ public static final QName ATTRIBUTE_AUTHORITY_DESCRIPTOR_NAME = new QName(MD_NS,
+ "AttributeAuthorityDescriptor");
+
+ /** QName of the PDPDescriptor element. */
+ public static final QName PDP_DESCRIPTOR_NAME = new QName(MD_NS, "PDPDescriptor");
+
/** Constructor. */
private SAMLMetadataSupport() {
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/EntityRoleFilterStageTest.java b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/EntityRoleFilterStageTest.java
index b5a329c..adc9a30 100644
--- a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/EntityRoleFilterStageTest.java
+++ b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/EntityRoleFilterStageTest.java
@@ -51,7 +51,7 @@ public class EntityRoleFilterStageTest extends BaseDOMTest {
public void testRoleWhitelist() throws Exception {
EntityRoleFilterStage stage = new EntityRoleFilterStage();
stage.setId("test");
- stage.setDesignatedRoles(Collections.singletonList(EntityRoleFilterStage.IDP_SSO_DESCRIPTOR_NAME));
+ stage.setDesignatedRoles(Collections.singletonList(SAMLMetadataSupport.IDP_SSO_DESCRIPTOR_NAME));
stage.setWhitelistingRoles(true);
stage.initialize();
@@ -61,7 +61,7 @@ public class EntityRoleFilterStageTest extends BaseDOMTest {
Assert.assertEquals(metadataCollection.size(), 1);
Element descriptor = metadataCollection.get(0).unwrap();
- Assert.assertEquals(ElementSupport.getChildElements(descriptor, EntityRoleFilterStage.IDP_SSO_DESCRIPTOR_NAME)
+ Assert.assertEquals(ElementSupport.getChildElements(descriptor, SAMLMetadataSupport.IDP_SSO_DESCRIPTOR_NAME)
.size(), 1);
}
@@ -75,7 +75,7 @@ public class EntityRoleFilterStageTest extends BaseDOMTest {
public void testRoleBlacklist() throws Exception {
EntityRoleFilterStage stage = new EntityRoleFilterStage();
stage.setId("test");
- stage.setDesignatedRoles(Collections.singletonList(EntityRoleFilterStage.IDP_SSO_DESCRIPTOR_NAME));
+ stage.setDesignatedRoles(Collections.singletonList(SAMLMetadataSupport.IDP_SSO_DESCRIPTOR_NAME));
stage.setWhitelistingRoles(false);
stage.initialize();
@@ -85,11 +85,11 @@ public class EntityRoleFilterStageTest extends BaseDOMTest {
Assert.assertEquals(metadataCollection.size(), 2);
Element descriptor = metadataCollection.get(0).unwrap();
- Assert.assertEquals(ElementSupport.getChildElements(descriptor, EntityRoleFilterStage.SP_SSO_DESCRIPTOR_NAME)
+ Assert.assertEquals(ElementSupport.getChildElements(descriptor, SAMLMetadataSupport.SP_SSO_DESCRIPTOR_NAME)
.size(), 1);
descriptor = metadataCollection.get(1).unwrap();
- Assert.assertEquals(ElementSupport.getChildElements(descriptor, EntityRoleFilterStage.SP_SSO_DESCRIPTOR_NAME)
+ Assert.assertEquals(ElementSupport.getChildElements(descriptor, SAMLMetadataSupport.SP_SSO_DESCRIPTOR_NAME)
.size(), 1);
}
@@ -103,7 +103,7 @@ public class EntityRoleFilterStageTest extends BaseDOMTest {
public void testDontRemoveRolelessEntityDescriptor() throws Exception {
EntityRoleFilterStage stage = new EntityRoleFilterStage();
stage.setId("test");
- stage.setDesignatedRoles(Collections.singletonList(EntityRoleFilterStage.IDP_SSO_DESCRIPTOR_NAME));
+ stage.setDesignatedRoles(Collections.singletonList(SAMLMetadataSupport.IDP_SSO_DESCRIPTOR_NAME));
stage.setWhitelistingRoles(true);
stage.setRemoveRolelessEntities(false);
stage.initialize();
@@ -114,15 +114,15 @@ public class EntityRoleFilterStageTest extends BaseDOMTest {
Assert.assertEquals(metadataCollection.size(), 3);
Element descriptor = metadataCollection.get(0).unwrap();
- Assert.assertEquals(ElementSupport.getChildElements(descriptor, EntityRoleFilterStage.IDP_SSO_DESCRIPTOR_NAME)
+ Assert.assertEquals(ElementSupport.getChildElements(descriptor, SAMLMetadataSupport.IDP_SSO_DESCRIPTOR_NAME)
.size(), 1);
descriptor = metadataCollection.get(1).unwrap();
- Assert.assertEquals(ElementSupport.getChildElements(descriptor, EntityRoleFilterStage.SP_SSO_DESCRIPTOR_NAME)
+ Assert.assertEquals(ElementSupport.getChildElements(descriptor, SAMLMetadataSupport.SP_SSO_DESCRIPTOR_NAME)
.size(), 0);
descriptor = metadataCollection.get(2).unwrap();
- Assert.assertEquals(ElementSupport.getChildElements(descriptor, EntityRoleFilterStage.SP_SSO_DESCRIPTOR_NAME)
+ Assert.assertEquals(ElementSupport.getChildElements(descriptor, SAMLMetadataSupport.SP_SSO_DESCRIPTOR_NAME)
.size(), 0);
}
@@ -138,7 +138,7 @@ public class EntityRoleFilterStageTest extends BaseDOMTest {
EntityRoleFilterStage stage = new EntityRoleFilterStage();
stage.setId("test");
- stage.setDesignatedRoles(Collections.singletonList(EntityRoleFilterStage.IDP_SSO_DESCRIPTOR_NAME));
+ stage.setDesignatedRoles(Collections.singletonList(SAMLMetadataSupport.IDP_SSO_DESCRIPTOR_NAME));
stage.setWhitelistingRoles(false);
stage.initialize();
@@ -148,11 +148,11 @@ public class EntityRoleFilterStageTest extends BaseDOMTest {
Assert.assertEquals(descriptors.size(), 2);
Element descriptor = descriptors.get(0);
- Assert.assertEquals(ElementSupport.getChildElements(descriptor, EntityRoleFilterStage.SP_SSO_DESCRIPTOR_NAME)
+ Assert.assertEquals(ElementSupport.getChildElements(descriptor, SAMLMetadataSupport.SP_SSO_DESCRIPTOR_NAME)
.size(), 1);
descriptor = descriptors.get(1);
- Assert.assertEquals(ElementSupport.getChildElements(descriptor, EntityRoleFilterStage.SP_SSO_DESCRIPTOR_NAME)
+ Assert.assertEquals(ElementSupport.getChildElements(descriptor, SAMLMetadataSupport.SP_SSO_DESCRIPTOR_NAME)
.size(), 1);
}
@@ -168,8 +168,8 @@ public class EntityRoleFilterStageTest extends BaseDOMTest {
EntityRoleFilterStage stage = new EntityRoleFilterStage();
stage.setId("test");
- stage.setDesignatedRoles(Arrays.asList(new QName[]{EntityRoleFilterStage.IDP_SSO_DESCRIPTOR_NAME,
- EntityRoleFilterStage.SP_SSO_DESCRIPTOR_NAME}));
+ stage.setDesignatedRoles(Arrays.asList(new QName[]{SAMLMetadataSupport.IDP_SSO_DESCRIPTOR_NAME,
+ SAMLMetadataSupport.SP_SSO_DESCRIPTOR_NAME}));
stage.setWhitelistingRoles(false);
stage.initialize();
@@ -191,8 +191,8 @@ public class EntityRoleFilterStageTest extends BaseDOMTest {
EntityRoleFilterStage stage = new EntityRoleFilterStage();
stage.setId("test");
- stage.setDesignatedRoles(Arrays.asList(new QName[]{EntityRoleFilterStage.IDP_SSO_DESCRIPTOR_NAME,
- EntityRoleFilterStage.SP_SSO_DESCRIPTOR_NAME}));
+ stage.setDesignatedRoles(Arrays.asList(new QName[]{SAMLMetadataSupport.IDP_SSO_DESCRIPTOR_NAME,
+ SAMLMetadataSupport.SP_SSO_DESCRIPTOR_NAME}));
stage.setWhitelistingRoles(false);
stage.setRemovingEntitylessEntitiesDescriptor(false);
stage.initialize();
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list