[java-identity-provider] branch main updated: IDP-1904 - Additional policy rules for attribute filter
Scott Cantor
cantor.2 at osu.edu
Wed Feb 16 15:11:32 UTC 2022
This is an automated email from the git hooks/post-receive script.
scantor 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=310b4b2c721686533daa1ced47fb684507902455
The following commit(s) were added to refs/heads/main by this push:
new 310b4b2c7 IDP-1904 - Additional policy rules for attribute filter
310b4b2c7 is described below
commit 310b4b2c721686533daa1ced47fb684507902455
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Feb 16 10:11:29 2022 -0500
IDP-1904 - Additional policy rules for attribute filter
https://shibboleth.atlassian.net/browse/IDP-1904
Added proxied requester metadata rules.
Added to filter context and profile action.
Renamed existing classes to shorten file/class names.
---
.../filter/context/AttributeFilterContext.java | 93 +++++++++++++++++-----
...a => IssuerEntityAttributeExactPolicyRule.java} | 2 +-
...a => IssuerEntityAttributeRegexPolicyRule.java} | 2 +-
...ule.java => IssuerInEntityGroupPolicyRule.java} | 4 +-
...java => IssuerNameIDFormatExactPolicyRule.java} | 4 +-
... => IssuerRegistrationAuthorityPolicyRule.java} | 2 +-
...edRequesterEntityAttributeExactPolicyRule.java} | 9 ++-
...edRequesterEntityAttributeRegexPolicyRule.java} | 7 +-
...> ProxiedRequesterInEntityGroupPolicyRule.java} | 33 +++++---
...dRequesterRegistrationAuthorityPolicyRule.java} | 6 +-
...> RequesterEntityAttributeExactPolicyRule.java} | 5 +-
...> RequesterEntityAttributeRegexPolicyRule.java} | 5 +-
....java => RequesterInEntityGroupPolicyRule.java} | 4 +-
...a => RequesterNameIDFormatExactPolicyRule.java} | 4 +-
... RequesterRegistrationAuthorityPolicyRule.java} | 4 +-
... IssuerEntityAttributeExactPolicyRuleTest.java} | 18 ++---
... IssuerEntityAttributeRegexPolicyRuleTest.java} | 12 +--
...java => IssuerInEntityGroupPolicyRuleTest.java} | 12 +--
... => IssuerNameIDFormatExactPolicyRuleTest.java} | 10 +--
...t.java => IssuerRegistrationAuthorityTest.java} | 10 +--
...questerEntityAttributeExactPolicyRuleTest.java} | 18 ++---
...questerEntityAttributeRegexPolicyRuleTest.java} | 12 +--
...a => RequesterInEntityGroupPolicyRuleTest.java} | 12 +--
... RequesterNameIDFormatExactPolicyRuleTest.java} | 10 +--
...ava => RequesterRegistrationAuthorityTest.java} | 10 +--
.../impl/AttributeFilterNamespaceHandler.java | 76 +++++++++++-------
...a => IssuerEntityAttributeExactRuleParser.java} | 10 +--
...a => IssuerEntityAttributeRegexRuleParser.java} | 10 +--
...ser.java => IssuerInEntityGroupRuleParser.java} | 10 +--
...rser.java => IssuerNameIDFormatRuleParser.java} | 10 +--
... => IssuerRegistrationAuthorityRuleParser.java} | 10 +--
...edRequesterEntityAttributeExactRuleParser.java} | 13 ++-
...edRequesterEntityAttributeRegexRuleParser.java} | 12 +--
...> ProxiedRequesterInEntityGroupRuleParser.java} | 12 +--
...dRequesterRegistrationAuthorityRuleParser.java} | 15 ++--
...> RequesterEntityAttributeExactRuleParser.java} | 10 +--
...> RequesterEntityAttributeRegexRuleParser.java} | 10 +--
....java => RequesterInEntityGroupRuleParser.java} | 10 +--
...r.java => RequesterNameIDFormatRuleParser.java} | 10 +--
... RequesterRegistrationAuthorityRuleParser.java} | 10 +--
... IssuerEntityAttributeExactRuleParserTest.java} | 14 ++--
... IssuerEntityAttributeRegexRuleParserTest.java} | 8 +-
...java => IssuerInEntityGroupRuleParserTest.java} | 11 +--
....java => IssuerNameIDFormatRuleParserTest.java} | 18 +++--
...IssuerRegistrationAuthorityRuleParserTest.java} | 17 ++--
...questerEntityAttributeExactRuleParserTest.java} | 19 +++--
...questerEntityAttributeRegexRuleParserTest.java} | 18 +++--
...oxiedRequesterInEntityGroupRuleParserTest.java} | 10 +--
...uesterRegistrationAuthorityRuleParserTest.java} | 14 ++--
...questerEntityAttributeExactRuleParserTest.java} | 19 +++--
...questerEntityAttributeRegexRuleParserTest.java} | 17 ++--
...a => RequesterInEntityGroupRuleParserTest.java} | 10 +--
...va => RequesterNameIDFormatRuleParserTest.java} | 21 +++--
...uesterRegistrationAuthorityRuleParserTest.java} | 14 ++--
.../policyrule/proxiedregistrationAuthorityOne.xml | 9 +++
.../policyrule/proxiedregistrationAuthorityTwo.xml | 9 +++
.../filter/policyrule/proxiedrequesterEA2.xml | 8 ++
.../filter/policyrule/proxiedrequesterEARegex2.xml | 7 ++
.../filter/policyrule/proxiedrequesterEG2.xml | 5 ++
idp-conf/src/test/resources/conf/credentials.xml | 2 +-
.../src/test/resources/conf/metadata-policy1.json | 21 +++++
idp-conf/src/test/resources/conf/oidc.properties | 5 +-
.../idp/profile/impl/FilterAttributes.java | 28 ++++++-
.../src/main/resources/schema/shibboleth-afp.xsd | 57 +++++++++++--
64 files changed, 573 insertions(+), 324 deletions(-)
diff --git a/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterContext.java b/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterContext.java
index 891a00ff4..ed6c2bdc2 100644
--- a/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterContext.java
+++ b/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterContext.java
@@ -87,15 +87,18 @@ public final class AttributeFilterContext extends BaseContext {
/** The attribute recipient's group identity. */
@Nullable private String attributeRecipientGroupID;
- /** Cache of IdP metadata context. */
+ /** Cache of issuer metadata context. */
@Nullable private SAMLMetadataContext issuerMetadataContext;
- /** Cache of SP metadata context. */
+ /** Cache of requester metadata context. */
@Nullable private SAMLMetadataContext requesterMetadataContext;
/** Cache of the proxied requester context. */
@Nullable private ProxiedRequesterContext proxiedRequesterContext;
+ /** Cache of proxied requester metadata context. */
+ @Nullable private SAMLMetadataContext proxiedRequesterMetadataContext;
+
/** Lookup strategy used to locate the IdP's metadata context. */
@Nullable
private Function<AttributeFilterContext,SAMLMetadataContext> issuerMetadataContextLookupStrategy;
@@ -108,6 +111,10 @@ public final class AttributeFilterContext extends BaseContext {
@Nullable
private Function<AttributeFilterContext,ProxiedRequesterContext> proxiedRequesterContextLookupStrategy;
+ /** Lookup strategy used to locate a proxied requester's metadata context. */
+ @Nullable
+ private Function<AttributeFilterContext,SAMLMetadataContext> proxiedRequesterMetadataContextLookupStrategy;
+
/** Constructor. */
public AttributeFilterContext() {
prefilteredAttributes = new HashMap<>();
@@ -335,6 +342,21 @@ public final class AttributeFilterContext extends BaseContext {
return requesterMetadataContextLookupStrategy;
}
+ /**
+ * Set the strategy used to locate the SP's metadata context.
+ *
+ * @param strategy lookup strategy
+ *
+ * @return this context
+ */
+ @Nonnull public AttributeFilterContext setRequesterMetadataContextLookupStrategy(
+ @Nullable final Function<AttributeFilterContext,SAMLMetadataContext> strategy) {
+ requesterMetadataContextLookupStrategy = strategy;
+
+ return this;
+ }
+
+
/**
* Set the strategy used to locate the IdP's metadata context.
*
@@ -361,6 +383,18 @@ public final class AttributeFilterContext extends BaseContext {
@Nullable public Function<AttributeFilterContext,SAMLMetadataContext> getIssuerMetadataContextLookupStrategy() {
return issuerMetadataContextLookupStrategy;
}
+
+ /**
+ * Get the strategy used to locate the {@link ProxiedRequesterContext}.
+ *
+ * @return lookup strategy
+ *
+ * @since 3.4.0
+ */
+ @Nullable
+ public Function<AttributeFilterContext,ProxiedRequesterContext> getProxiedRequesterContextLookupStrategy() {
+ return proxiedRequesterContextLookupStrategy;
+ }
/**
* Set the strategy used to locate the SP's metadata context.
@@ -368,43 +402,48 @@ public final class AttributeFilterContext extends BaseContext {
* @param strategy lookup strategy
*
* @return this context
+ *
+ * @since 3.4.0
*/
- @Nonnull public AttributeFilterContext setRequesterMetadataContextLookupStrategy(
- @Nullable final Function<AttributeFilterContext,SAMLMetadataContext> strategy) {
- requesterMetadataContextLookupStrategy = strategy;
+ @Nonnull public AttributeFilterContext setProxiedRequesterContextLookupStrategy(
+ @Nullable final Function<AttributeFilterContext,ProxiedRequesterContext> strategy) {
+ proxiedRequesterContextLookupStrategy = strategy;
return this;
}
/**
- * Get the strategy used to locate the {@link ProxiedRequesterContext}.
+ * Get the strategy used to locate a proxied requester's metadata context.
*
- * @return lookup strategy
+ * @return lookup strategy
*
- * @since 3.4.0
+ * @since 4.2.0
*/
@Nullable
- public Function<AttributeFilterContext,ProxiedRequesterContext> getProxiedRequesterContextLookupStrategy() {
- return proxiedRequesterContextLookupStrategy;
+ public Function<AttributeFilterContext,SAMLMetadataContext> getProxiedRequesterMetadataContextLookupStrategy() {
+ return proxiedRequesterMetadataContextLookupStrategy;
}
+
/**
- * Set the strategy used to locate the SP's metadata context.
+ * Set the strategy used to locate a proxied requester's metadata context.
*
* @param strategy lookup strategy
*
* @return this context
*
- * @since 3.4.0
+ * @since 4.2.0
*/
- @Nonnull public AttributeFilterContext setProxiedRequesterContextLookupStrategy(
- @Nullable final Function<AttributeFilterContext,ProxiedRequesterContext> strategy) {
- proxiedRequesterContextLookupStrategy = strategy;
+ @Nonnull public AttributeFilterContext setProxiedRequesterMetadataContextLookupStrategy(
+ @Nullable final Function<AttributeFilterContext,SAMLMetadataContext> strategy) {
+ proxiedRequesterMetadataContextLookupStrategy = strategy;
return this;
}
- /** Get the Issuer Metadata context.
+
+ /**
+ * Get the Issuer Metadata context.
*
* <p>This value is cached and so only calculated once.</p>
*
@@ -419,7 +458,8 @@ public final class AttributeFilterContext extends BaseContext {
return issuerMetadataContext;
}
- /** Get the Requester Metadata context.
+ /**
+ * Get the Requester Metadata context.
*
* <p>This value is cached and so only calculated once.</p>
*
@@ -432,7 +472,8 @@ public final class AttributeFilterContext extends BaseContext {
return requesterMetadataContext;
}
- /** Get the {@link ProxiedRequesterContext}.
+ /**
+ * Get the {@link ProxiedRequesterContext}.
*
* <p>This value is cached and so only calculated once.</p>
*
@@ -447,6 +488,22 @@ public final class AttributeFilterContext extends BaseContext {
return proxiedRequesterContext;
}
+ /**
+ * Get the Proxied Requester Metadata context.
+ *
+ * <p>This value is cached and so only calculated once.</p>
+ *
+ * @return the context
+ *
+ * @since 4.2.0
+ */
+ @Nullable public SAMLMetadataContext getProxiedRequesterMetadataContext() {
+ if (null == proxiedRequesterMetadataContext && null != proxiedRequesterMetadataContextLookupStrategy) {
+ proxiedRequesterMetadataContext = proxiedRequesterMetadataContextLookupStrategy.apply(this);
+ }
+ return proxiedRequesterMetadataContext;
+ }
+
/**
* Helper method to invoke an AttributeFilter service using this context.
*
diff --git a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeIssuerEntityAttributeExactPolicyRule.java b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/IssuerEntityAttributeExactPolicyRule.java
similarity index 93%
rename from idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeIssuerEntityAttributeExactPolicyRule.java
rename to idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/IssuerEntityAttributeExactPolicyRule.java
index d22cf254e..e8762f142 100644
--- a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeIssuerEntityAttributeExactPolicyRule.java
+++ b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/IssuerEntityAttributeExactPolicyRule.java
@@ -28,7 +28,7 @@ import org.opensaml.saml.saml2.metadata.EntityDescriptor;
/**
* Matcher that checks, via an exact match, if the attribute issuer contains an entity attribute with a given value.
*/
-public class AttributeIssuerEntityAttributeExactPolicyRule extends AbstractEntityAttributeExactPolicyRule {
+public class IssuerEntityAttributeExactPolicyRule extends AbstractEntityAttributeExactPolicyRule {
/** {@inheritDoc} */
@Override
diff --git a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeIssuerEntityAttributeRegexPolicyRule.java b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/IssuerEntityAttributeRegexPolicyRule.java
similarity index 93%
copy from idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeIssuerEntityAttributeRegexPolicyRule.java
copy to idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/IssuerEntityAttributeRegexPolicyRule.java
index 38bd342a0..a1dbdc048 100644
--- a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeIssuerEntityAttributeRegexPolicyRule.java
+++ b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/IssuerEntityAttributeRegexPolicyRule.java
@@ -28,7 +28,7 @@ import org.opensaml.saml.saml2.metadata.EntityDescriptor;
/**
* Matcher that checks, via regex, if the attribute issuer contains an entity attribute with a given value.
*/
-public class AttributeIssuerEntityAttributeRegexPolicyRule extends AbstractEntityAttributeRegexPolicyRule {
+public class IssuerEntityAttributeRegexPolicyRule extends AbstractEntityAttributeRegexPolicyRule {
/** {@inheritDoc} */
@Override
diff --git a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeIssuerInEntityGroupPolicyRule.java b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/IssuerInEntityGroupPolicyRule.java
similarity index 93%
rename from idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeIssuerInEntityGroupPolicyRule.java
rename to idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/IssuerInEntityGroupPolicyRule.java
index 1b8b48dab..189035d7b 100644
--- a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeIssuerInEntityGroupPolicyRule.java
+++ b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/IssuerInEntityGroupPolicyRule.java
@@ -33,10 +33,10 @@ import org.slf4j.LoggerFactory;
*
* @since 4.0.0
*/
-public class AttributeIssuerInEntityGroupPolicyRule extends AbstractEntityGroupPolicyRule {
+public class IssuerInEntityGroupPolicyRule extends AbstractEntityGroupPolicyRule {
/** Class logger. */
- @Nonnull private final Logger log = LoggerFactory.getLogger(AttributeIssuerInEntityGroupPolicyRule.class);
+ @Nonnull private final Logger log = LoggerFactory.getLogger(IssuerInEntityGroupPolicyRule.class);
/**
* Gets the entity descriptor for the entity to check.
diff --git a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeIssuerNameIDFormatExactPolicyRule.java b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/IssuerNameIDFormatExactPolicyRule.java
similarity index 94%
rename from idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeIssuerNameIDFormatExactPolicyRule.java
rename to idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/IssuerNameIDFormatExactPolicyRule.java
index e79e41936..690b85404 100644
--- a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeIssuerNameIDFormatExactPolicyRule.java
+++ b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/IssuerNameIDFormatExactPolicyRule.java
@@ -29,10 +29,10 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/** Checks if the attribute issuer supports the required NameID format. */
-public class AttributeIssuerNameIDFormatExactPolicyRule extends AbstractNameIDFormatExactPolicyRule {
+public class IssuerNameIDFormatExactPolicyRule extends AbstractNameIDFormatExactPolicyRule {
/** Class logger. */
- @Nonnull private final Logger log = LoggerFactory.getLogger(AttributeIssuerNameIDFormatExactPolicyRule.class);
+ @Nonnull private final Logger log = LoggerFactory.getLogger(IssuerNameIDFormatExactPolicyRule.class);
/**
* Gets the SSO role descriptor for the entity to be checked.
diff --git a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeIssuerRegistrationAuthorityPolicyRule.java b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/IssuerRegistrationAuthorityPolicyRule.java
similarity index 94%
rename from idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeIssuerRegistrationAuthorityPolicyRule.java
rename to idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/IssuerRegistrationAuthorityPolicyRule.java
index 1bcce8685..68da3618f 100644
--- a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeIssuerRegistrationAuthorityPolicyRule.java
+++ b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/IssuerRegistrationAuthorityPolicyRule.java
@@ -28,7 +28,7 @@ import org.opensaml.saml.saml2.metadata.EntityDescriptor;
/**
* Rule based on RPI extension in attribute issuer's metadata.
*/
-public class AttributeIssuerRegistrationAuthorityPolicyRule extends AbstractRegistrationAuthorityPolicyRule {
+public class IssuerRegistrationAuthorityPolicyRule extends AbstractRegistrationAuthorityPolicyRule {
/** {@inheritDoc} */
@Override
diff --git a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeRequesterEntityAttributeRegexPolicyRule.java b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/ProxiedRequesterEntityAttributeExactPolicyRule.java
similarity index 83%
copy from idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeRequesterEntityAttributeRegexPolicyRule.java
copy to idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/ProxiedRequesterEntityAttributeExactPolicyRule.java
index c1f30cd31..af11bc2cc 100644
--- a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeRequesterEntityAttributeRegexPolicyRule.java
+++ b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/ProxiedRequesterEntityAttributeExactPolicyRule.java
@@ -26,14 +26,17 @@ import org.opensaml.saml.common.messaging.context.SAMLMetadataContext;
import org.opensaml.saml.saml2.metadata.EntityDescriptor;
/**
- * Matcher that checks, via regex, if the attribute requester contains an entity attribute with a given value.
+ * Matcher that checks, via an exact match, if the proxied requester's metadata
+ * contains an entity attribute with a given value.
+ *
+ * @since 4.2.0
*/
-public class AttributeRequesterEntityAttributeRegexPolicyRule extends AbstractEntityAttributeRegexPolicyRule {
+public class ProxiedRequesterEntityAttributeExactPolicyRule extends AbstractEntityAttributeExactPolicyRule {
/** {@inheritDoc} */
@Override
@Nullable protected EntityDescriptor getEntityMetadata(@Nonnull final AttributeFilterContext filterContext) {
- final SAMLMetadataContext metadataContext = filterContext.getRequesterMetadataContext();
+ final SAMLMetadataContext metadataContext = filterContext.getProxiedRequesterMetadataContext();
return metadataContext != null ? metadataContext.getEntityDescriptor() : null;
}
diff --git a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeRequesterEntityAttributeRegexPolicyRule.java b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/ProxiedRequesterEntityAttributeRegexPolicyRule.java
similarity index 84%
copy from idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeRequesterEntityAttributeRegexPolicyRule.java
copy to idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/ProxiedRequesterEntityAttributeRegexPolicyRule.java
index c1f30cd31..57ff67c9b 100644
--- a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeRequesterEntityAttributeRegexPolicyRule.java
+++ b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/ProxiedRequesterEntityAttributeRegexPolicyRule.java
@@ -26,14 +26,15 @@ import org.opensaml.saml.common.messaging.context.SAMLMetadataContext;
import org.opensaml.saml.saml2.metadata.EntityDescriptor;
/**
- * Matcher that checks, via regex, if the attribute requester contains an entity attribute with a given value.
+ * Matcher that checks, via regex, if the proxied attribute requester's metadata
+ * contains an entity attribute with a given value.
*/
-public class AttributeRequesterEntityAttributeRegexPolicyRule extends AbstractEntityAttributeRegexPolicyRule {
+public class ProxiedRequesterEntityAttributeRegexPolicyRule extends AbstractEntityAttributeRegexPolicyRule {
/** {@inheritDoc} */
@Override
@Nullable protected EntityDescriptor getEntityMetadata(@Nonnull final AttributeFilterContext filterContext) {
- final SAMLMetadataContext metadataContext = filterContext.getRequesterMetadataContext();
+ final SAMLMetadataContext metadataContext = filterContext.getProxiedRequesterMetadataContext();
return metadataContext != null ? metadataContext.getEntityDescriptor() : null;
}
diff --git a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeRequesterRegistrationAuthorityPolicyRule.java b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/ProxiedRequesterInEntityGroupPolicyRule.java
similarity index 63%
rename from idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeRequesterRegistrationAuthorityPolicyRule.java
rename to idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/ProxiedRequesterInEntityGroupPolicyRule.java
index 96e79a3e1..67b67e767 100644
--- a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeRequesterRegistrationAuthorityPolicyRule.java
+++ b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/ProxiedRequesterInEntityGroupPolicyRule.java
@@ -24,26 +24,33 @@ import net.shibboleth.idp.attribute.filter.context.AttributeFilterContext;
import org.opensaml.saml.common.messaging.context.SAMLMetadataContext;
import org.opensaml.saml.saml2.metadata.EntityDescriptor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
- * Rule based on RPI extension in attribute requester's metadata.
+ * A matcher that evaluates to true if proxied requester's metadata matches the provided entity group name,
+ * or a valid metadata-sourced affiliation of entities.
*/
-public class AttributeRequesterRegistrationAuthorityPolicyRule extends AbstractRegistrationAuthorityPolicyRule {
-
- /** {@inheritDoc} */
- @Override
+public class ProxiedRequesterInEntityGroupPolicyRule extends AbstractEntityGroupPolicyRule {
+
+ /** Class logger. */
+ @Nonnull private final Logger log = LoggerFactory.getLogger(ProxiedRequesterInEntityGroupPolicyRule.class);
+
+ /**
+ * Gets the entity descriptor for the entity to check.
+ *
+ * @param filterContext current filter request context
+ *
+ * @return entity descriptor for the entity to check
+ */
@Nullable protected EntityDescriptor getEntityMetadata(@Nonnull final AttributeFilterContext filterContext) {
- final SAMLMetadataContext metadataContext = filterContext.getRequesterMetadataContext();
- if (null == metadataContext) {
- return null;
- }
+ final SAMLMetadataContext metadataContext = filterContext.getProxiedRequesterMetadataContext();
- final EntityDescriptor spEntity = metadataContext.getEntityDescriptor();
- if (null == spEntity) {
+ if (null == metadataContext) {
+ log.debug("{} No proxied requester metadata found", getLogPrefix());
return null;
}
-
- return spEntity;
+ return metadataContext.getEntityDescriptor();
}
}
\ No newline at end of file
diff --git a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeIssuerEntityAttributeRegexPolicyRule.java b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/ProxiedRequesterRegistrationAuthorityPolicyRule.java
similarity index 85%
rename from idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeIssuerEntityAttributeRegexPolicyRule.java
rename to idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/ProxiedRequesterRegistrationAuthorityPolicyRule.java
index 38bd342a0..472bd1dd2 100644
--- a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeIssuerEntityAttributeRegexPolicyRule.java
+++ b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/ProxiedRequesterRegistrationAuthorityPolicyRule.java
@@ -26,14 +26,14 @@ import org.opensaml.saml.common.messaging.context.SAMLMetadataContext;
import org.opensaml.saml.saml2.metadata.EntityDescriptor;
/**
- * Matcher that checks, via regex, if the attribute issuer contains an entity attribute with a given value.
+ * Rule based on RPI extension in proxied requester's metadata.
*/
-public class AttributeIssuerEntityAttributeRegexPolicyRule extends AbstractEntityAttributeRegexPolicyRule {
+public class ProxiedRequesterRegistrationAuthorityPolicyRule extends AbstractRegistrationAuthorityPolicyRule {
/** {@inheritDoc} */
@Override
@Nullable protected EntityDescriptor getEntityMetadata(@Nonnull final AttributeFilterContext filterContext) {
- final SAMLMetadataContext metadataContext = filterContext.getIssuerMetadataContext();
+ final SAMLMetadataContext metadataContext = filterContext.getProxiedRequesterMetadataContext();
return metadataContext != null ? metadataContext.getEntityDescriptor() : null;
}
diff --git a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeRequesterEntityAttributeExactPolicyRule.java b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/RequesterEntityAttributeExactPolicyRule.java
similarity index 90%
rename from idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeRequesterEntityAttributeExactPolicyRule.java
rename to idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/RequesterEntityAttributeExactPolicyRule.java
index 262f26cd0..3daeefcdd 100644
--- a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeRequesterEntityAttributeExactPolicyRule.java
+++ b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/RequesterEntityAttributeExactPolicyRule.java
@@ -26,9 +26,10 @@ import org.opensaml.saml.common.messaging.context.SAMLMetadataContext;
import org.opensaml.saml.saml2.metadata.EntityDescriptor;
/**
- * Matcher that checks, via an exact match, if the attribute requester contains an entity attribute with a given value.
+ * Matcher that checks, via an exact match, if the attribute requester's metadata
+ * contains an entity attribute with a given value.
*/
-public class AttributeRequesterEntityAttributeExactPolicyRule extends AbstractEntityAttributeExactPolicyRule {
+public class RequesterEntityAttributeExactPolicyRule extends AbstractEntityAttributeExactPolicyRule {
/** {@inheritDoc} */
@Override
diff --git a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeRequesterEntityAttributeRegexPolicyRule.java b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/RequesterEntityAttributeRegexPolicyRule.java
similarity index 87%
copy from idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeRequesterEntityAttributeRegexPolicyRule.java
copy to idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/RequesterEntityAttributeRegexPolicyRule.java
index c1f30cd31..ee3e30773 100644
--- a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeRequesterEntityAttributeRegexPolicyRule.java
+++ b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/RequesterEntityAttributeRegexPolicyRule.java
@@ -26,9 +26,10 @@ import org.opensaml.saml.common.messaging.context.SAMLMetadataContext;
import org.opensaml.saml.saml2.metadata.EntityDescriptor;
/**
- * Matcher that checks, via regex, if the attribute requester contains an entity attribute with a given value.
+ * Matcher that checks, via regex, if the attribute requester's metadata
+ * contains an entity attribute with a given value.
*/
-public class AttributeRequesterEntityAttributeRegexPolicyRule extends AbstractEntityAttributeRegexPolicyRule {
+public class RequesterEntityAttributeRegexPolicyRule extends AbstractEntityAttributeRegexPolicyRule {
/** {@inheritDoc} */
@Override
diff --git a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeRequesterInEntityGroupPolicyRule.java b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/RequesterInEntityGroupPolicyRule.java
similarity index 93%
rename from idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeRequesterInEntityGroupPolicyRule.java
rename to idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/RequesterInEntityGroupPolicyRule.java
index cfb8c4aca..3d077255a 100644
--- a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeRequesterInEntityGroupPolicyRule.java
+++ b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/RequesterInEntityGroupPolicyRule.java
@@ -31,10 +31,10 @@ import org.slf4j.LoggerFactory;
* A matcher that evaluates to true if attribute requester's metadata matches the provided entity group name,
* or a valid metadata-sourced affiliation of entities.
*/
-public class AttributeRequesterInEntityGroupPolicyRule extends AbstractEntityGroupPolicyRule {
+public class RequesterInEntityGroupPolicyRule extends AbstractEntityGroupPolicyRule {
/** Class logger. */
- @Nonnull private final Logger log = LoggerFactory.getLogger(AttributeRequesterInEntityGroupPolicyRule.class);
+ @Nonnull private final Logger log = LoggerFactory.getLogger(RequesterInEntityGroupPolicyRule.class);
/**
* Gets the entity descriptor for the entity to check.
diff --git a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeRequesterNameIDFormatExactPolicyRule.java b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/RequesterNameIDFormatExactPolicyRule.java
similarity index 94%
rename from idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeRequesterNameIDFormatExactPolicyRule.java
rename to idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/RequesterNameIDFormatExactPolicyRule.java
index 1b352cfdd..d505f260e 100644
--- a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeRequesterNameIDFormatExactPolicyRule.java
+++ b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/RequesterNameIDFormatExactPolicyRule.java
@@ -29,10 +29,10 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/** Checks if the attribute requester supports the required NameID format. */
-public class AttributeRequesterNameIDFormatExactPolicyRule extends AbstractNameIDFormatExactPolicyRule {
+public class RequesterNameIDFormatExactPolicyRule extends AbstractNameIDFormatExactPolicyRule {
/** Class logger. */
- @Nonnull private final Logger log = LoggerFactory.getLogger(AttributeRequesterNameIDFormatExactPolicyRule.class);
+ @Nonnull private final Logger log = LoggerFactory.getLogger(RequesterNameIDFormatExactPolicyRule.class);
/**
* Gets the SSO role descriptor for the entity to be checked.
diff --git a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeRequesterEntityAttributeRegexPolicyRule.java b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/RequesterRegistrationAuthorityPolicyRule.java
similarity index 87%
rename from idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeRequesterEntityAttributeRegexPolicyRule.java
rename to idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/RequesterRegistrationAuthorityPolicyRule.java
index c1f30cd31..97f3687a0 100644
--- a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeRequesterEntityAttributeRegexPolicyRule.java
+++ b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/RequesterRegistrationAuthorityPolicyRule.java
@@ -26,9 +26,9 @@ import org.opensaml.saml.common.messaging.context.SAMLMetadataContext;
import org.opensaml.saml.saml2.metadata.EntityDescriptor;
/**
- * Matcher that checks, via regex, if the attribute requester contains an entity attribute with a given value.
+ * Rule based on RPI extension in attribute requester's metadata.
*/
-public class AttributeRequesterEntityAttributeRegexPolicyRule extends AbstractEntityAttributeRegexPolicyRule {
+public class RequesterRegistrationAuthorityPolicyRule extends AbstractRegistrationAuthorityPolicyRule {
/** {@inheritDoc} */
@Override
diff --git a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeIssuerEntityAttributeExactPolicyRuleTest.java b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/IssuerEntityAttributeExactPolicyRuleTest.java
similarity index 86%
rename from idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeIssuerEntityAttributeExactPolicyRuleTest.java
rename to idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/IssuerEntityAttributeExactPolicyRuleTest.java
index 078c47f21..85b317f7b 100644
--- a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeIssuerEntityAttributeExactPolicyRuleTest.java
+++ b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/IssuerEntityAttributeExactPolicyRuleTest.java
@@ -26,18 +26,18 @@ import net.shibboleth.idp.attribute.filter.matcher.impl.DataSources;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
/**
- * test for {@link AttributeIssuerEntityAttributeExactPolicyRule}.
+ * test for {@link IssuerEntityAttributeExactPolicyRule}.
*/
@SuppressWarnings("javadoc")
-public class AttributeIssuerEntityAttributeExactPolicyRuleTest extends BaseMetadataTests {
+public class IssuerEntityAttributeExactPolicyRuleTest extends BaseMetadataTests {
- private AttributeIssuerEntityAttributeExactPolicyRule getMatcher() throws ComponentInitializationException {
+ private IssuerEntityAttributeExactPolicyRule getMatcher() throws ComponentInitializationException {
return getMatcher("urn:example.org:policies", "urn:example.org:policy:1234", null, false);
}
- private AttributeIssuerEntityAttributeExactPolicyRule getMatcher(String attributeName, String attributeValue,
+ private IssuerEntityAttributeExactPolicyRule getMatcher(String attributeName, String attributeValue,
String attributeNameFormat, boolean ignoreUnmapped) throws ComponentInitializationException {
- AttributeIssuerEntityAttributeExactPolicyRule matcher = new AttributeIssuerEntityAttributeExactPolicyRule();
+ IssuerEntityAttributeExactPolicyRule matcher = new IssuerEntityAttributeExactPolicyRule();
matcher.setId("matcher");
matcher.setAttributeName(attributeName);
matcher.setValue(attributeValue);
@@ -49,7 +49,7 @@ public class AttributeIssuerEntityAttributeExactPolicyRuleTest extends BaseMetad
@Test public void testValue() throws ComponentInitializationException {
- AttributeIssuerEntityAttributeExactPolicyRule matcher = getMatcher();
+ IssuerEntityAttributeExactPolicyRule matcher = getMatcher();
assertEquals(matcher.matches(issMetadataContext(idpEntity, "Principal")), Tristate.TRUE);
assertEquals(matcher.matches(issMetadataContext(jiraEntity, "Principal")), Tristate.FALSE);
@@ -57,7 +57,7 @@ public class AttributeIssuerEntityAttributeExactPolicyRuleTest extends BaseMetad
@Test public void testFormat() throws ComponentInitializationException {
- AttributeIssuerEntityAttributeExactPolicyRule matcher =
+ IssuerEntityAttributeExactPolicyRule matcher =
getMatcher("urn:example.org:entitlements", "urn:example.org:entitlements:1234", null, true);
assertEquals(matcher.getValue(), "urn:example.org:entitlements:1234");
assertEquals(matcher.matches(issMetadataContext(idpEntity, "Principal")), Tristate.TRUE);
@@ -79,7 +79,7 @@ public class AttributeIssuerEntityAttributeExactPolicyRuleTest extends BaseMetad
@Test public void testNoMatch() throws ComponentInitializationException {
- AttributeIssuerEntityAttributeExactPolicyRule matcher =
+ IssuerEntityAttributeExactPolicyRule matcher =
getMatcher("urn:example.org:policies", "urn:example.org:policy:1235", null, false);
assertEquals(matcher.matches(issMetadataContext(idpEntity, "Principal")), Tristate.FALSE);
assertEquals(matcher.matches(issMetadataContext(jiraEntity, "Principal")), Tristate.FALSE);
@@ -91,7 +91,7 @@ public class AttributeIssuerEntityAttributeExactPolicyRuleTest extends BaseMetad
@Test public void testSplitAttribute() throws ComponentInitializationException {
- AttributeIssuerEntityAttributeExactPolicyRule matcher =
+ IssuerEntityAttributeExactPolicyRule matcher =
getMatcher("urn:example.org:policies", "urn:example.org:policy:1234", null, false);
assertEquals(matcher.matches(issMetadataContext(idpEntity, "Principal")), Tristate.TRUE);
assertEquals(matcher.matches(issMetadataContext(jiraEntity, "Principal")), Tristate.FALSE);
diff --git a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeIssuerEntityAttributeRegexPolicyRuleTest.java b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/IssuerEntityAttributeRegexPolicyRuleTest.java
similarity index 78%
rename from idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeIssuerEntityAttributeRegexPolicyRuleTest.java
rename to idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/IssuerEntityAttributeRegexPolicyRuleTest.java
index b6fe43f90..1274eb04c 100644
--- a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeIssuerEntityAttributeRegexPolicyRuleTest.java
+++ b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/IssuerEntityAttributeRegexPolicyRuleTest.java
@@ -27,19 +27,19 @@ import net.shibboleth.idp.attribute.filter.PolicyRequirementRule.Tristate;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
/**
- * test for {@link AttributeIssuerEntityAttributeRegexPolicyRule}.
+ * test for {@link IssuerEntityAttributeRegexPolicyRule}.
*/
@SuppressWarnings("javadoc")
-public class AttributeIssuerEntityAttributeRegexPolicyRuleTest extends BaseMetadataTests {
+public class IssuerEntityAttributeRegexPolicyRuleTest extends BaseMetadataTests {
- private AttributeIssuerEntityAttributeRegexPolicyRule getMatcher() throws ComponentInitializationException {
+ private IssuerEntityAttributeRegexPolicyRule getMatcher() throws ComponentInitializationException {
Pattern pattern = Pattern.compile("urn\\:example.org\\:policy\\:56.*");
return getMatcher("urn:example.org:policies", pattern, null);
}
- private AttributeIssuerEntityAttributeRegexPolicyRule getMatcher(String attributeName, Pattern attributeValuePattern,
+ private IssuerEntityAttributeRegexPolicyRule getMatcher(String attributeName, Pattern attributeValuePattern,
String attributeNameFormat) throws ComponentInitializationException {
- AttributeIssuerEntityAttributeRegexPolicyRule matcher = new AttributeIssuerEntityAttributeRegexPolicyRule();
+ IssuerEntityAttributeRegexPolicyRule matcher = new IssuerEntityAttributeRegexPolicyRule();
matcher.setId("matcher");
matcher.setAttributeName(attributeName);
matcher.setValueRegex(attributeValuePattern);
@@ -50,7 +50,7 @@ public class AttributeIssuerEntityAttributeRegexPolicyRuleTest extends BaseMeta
@Test public void simple() throws ComponentInitializationException {
- AttributeIssuerEntityAttributeRegexPolicyRule matcher = getMatcher();
+ IssuerEntityAttributeRegexPolicyRule matcher = getMatcher();
assertEquals(matcher.matches(issMetadataContext(idpEntity, "Principal")), Tristate.TRUE);
assertEquals(matcher.matches(issMetadataContext(jiraEntity, "Principal")), Tristate.FALSE);
diff --git a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeIssuerInEntityGroupPolicyRuleTest.java b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/IssuerInEntityGroupPolicyRuleTest.java
similarity index 79%
rename from idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeIssuerInEntityGroupPolicyRuleTest.java
rename to idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/IssuerInEntityGroupPolicyRuleTest.java
index a59b74532..658278cc7 100644
--- a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeIssuerInEntityGroupPolicyRuleTest.java
+++ b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/IssuerInEntityGroupPolicyRuleTest.java
@@ -25,13 +25,13 @@ import net.shibboleth.idp.attribute.filter.PolicyRequirementRule.Tristate;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
/**
- * test for {@link AttributeIssuerInEntityGroupPolicyRule}.
+ * test for {@link IssuerInEntityGroupPolicyRule}.
*/
@SuppressWarnings("javadoc")
-public class AttributeIssuerInEntityGroupPolicyRuleTest extends BaseMetadataTests {
+public class IssuerInEntityGroupPolicyRuleTest extends BaseMetadataTests {
- private AttributeIssuerInEntityGroupPolicyRule getMatcher(String group) throws ComponentInitializationException {
- AttributeIssuerInEntityGroupPolicyRule matcher = new AttributeIssuerInEntityGroupPolicyRule();
+ private IssuerInEntityGroupPolicyRule getMatcher(String group) throws ComponentInitializationException {
+ IssuerInEntityGroupPolicyRule matcher = new IssuerInEntityGroupPolicyRule();
matcher.setId("matcher");
matcher.setEntityGroup(group);
matcher.initialize();
@@ -40,7 +40,7 @@ public class AttributeIssuerInEntityGroupPolicyRuleTest extends BaseMetadataTest
@Test public void parent() throws ComponentInitializationException {
- AttributeIssuerInEntityGroupPolicyRule matcher = getMatcher("http://shibboleth.net");
+ IssuerInEntityGroupPolicyRule matcher = getMatcher("http://shibboleth.net");
assertEquals(matcher.matches(issMetadataContext(jiraEntity, "Principal")), Tristate.TRUE);
assertEquals(matcher.matches(issMetadataContext(null, null)), Tristate.FALSE);
@@ -55,7 +55,7 @@ public class AttributeIssuerInEntityGroupPolicyRuleTest extends BaseMetadataTest
@Test(expectedExceptions=ComponentInitializationException.class)
public void noGroup() throws ComponentInitializationException {
- AttributeIssuerInEntityGroupPolicyRule matcher = new AttributeIssuerInEntityGroupPolicyRule();
+ IssuerInEntityGroupPolicyRule matcher = new IssuerInEntityGroupPolicyRule();
matcher.setId("matcher");
matcher.initialize();
}
diff --git a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeIssuerNameIDFormatExactPolicyRuleTest.java b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/IssuerNameIDFormatExactPolicyRuleTest.java
similarity index 78%
rename from idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeIssuerNameIDFormatExactPolicyRuleTest.java
rename to idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/IssuerNameIDFormatExactPolicyRuleTest.java
index 763e6d293..714471327 100644
--- a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeIssuerNameIDFormatExactPolicyRuleTest.java
+++ b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/IssuerNameIDFormatExactPolicyRuleTest.java
@@ -25,13 +25,13 @@ import net.shibboleth.idp.attribute.filter.PolicyRequirementRule.Tristate;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
/**
- * test for {@link AttributeIssuerNameIDFormatExactPolicyRule}.
+ * test for {@link IssuerNameIDFormatExactPolicyRule}.
*/
@SuppressWarnings("javadoc")
-public class AttributeIssuerNameIDFormatExactPolicyRuleTest extends BaseMetadataTests {
+public class IssuerNameIDFormatExactPolicyRuleTest extends BaseMetadataTests {
- private AttributeIssuerNameIDFormatExactPolicyRule getMatcher(String format) throws ComponentInitializationException {
- AttributeIssuerNameIDFormatExactPolicyRule matcher = new AttributeIssuerNameIDFormatExactPolicyRule();
+ private IssuerNameIDFormatExactPolicyRule getMatcher(String format) throws ComponentInitializationException {
+ IssuerNameIDFormatExactPolicyRule matcher = new IssuerNameIDFormatExactPolicyRule();
matcher.setId("matcher");
matcher.setNameIdFormat(format);
matcher.initialize();
@@ -40,7 +40,7 @@ public class AttributeIssuerNameIDFormatExactPolicyRuleTest extends BaseMetadata
@Test public void simple() throws ComponentInitializationException {
- AttributeIssuerNameIDFormatExactPolicyRule matcher = getMatcher("https://example.org/foo");
+ IssuerNameIDFormatExactPolicyRule matcher = getMatcher("https://example.org/foo");
assertEquals(matcher.getNameIdFormat(), "https://example.org/foo");
diff --git a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeIssuerRegistrationAuthorityTest.java b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/IssuerRegistrationAuthorityTest.java
similarity index 87%
rename from idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeIssuerRegistrationAuthorityTest.java
rename to idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/IssuerRegistrationAuthorityTest.java
index 9d3dc7f3d..52ff902b5 100644
--- a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeIssuerRegistrationAuthorityTest.java
+++ b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/IssuerRegistrationAuthorityTest.java
@@ -30,9 +30,9 @@ import org.testng.annotations.Test;
import net.shibboleth.idp.attribute.filter.PolicyRequirementRule.Tristate;
import net.shibboleth.idp.attribute.filter.context.AttributeFilterContext;
-/** {@link AttributeIssuerRegistrationAuthorityPolicyRule} unit test. */
+/** {@link IssuerRegistrationAuthorityPolicyRule} unit test. */
@SuppressWarnings("javadoc")
-public class AttributeIssuerRegistrationAuthorityTest extends BaseMetadataTests {
+public class IssuerRegistrationAuthorityTest extends BaseMetadataTests {
private static final String REQUESTED_REG_INFO = "http://www.swamid.se/";
@@ -63,7 +63,7 @@ public class AttributeIssuerRegistrationAuthorityTest extends BaseMetadataTests
@Test public void swamid() throws Exception {
AttributeFilterContext context = issMetadataContext(getEntity(SWAMID), "principal");
- final AttributeIssuerRegistrationAuthorityPolicyRule filter = new AttributeIssuerRegistrationAuthorityPolicyRule();
+ final IssuerRegistrationAuthorityPolicyRule filter = new IssuerRegistrationAuthorityPolicyRule();
String[] array = {REQUESTED_REG_INFO, "foo",};
filter.setRegistrars(Arrays.asList(array));
@@ -75,7 +75,7 @@ public class AttributeIssuerRegistrationAuthorityTest extends BaseMetadataTests
@Test public void ligo() {
AttributeFilterContext context = issMetadataContext(getEntity(INCOMMON_SP), "principal");
- final AttributeIssuerRegistrationAuthorityPolicyRule filter = new AttributeIssuerRegistrationAuthorityPolicyRule();
+ final IssuerRegistrationAuthorityPolicyRule filter = new IssuerRegistrationAuthorityPolicyRule();
String[] array = {REQUESTED_REG_INFO, "foo",};
filter.setRegistrars(Arrays.asList(array));
@@ -87,7 +87,7 @@ public class AttributeIssuerRegistrationAuthorityTest extends BaseMetadataTests
@Test public void none() {
AttributeFilterContext context = issMetadataContext(getEntity(NO_REGINFO_SP), "principal");
- final AttributeIssuerRegistrationAuthorityPolicyRule filter = new AttributeIssuerRegistrationAuthorityPolicyRule();
+ final IssuerRegistrationAuthorityPolicyRule filter = new IssuerRegistrationAuthorityPolicyRule();
String[] array = {REQUESTED_REG_INFO, INCOMMON_REG_INFO, "foo",};
filter.setRegistrars(Arrays.asList(array));
diff --git a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeRequesterEntityAttributeExactPolicyRuleTest.java b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/RequesterEntityAttributeExactPolicyRuleTest.java
similarity index 86%
rename from idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeRequesterEntityAttributeExactPolicyRuleTest.java
rename to idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/RequesterEntityAttributeExactPolicyRuleTest.java
index b17149600..f46d0b9ba 100644
--- a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeRequesterEntityAttributeExactPolicyRuleTest.java
+++ b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/RequesterEntityAttributeExactPolicyRuleTest.java
@@ -26,18 +26,18 @@ import net.shibboleth.idp.attribute.filter.matcher.impl.DataSources;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
/**
- * test for {@link AttributeRequesterEntityAttributeExactPolicyRule}.
+ * test for {@link RequesterEntityAttributeExactPolicyRule}.
*/
@SuppressWarnings("javadoc")
-public class AttributeRequesterEntityAttributeExactPolicyRuleTest extends BaseMetadataTests {
+public class RequesterEntityAttributeExactPolicyRuleTest extends BaseMetadataTests {
- private AttributeRequesterEntityAttributeExactPolicyRule getMatcher() throws ComponentInitializationException {
+ private RequesterEntityAttributeExactPolicyRule getMatcher() throws ComponentInitializationException {
return getMatcher("urn:example.org:policies", "urn:example.org:policy:1234", null, false);
}
- private AttributeRequesterEntityAttributeExactPolicyRule getMatcher(String attributeName, String attributeValue,
+ private RequesterEntityAttributeExactPolicyRule getMatcher(String attributeName, String attributeValue,
String attributeNameFormat, boolean ignoreUnmapped) throws ComponentInitializationException {
- AttributeRequesterEntityAttributeExactPolicyRule matcher = new AttributeRequesterEntityAttributeExactPolicyRule();
+ RequesterEntityAttributeExactPolicyRule matcher = new RequesterEntityAttributeExactPolicyRule();
matcher.setId("matcher");
matcher.setAttributeName(attributeName);
matcher.setValue(attributeValue);
@@ -49,7 +49,7 @@ public class AttributeRequesterEntityAttributeExactPolicyRuleTest extends BaseMe
@Test public void testValue() throws ComponentInitializationException {
- AttributeRequesterEntityAttributeExactPolicyRule matcher = getMatcher();
+ RequesterEntityAttributeExactPolicyRule matcher = getMatcher();
assertEquals(matcher.matches(reqMetadataContext(idpEntity, "Principal")), Tristate.TRUE);
assertEquals(matcher.matches(reqMetadataContext(jiraEntity, "Principal")), Tristate.FALSE);
@@ -57,7 +57,7 @@ public class AttributeRequesterEntityAttributeExactPolicyRuleTest extends BaseMe
@Test public void testFormat() throws ComponentInitializationException {
- AttributeRequesterEntityAttributeExactPolicyRule matcher =
+ RequesterEntityAttributeExactPolicyRule matcher =
getMatcher("urn:example.org:entitlements", "urn:example.org:entitlements:1234", null, true);
assertEquals(matcher.getValue(), "urn:example.org:entitlements:1234");
assertEquals(matcher.matches(reqMetadataContext(idpEntity, "Principal")), Tristate.TRUE);
@@ -79,7 +79,7 @@ public class AttributeRequesterEntityAttributeExactPolicyRuleTest extends BaseMe
@Test public void testNoMatch() throws ComponentInitializationException {
- AttributeRequesterEntityAttributeExactPolicyRule matcher =
+ RequesterEntityAttributeExactPolicyRule matcher =
getMatcher("urn:example.org:policies", "urn:example.org:policy:1235", null, false);
assertEquals(matcher.matches(reqMetadataContext(idpEntity, "Principal")), Tristate.FALSE);
assertEquals(matcher.matches(reqMetadataContext(jiraEntity, "Principal")), Tristate.FALSE);
@@ -91,7 +91,7 @@ public class AttributeRequesterEntityAttributeExactPolicyRuleTest extends BaseMe
@Test public void testSplitAttribute() throws ComponentInitializationException {
- AttributeRequesterEntityAttributeExactPolicyRule matcher =
+ RequesterEntityAttributeExactPolicyRule matcher =
getMatcher("urn:example.org:policies", "urn:example.org:policy:1234", null, false);
assertEquals(matcher.matches(reqMetadataContext(idpEntity, "Principal")), Tristate.TRUE);
assertEquals(matcher.matches(reqMetadataContext(jiraEntity, "Principal")), Tristate.FALSE);
diff --git a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeRequesterEntityAttributeRegexPolicyRuleTest.java b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/RequesterEntityAttributeRegexPolicyRuleTest.java
similarity index 78%
rename from idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeRequesterEntityAttributeRegexPolicyRuleTest.java
rename to idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/RequesterEntityAttributeRegexPolicyRuleTest.java
index fbda06421..12aeec912 100644
--- a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeRequesterEntityAttributeRegexPolicyRuleTest.java
+++ b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/RequesterEntityAttributeRegexPolicyRuleTest.java
@@ -27,19 +27,19 @@ import net.shibboleth.idp.attribute.filter.PolicyRequirementRule.Tristate;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
/**
- * test for {@link AttributeRequesterEntityAttributeRegexPolicyRule}.
+ * test for {@link RequesterEntityAttributeRegexPolicyRule}.
*/
@SuppressWarnings("javadoc")
-public class AttributeRequesterEntityAttributeRegexPolicyRuleTest extends BaseMetadataTests {
+public class RequesterEntityAttributeRegexPolicyRuleTest extends BaseMetadataTests {
- private AttributeRequesterEntityAttributeRegexPolicyRule getMatcher() throws ComponentInitializationException {
+ private RequesterEntityAttributeRegexPolicyRule getMatcher() throws ComponentInitializationException {
Pattern pattern = Pattern.compile("urn\\:example.org\\:policy\\:56.*");
return getMatcher("urn:example.org:policies", pattern, null);
}
- private AttributeRequesterEntityAttributeRegexPolicyRule getMatcher(String attributeName, Pattern attributeValuePattern,
+ private RequesterEntityAttributeRegexPolicyRule getMatcher(String attributeName, Pattern attributeValuePattern,
String attributeNameFormat) throws ComponentInitializationException {
- AttributeRequesterEntityAttributeRegexPolicyRule matcher = new AttributeRequesterEntityAttributeRegexPolicyRule();
+ RequesterEntityAttributeRegexPolicyRule matcher = new RequesterEntityAttributeRegexPolicyRule();
matcher.setId("matcher");
matcher.setAttributeName(attributeName);
matcher.setValueRegex(attributeValuePattern);
@@ -50,7 +50,7 @@ public class AttributeRequesterEntityAttributeRegexPolicyRuleTest extends BaseM
@Test public void simple() throws ComponentInitializationException {
- AttributeRequesterEntityAttributeRegexPolicyRule matcher = getMatcher();
+ RequesterEntityAttributeRegexPolicyRule matcher = getMatcher();
assertEquals(matcher.matches(reqMetadataContext(idpEntity, "Principal")), Tristate.TRUE);
assertEquals(matcher.matches(reqMetadataContext(jiraEntity, "Principal")), Tristate.FALSE);
diff --git a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeRequesterInEntityGroupPolicyRuleTest.java b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/RequesterInEntityGroupPolicyRuleTest.java
similarity index 78%
rename from idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeRequesterInEntityGroupPolicyRuleTest.java
rename to idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/RequesterInEntityGroupPolicyRuleTest.java
index 237f4a1e1..c0f04868f 100644
--- a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeRequesterInEntityGroupPolicyRuleTest.java
+++ b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/RequesterInEntityGroupPolicyRuleTest.java
@@ -25,13 +25,13 @@ import net.shibboleth.idp.attribute.filter.PolicyRequirementRule.Tristate;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
/**
- * test for {@link AttributeRequesterInEntityGroupPolicyRule}.
+ * test for {@link RequesterInEntityGroupPolicyRule}.
*/
@SuppressWarnings("javadoc")
-public class AttributeRequesterInEntityGroupPolicyRuleTest extends BaseMetadataTests {
+public class RequesterInEntityGroupPolicyRuleTest extends BaseMetadataTests {
- private AttributeRequesterInEntityGroupPolicyRule getMatcher(String group) throws ComponentInitializationException {
- AttributeRequesterInEntityGroupPolicyRule matcher = new AttributeRequesterInEntityGroupPolicyRule();
+ private RequesterInEntityGroupPolicyRule getMatcher(String group) throws ComponentInitializationException {
+ RequesterInEntityGroupPolicyRule matcher = new RequesterInEntityGroupPolicyRule();
matcher.setId("matcher");
matcher.setEntityGroup(group);
matcher.initialize();
@@ -40,7 +40,7 @@ public class AttributeRequesterInEntityGroupPolicyRuleTest extends BaseMetadataT
@Test public void parent() throws ComponentInitializationException {
- AttributeRequesterInEntityGroupPolicyRule matcher = getMatcher("http://shibboleth.net");
+ RequesterInEntityGroupPolicyRule matcher = getMatcher("http://shibboleth.net");
assertEquals(matcher.matches(reqMetadataContext(jiraEntity, "Principal")), Tristate.TRUE);
assertEquals(matcher.matches(reqMetadataContext(null, null)), Tristate.FALSE);
@@ -55,7 +55,7 @@ public class AttributeRequesterInEntityGroupPolicyRuleTest extends BaseMetadataT
@Test(expectedExceptions=ComponentInitializationException.class)
public void noGroup() throws ComponentInitializationException {
- AttributeRequesterInEntityGroupPolicyRule matcher = new AttributeRequesterInEntityGroupPolicyRule();
+ RequesterInEntityGroupPolicyRule matcher = new RequesterInEntityGroupPolicyRule();
matcher.setId("matcher");
matcher.initialize();
}
diff --git a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeRequesterNameIDFormatExactPolicyRuleTest.java b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/RequesterNameIDFormatExactPolicyRuleTest.java
similarity index 80%
rename from idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeRequesterNameIDFormatExactPolicyRuleTest.java
rename to idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/RequesterNameIDFormatExactPolicyRuleTest.java
index ab516a492..bf0335c0d 100644
--- a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeRequesterNameIDFormatExactPolicyRuleTest.java
+++ b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/RequesterNameIDFormatExactPolicyRuleTest.java
@@ -25,13 +25,13 @@ import net.shibboleth.idp.attribute.filter.PolicyRequirementRule.Tristate;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
/**
- * test for {@link AttributeRequesterNameIDFormatExactPolicyRule}.
+ * test for {@link RequesterNameIDFormatExactPolicyRule}.
*/
@SuppressWarnings("javadoc")
-public class AttributeRequesterNameIDFormatExactPolicyRuleTest extends BaseMetadataTests {
+public class RequesterNameIDFormatExactPolicyRuleTest extends BaseMetadataTests {
- private AttributeRequesterNameIDFormatExactPolicyRule getMatcher(String format) throws ComponentInitializationException {
- AttributeRequesterNameIDFormatExactPolicyRule matcher = new AttributeRequesterNameIDFormatExactPolicyRule();
+ private RequesterNameIDFormatExactPolicyRule getMatcher(String format) throws ComponentInitializationException {
+ RequesterNameIDFormatExactPolicyRule matcher = new RequesterNameIDFormatExactPolicyRule();
matcher.setId("matcher");
matcher.setNameIdFormat(format);
matcher.initialize();
@@ -40,7 +40,7 @@ public class AttributeRequesterNameIDFormatExactPolicyRuleTest extends BaseMetad
@Test public void simple() throws ComponentInitializationException {
- AttributeRequesterNameIDFormatExactPolicyRule matcher = getMatcher("https://example.org/foo");
+ RequesterNameIDFormatExactPolicyRule matcher = getMatcher("https://example.org/foo");
assertEquals(matcher.getNameIdFormat(), "https://example.org/foo");
diff --git a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeRequesterRegistrationAuthorityTest.java b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/RequesterRegistrationAuthorityTest.java
similarity index 87%
rename from idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeRequesterRegistrationAuthorityTest.java
rename to idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/RequesterRegistrationAuthorityTest.java
index 4a0d22155..a9e1772e2 100644
--- a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeRequesterRegistrationAuthorityTest.java
+++ b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/RequesterRegistrationAuthorityTest.java
@@ -30,9 +30,9 @@ import org.testng.annotations.Test;
import net.shibboleth.idp.attribute.filter.PolicyRequirementRule.Tristate;
import net.shibboleth.idp.attribute.filter.context.AttributeFilterContext;
-/** {@link AttributeRequesterRegistrationAuthorityPolicyRule} unit test. */
+/** {@link RequesterRegistrationAuthorityPolicyRule} unit test. */
@SuppressWarnings("javadoc")
-public class AttributeRequesterRegistrationAuthorityTest extends BaseMetadataTests {
+public class RequesterRegistrationAuthorityTest extends BaseMetadataTests {
private static final String REQUESTED_REG_INFO = "http://www.swamid.se/";
@@ -63,7 +63,7 @@ public class AttributeRequesterRegistrationAuthorityTest extends BaseMetadataTes
@Test public void swamid() throws Exception {
AttributeFilterContext context = reqMetadataContext(getEntity(SWAMID), "principal");
- final AttributeRequesterRegistrationAuthorityPolicyRule filter = new AttributeRequesterRegistrationAuthorityPolicyRule();
+ final RequesterRegistrationAuthorityPolicyRule filter = new RequesterRegistrationAuthorityPolicyRule();
String[] array = {REQUESTED_REG_INFO, "foo",};
filter.setRegistrars(Arrays.asList(array));
@@ -75,7 +75,7 @@ public class AttributeRequesterRegistrationAuthorityTest extends BaseMetadataTes
@Test public void ligo() {
AttributeFilterContext context = reqMetadataContext(getEntity(INCOMMON_SP), "principal");
- final AttributeRequesterRegistrationAuthorityPolicyRule filter = new AttributeRequesterRegistrationAuthorityPolicyRule();
+ final RequesterRegistrationAuthorityPolicyRule filter = new RequesterRegistrationAuthorityPolicyRule();
String[] array = {REQUESTED_REG_INFO, "foo",};
filter.setRegistrars(Arrays.asList(array));
@@ -87,7 +87,7 @@ public class AttributeRequesterRegistrationAuthorityTest extends BaseMetadataTes
@Test public void none() {
AttributeFilterContext context = reqMetadataContext(getEntity(NO_REGINFO_SP), "principal");
- final AttributeRequesterRegistrationAuthorityPolicyRule filter = new AttributeRequesterRegistrationAuthorityPolicyRule();
+ final RequesterRegistrationAuthorityPolicyRule filter = new RequesterRegistrationAuthorityPolicyRule();
String[] array = {REQUESTED_REG_INFO, INCOMMON_REG_INFO, "foo",};
filter.setRegistrars(Arrays.asList(array));
diff --git a/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/impl/AttributeFilterNamespaceHandler.java b/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/impl/AttributeFilterNamespaceHandler.java
index c94653a7c..a1c6b8941 100644
--- a/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/impl/AttributeFilterNamespaceHandler.java
+++ b/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/impl/AttributeFilterNamespaceHandler.java
@@ -43,17 +43,21 @@ import net.shibboleth.idp.attribute.filter.spring.policyrule.impl.PrincipalNameR
import net.shibboleth.idp.attribute.filter.spring.policyrule.impl.ProxiedRequesterRegexRuleParser;
import net.shibboleth.idp.attribute.filter.spring.policyrule.impl.ProxiedRequesterRuleParser;
import net.shibboleth.idp.attribute.filter.spring.saml.impl.AttributeInMetadataRuleParser;
-import net.shibboleth.idp.attribute.filter.spring.saml.impl.AttributeIssuerEntityAttributeExactRuleParser;
-import net.shibboleth.idp.attribute.filter.spring.saml.impl.AttributeIssuerEntityAttributeRegexRuleParser;
-import net.shibboleth.idp.attribute.filter.spring.saml.impl.AttributeIssuerInEntityGroupRuleParser;
-import net.shibboleth.idp.attribute.filter.spring.saml.impl.AttributeIssuerNameIDFormatRuleParser;
-import net.shibboleth.idp.attribute.filter.spring.saml.impl.AttributeIssuerRegistrationAuthorityRuleParser;
-import net.shibboleth.idp.attribute.filter.spring.saml.impl.AttributeRequesterEntityAttributeExactRuleParser;
-import net.shibboleth.idp.attribute.filter.spring.saml.impl.AttributeRequesterEntityAttributeRegexRuleParser;
-import net.shibboleth.idp.attribute.filter.spring.saml.impl.AttributeRequesterInEntityGroupRuleParser;
-import net.shibboleth.idp.attribute.filter.spring.saml.impl.AttributeRequesterNameIDFormatRuleParser;
-import net.shibboleth.idp.attribute.filter.spring.saml.impl.AttributeRequesterRegistrationAuthorityRuleParser;
+import net.shibboleth.idp.attribute.filter.spring.saml.impl.IssuerEntityAttributeExactRuleParser;
+import net.shibboleth.idp.attribute.filter.spring.saml.impl.IssuerEntityAttributeRegexRuleParser;
+import net.shibboleth.idp.attribute.filter.spring.saml.impl.IssuerInEntityGroupRuleParser;
+import net.shibboleth.idp.attribute.filter.spring.saml.impl.IssuerNameIDFormatRuleParser;
+import net.shibboleth.idp.attribute.filter.spring.saml.impl.IssuerRegistrationAuthorityRuleParser;
+import net.shibboleth.idp.attribute.filter.spring.saml.impl.RequesterEntityAttributeExactRuleParser;
+import net.shibboleth.idp.attribute.filter.spring.saml.impl.RequesterEntityAttributeRegexRuleParser;
+import net.shibboleth.idp.attribute.filter.spring.saml.impl.RequesterInEntityGroupRuleParser;
+import net.shibboleth.idp.attribute.filter.spring.saml.impl.RequesterNameIDFormatRuleParser;
+import net.shibboleth.idp.attribute.filter.spring.saml.impl.RequesterRegistrationAuthorityRuleParser;
import net.shibboleth.idp.attribute.filter.spring.saml.impl.MappedAttributeInMetadataRuleParser;
+import net.shibboleth.idp.attribute.filter.spring.saml.impl.ProxiedRequesterEntityAttributeExactRuleParser;
+import net.shibboleth.idp.attribute.filter.spring.saml.impl.ProxiedRequesterEntityAttributeRegexRuleParser;
+import net.shibboleth.idp.attribute.filter.spring.saml.impl.ProxiedRequesterInEntityGroupRuleParser;
+import net.shibboleth.idp.attribute.filter.spring.saml.impl.ProxiedRequesterRegistrationAuthorityRuleParser;
import net.shibboleth.idp.attribute.filter.spring.saml.impl.ScopeMatchesShibMDScopeParser;
import net.shibboleth.idp.attribute.filter.spring.saml.impl.ValueMatchesShibMDScopeParser;
@@ -130,29 +134,38 @@ public class AttributeFilterNamespaceHandler extends BaseSpringNamespaceHandler
registerBeanDefinitionParser(PredicateRuleParser.SCHEMA_TYPE, new PredicateRuleParser());
// SAML -
- registerBeanDefinitionParser(AttributeRequesterEntityAttributeExactRuleParser.SCHEMA_TYPE,
- new AttributeRequesterEntityAttributeExactRuleParser());
+ registerBeanDefinitionParser(RequesterEntityAttributeExactRuleParser.SCHEMA_TYPE,
+ new RequesterEntityAttributeExactRuleParser());
- registerBeanDefinitionParser(AttributeIssuerEntityAttributeExactRuleParser.SCHEMA_TYPE,
- new AttributeIssuerEntityAttributeExactRuleParser());
+ registerBeanDefinitionParser(ProxiedRequesterEntityAttributeExactRuleParser.SCHEMA_TYPE,
+ new ProxiedRequesterEntityAttributeExactRuleParser());
- registerBeanDefinitionParser(AttributeRequesterEntityAttributeRegexRuleParser.SCHEMA_TYPE,
- new AttributeRequesterEntityAttributeRegexRuleParser());
+ registerBeanDefinitionParser(IssuerEntityAttributeExactRuleParser.SCHEMA_TYPE,
+ new IssuerEntityAttributeExactRuleParser());
- registerBeanDefinitionParser(AttributeIssuerEntityAttributeRegexRuleParser.SCHEMA_TYPE,
- new AttributeIssuerEntityAttributeRegexRuleParser());
+ registerBeanDefinitionParser(RequesterEntityAttributeRegexRuleParser.SCHEMA_TYPE,
+ new RequesterEntityAttributeRegexRuleParser());
- registerBeanDefinitionParser(AttributeRequesterNameIDFormatRuleParser.SCHEMA_TYPE,
- new AttributeRequesterNameIDFormatRuleParser());
+ registerBeanDefinitionParser(ProxiedRequesterEntityAttributeRegexRuleParser.SCHEMA_TYPE,
+ new ProxiedRequesterEntityAttributeRegexRuleParser());
- registerBeanDefinitionParser(AttributeIssuerNameIDFormatRuleParser.SCHEMA_TYPE,
- new AttributeIssuerNameIDFormatRuleParser());
+ registerBeanDefinitionParser(IssuerEntityAttributeRegexRuleParser.SCHEMA_TYPE,
+ new IssuerEntityAttributeRegexRuleParser());
- registerBeanDefinitionParser(AttributeRequesterInEntityGroupRuleParser.SCHEMA_TYPE,
- new AttributeRequesterInEntityGroupRuleParser());
+ registerBeanDefinitionParser(RequesterNameIDFormatRuleParser.SCHEMA_TYPE,
+ new RequesterNameIDFormatRuleParser());
- registerBeanDefinitionParser(AttributeIssuerInEntityGroupRuleParser.SCHEMA_TYPE,
- new AttributeIssuerInEntityGroupRuleParser());
+ registerBeanDefinitionParser(IssuerNameIDFormatRuleParser.SCHEMA_TYPE,
+ new IssuerNameIDFormatRuleParser());
+
+ registerBeanDefinitionParser(RequesterInEntityGroupRuleParser.SCHEMA_TYPE,
+ new RequesterInEntityGroupRuleParser());
+
+ registerBeanDefinitionParser(ProxiedRequesterInEntityGroupRuleParser.SCHEMA_TYPE,
+ new ProxiedRequesterInEntityGroupRuleParser());
+
+ registerBeanDefinitionParser(IssuerInEntityGroupRuleParser.SCHEMA_TYPE,
+ new IssuerInEntityGroupRuleParser());
registerBeanDefinitionParser(AttributeInMetadataRuleParser.SCHEMA_TYPE,
new AttributeInMetadataRuleParser());
@@ -160,11 +173,14 @@ public class AttributeFilterNamespaceHandler extends BaseSpringNamespaceHandler
registerBeanDefinitionParser(MappedAttributeInMetadataRuleParser.SCHEMA_TYPE,
new MappedAttributeInMetadataRuleParser());
- registerBeanDefinitionParser(AttributeRequesterRegistrationAuthorityRuleParser.SCHEMA_TYPE,
- new AttributeRequesterRegistrationAuthorityRuleParser());
+ registerBeanDefinitionParser(RequesterRegistrationAuthorityRuleParser.SCHEMA_TYPE,
+ new RequesterRegistrationAuthorityRuleParser());
+
+ registerBeanDefinitionParser(ProxiedRequesterRegistrationAuthorityRuleParser.SCHEMA_TYPE,
+ new ProxiedRequesterRegistrationAuthorityRuleParser());
- registerBeanDefinitionParser(AttributeIssuerRegistrationAuthorityRuleParser.SCHEMA_TYPE,
- new AttributeIssuerRegistrationAuthorityRuleParser());
+ registerBeanDefinitionParser(IssuerRegistrationAuthorityRuleParser.SCHEMA_TYPE,
+ new IssuerRegistrationAuthorityRuleParser());
registerBeanDefinitionParser(ValueMatchesShibMDScopeParser.SCHEMA_TYPE, new ValueMatchesShibMDScopeParser());
diff --git a/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/AttributeIssuerEntityAttributeExactRuleParser.java b/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/IssuerEntityAttributeExactRuleParser.java
similarity index 76%
rename from idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/AttributeIssuerEntityAttributeExactRuleParser.java
rename to idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/IssuerEntityAttributeExactRuleParser.java
index 856b45a15..79d095004 100644
--- a/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/AttributeIssuerEntityAttributeExactRuleParser.java
+++ b/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/IssuerEntityAttributeExactRuleParser.java
@@ -20,21 +20,21 @@ package net.shibboleth.idp.attribute.filter.spring.saml.impl;
import javax.annotation.Nonnull;
import javax.xml.namespace.QName;
-import net.shibboleth.idp.attribute.filter.policyrule.saml.impl.AttributeIssuerEntityAttributeExactPolicyRule;
+import net.shibboleth.idp.attribute.filter.policyrule.saml.impl.IssuerEntityAttributeExactPolicyRule;
import net.shibboleth.idp.attribute.filter.spring.BaseFilterParser;
/**
- * Parser for {@link AttributeIssuerEntityAttributeExactPolicyRule}.
+ * Parser for {@link IssuerEntityAttributeExactPolicyRule}.
*/
-public class AttributeIssuerEntityAttributeExactRuleParser extends AbstractEntityAttributeExactRuleParser {
+public class IssuerEntityAttributeExactRuleParser extends AbstractEntityAttributeExactRuleParser {
/** Schema type. */
@Nonnull public static final QName SCHEMA_TYPE = new QName(BaseFilterParser.NAMESPACE,
"IssuerEntityAttributeExactMatch");
- @Override @Nonnull protected Class<AttributeIssuerEntityAttributeExactPolicyRule> getNativeBeanClass() {
+ @Override @Nonnull protected Class<IssuerEntityAttributeExactPolicyRule> getNativeBeanClass() {
- return AttributeIssuerEntityAttributeExactPolicyRule.class;
+ return IssuerEntityAttributeExactPolicyRule.class;
}
}
\ No newline at end of file
diff --git a/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/AttributeIssuerEntityAttributeRegexRuleParser.java b/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/IssuerEntityAttributeRegexRuleParser.java
similarity index 76%
copy from idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/AttributeIssuerEntityAttributeRegexRuleParser.java
copy to idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/IssuerEntityAttributeRegexRuleParser.java
index 31dc2d7b3..42c6a6b8c 100644
--- a/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/AttributeIssuerEntityAttributeRegexRuleParser.java
+++ b/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/IssuerEntityAttributeRegexRuleParser.java
@@ -20,22 +20,22 @@ package net.shibboleth.idp.attribute.filter.spring.saml.impl;
import javax.annotation.Nonnull;
import javax.xml.namespace.QName;
-import net.shibboleth.idp.attribute.filter.policyrule.saml.impl.AttributeIssuerEntityAttributeRegexPolicyRule;
+import net.shibboleth.idp.attribute.filter.policyrule.saml.impl.IssuerEntityAttributeRegexPolicyRule;
import net.shibboleth.idp.attribute.filter.spring.BaseFilterParser;
/**
- * Parser for {@link AttributeIssuerEntityAttributeRegexPolicyRule}.
+ * Parser for {@link IssuerEntityAttributeRegexPolicyRule}.
*/
-public class AttributeIssuerEntityAttributeRegexRuleParser extends AbstractEntityAttributeRegexRuleParser {
+public class IssuerEntityAttributeRegexRuleParser extends AbstractEntityAttributeRegexRuleParser {
/** Schema type. */
@Nonnull public static final QName SCHEMA_TYPE = new QName(BaseFilterParser.NAMESPACE,
"IssuerEntityAttributeRegexMatch");
/** {@inheritDoc} */
- @Override @Nonnull protected Class<AttributeIssuerEntityAttributeRegexPolicyRule> getNativeBeanClass() {
+ @Override @Nonnull protected Class<IssuerEntityAttributeRegexPolicyRule> getNativeBeanClass() {
- return AttributeIssuerEntityAttributeRegexPolicyRule.class;
+ return IssuerEntityAttributeRegexPolicyRule.class;
}
}
\ No newline at end of file
diff --git a/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/AttributeIssuerInEntityGroupRuleParser.java b/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/IssuerInEntityGroupRuleParser.java
similarity index 78%
copy from idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/AttributeIssuerInEntityGroupRuleParser.java
copy to idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/IssuerInEntityGroupRuleParser.java
index eaf5c738f..fc8eab866 100644
--- a/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/AttributeIssuerInEntityGroupRuleParser.java
+++ b/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/IssuerInEntityGroupRuleParser.java
@@ -20,20 +20,20 @@ package net.shibboleth.idp.attribute.filter.spring.saml.impl;
import javax.annotation.Nonnull;
import javax.xml.namespace.QName;
-import net.shibboleth.idp.attribute.filter.policyrule.saml.impl.AttributeIssuerInEntityGroupPolicyRule;
+import net.shibboleth.idp.attribute.filter.policyrule.saml.impl.IssuerInEntityGroupPolicyRule;
import net.shibboleth.idp.attribute.filter.spring.BaseFilterParser;
/**
- * Parser for {@link AttributeIssuerInEntityGroupPolicyRule}.
+ * Parser for {@link IssuerInEntityGroupPolicyRule}.
*/
-public class AttributeIssuerInEntityGroupRuleParser extends AbstractEntityGroupRuleParser {
+public class IssuerInEntityGroupRuleParser extends AbstractEntityGroupRuleParser {
/** Schema type. */
public static final QName SCHEMA_TYPE = new QName(BaseFilterParser.NAMESPACE, "IssuerInEntityGroup");
/** {@inheritDoc} */
- @Override @Nonnull protected Class<AttributeIssuerInEntityGroupPolicyRule> getNativeBeanClass() {
- return AttributeIssuerInEntityGroupPolicyRule.class;
+ @Override @Nonnull protected Class<IssuerInEntityGroupPolicyRule> getNativeBeanClass() {
+ return IssuerInEntityGroupPolicyRule.class;
}
}
\ No newline at end of file
diff --git a/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/AttributeIssuerNameIDFormatRuleParser.java b/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/IssuerNameIDFormatRuleParser.java
similarity index 77%
rename from idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/AttributeIssuerNameIDFormatRuleParser.java
rename to idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/IssuerNameIDFormatRuleParser.java
index 055873ff2..f3c687222 100644
--- a/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/AttributeIssuerNameIDFormatRuleParser.java
+++ b/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/IssuerNameIDFormatRuleParser.java
@@ -20,21 +20,21 @@ package net.shibboleth.idp.attribute.filter.spring.saml.impl;
import javax.annotation.Nonnull;
import javax.xml.namespace.QName;
-import net.shibboleth.idp.attribute.filter.policyrule.saml.impl.AttributeIssuerNameIDFormatExactPolicyRule;
+import net.shibboleth.idp.attribute.filter.policyrule.saml.impl.IssuerNameIDFormatExactPolicyRule;
import net.shibboleth.idp.attribute.filter.spring.BaseFilterParser;
/**
- * Parser for {@link AttributeIssuerNameIDFormatExactPolicyRule}.
+ * Parser for {@link IssuerNameIDFormatExactPolicyRule}.
*/
-public class AttributeIssuerNameIDFormatRuleParser extends AbstractNameIDFormatRuleParser {
+public class IssuerNameIDFormatRuleParser extends AbstractNameIDFormatRuleParser {
/** Schema type. */
public static final QName SCHEMA_TYPE = new QName(BaseFilterParser.NAMESPACE,
"IssuerNameIDFormatExactMatch");
/** {@inheritDoc} */
- @Override @Nonnull protected Class<AttributeIssuerNameIDFormatExactPolicyRule> getNativeBeanClass() {
- return AttributeIssuerNameIDFormatExactPolicyRule.class;
+ @Override @Nonnull protected Class<IssuerNameIDFormatExactPolicyRule> getNativeBeanClass() {
+ return IssuerNameIDFormatExactPolicyRule.class;
}
}
\ No newline at end of file
diff --git a/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/AttributeIssuerRegistrationAuthorityRuleParser.java b/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/IssuerRegistrationAuthorityRuleParser.java
similarity index 74%
rename from idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/AttributeIssuerRegistrationAuthorityRuleParser.java
rename to idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/IssuerRegistrationAuthorityRuleParser.java
index 75475f1f8..9042b072a 100644
--- a/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/AttributeIssuerRegistrationAuthorityRuleParser.java
+++ b/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/IssuerRegistrationAuthorityRuleParser.java
@@ -20,19 +20,19 @@ package net.shibboleth.idp.attribute.filter.spring.saml.impl;
import javax.annotation.Nonnull;
import javax.xml.namespace.QName;
-import net.shibboleth.idp.attribute.filter.policyrule.saml.impl.AttributeIssuerRegistrationAuthorityPolicyRule;
+import net.shibboleth.idp.attribute.filter.policyrule.saml.impl.IssuerRegistrationAuthorityPolicyRule;
import net.shibboleth.idp.attribute.filter.spring.BaseFilterParser;
-/** Spring bean definition parser that creates {@link AttributeIssuerRegistrationAuthorityPolicyRule} beans. */
-public class AttributeIssuerRegistrationAuthorityRuleParser extends AbstractRegistrationAuthorityRuleParser {
+/** Spring bean definition parser that creates {@link IssuerRegistrationAuthorityPolicyRule} beans. */
+public class IssuerRegistrationAuthorityRuleParser extends AbstractRegistrationAuthorityRuleParser {
/** Schema type. */
@Nonnull public static final QName SCHEMA_TYPE = new QName(BaseFilterParser.NAMESPACE,
"IssuerRegistrationAuthority");
/** {@inheritDoc} */
- @Override protected Class<AttributeIssuerRegistrationAuthorityPolicyRule> getNativeBeanClass() {
- return AttributeIssuerRegistrationAuthorityPolicyRule.class;
+ @Override protected Class<IssuerRegistrationAuthorityPolicyRule> getNativeBeanClass() {
+ return IssuerRegistrationAuthorityPolicyRule.class;
}
}
\ No newline at end of file
diff --git a/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/AttributeRequesterEntityAttributeExactRuleParser.java b/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/ProxiedRequesterEntityAttributeExactRuleParser.java
similarity index 72%
copy from idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/AttributeRequesterEntityAttributeExactRuleParser.java
copy to idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/ProxiedRequesterEntityAttributeExactRuleParser.java
index 061d36e1a..6e2e1ec20 100644
--- a/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/AttributeRequesterEntityAttributeExactRuleParser.java
+++ b/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/ProxiedRequesterEntityAttributeExactRuleParser.java
@@ -20,21 +20,20 @@ package net.shibboleth.idp.attribute.filter.spring.saml.impl;
import javax.annotation.Nonnull;
import javax.xml.namespace.QName;
-import net.shibboleth.idp.attribute.filter.policyrule.saml.impl.AttributeRequesterEntityAttributeExactPolicyRule;
+import net.shibboleth.idp.attribute.filter.policyrule.saml.impl.ProxiedRequesterEntityAttributeExactPolicyRule;
import net.shibboleth.idp.attribute.filter.spring.BaseFilterParser;
/**
- * Parser for {@link AttributeRequesterEntityAttributeExactPolicyRule}.
+ * Parser for {@link ProxiedRequesterEntityAttributeExactPolicyRule}.
*/
-public class AttributeRequesterEntityAttributeExactRuleParser extends AbstractEntityAttributeExactRuleParser {
+public class ProxiedRequesterEntityAttributeExactRuleParser extends AbstractEntityAttributeExactRuleParser {
/** Schema type. */
@Nonnull public static final QName SCHEMA_TYPE = new QName(BaseFilterParser.NAMESPACE,
- "EntityAttributeExactMatch");
+ "ProxiedRequesterEntityAttributeExactMatch");
- @Override @Nonnull protected Class<AttributeRequesterEntityAttributeExactPolicyRule> getNativeBeanClass() {
-
- return AttributeRequesterEntityAttributeExactPolicyRule.class;
+ @Override @Nonnull protected Class<ProxiedRequesterEntityAttributeExactPolicyRule> getNativeBeanClass() {
+ return ProxiedRequesterEntityAttributeExactPolicyRule.class;
}
}
\ No newline at end of file
diff --git a/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/AttributeIssuerEntityAttributeRegexRuleParser.java b/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/ProxiedRequesterEntityAttributeRegexRuleParser.java
similarity index 73%
copy from idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/AttributeIssuerEntityAttributeRegexRuleParser.java
copy to idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/ProxiedRequesterEntityAttributeRegexRuleParser.java
index 31dc2d7b3..fb931c6e8 100644
--- a/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/AttributeIssuerEntityAttributeRegexRuleParser.java
+++ b/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/ProxiedRequesterEntityAttributeRegexRuleParser.java
@@ -20,22 +20,22 @@ package net.shibboleth.idp.attribute.filter.spring.saml.impl;
import javax.annotation.Nonnull;
import javax.xml.namespace.QName;
-import net.shibboleth.idp.attribute.filter.policyrule.saml.impl.AttributeIssuerEntityAttributeRegexPolicyRule;
+import net.shibboleth.idp.attribute.filter.policyrule.saml.impl.ProxiedRequesterEntityAttributeRegexPolicyRule;
import net.shibboleth.idp.attribute.filter.spring.BaseFilterParser;
/**
- * Parser for {@link AttributeIssuerEntityAttributeRegexPolicyRule}.
+ * Parser for {@link ProxiedRequesterEntityAttributeRegexPolicyRule}.
*/
-public class AttributeIssuerEntityAttributeRegexRuleParser extends AbstractEntityAttributeRegexRuleParser {
+public class ProxiedRequesterEntityAttributeRegexRuleParser extends AbstractEntityAttributeRegexRuleParser {
/** Schema type. */
@Nonnull public static final QName SCHEMA_TYPE = new QName(BaseFilterParser.NAMESPACE,
- "IssuerEntityAttributeRegexMatch");
+ "ProxiedRequesterEntityAttributeRegexMatch");
/** {@inheritDoc} */
- @Override @Nonnull protected Class<AttributeIssuerEntityAttributeRegexPolicyRule> getNativeBeanClass() {
+ @Override @Nonnull protected Class<ProxiedRequesterEntityAttributeRegexPolicyRule> getNativeBeanClass() {
- return AttributeIssuerEntityAttributeRegexPolicyRule.class;
+ return ProxiedRequesterEntityAttributeRegexPolicyRule.class;
}
}
\ No newline at end of file
diff --git a/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/AttributeIssuerInEntityGroupRuleParser.java b/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/ProxiedRequesterInEntityGroupRuleParser.java
similarity index 74%
rename from idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/AttributeIssuerInEntityGroupRuleParser.java
rename to idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/ProxiedRequesterInEntityGroupRuleParser.java
index eaf5c738f..987609f31 100644
--- a/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/AttributeIssuerInEntityGroupRuleParser.java
+++ b/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/ProxiedRequesterInEntityGroupRuleParser.java
@@ -20,20 +20,20 @@ package net.shibboleth.idp.attribute.filter.spring.saml.impl;
import javax.annotation.Nonnull;
import javax.xml.namespace.QName;
-import net.shibboleth.idp.attribute.filter.policyrule.saml.impl.AttributeIssuerInEntityGroupPolicyRule;
+import net.shibboleth.idp.attribute.filter.policyrule.saml.impl.ProxiedRequesterInEntityGroupPolicyRule;
import net.shibboleth.idp.attribute.filter.spring.BaseFilterParser;
/**
- * Parser for {@link AttributeIssuerInEntityGroupPolicyRule}.
+ * Parser for {@link ProxiedRequesterInEntityGroupPolicyRule}.
*/
-public class AttributeIssuerInEntityGroupRuleParser extends AbstractEntityGroupRuleParser {
+public class ProxiedRequesterInEntityGroupRuleParser extends AbstractEntityGroupRuleParser {
/** Schema type. */
- public static final QName SCHEMA_TYPE = new QName(BaseFilterParser.NAMESPACE, "IssuerInEntityGroup");
+ public static final QName SCHEMA_TYPE = new QName(BaseFilterParser.NAMESPACE, "ProxiedRequesterInEntityGroup");
/** {@inheritDoc} */
- @Override @Nonnull protected Class<AttributeIssuerInEntityGroupPolicyRule> getNativeBeanClass() {
- return AttributeIssuerInEntityGroupPolicyRule.class;
+ @Override @Nonnull protected Class<ProxiedRequesterInEntityGroupPolicyRule> getNativeBeanClass() {
+ return ProxiedRequesterInEntityGroupPolicyRule.class;
}
}
\ No newline at end of file
diff --git a/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/AttributeIssuerEntityAttributeRegexRuleParser.java b/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/ProxiedRequesterRegistrationAuthorityRuleParser.java
similarity index 71%
rename from idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/AttributeIssuerEntityAttributeRegexRuleParser.java
rename to idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/ProxiedRequesterRegistrationAuthorityRuleParser.java
index 31dc2d7b3..a6d94b069 100644
--- a/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/AttributeIssuerEntityAttributeRegexRuleParser.java
+++ b/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/ProxiedRequesterRegistrationAuthorityRuleParser.java
@@ -20,22 +20,19 @@ package net.shibboleth.idp.attribute.filter.spring.saml.impl;
import javax.annotation.Nonnull;
import javax.xml.namespace.QName;
-import net.shibboleth.idp.attribute.filter.policyrule.saml.impl.AttributeIssuerEntityAttributeRegexPolicyRule;
+import net.shibboleth.idp.attribute.filter.policyrule.saml.impl.ProxiedRequesterRegistrationAuthorityPolicyRule;
import net.shibboleth.idp.attribute.filter.spring.BaseFilterParser;
-/**
- * Parser for {@link AttributeIssuerEntityAttributeRegexPolicyRule}.
- */
-public class AttributeIssuerEntityAttributeRegexRuleParser extends AbstractEntityAttributeRegexRuleParser {
+/** Spring bean definition parser that creates {@link ProxiedRequesterRegistrationAuthorityPolicyRule} beans. */
+public class ProxiedRequesterRegistrationAuthorityRuleParser extends AbstractRegistrationAuthorityRuleParser {
/** Schema type. */
@Nonnull public static final QName SCHEMA_TYPE = new QName(BaseFilterParser.NAMESPACE,
- "IssuerEntityAttributeRegexMatch");
+ "ProxiedRequesterRegistrationAuthority");
/** {@inheritDoc} */
- @Override @Nonnull protected Class<AttributeIssuerEntityAttributeRegexPolicyRule> getNativeBeanClass() {
-
- return AttributeIssuerEntityAttributeRegexPolicyRule.class;
+ @Override protected Class<ProxiedRequesterRegistrationAuthorityPolicyRule> getNativeBeanClass() {
+ return ProxiedRequesterRegistrationAuthorityPolicyRule.class;
}
}
\ No newline at end of file
diff --git a/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/AttributeRequesterEntityAttributeExactRuleParser.java b/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/RequesterEntityAttributeExactRuleParser.java
similarity index 75%
rename from idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/AttributeRequesterEntityAttributeExactRuleParser.java
rename to idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/RequesterEntityAttributeExactRuleParser.java
index 061d36e1a..227a5101d 100644
--- a/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/AttributeRequesterEntityAttributeExactRuleParser.java
+++ b/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/RequesterEntityAttributeExactRuleParser.java
@@ -20,21 +20,21 @@ package net.shibboleth.idp.attribute.filter.spring.saml.impl;
import javax.annotation.Nonnull;
import javax.xml.namespace.QName;
-import net.shibboleth.idp.attribute.filter.policyrule.saml.impl.AttributeRequesterEntityAttributeExactPolicyRule;
+import net.shibboleth.idp.attribute.filter.policyrule.saml.impl.RequesterEntityAttributeExactPolicyRule;
import net.shibboleth.idp.attribute.filter.spring.BaseFilterParser;
/**
- * Parser for {@link AttributeRequesterEntityAttributeExactPolicyRule}.
+ * Parser for {@link RequesterEntityAttributeExactPolicyRule}.
*/
-public class AttributeRequesterEntityAttributeExactRuleParser extends AbstractEntityAttributeExactRuleParser {
+public class RequesterEntityAttributeExactRuleParser extends AbstractEntityAttributeExactRuleParser {
/** Schema type. */
@Nonnull public static final QName SCHEMA_TYPE = new QName(BaseFilterParser.NAMESPACE,
"EntityAttributeExactMatch");
- @Override @Nonnull protected Class<AttributeRequesterEntityAttributeExactPolicyRule> getNativeBeanClass() {
+ @Override @Nonnull protected Class<RequesterEntityAttributeExactPolicyRule> getNativeBeanClass() {
- return AttributeRequesterEntityAttributeExactPolicyRule.class;
+ return RequesterEntityAttributeExactPolicyRule.class;
}
}
\ No newline at end of file
diff --git a/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/AttributeRequesterEntityAttributeRegexRuleParser.java b/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/RequesterEntityAttributeRegexRuleParser.java
similarity index 75%
rename from idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/AttributeRequesterEntityAttributeRegexRuleParser.java
rename to idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/RequesterEntityAttributeRegexRuleParser.java
index 44aa18618..4c5741c54 100644
--- a/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/AttributeRequesterEntityAttributeRegexRuleParser.java
+++ b/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/RequesterEntityAttributeRegexRuleParser.java
@@ -20,22 +20,22 @@ package net.shibboleth.idp.attribute.filter.spring.saml.impl;
import javax.annotation.Nonnull;
import javax.xml.namespace.QName;
-import net.shibboleth.idp.attribute.filter.policyrule.saml.impl.AttributeRequesterEntityAttributeRegexPolicyRule;
+import net.shibboleth.idp.attribute.filter.policyrule.saml.impl.RequesterEntityAttributeRegexPolicyRule;
import net.shibboleth.idp.attribute.filter.spring.BaseFilterParser;
/**
- * Parser for {@link AttributeRequesterEntityAttributeRegexPolicyRule}.
+ * Parser for {@link RequesterEntityAttributeRegexPolicyRule}.
*/
-public class AttributeRequesterEntityAttributeRegexRuleParser extends AbstractEntityAttributeRegexRuleParser {
+public class RequesterEntityAttributeRegexRuleParser extends AbstractEntityAttributeRegexRuleParser {
/** Schema type. */
@Nonnull public static final QName SCHEMA_TYPE = new QName(BaseFilterParser.NAMESPACE,
"EntityAttributeRegexMatch");
/** {@inheritDoc} */
- @Override @Nonnull protected Class<AttributeRequesterEntityAttributeRegexPolicyRule> getNativeBeanClass() {
+ @Override @Nonnull protected Class<RequesterEntityAttributeRegexPolicyRule> getNativeBeanClass() {
- return AttributeRequesterEntityAttributeRegexPolicyRule.class;
+ return RequesterEntityAttributeRegexPolicyRule.class;
}
}
\ No newline at end of file
diff --git a/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/AttributeRequesterInEntityGroupRuleParser.java b/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/RequesterInEntityGroupRuleParser.java
similarity index 77%
rename from idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/AttributeRequesterInEntityGroupRuleParser.java
rename to idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/RequesterInEntityGroupRuleParser.java
index cc4e8f0cd..ab97461f7 100644
--- a/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/AttributeRequesterInEntityGroupRuleParser.java
+++ b/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/RequesterInEntityGroupRuleParser.java
@@ -20,20 +20,20 @@ package net.shibboleth.idp.attribute.filter.spring.saml.impl;
import javax.annotation.Nonnull;
import javax.xml.namespace.QName;
-import net.shibboleth.idp.attribute.filter.policyrule.saml.impl.AttributeRequesterInEntityGroupPolicyRule;
+import net.shibboleth.idp.attribute.filter.policyrule.saml.impl.RequesterInEntityGroupPolicyRule;
import net.shibboleth.idp.attribute.filter.spring.BaseFilterParser;
/**
- * Parser for {@link AttributeRequesterInEntityGroupPolicyRule}.
+ * Parser for {@link RequesterInEntityGroupPolicyRule}.
*/
-public class AttributeRequesterInEntityGroupRuleParser extends AbstractEntityGroupRuleParser {
+public class RequesterInEntityGroupRuleParser extends AbstractEntityGroupRuleParser {
/** Schema type. */
public static final QName SCHEMA_TYPE = new QName(BaseFilterParser.NAMESPACE, "InEntityGroup");
/** {@inheritDoc} */
- @Override @Nonnull protected Class<AttributeRequesterInEntityGroupPolicyRule> getNativeBeanClass() {
- return AttributeRequesterInEntityGroupPolicyRule.class;
+ @Override @Nonnull protected Class<RequesterInEntityGroupPolicyRule> getNativeBeanClass() {
+ return RequesterInEntityGroupPolicyRule.class;
}
}
\ No newline at end of file
diff --git a/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/AttributeRequesterNameIDFormatRuleParser.java b/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/RequesterNameIDFormatRuleParser.java
similarity index 76%
rename from idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/AttributeRequesterNameIDFormatRuleParser.java
rename to idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/RequesterNameIDFormatRuleParser.java
index 41f4a95ba..dbe99d537 100644
--- a/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/AttributeRequesterNameIDFormatRuleParser.java
+++ b/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/RequesterNameIDFormatRuleParser.java
@@ -20,21 +20,21 @@ package net.shibboleth.idp.attribute.filter.spring.saml.impl;
import javax.annotation.Nonnull;
import javax.xml.namespace.QName;
-import net.shibboleth.idp.attribute.filter.policyrule.saml.impl.AttributeRequesterNameIDFormatExactPolicyRule;
+import net.shibboleth.idp.attribute.filter.policyrule.saml.impl.RequesterNameIDFormatExactPolicyRule;
import net.shibboleth.idp.attribute.filter.spring.BaseFilterParser;
/**
- * Parser for {@link AttributeRequesterNameIDFormatExactPolicyRule}.
+ * Parser for {@link RequesterNameIDFormatExactPolicyRule}.
*/
-public class AttributeRequesterNameIDFormatRuleParser extends AbstractNameIDFormatRuleParser {
+public class RequesterNameIDFormatRuleParser extends AbstractNameIDFormatRuleParser {
/** Schema type. */
public static final QName SCHEMA_TYPE = new QName(BaseFilterParser.NAMESPACE,
"NameIDFormatExactMatch");
/** {@inheritDoc} */
- @Override @Nonnull protected Class<AttributeRequesterNameIDFormatExactPolicyRule> getNativeBeanClass() {
- return AttributeRequesterNameIDFormatExactPolicyRule.class;
+ @Override @Nonnull protected Class<RequesterNameIDFormatExactPolicyRule> getNativeBeanClass() {
+ return RequesterNameIDFormatExactPolicyRule.class;
}
}
\ No newline at end of file
diff --git a/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/AttributeRequesterRegistrationAuthorityRuleParser.java b/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/RequesterRegistrationAuthorityRuleParser.java
similarity index 73%
rename from idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/AttributeRequesterRegistrationAuthorityRuleParser.java
rename to idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/RequesterRegistrationAuthorityRuleParser.java
index b3e3aa91a..7b5f23ca7 100644
--- a/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/AttributeRequesterRegistrationAuthorityRuleParser.java
+++ b/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/RequesterRegistrationAuthorityRuleParser.java
@@ -20,19 +20,19 @@ package net.shibboleth.idp.attribute.filter.spring.saml.impl;
import javax.annotation.Nonnull;
import javax.xml.namespace.QName;
-import net.shibboleth.idp.attribute.filter.policyrule.saml.impl.AttributeRequesterRegistrationAuthorityPolicyRule;
+import net.shibboleth.idp.attribute.filter.policyrule.saml.impl.RequesterRegistrationAuthorityPolicyRule;
import net.shibboleth.idp.attribute.filter.spring.BaseFilterParser;
-/** Spring bean definition parser that creates {@link AttributeRequesterRegistrationAuthorityPolicyRule} beans. */
-public class AttributeRequesterRegistrationAuthorityRuleParser extends AbstractRegistrationAuthorityRuleParser {
+/** Spring bean definition parser that creates {@link RequesterRegistrationAuthorityPolicyRule} beans. */
+public class RequesterRegistrationAuthorityRuleParser extends AbstractRegistrationAuthorityRuleParser {
/** Schema type. */
@Nonnull public static final QName SCHEMA_TYPE = new QName(BaseFilterParser.NAMESPACE,
"RegistrationAuthority");
/** {@inheritDoc} */
- @Override protected Class<AttributeRequesterRegistrationAuthorityPolicyRule> getNativeBeanClass() {
- return AttributeRequesterRegistrationAuthorityPolicyRule.class;
+ @Override protected Class<RequesterRegistrationAuthorityPolicyRule> getNativeBeanClass() {
+ return RequesterRegistrationAuthorityPolicyRule.class;
}
}
\ No newline at end of file
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/IssuerEntityAttributeExactRuleParserTest.java
similarity index 78%
rename from idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeIssuerEntityAttributeExactRuleParserTest.java
rename to idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/IssuerEntityAttributeExactRuleParserTest.java
index a4606bf34..4b5c7b892 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/IssuerEntityAttributeExactRuleParserTest.java
@@ -22,19 +22,19 @@ import static org.testng.Assert.*;
import org.springframework.beans.factory.BeanCreationException;
import org.testng.annotations.Test;
-import net.shibboleth.idp.attribute.filter.policyrule.saml.impl.AttributeIssuerEntityAttributeExactPolicyRule;
+import net.shibboleth.idp.attribute.filter.policyrule.saml.impl.IssuerEntityAttributeExactPolicyRule;
import net.shibboleth.idp.attribute.filter.spring.testing.BaseAttributeFilterParserTest;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
/**
- * test for {@link AttributeIssuerEntityAttributeExactPolicyRule}.
+ * test for {@link IssuerEntityAttributeExactPolicyRule}.
*/
@SuppressWarnings("javadoc")
-public class AttributeIssuerEntityAttributeExactRuleParserTest extends BaseAttributeFilterParserTest {
+public class IssuerEntityAttributeExactRuleParserTest extends BaseAttributeFilterParserTest {
@Test public void basic() throws ComponentInitializationException {
- AttributeIssuerEntityAttributeExactPolicyRule rule =
- (AttributeIssuerEntityAttributeExactPolicyRule) getPolicyRule("issuerEA2.xml");
+ IssuerEntityAttributeExactPolicyRule rule =
+ (IssuerEntityAttributeExactPolicyRule) getPolicyRule("issuerEA2.xml");
assertEquals(rule.getValue(), "urn:example.org:policy:ABCD1234");
assertEquals(rule.getAttributeName(), "urn:example.org:policy");
@@ -42,8 +42,8 @@ public class AttributeIssuerEntityAttributeExactRuleParserTest extends BaseAttri
}
@Test(expectedExceptions = {BeanCreationException.class}) public void empty() throws ComponentInitializationException {
- AttributeIssuerEntityAttributeExactPolicyRule rule =
- (AttributeIssuerEntityAttributeExactPolicyRule) getPolicyRule("issuerEA3.xml");
+ IssuerEntityAttributeExactPolicyRule rule =
+ (IssuerEntityAttributeExactPolicyRule) getPolicyRule("issuerEA3.xml");
assertEquals(rule.getValue(), "urn:example.org:policy:ABCD1234");
assertEquals(rule.getAttributeName(), "urn:example.org:policy");
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/IssuerEntityAttributeRegexRuleParserTest.java
similarity index 80%
rename from idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeIssuerEntityAttributeRegexRuleParserTest.java
rename to idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/IssuerEntityAttributeRegexRuleParserTest.java
index 66f8a5469..1e203cc06 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/IssuerEntityAttributeRegexRuleParserTest.java
@@ -21,17 +21,17 @@ import static org.testng.Assert.*;
import org.testng.annotations.Test;
-import net.shibboleth.idp.attribute.filter.policyrule.saml.impl.AttributeIssuerEntityAttributeRegexPolicyRule;
+import net.shibboleth.idp.attribute.filter.policyrule.saml.impl.IssuerEntityAttributeRegexPolicyRule;
import net.shibboleth.idp.attribute.filter.spring.testing.BaseAttributeFilterParserTest;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
/**
- * test for {@link AttributeIssuerEntityAttributeRegexPolicyRule}.
+ * test for {@link IssuerEntityAttributeRegexPolicyRule}.
*/
-public class AttributeIssuerEntityAttributeRegexRuleParserTest extends BaseAttributeFilterParserTest {
+public class IssuerEntityAttributeRegexRuleParserTest extends BaseAttributeFilterParserTest {
@SuppressWarnings("javadoc") @Test public void basic() throws ComponentInitializationException {
- final AttributeIssuerEntityAttributeRegexPolicyRule rule = (AttributeIssuerEntityAttributeRegexPolicyRule) getPolicyRule("issuerEARegex2.xml");
+ final IssuerEntityAttributeRegexPolicyRule rule = (IssuerEntityAttributeRegexPolicyRule) getPolicyRule("issuerEARegex2.xml");
assertEquals(rule.getValueRegex().pattern(), "^urn:example\\.org:policy:[^:]*$");
assertEquals(rule.getAttributeName(), "urn:example.org:policy");
assertFalse(rule.getIgnoreUnmappedEntityAttributes());
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/IssuerInEntityGroupRuleParserTest.java
similarity index 79%
rename from idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeIssuerInEntityGroupRuleParserTest.java
rename to idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/IssuerInEntityGroupRuleParserTest.java
index 483260502..b3aeac9d8 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/IssuerInEntityGroupRuleParserTest.java
@@ -22,18 +22,19 @@ import static org.testng.Assert.assertEquals;
import org.springframework.beans.factory.BeanCreationException;
import org.testng.annotations.Test;
-import net.shibboleth.idp.attribute.filter.policyrule.saml.impl.AttributeIssuerInEntityGroupPolicyRule;
-import net.shibboleth.idp.attribute.filter.spring.saml.impl.AttributeIssuerInEntityGroupRuleParser;
+import net.shibboleth.idp.attribute.filter.policyrule.saml.impl.IssuerInEntityGroupPolicyRule;
+import net.shibboleth.idp.attribute.filter.spring.saml.impl.IssuerInEntityGroupRuleParser;
import net.shibboleth.idp.attribute.filter.spring.testing.BaseAttributeFilterParserTest;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
/**
- * test for {@link AttributeIssuerInEntityGroupRuleParser}.
+ * test for {@link IssuerInEntityGroupRuleParser}.
*/
- at SuppressWarnings("javadoc") public class AttributeIssuerInEntityGroupRuleParserTest extends BaseAttributeFilterParserTest {
+ at SuppressWarnings("javadoc")
+public class IssuerInEntityGroupRuleParserTest extends BaseAttributeFilterParserTest {
private void testRule(final String propValue, final boolean result) throws ComponentInitializationException {
- final AttributeIssuerInEntityGroupPolicyRule rule = (AttributeIssuerInEntityGroupPolicyRule) getPolicyRule("issuerEG2.xml", contextWithPropertyValue(propValue));
+ final IssuerInEntityGroupPolicyRule rule = (IssuerInEntityGroupPolicyRule) getPolicyRule("issuerEG2.xml", contextWithPropertyValue(propValue));
assertEquals(rule.getEntityGroup(), "urn:example.org");
assertEquals(rule.isCheckAffiliations(), result);
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/IssuerNameIDFormatRuleParserTest.java
similarity index 74%
rename from idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeIssuerNameIDFormatRuleParserTest.java
rename to idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/IssuerNameIDFormatRuleParserTest.java
index 053554b9b..dda2be06e 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/IssuerNameIDFormatRuleParserTest.java
@@ -21,20 +21,24 @@ import static org.testng.Assert.assertEquals;
import org.testng.annotations.Test;
-import net.shibboleth.idp.attribute.filter.policyrule.saml.impl.AttributeIssuerNameIDFormatExactPolicyRule;
-import net.shibboleth.idp.attribute.filter.spring.saml.impl.AttributeIssuerNameIDFormatRuleParser;
+import net.shibboleth.idp.attribute.filter.policyrule.saml.impl.IssuerNameIDFormatExactPolicyRule;
+import net.shibboleth.idp.attribute.filter.spring.saml.impl.IssuerNameIDFormatRuleParser;
import net.shibboleth.idp.attribute.filter.spring.testing.BaseAttributeFilterParserTest;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
/**
- * test for {@link AttributeIssuerNameIDFormatRuleParser}.
+ * test for {@link IssuerNameIDFormatRuleParser}.
*/
-public class AttributeIssuerNameIDFormatRuleParserTest extends BaseAttributeFilterParserTest {
+public class IssuerNameIDFormatRuleParserTest extends BaseAttributeFilterParserTest {
- @SuppressWarnings("javadoc")
+ /**
+ * Basic test.
+ *
+ * @throws ComponentInitializationException
+ */
@Test public void basic() throws ComponentInitializationException {
- final AttributeIssuerNameIDFormatExactPolicyRule rule =
- (AttributeIssuerNameIDFormatExactPolicyRule) getPolicyRule("issuerNameId2.xml");
+ final IssuerNameIDFormatExactPolicyRule rule =
+ (IssuerNameIDFormatExactPolicyRule) getPolicyRule("issuerNameId2.xml");
assertEquals(rule.getNameIdFormat(), "urn:oasis:names:tc:SAML:2.0:nameid-format:persistent");
}
diff --git a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeIssuerRegistrationAuthorityRuleParserTest.java b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/IssuerRegistrationAuthorityRuleParserTest.java
similarity index 75%
rename from idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeIssuerRegistrationAuthorityRuleParserTest.java
rename to idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/IssuerRegistrationAuthorityRuleParserTest.java
index 666d9530c..e1f10bbc8 100644
--- a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeIssuerRegistrationAuthorityRuleParserTest.java
+++ b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/IssuerRegistrationAuthorityRuleParserTest.java
@@ -24,20 +24,21 @@ import java.util.Set;
import org.testng.annotations.Test;
-import net.shibboleth.idp.attribute.filter.policyrule.saml.impl.AttributeIssuerRegistrationAuthorityPolicyRule;
-import net.shibboleth.idp.attribute.filter.spring.saml.impl.AttributeIssuerRegistrationAuthorityRuleParser;
+import net.shibboleth.idp.attribute.filter.policyrule.saml.impl.IssuerRegistrationAuthorityPolicyRule;
+import net.shibboleth.idp.attribute.filter.spring.saml.impl.IssuerRegistrationAuthorityRuleParser;
import net.shibboleth.idp.attribute.filter.spring.testing.BaseAttributeFilterParserTest;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
/**
- * test for {@link AttributeIssuerRegistrationAuthorityRuleParser}.
+ * test for {@link IssuerRegistrationAuthorityRuleParser}.
*/
- at SuppressWarnings("javadoc") public class AttributeIssuerRegistrationAuthorityRuleParserTest extends BaseAttributeFilterParserTest {
+ at SuppressWarnings("javadoc")
+public class IssuerRegistrationAuthorityRuleParserTest extends BaseAttributeFilterParserTest {
@Test public void silentTrue() throws ComponentInitializationException {
- final AttributeIssuerRegistrationAuthorityPolicyRule rule =
- (AttributeIssuerRegistrationAuthorityPolicyRule) getPolicyRule("issuerAuthorityOne.xml");
+ final IssuerRegistrationAuthorityPolicyRule rule =
+ (IssuerRegistrationAuthorityPolicyRule) getPolicyRule("issuerAuthorityOne.xml");
assertTrue(rule.isMatchIfMetadataSilent());
final Set<String> issuers = rule.getRegistrars();
@@ -48,8 +49,8 @@ import net.shibboleth.utilities.java.support.component.ComponentInitializationEx
}
@Test public void silentFalse() throws ComponentInitializationException {
- final AttributeIssuerRegistrationAuthorityPolicyRule rule
- = (AttributeIssuerRegistrationAuthorityPolicyRule) getPolicyRule("issuerAuthorityTwo.xml");
+ final IssuerRegistrationAuthorityPolicyRule rule
+ = (IssuerRegistrationAuthorityPolicyRule) getPolicyRule("issuerAuthorityTwo.xml");
assertTrue(rule.isMatchIfMetadataSilent());
final Set<String> issuers = rule.getRegistrars();
diff --git a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeRequesterEntityAttributeExactRuleParserTest.java b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/ProxiedRequesterEntityAttributeExactRuleParserTest.java
similarity index 72%
copy from idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeRequesterEntityAttributeExactRuleParserTest.java
copy to idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/ProxiedRequesterEntityAttributeExactRuleParserTest.java
index c2eb59336..618696d26 100644
--- a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeRequesterEntityAttributeExactRuleParserTest.java
+++ b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/ProxiedRequesterEntityAttributeExactRuleParserTest.java
@@ -21,18 +21,23 @@ import static org.testng.Assert.*;
import org.testng.annotations.Test;
-import net.shibboleth.idp.attribute.filter.policyrule.saml.impl.AttributeRequesterEntityAttributeExactPolicyRule;
+import net.shibboleth.idp.attribute.filter.policyrule.saml.impl.ProxiedRequesterEntityAttributeExactPolicyRule;
import net.shibboleth.idp.attribute.filter.spring.testing.BaseAttributeFilterParserTest;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
/**
- * test for {@link AttributeRequesterEntityAttributeExactPolicyRule}.
+ * test for {@link ProxiedRequesterEntityAttributeExactPolicyRule}.
*/
-public class AttributeRequesterEntityAttributeExactRuleParserTest extends BaseAttributeFilterParserTest {
-
- @SuppressWarnings("javadoc") @Test public void basic() throws ComponentInitializationException {
- AttributeRequesterEntityAttributeExactPolicyRule rule =
- (AttributeRequesterEntityAttributeExactPolicyRule) getPolicyRule("requesterEA2.xml");
+public class ProxiedRequesterEntityAttributeExactRuleParserTest extends BaseAttributeFilterParserTest {
+
+ /**
+ * Basic test.
+ *
+ * @throws ComponentInitializationException
+ */
+ @Test public void basic() throws ComponentInitializationException {
+ ProxiedRequesterEntityAttributeExactPolicyRule rule =
+ (ProxiedRequesterEntityAttributeExactPolicyRule) getPolicyRule("proxiedrequesterEA2.xml");
assertEquals(rule.getValue(), "urn:example.org:policy:ABCD1234");
assertEquals(rule.getAttributeName(), "urn:example.org:policy");
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/ProxiedRequesterEntityAttributeRegexRuleParserTest.java
similarity index 68%
copy from idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeRequesterEntityAttributeRegexRuleParserTest.java
copy to idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/ProxiedRequesterEntityAttributeRegexRuleParserTest.java
index eff3a5301..7851d1de6 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/ProxiedRequesterEntityAttributeRegexRuleParserTest.java
@@ -21,18 +21,24 @@ import static org.testng.Assert.*;
import org.testng.annotations.Test;
-import net.shibboleth.idp.attribute.filter.policyrule.saml.impl.AttributeRequesterEntityAttributeRegexPolicyRule;
-import net.shibboleth.idp.attribute.filter.spring.saml.impl.AttributeRequesterEntityAttributeRegexRuleParser;
+import net.shibboleth.idp.attribute.filter.policyrule.saml.impl.ProxiedRequesterEntityAttributeRegexPolicyRule;
+import net.shibboleth.idp.attribute.filter.spring.saml.impl.ProxiedRequesterEntityAttributeRegexRuleParser;
import net.shibboleth.idp.attribute.filter.spring.testing.BaseAttributeFilterParserTest;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
/**
- * test for {@link AttributeRequesterEntityAttributeRegexRuleParser}.
+ * test for {@link ProxiedRequesterEntityAttributeRegexRuleParser}.
*/
-public class AttributeRequesterEntityAttributeRegexRuleParserTest extends BaseAttributeFilterParserTest {
+public class ProxiedRequesterEntityAttributeRegexRuleParserTest extends BaseAttributeFilterParserTest {
- @SuppressWarnings("javadoc") @Test public void basic() throws ComponentInitializationException {
- final AttributeRequesterEntityAttributeRegexPolicyRule rule = (AttributeRequesterEntityAttributeRegexPolicyRule) getPolicyRule("requesterEARegex2.xml");
+ /**
+ * Basic test.
+ *
+ * @throws ComponentInitializationException
+ */
+ @Test public void basic() throws ComponentInitializationException {
+ final ProxiedRequesterEntityAttributeRegexPolicyRule rule =
+ (ProxiedRequesterEntityAttributeRegexPolicyRule) getPolicyRule("proxiedrequesterEARegex2.xml");
assertEquals(rule.getValueRegex().pattern(), "^urn:example\\.org:policy:[^:]*$");
assertEquals(rule.getAttributeName(), "urn:example.org:policy");
assertFalse(rule.getIgnoreUnmappedEntityAttributes());
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/ProxiedRequesterInEntityGroupRuleParserTest.java
similarity index 80%
copy from idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeRequesterInEntityGroupRuleParserTest.java
copy to idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/ProxiedRequesterInEntityGroupRuleParserTest.java
index 4259e2ef5..cfa7ba0be 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/ProxiedRequesterInEntityGroupRuleParserTest.java
@@ -22,19 +22,19 @@ import static org.testng.Assert.assertEquals;
import org.springframework.beans.factory.BeanCreationException;
import org.testng.annotations.Test;
-import net.shibboleth.idp.attribute.filter.policyrule.saml.impl.AttributeRequesterInEntityGroupPolicyRule;
-import net.shibboleth.idp.attribute.filter.spring.saml.impl.AttributeRequesterInEntityGroupRuleParser;
+import net.shibboleth.idp.attribute.filter.policyrule.saml.impl.ProxiedRequesterInEntityGroupPolicyRule;
import net.shibboleth.idp.attribute.filter.spring.testing.BaseAttributeFilterParserTest;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
/**
- * test for {@link AttributeRequesterInEntityGroupRuleParser}.
+ * test for {@link ProxiedRequesterInEntityGroupRuleParser}.
*/
@SuppressWarnings("javadoc")
-public class AttributeRequesterInEntityGroupRuleParserTest extends BaseAttributeFilterParserTest {
+public class ProxiedRequesterInEntityGroupRuleParserTest extends BaseAttributeFilterParserTest {
private void testRule(final String propValue, final boolean result) throws ComponentInitializationException {
- final AttributeRequesterInEntityGroupPolicyRule rule = (AttributeRequesterInEntityGroupPolicyRule) getPolicyRule("requesterEG2.xml", contextWithPropertyValue(propValue));
+ final ProxiedRequesterInEntityGroupPolicyRule rule =
+ (ProxiedRequesterInEntityGroupPolicyRule) getPolicyRule("proxiedrequesterEG2.xml", contextWithPropertyValue(propValue));
assertEquals(rule.getEntityGroup(), "urn:example.org");
assertEquals(rule.isCheckAffiliations(), result);
diff --git a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeRequesterRegistrationAuthorityRuleParserTest.java b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/ProxiedRequesterRegistrationAuthorityRuleParserTest.java
similarity index 78%
copy from idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeRequesterRegistrationAuthorityRuleParserTest.java
copy to idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/ProxiedRequesterRegistrationAuthorityRuleParserTest.java
index 441c4dd32..40db8b0e3 100644
--- a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeRequesterRegistrationAuthorityRuleParserTest.java
+++ b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/ProxiedRequesterRegistrationAuthorityRuleParserTest.java
@@ -24,20 +24,20 @@ import java.util.Set;
import org.testng.annotations.Test;
-import net.shibboleth.idp.attribute.filter.policyrule.saml.impl.AttributeRequesterRegistrationAuthorityPolicyRule;
+import net.shibboleth.idp.attribute.filter.policyrule.saml.impl.ProxiedRequesterRegistrationAuthorityPolicyRule;
import net.shibboleth.idp.attribute.filter.spring.testing.BaseAttributeFilterParserTest;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
/**
- * test for {@link AttributeRequesterRegistrationAuthorityPolicyRule}.
+ * test for {@link ProxiedRequesterRegistrationAuthorityPolicyRule}.
*/
@SuppressWarnings("javadoc")
-public class AttributeRequesterRegistrationAuthorityRuleParserTest extends BaseAttributeFilterParserTest {
+public class ProxiedRequesterRegistrationAuthorityRuleParserTest extends BaseAttributeFilterParserTest {
@Test public void silentTrue() throws ComponentInitializationException {
- final AttributeRequesterRegistrationAuthorityPolicyRule rule =
- (AttributeRequesterRegistrationAuthorityPolicyRule) getPolicyRule("registrationAuthorityOne.xml");
+ final ProxiedRequesterRegistrationAuthorityPolicyRule rule =
+ (ProxiedRequesterRegistrationAuthorityPolicyRule) getPolicyRule("proxiedregistrationAuthorityOne.xml");
assertTrue(rule.isMatchIfMetadataSilent());
final Set<String> issuers = rule.getRegistrars();
@@ -48,8 +48,8 @@ public class AttributeRequesterRegistrationAuthorityRuleParserTest extends BaseA
}
@Test public void silentFalse() throws ComponentInitializationException {
- final AttributeRequesterRegistrationAuthorityPolicyRule rule
- = (AttributeRequesterRegistrationAuthorityPolicyRule) getPolicyRule("registrationAuthorityTwo.xml");
+ final ProxiedRequesterRegistrationAuthorityPolicyRule rule
+ = (ProxiedRequesterRegistrationAuthorityPolicyRule) getPolicyRule("proxiedregistrationAuthorityTwo.xml");
assertTrue(rule.isMatchIfMetadataSilent());
final Set<String> issuers = rule.getRegistrars();
diff --git a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeRequesterEntityAttributeExactRuleParserTest.java b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/RequesterEntityAttributeExactRuleParserTest.java
similarity index 73%
rename from idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeRequesterEntityAttributeExactRuleParserTest.java
rename to idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/RequesterEntityAttributeExactRuleParserTest.java
index c2eb59336..a2f67aab3 100644
--- a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeRequesterEntityAttributeExactRuleParserTest.java
+++ b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/RequesterEntityAttributeExactRuleParserTest.java
@@ -21,18 +21,23 @@ import static org.testng.Assert.*;
import org.testng.annotations.Test;
-import net.shibboleth.idp.attribute.filter.policyrule.saml.impl.AttributeRequesterEntityAttributeExactPolicyRule;
+import net.shibboleth.idp.attribute.filter.policyrule.saml.impl.RequesterEntityAttributeExactPolicyRule;
import net.shibboleth.idp.attribute.filter.spring.testing.BaseAttributeFilterParserTest;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
/**
- * test for {@link AttributeRequesterEntityAttributeExactPolicyRule}.
+ * test for {@link RequesterEntityAttributeExactPolicyRule}.
*/
-public class AttributeRequesterEntityAttributeExactRuleParserTest extends BaseAttributeFilterParserTest {
-
- @SuppressWarnings("javadoc") @Test public void basic() throws ComponentInitializationException {
- AttributeRequesterEntityAttributeExactPolicyRule rule =
- (AttributeRequesterEntityAttributeExactPolicyRule) getPolicyRule("requesterEA2.xml");
+public class RequesterEntityAttributeExactRuleParserTest extends BaseAttributeFilterParserTest {
+
+ /**
+ * Basic test.
+ *
+ * @throws ComponentInitializationException
+ */
+ @Test public void basic() throws ComponentInitializationException {
+ RequesterEntityAttributeExactPolicyRule rule =
+ (RequesterEntityAttributeExactPolicyRule) getPolicyRule("requesterEA2.xml");
assertEquals(rule.getValue(), "urn:example.org:policy:ABCD1234");
assertEquals(rule.getAttributeName(), "urn:example.org:policy");
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/RequesterEntityAttributeRegexRuleParserTest.java
similarity index 70%
rename from idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeRequesterEntityAttributeRegexRuleParserTest.java
rename to idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/RequesterEntityAttributeRegexRuleParserTest.java
index eff3a5301..ec94add4c 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/RequesterEntityAttributeRegexRuleParserTest.java
@@ -21,18 +21,23 @@ import static org.testng.Assert.*;
import org.testng.annotations.Test;
-import net.shibboleth.idp.attribute.filter.policyrule.saml.impl.AttributeRequesterEntityAttributeRegexPolicyRule;
-import net.shibboleth.idp.attribute.filter.spring.saml.impl.AttributeRequesterEntityAttributeRegexRuleParser;
+import net.shibboleth.idp.attribute.filter.policyrule.saml.impl.RequesterEntityAttributeRegexPolicyRule;
+import net.shibboleth.idp.attribute.filter.spring.saml.impl.RequesterEntityAttributeRegexRuleParser;
import net.shibboleth.idp.attribute.filter.spring.testing.BaseAttributeFilterParserTest;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
/**
- * test for {@link AttributeRequesterEntityAttributeRegexRuleParser}.
+ * test for {@link RequesterEntityAttributeRegexRuleParser}.
*/
-public class AttributeRequesterEntityAttributeRegexRuleParserTest extends BaseAttributeFilterParserTest {
+public class RequesterEntityAttributeRegexRuleParserTest extends BaseAttributeFilterParserTest {
- @SuppressWarnings("javadoc") @Test public void basic() throws ComponentInitializationException {
- final AttributeRequesterEntityAttributeRegexPolicyRule rule = (AttributeRequesterEntityAttributeRegexPolicyRule) getPolicyRule("requesterEARegex2.xml");
+ /**
+ * Basic test.
+ *
+ * @throws ComponentInitializationException
+ */
+ @Test public void basic() throws ComponentInitializationException {
+ final RequesterEntityAttributeRegexPolicyRule rule = (RequesterEntityAttributeRegexPolicyRule) getPolicyRule("requesterEARegex2.xml");
assertEquals(rule.getValueRegex().pattern(), "^urn:example\\.org:policy:[^:]*$");
assertEquals(rule.getAttributeName(), "urn:example.org:policy");
assertFalse(rule.getIgnoreUnmappedEntityAttributes());
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/RequesterInEntityGroupRuleParserTest.java
similarity index 80%
rename from idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeRequesterInEntityGroupRuleParserTest.java
rename to idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/RequesterInEntityGroupRuleParserTest.java
index 4259e2ef5..547581873 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/RequesterInEntityGroupRuleParserTest.java
@@ -22,19 +22,19 @@ import static org.testng.Assert.assertEquals;
import org.springframework.beans.factory.BeanCreationException;
import org.testng.annotations.Test;
-import net.shibboleth.idp.attribute.filter.policyrule.saml.impl.AttributeRequesterInEntityGroupPolicyRule;
-import net.shibboleth.idp.attribute.filter.spring.saml.impl.AttributeRequesterInEntityGroupRuleParser;
+import net.shibboleth.idp.attribute.filter.policyrule.saml.impl.RequesterInEntityGroupPolicyRule;
+import net.shibboleth.idp.attribute.filter.spring.saml.impl.RequesterInEntityGroupRuleParser;
import net.shibboleth.idp.attribute.filter.spring.testing.BaseAttributeFilterParserTest;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
/**
- * test for {@link AttributeRequesterInEntityGroupRuleParser}.
+ * test for {@link RequesterInEntityGroupRuleParser}.
*/
@SuppressWarnings("javadoc")
-public class AttributeRequesterInEntityGroupRuleParserTest extends BaseAttributeFilterParserTest {
+public class RequesterInEntityGroupRuleParserTest extends BaseAttributeFilterParserTest {
private void testRule(final String propValue, final boolean result) throws ComponentInitializationException {
- final AttributeRequesterInEntityGroupPolicyRule rule = (AttributeRequesterInEntityGroupPolicyRule) getPolicyRule("requesterEG2.xml", contextWithPropertyValue(propValue));
+ final RequesterInEntityGroupPolicyRule rule = (RequesterInEntityGroupPolicyRule) getPolicyRule("requesterEG2.xml", contextWithPropertyValue(propValue));
assertEquals(rule.getEntityGroup(), "urn:example.org");
assertEquals(rule.isCheckAffiliations(), result);
diff --git a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeRequesterNameIDFormatRuleParserTest.java b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/RequesterNameIDFormatRuleParserTest.java
similarity index 69%
rename from idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeRequesterNameIDFormatRuleParserTest.java
rename to idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/RequesterNameIDFormatRuleParserTest.java
index 9efbd768e..382e689d5 100644
--- a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeRequesterNameIDFormatRuleParserTest.java
+++ b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/RequesterNameIDFormatRuleParserTest.java
@@ -21,19 +21,24 @@ import static org.testng.Assert.assertEquals;
import org.testng.annotations.Test;
-import net.shibboleth.idp.attribute.filter.policyrule.saml.impl.AttributeRequesterNameIDFormatExactPolicyRule;
-import net.shibboleth.idp.attribute.filter.spring.saml.impl.AttributeRequesterNameIDFormatRuleParser;
+import net.shibboleth.idp.attribute.filter.policyrule.saml.impl.RequesterNameIDFormatExactPolicyRule;
+import net.shibboleth.idp.attribute.filter.spring.saml.impl.RequesterNameIDFormatRuleParser;
import net.shibboleth.idp.attribute.filter.spring.testing.BaseAttributeFilterParserTest;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
/**
- * test for {@link AttributeRequesterNameIDFormatRuleParser}.
+ * test for {@link RequesterNameIDFormatRuleParser}.
*/
-public class AttributeRequesterNameIDFormatRuleParserTest extends BaseAttributeFilterParserTest {
-
- @SuppressWarnings("javadoc") @Test public void basic() throws ComponentInitializationException {
- final AttributeRequesterNameIDFormatExactPolicyRule rule =
- (AttributeRequesterNameIDFormatExactPolicyRule) getPolicyRule("requesterNameId2.xml");
+public class RequesterNameIDFormatRuleParserTest extends BaseAttributeFilterParserTest {
+
+ /**
+ * Basic test.
+ *
+ * @throws ComponentInitializationException
+ */
+ @Test public void basic() throws ComponentInitializationException {
+ final RequesterNameIDFormatExactPolicyRule rule =
+ (RequesterNameIDFormatExactPolicyRule) getPolicyRule("requesterNameId2.xml");
assertEquals(rule.getNameIdFormat(), "urn:oasis:names:tc:SAML:2.0:nameid-format:persistent");
}
diff --git a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeRequesterRegistrationAuthorityRuleParserTest.java b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/RequesterRegistrationAuthorityRuleParserTest.java
similarity index 78%
rename from idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeRequesterRegistrationAuthorityRuleParserTest.java
rename to idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/RequesterRegistrationAuthorityRuleParserTest.java
index 441c4dd32..27f485d24 100644
--- a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeRequesterRegistrationAuthorityRuleParserTest.java
+++ b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/RequesterRegistrationAuthorityRuleParserTest.java
@@ -24,20 +24,20 @@ import java.util.Set;
import org.testng.annotations.Test;
-import net.shibboleth.idp.attribute.filter.policyrule.saml.impl.AttributeRequesterRegistrationAuthorityPolicyRule;
+import net.shibboleth.idp.attribute.filter.policyrule.saml.impl.RequesterRegistrationAuthorityPolicyRule;
import net.shibboleth.idp.attribute.filter.spring.testing.BaseAttributeFilterParserTest;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
/**
- * test for {@link AttributeRequesterRegistrationAuthorityPolicyRule}.
+ * test for {@link RequesterRegistrationAuthorityPolicyRule}.
*/
@SuppressWarnings("javadoc")
-public class AttributeRequesterRegistrationAuthorityRuleParserTest extends BaseAttributeFilterParserTest {
+public class RequesterRegistrationAuthorityRuleParserTest extends BaseAttributeFilterParserTest {
@Test public void silentTrue() throws ComponentInitializationException {
- final AttributeRequesterRegistrationAuthorityPolicyRule rule =
- (AttributeRequesterRegistrationAuthorityPolicyRule) getPolicyRule("registrationAuthorityOne.xml");
+ final RequesterRegistrationAuthorityPolicyRule rule =
+ (RequesterRegistrationAuthorityPolicyRule) getPolicyRule("registrationAuthorityOne.xml");
assertTrue(rule.isMatchIfMetadataSilent());
final Set<String> issuers = rule.getRegistrars();
@@ -48,8 +48,8 @@ public class AttributeRequesterRegistrationAuthorityRuleParserTest extends BaseA
}
@Test public void silentFalse() throws ComponentInitializationException {
- final AttributeRequesterRegistrationAuthorityPolicyRule rule
- = (AttributeRequesterRegistrationAuthorityPolicyRule) getPolicyRule("registrationAuthorityTwo.xml");
+ final RequesterRegistrationAuthorityPolicyRule rule
+ = (RequesterRegistrationAuthorityPolicyRule) getPolicyRule("registrationAuthorityTwo.xml");
assertTrue(rule.isMatchIfMetadataSilent());
final Set<String> issuers = rule.getRegistrars();
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/proxiedregistrationAuthorityOne.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/proxiedregistrationAuthorityOne.xml
new file mode 100644
index 000000000..bf88e110a
--- /dev/null
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/proxiedregistrationAuthorityOne.xml
@@ -0,0 +1,9 @@
+<AttributeFilterPolicy id="MostBasicExample" 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">
+
+ <PolicyRequirementRule
+ xsi:type="ProxiedRequesterRegistrationAuthority" id="SilentTRUE"
+ matchIfMetadataSilent="true"
+ registrars="https://example.org/SilentTrue/One https://example.org/SilentTrue/Two" />
+</AttributeFilterPolicy>
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/proxiedregistrationAuthorityTwo.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/proxiedregistrationAuthorityTwo.xml
new file mode 100644
index 000000000..7125f1ef8
--- /dev/null
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/proxiedregistrationAuthorityTwo.xml
@@ -0,0 +1,9 @@
+<AttributeFilterPolicy id="MostBasicExample" 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">
+
+ <PolicyRequirementRule
+ xsi:type="ProxiedRequesterRegistrationAuthority" id="SilentTRUE"
+ matchIfMetadataSilent="true"
+ registrars="https://example.org/SilentFalse/One https://example.org/SilentFalse/Two https://example.org/SilentFalse/Three" />
+</AttributeFilterPolicy>
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/proxiedrequesterEA2.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/proxiedrequesterEA2.xml
new file mode 100644
index 000000000..868307234
--- /dev/null
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/proxiedrequesterEA2.xml
@@ -0,0 +1,8 @@
+<AttributeFilterPolicy id="MostBasicExample" 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">
+ <PolicyRequirementRule xsi:type="ProxiedRequesterEntityAttributeExactMatch"
+ attributeName="urn:example.org:policy"
+ attributeValue="urn:example.org:policy:ABCD1234"
+ ignoreUnmappedEntityAttributes="true"/>
+</AttributeFilterPolicy>
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/proxiedrequesterEARegex2.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/proxiedrequesterEARegex2.xml
new file mode 100644
index 000000000..c68fa0823
--- /dev/null
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/proxiedrequesterEARegex2.xml
@@ -0,0 +1,7 @@
+<AttributeFilterPolicy id="MostBasicExample" 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">
+ <PolicyRequirementRule
+ xsi:type="ProxiedRequesterEntityAttributeRegexMatch"
+ attributeName="urn:example.org:policy"
+ attributeValueRegex="^urn:example\.org:policy:[^:]*$" />
+</AttributeFilterPolicy>
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/proxiedrequesterEG2.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/proxiedrequesterEG2.xml
new file mode 100644
index 000000000..1708fcbe5
--- /dev/null
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/proxiedrequesterEG2.xml
@@ -0,0 +1,5 @@
+<AttributeFilterPolicy id="MostBasicExample" 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">
+ <PolicyRequirementRule xsi:type="ProxiedRequesterInEntityGroup" groupID="urn:example.org" checkAffiliations="%{prop}"/>
+</AttributeFilterPolicy>
diff --git a/idp-conf/src/test/resources/conf/credentials.xml b/idp-conf/src/test/resources/conf/credentials.xml
index afb12d854..e457d442f 100644
--- a/idp-conf/src/test/resources/conf/credentials.xml
+++ b/idp-conf/src/test/resources/conf/credentials.xml
@@ -66,6 +66,6 @@
</util:list>
<!-- OIDC extension default credential definitions -->
-<!-- <import resource="oidc-credentials.xml" /> -->
+ <import resource="oidc-credentials.xml" />
</beans>
diff --git a/idp-conf/src/test/resources/conf/metadata-policy1.json b/idp-conf/src/test/resources/conf/metadata-policy1.json
new file mode 100644
index 000000000..c5945dfbe
--- /dev/null
+++ b/idp-conf/src/test/resources/conf/metadata-policy1.json
@@ -0,0 +1,21 @@
+{
+ "grant_types": {
+ "one_of": ["authorization_code","implicit"]
+ },
+ "client_name": {
+ "default": "A known test application"
+ },
+ "organization_name": {
+ "value": "A trusted organization"
+ },
+ "redirect_uris": {
+ "regexp": "^https:\/\/(?:([^.]+).)?example.org\/(.*)",
+ "essential": true
+ },
+ "id_token_signed_response_alg": {
+ "subset_of": ["RS256", "RS384", "RS512"]
+ },
+ "scopes": {
+ "subset_of": ["openid", "profile", "email", "phone"]
+ }
+}
\ No newline at end of file
diff --git a/idp-conf/src/test/resources/conf/oidc.properties b/idp-conf/src/test/resources/conf/oidc.properties
index 588ae7d3f..fefd811e4 100644
--- a/idp-conf/src/test/resources/conf/oidc.properties
+++ b/idp-conf/src/test/resources/conf/oidc.properties
@@ -80,4 +80,7 @@ idp.oidc.subject.salt = this_too_should_be_ch4ng3d
# Lower bound on the next file refresh from the time calculated based on the previous attempt for OP's own metadata (configuration-flow).
#idp.oidc.config.minRefreshDelay = PT5M
-#idp.oidc.config.maxRefreshDelay = PT4H
\ No newline at end of file
+#idp.oidc.config.maxRefreshDelay = PT4H
+
+## To get things loading...
+idp.oidc.dynreg.defaultMetadataPolicyFile = conf/metadata-policy1.json
\ No newline at end of file
diff --git a/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/FilterAttributes.java b/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/FilterAttributes.java
index 5ce1cd5ee..64cb713c9 100644
--- a/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/FilterAttributes.java
+++ b/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/FilterAttributes.java
@@ -130,6 +130,15 @@ public class FilterAttributes extends AbstractProfileAction {
*/
@Nullable private Function<AttributeFilterContext,ProxiedRequesterContext> proxiesFromFilterLookupStrategy;
+ /** Strategy used to locate the {@link SAMLMetadataContext} for the proxied requester. */
+ @Nullable private Function<ProfileRequestContext,SAMLMetadataContext> proxiedRequesterMetadataLookupStrategy;
+
+ /**
+ * Strategy used to locate the {@link SAMLMetadataContext} for the proxied requester via the
+ * {@link AttributeFilterContext}.
+ */
+ @Nullable private Function<AttributeFilterContext,SAMLMetadataContext> proxiedMetadataFromFilterLookupStrategy;
+
/** Whether to treat resolver errors as equivalent to resolving no attributes. */
private boolean maskFailures;
@@ -306,6 +315,22 @@ public class FilterAttributes extends AbstractProfileAction {
proxiedRequesterContextLookupStrategy.compose(profileRequestContextFromFilterLookupStrategy) : null;
}
+ /**
+ * Sets the strategy used to locate proxied requester metadata.
+ *
+ * @param strategy lookup strategy
+ *
+ * @since 4.2.0
+ */
+ public void setProxiedRequesterMetadataLookupStrategy(
+ @Nullable final Function<ProfileRequestContext,SAMLMetadataContext> strategy) {
+ ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
+
+ proxiedRequesterMetadataLookupStrategy = strategy;
+ proxiedMetadataFromFilterLookupStrategy = strategy != null ?
+ proxiedRequesterMetadataLookupStrategy.compose(profileRequestContextFromFilterLookupStrategy) : null;
+ }
+
/**
* Set whether to treat resolution failure as equivalent to resolving no attributes.
*
@@ -413,7 +438,8 @@ public class FilterAttributes extends AbstractProfileAction {
issuerLookupStrategy != null ? issuerLookupStrategy.apply(profileRequestContext) : null)
.setIssuerMetadataContextLookupStrategy(issuerMetadataFromFilterLookupStrategy)
.setRequesterMetadataContextLookupStrategy(metadataFromFilterLookupStrategy)
- .setProxiedRequesterContextLookupStrategy(proxiesFromFilterLookupStrategy);
+ .setProxiedRequesterContextLookupStrategy(proxiesFromFilterLookupStrategy)
+ .setProxiedRequesterMetadataContextLookupStrategy(proxiedMetadataFromFilterLookupStrategy);
// If the filter context doesn't have a set of attributes to filter already
// then look for them in the AttributeContext.
diff --git a/idp-schema/src/main/resources/schema/shibboleth-afp.xsd b/idp-schema/src/main/resources/schema/shibboleth-afp.xsd
index 6aa5da5d7..fe7f11a6b 100644
--- a/idp-schema/src/main/resources/schema/shibboleth-afp.xsd
+++ b/idp-schema/src/main/resources/schema/shibboleth-afp.xsd
@@ -606,6 +606,18 @@
</complexContent>
</complexType>
+ <complexType name="ProxiedRequesterEntityAttributeExactMatch">
+ <annotation>
+ <documentation>
+ A match function that checks if a proxied requester's metadata
+ contains an entity attribute with the specified value.
+ </documentation>
+ </annotation>
+ <complexContent>
+ <extension base="afp:EntityAttributeExactMatchType"/>
+ </complexContent>
+ </complexType>
+
<complexType name="IssuerEntityAttributeExactMatch">
<annotation>
<documentation>
@@ -650,8 +662,20 @@
<complexType name="EntityAttributeRegexMatch">
<annotation>
<documentation>
- A match function that checks if the attribute requester's metadata
- contains an entity attribute with a value that matches the given regular expression.
+ A match function that checks if the attribute requester's metadata contains
+ an entity attribute with a value that matches the given regular expression.
+ </documentation>
+ </annotation>
+ <complexContent>
+ <extension base="afp:EntityAttributeRegexMatchType"/>
+ </complexContent>
+ </complexType>
+
+ <complexType name="ProxiedRequesterEntityAttributeRegexMatch">
+ <annotation>
+ <documentation>
+ A match function that checks if a proxied requester's metadata contains
+ an entity attribute with a value that matches the given regular expression.
</documentation>
</annotation>
<complexContent>
@@ -662,8 +686,8 @@
<complexType name="IssuerEntityAttributeRegexMatch">
<annotation>
<documentation>
- A match function that checks if the attribute issuer's metadata
- contains an entity attribute with a value that matches the given regular expression.
+ A match function that checks if the attribute issuer's metadata contains
+ an entity attribute with a value that matches the given regular expression.
</documentation>
</annotation>
<complexContent>
@@ -749,6 +773,18 @@
</complexContent>
</complexType>
+ <complexType name="ProxiedRequesterInEntityGroup">
+ <annotation>
+ <documentation>
+ A match function that evaluates to true if a proxied requester is found in metadata and
+ is a member of the given entity group.
+ </documentation>
+ </annotation>
+ <complexContent>
+ <extension base="afp:EntityGroupMatchType"/>
+ </complexContent>
+ </complexType>
+
<complexType name="IssuerInEntityGroup">
<annotation>
<documentation>
@@ -785,7 +821,18 @@
<complexType name="RegistrationAuthority">
<annotation>
<documentation>
- A match function that matches the SP (requester) MDRPI against a list of potential values.
+ A match function that matches a requester's MDRPI against a list of potential values.
+ </documentation>
+ </annotation>
+ <complexContent>
+ <extension base="afp:RegistrationAuthorityMatchType" />
+ </complexContent>
+ </complexType>
+
+ <complexType name="ProxiedRequesterRegistrationAuthority">
+ <annotation>
+ <documentation>
+ A match function that matches a proxied requester's MDRPI against a list of potential values.
</documentation>
</annotation>
<complexContent>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list