[java-identity-provider COMMIT] in /trunk: idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter...

[noreply at shibboleth.net]

Author: rdw
Date: Sat Jan  4 10:26:31 2014
New Revision: 5148

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5148&view=rev
Log:
IDP-351 Add the principal to the AttributeFilterContext and AttributeResolutionContext

Modified:
    trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterContext.java
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/impl/matcher/DataSources.java
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/context/AttributeResolutionContext.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/TestSources.java
    trunk/idp-profile-api/pom.xml
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/IdPEventIds.java
    trunk/idp-profile-api/src/test/java/net/shibboleth/idp/profile/RequestContextBuilder.java
    trunk/idp-profile-impl/pom.xml
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/FilterAttributes.java
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ResolveAttributes.java

Modified: trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterContext.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterContext.java?rev=5148&r1=5147&r2=5148&view=diff
==============================================================================
--- trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterContext.java (original)
+++ trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterContext.java Sat Jan  4 10:26:31 2014
@@ -65,6 +65,9 @@
     /** Attributes which have been filtered. */
     private Map<String, IdPAttribute> filteredAttributes;
 
+    /** The principal associated with the filtering. */
+    private String principal;
+
     /** Constructor. */
     public AttributeFilterContext() {
         prefilteredAttributes =
@@ -109,7 +112,8 @@
      * 
      * @return collection of attribute values, indexed by ID, that are permitted to be released,
      */
-    @Nonnull @NonnullElements @Unmodifiable public Map<String, Set<IdPAttributeValue>> getPermittedIdPAttributeValues(){
+    @Nonnull @NonnullElements @Unmodifiable public Map<String, Set<IdPAttributeValue>> 
+            getPermittedIdPAttributeValues() {
         return Collections.unmodifiableMap(permittedValues);
     }
 
@@ -251,4 +255,23 @@
 
         requestedAttributes = attributes;
     }
+
+    /**
+     * Sets the principal associated with the filtering.
+     * 
+     * @return Returns the principal.
+     */
+    public String getPrincipal() {
+        return principal;
+    }
+
+    /**
+     * Gets the principal associated with the filtering.
+     * 
+     * @param who The principal to set.
+     */
+    public void setPrincipal(String who) {
+        principal = who;
+    }
+
 }

Modified: trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/impl/matcher/DataSources.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/impl/matcher/DataSources.java?rev=5148&r1=5147&r2=5148&view=diff
==============================================================================
--- trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/impl/matcher/DataSources.java (original)
+++ trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/impl/matcher/DataSources.java Sat Jan  4 10:26:31 2014
@@ -19,8 +19,8 @@
 
 import javax.annotation.Nonnull;
 
+import net.shibboleth.idp.attribute.ByteAttributeValue;
 import net.shibboleth.idp.attribute.IdPAttributeValue;
-import net.shibboleth.idp.attribute.ByteAttributeValue;
 import net.shibboleth.idp.attribute.ScopedStringAttributeValue;
 import net.shibboleth.idp.attribute.StringAttributeValue;
 import net.shibboleth.idp.attribute.filter.context.AttributeFilterContext;
@@ -56,16 +56,18 @@
 
     public final static IdPAttributeValue OTHER_VALUE = new IdPAttributeValue() {
 
-        @Nonnull public Object getValue() {
+        @Override @Nonnull public Object getValue() {
             return TEST_STRING;
         }
     };
-    
+
     public static AttributeFilterContext populatedFilterContext(String principal, String issuerID, String recipientId) {
 
         BaseContext parent = new BaseContext() {};
         parent.addSubcontext(TestSources.createResolutionContext(principal, issuerID, recipientId));
-        return parent.getSubcontext(AttributeFilterContext.class, true);
+        AttributeFilterContext retVal = parent.getSubcontext(AttributeFilterContext.class, true);
+        retVal.setPrincipal(principal);
+        return retVal;
     }
 
     public static AttributeFilterContext unPopulatedFilterContext() {


[... 357 lines stripped ...]