[java-identity-provider] branch master updated: IDP-1331 - Support relying party groups in attribute resolver/filter

[Scott Cantor]

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=b78b9f434c1516d659c07bdbf0209a27824cf98a

The following commit(s) were added to refs/heads/master by this push:
       new  b78b9f4   IDP-1331 - Support relying party groups in attribute resolver/filter
b78b9f4 is described below

commit b78b9f434c1516d659c07bdbf0209a27824cf98a
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Sep 11 14:27:35 2018 -0400

    IDP-1331 - Support relying party groups in attribute resolver/filter
    
    https://issues.shibboleth.net/jira/browse/IDP-1331
    
    Extend support to filter context.
---
 .../filter/context/AttributeFilterContext.java     | 48 ++++++++++++++++++----
 .../context/AttributeResolutionContext.java        |  1 +
 2 files changed, 41 insertions(+), 8 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 0ddc940..09a86b9 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
@@ -63,6 +63,9 @@ public final class AttributeFilterContext extends BaseContext {
     /** The attribute recipient identity. */
     @Nullable private String attributeRecipientID;
 
+    /** The attribute recipient's group identity. */
+    @Nullable private String attributeRecipientGroupID;
+    
     /** How was the principal Authenticated? */
     @Deprecated
     @Nullable private String principalAuthenticationMethod;
@@ -178,42 +181,71 @@ public final class AttributeFilterContext extends BaseContext {
     }
 
     /**
-     * Gets the attribute issuer (me) associated with this resolution.
+     * Gets the attribute issuer (me) associated with this filtering.
      * 
-     * @return the attribute issuer associated with this resolution.
+     * @return the attribute issuer associated with this filtering
      */
     @Nullable public String getAttributeIssuerID() {
         return attributeIssuerID;
     }
 
     /**
-     * Sets the attribute issuer (me) associated with this resolution.
+     * Sets the attribute issuer (me) associated with this filtering.
      * 
-     * @param value the attribute issuer associated with this resolution.
+     * @param value the attribute issuer associated with this filtering
      */
     @Nullable public void setAttributeIssuerID(@Nullable final String value) {
         attributeIssuerID = value;
     }
 
     /**
-     * Gets the attribute recipient (her) associated with this resolution.
+     * Gets the attribute recipient (her) associated with this filtering.
      * 
-     * @return the attribute recipient associated with this resolution.
+     * @return the attribute recipient associated with this filtering
      */
     @Nullable public String getAttributeRecipientID() {
         return attributeRecipientID;
     }
 
     /**
-     * Sets the attribute recipient (her) associated with this resolution.
+     * Sets the attribute recipient (her) associated with this filtering.
      * 
-     * @param value the attribute recipient associated with this resolution.
+     * @param value the attribute recipient associated with this filtering
      */
     @Nullable public void setAttributeRecipientID(@Nullable final String value) {
         attributeRecipientID = value;
     }
 
     /**
+     * Get the attribute recipient grouping associated with this filtering.
+     * 
+     * <p>This is a protocol-independent way to represent an association between the attribute recipient
+     * and some larger group that may be relevant to attribute filtering.</p>
+     * 
+     * @return the attribute recipient group associated with this filtering
+     * 
+     * @since 3.4.0
+     */
+    @Nullable public String getAttributeRecipientGroupID() {
+        return attributeRecipientGroupID;
+    }
+
+    /**
+     * Set the attribute recipient grouping associated with this filtering.
+     * 
+     * @param value the attribute recipient group associated with this filtering
+     * 
+     * @return this context
+     * 
+     * @since 3.4.0
+     */
+    @Nullable public AttributeFilterContext setAttributeRecipientGroupID(@Nullable final String value) {
+        attributeRecipientGroupID = value;
+        
+        return this;
+    }
+    
+    /**
      * Sets how the principal was authenticated.
      * 
      * @return Returns the principalAuthenticationMethod.
diff --git a/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/context/AttributeResolutionContext.java b/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/context/AttributeResolutionContext.java
index e28ac27..c235bbb 100644
--- a/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/context/AttributeResolutionContext.java
+++ b/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/context/AttributeResolutionContext.java
@@ -68,6 +68,7 @@ public class AttributeResolutionContext extends BaseContext {
     @Nullable private String attributeRecipientGroupID;
 
     /** How was the principal Authenticated? */
+    @Deprecated
     @Nullable private String principalAuthenticationMethod;
     
     /** Whether the resolver should allow for results to come from cache. */

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