[java-identity-provider] 42/51: IDP-1409 Remove PrinciaplAuthenticationMethod from attribute filter context

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=fe6a593f9c9c8dafd1dc78325eef74b90ce91df2

commit fe6a593f9c9c8dafd1dc78325eef74b90ce91df2
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Jan 30 17:15:00 2019 +0000

    IDP-1409 Remove PrinciaplAuthenticationMethod from attribute filter context
    
    https://issues.shibboleth.net/jira/browse/IDP-1409
---
 .../filter/context/AttributeFilterContext.java     | 20 -------------
 .../filter/context/AttributeFilterContextTest.java |  5 ----
 .../idp/profile/impl/FilterAttributes.java         | 34 ++++++++--------------
 3 files changed, 12 insertions(+), 47 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 62c5195..8e8f8b7 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
@@ -246,26 +246,6 @@ public final class AttributeFilterContext extends BaseContext {
     }
     
     /**
-     * Sets how the principal was authenticated.
-     * 
-     * @return Returns the principalAuthenticationMethod.
-     */
-    @Deprecated
-    @Nullable public String getPrincipalAuthenticationMethod() {
-        return principalAuthenticationMethod;
-    }
-
-    /**
-     * Gets how the principal was authenticated.
-     * 
-     * @param method The principalAuthenticationMethod to set.
-     */
-    @Deprecated
-    public void setPrincipalAuthenticationMethod(@Nullable final String method) {
-        principalAuthenticationMethod = method;
-    }
-
-    /**
      * Get the strategy used to locate the SP's metadata context.
      * 
      * @return lookup strategy
diff --git a/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterContextTest.java b/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterContextTest.java
index 543fafa..93ccfc4 100644
--- a/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterContextTest.java
+++ b/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterContextTest.java
@@ -151,7 +151,6 @@ public class AttributeFilterContextTest {
         Assert.assertNull(context.getAttributeIssuerID());
         Assert.assertNull(context.getAttributeRecipientID());
         Assert.assertNull(context.getPrincipal());
-        Assert.assertNull(context.getPrincipalAuthenticationMethod());
 
         context.setAttributeIssuerID("aiid");
         Assert.assertEquals(context.getAttributeIssuerID(), "aiid");
@@ -161,10 +160,6 @@ public class AttributeFilterContextTest {
 
         context.setPrincipal("princ");
         Assert.assertEquals(context.getPrincipal(), "princ");
-
-        context.setPrincipalAuthenticationMethod("princam");
-        Assert.assertEquals(context.getPrincipalAuthenticationMethod(), "princam");
-
     }
 
     @Test public void strategies() {
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 0b12606..b974a81 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
@@ -22,11 +22,22 @@ import java.util.function.Function;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+import org.opensaml.messaging.context.navigate.ChildContextLookup;
+import org.opensaml.messaging.context.navigate.RootContextLookup;
+import org.opensaml.profile.action.ActionSupport;
+import org.opensaml.profile.context.ProfileRequestContext;
+import org.opensaml.profile.context.ProxiedRequesterContext;
+import org.opensaml.profile.context.navigate.InboundMessageContextLookup;
+import org.opensaml.saml.common.messaging.context.SAMLMetadataContext;
+import org.opensaml.saml.common.messaging.context.SAMLPeerEntityContext;
+import org.opensaml.saml.metadata.resolver.MetadataResolver;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import net.shibboleth.idp.attribute.context.AttributeContext;
 import net.shibboleth.idp.attribute.filter.AttributeFilter;
 import net.shibboleth.idp.attribute.filter.AttributeFilterException;
 import net.shibboleth.idp.attribute.filter.context.AttributeFilterContext;
-import net.shibboleth.idp.authn.AuthenticationResult;
 import net.shibboleth.idp.authn.context.AuthenticationContext;
 import net.shibboleth.idp.authn.context.SubjectContext;
 import net.shibboleth.idp.authn.context.navigate.SubjectContextPrincipalLookupFunction;
@@ -40,18 +51,6 @@ import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.service.ReloadableService;
 import net.shibboleth.utilities.java.support.service.ServiceableComponent;
 
-import org.opensaml.messaging.context.navigate.ChildContextLookup;
-import org.opensaml.messaging.context.navigate.RootContextLookup;
-import org.opensaml.profile.action.ActionSupport;
-import org.opensaml.profile.context.ProfileRequestContext;
-import org.opensaml.profile.context.ProxiedRequesterContext;
-import org.opensaml.profile.context.navigate.InboundMessageContextLookup;
-import org.opensaml.saml.common.messaging.context.SAMLMetadataContext;
-import org.opensaml.saml.common.messaging.context.SAMLPeerEntityContext;
-import org.opensaml.saml.metadata.resolver.MetadataResolver;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
  * Action that invokes the {@link AttributeFilter} for the current request.
  * 
@@ -389,7 +388,6 @@ 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) {
         
@@ -397,14 +395,6 @@ public class FilterAttributes extends AbstractProfileAction {
         
         filterContext.setPrincipal(principalNameLookupStrategy.apply(profileRequestContext));
 
-        filterContext.setPrincipalAuthenticationMethod(null);
-        if (null != authenticationContext) {
-            final AuthenticationResult result = authenticationContext.getAuthenticationResult();
-            if (null != result) {
-                filterContext.setPrincipalAuthenticationMethod(result.getAuthenticationFlowId());
-            }
-        }
-
         if (recipientLookupStrategy != null) {
             filterContext.setAttributeRecipientID(recipientLookupStrategy.apply(profileRequestContext));
         } else {

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.