[java-identity-provider] branch master updated: Deprecate AuthenticationMethod simplification during filtering.
Scott Cantor
cantor.2 at osu.edu
Thu Nov 2 23:15:55 EDT 2017
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch master
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=8b2a7d998f19ff6598eb27eb9df6ee3641dd8020
The following commit(s) were added to refs/heads/master by this push:
new 8b2a7d9 Deprecate AuthenticationMethod simplification during filtering.
8b2a7d9 is described below
commit 8b2a7d998f19ff6598eb27eb9df6ee3641dd8020
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Nov 2 23:15:50 2017 -0400
Deprecate AuthenticationMethod simplification during filtering.
---
.../filter/context/AttributeFilterContext.java | 3 +++
.../impl/AuthenticationMethodPolicyRule.java | 2 +-
.../impl/AuthenticationMethodRegexpPolicyRule.java | 2 +-
.../impl/AuthenticationMethodRegexRuleParser.java | 18 +++++++++++++++++-
.../impl/AuthenticationMethodRuleParser.java | 17 ++++++++++++++++-
.../shibboleth/idp/profile/impl/FilterAttributes.java | 1 +
6 files changed, 39 insertions(+), 4 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 8b1447d..0ddc940 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
@@ -64,6 +64,7 @@ public final class AttributeFilterContext extends BaseContext {
@Nullable private String attributeRecipientID;
/** How was the principal Authenticated? */
+ @Deprecated
@Nullable private String principalAuthenticationMethod;
/** Cache of the metadata context. */
@@ -217,6 +218,7 @@ public final class AttributeFilterContext extends BaseContext {
*
* @return Returns the principalAuthenticationMethod.
*/
+ @Deprecated
@Nullable public String getPrincipalAuthenticationMethod() {
return principalAuthenticationMethod;
}
@@ -226,6 +228,7 @@ public final class AttributeFilterContext extends BaseContext {
*
* @param method The principalAuthenticationMethod to set.
*/
+ @Deprecated
public void setPrincipalAuthenticationMethod(@Nullable final String method) {
principalAuthenticationMethod = method;
}
diff --git a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/AuthenticationMethodPolicyRule.java b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/AuthenticationMethodPolicyRule.java
index b174605..8d961fb 100644
--- a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/AuthenticationMethodPolicyRule.java
+++ b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/AuthenticationMethodPolicyRule.java
@@ -46,7 +46,7 @@ public class AuthenticationMethodPolicyRule extends AbstractStringPolicyRule {
ComponentSupport.ifNotInitializedThrowUninitializedComponentException(this);
- final String method = filterContext.getPrincipalAuthenticationMethod();
+ @SuppressWarnings("deprecation") final String method = filterContext.getPrincipalAuthenticationMethod();
if (null == method) {
log.warn("{} No authetication method found for comparison", getLogPrefix());
return Tristate.FAIL;
diff --git a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/AuthenticationMethodRegexpPolicyRule.java b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/AuthenticationMethodRegexpPolicyRule.java
index 6624199..481bca4 100644
--- a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/AuthenticationMethodRegexpPolicyRule.java
+++ b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/AuthenticationMethodRegexpPolicyRule.java
@@ -46,7 +46,7 @@ public class AuthenticationMethodRegexpPolicyRule extends AbstractRegexpPolicyRu
ComponentSupport.ifNotInitializedThrowUninitializedComponentException(this);
- final String method = filterContext.getPrincipalAuthenticationMethod();
+ @SuppressWarnings("deprecation") final String method = filterContext.getPrincipalAuthenticationMethod();
if (null == method) {
log.warn("{} No authetication method found for comparison", getLogPrefix());
return Tristate.FAIL;
diff --git a/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/policyrule/impl/AuthenticationMethodRegexRuleParser.java b/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/policyrule/impl/AuthenticationMethodRegexRuleParser.java
index 60259cb..fe5e5e6 100644
--- a/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/policyrule/impl/AuthenticationMethodRegexRuleParser.java
+++ b/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/policyrule/impl/AuthenticationMethodRegexRuleParser.java
@@ -20,9 +20,15 @@ package net.shibboleth.idp.attribute.filter.spring.policyrule.impl;
import javax.annotation.Nonnull;
import javax.xml.namespace.QName;
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.xml.ParserContext;
+import org.w3c.dom.Element;
+
import net.shibboleth.idp.attribute.filter.policyrule.filtercontext.impl.AuthenticationMethodRegexpPolicyRule;
import net.shibboleth.idp.attribute.filter.spring.BaseFilterParser;
import net.shibboleth.idp.attribute.filter.spring.basic.impl.AttributeFilterBasicNamespaceHandler;
+import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
+import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
/**
* Bean definition parser for {@link AuthenticationMethodRegexpPolicyRule}.
@@ -45,4 +51,14 @@ public class AuthenticationMethodRegexRuleParser extends AbstractRegexPolicyRule
@Override @Nonnull protected Class<AuthenticationMethodRegexpPolicyRule> getNativeBeanClass() {
return AuthenticationMethodRegexpPolicyRule.class;
}
-}
+
+ /** {@inheritDoc} */
+ @Override protected void doNativeParse(@Nonnull final Element element, @Nonnull final ParserContext parserContext,
+ @Nonnull final BeanDefinitionBuilder builder) {
+ super.doNativeParse(element, parserContext, builder);
+
+ DeprecationSupport.warn(ObjectType.XSITYPE, SCHEMA_TYPE_AFP.toString(),
+ parserContext.getReaderContext().getResource().getDescription(), null);
+ }
+
+}
\ No newline at end of file
diff --git a/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/policyrule/impl/AuthenticationMethodRuleParser.java b/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/policyrule/impl/AuthenticationMethodRuleParser.java
index 6bb522a..4e5065d 100644
--- a/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/policyrule/impl/AuthenticationMethodRuleParser.java
+++ b/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/policyrule/impl/AuthenticationMethodRuleParser.java
@@ -20,9 +20,15 @@ package net.shibboleth.idp.attribute.filter.spring.policyrule.impl;
import javax.annotation.Nonnull;
import javax.xml.namespace.QName;
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.xml.ParserContext;
+import org.w3c.dom.Element;
+
import net.shibboleth.idp.attribute.filter.policyrule.filtercontext.impl.AuthenticationMethodPolicyRule;
import net.shibboleth.idp.attribute.filter.spring.BaseFilterParser;
import net.shibboleth.idp.attribute.filter.spring.basic.impl.AttributeFilterBasicNamespaceHandler;
+import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
+import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
/**
* Bean definition parser for {@link AuthenticationMethodPolicyRule}.
@@ -46,4 +52,13 @@ public class AuthenticationMethodRuleParser extends AbstractStringPolicyRulePars
return AuthenticationMethodPolicyRule.class;
}
-}
+ /** {@inheritDoc} */
+ @Override protected void doNativeParse(@Nonnull final Element element, @Nonnull final ParserContext parserContext,
+ @Nonnull final BeanDefinitionBuilder builder) {
+ super.doNativeParse(element, parserContext, builder);
+
+ DeprecationSupport.warn(ObjectType.XSITYPE, SCHEMA_TYPE_AFP.toString(),
+ parserContext.getReaderContext().getResource().getDescription(), null);
+ }
+
+}
\ 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 3f64f34..bd457be 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
@@ -394,6 +394,7 @@ public class FilterAttributes extends AbstractProfileAction {
* @param profileRequestContext current profile request context
* @param filterContext context to populate
*/
+ @SuppressWarnings("deprecation")
private void populateFilterContext(@Nonnull final ProfileRequestContext profileRequestContext,
@Nonnull final AttributeFilterContext filterContext) {
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list