[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: Tue Jan  7 06:09:52 2014
New Revision: 5158

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5158&view=rev
Log:
IDP-351 Metadata only comes from the SAMLMetadatContext.  Put mechanisms into the AttributeFilterContext to locate it and allow for an injectable strategy in the FilterAttributes Action

Modified:
    trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterContext.java
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/policyrule/saml/AttributeIssuerEntityAttributeExactPolicyRule.java
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/policyrule/saml/AttributeIssuerEntityAttributeRegexPolicyRule.java
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/policyrule/saml/AttributeIssuerInEntityGroupPolicyRule.java
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/policyrule/saml/AttributeIssuerNameIDFormatExactPolicyRule.java
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/policyrule/saml/AttributeRequesterEntityAttributeExactPolicyRule.java
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/policyrule/saml/AttributeRequesterEntityAttributeRegexPolicyRule.java
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/policyrule/saml/AttributeRequesterInEntityGroupPolicyRule.java
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/policyrule/saml/AttributeRequesterNameIDFormatExactPolicyRule.java
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/impl/policyrule/saml/AttributeIssuerEntityAttributeExactPolicyRuleTest.java
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/impl/policyrule/saml/AttributeIssuerEntityAttributeRegexPolicyRuleTest.java
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/impl/policyrule/saml/AttributeIssuerInEntityGroupPolicyRuleTest.java
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/impl/policyrule/saml/AttributeIssuerNameIDFormatExactPolicyRuleTest.java
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/impl/policyrule/saml/BaseMetadataTests.java
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/impl/policyrule/saml/attributemapper/
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/FilterAttributes.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=5158&r1=5157&r2=5158&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 Tue Jan  7 06:09:52 2014
@@ -32,6 +32,7 @@
 import net.shibboleth.idp.attribute.IdPAttribute;
 import net.shibboleth.idp.attribute.IdPAttributeValue;
 import net.shibboleth.idp.attribute.IdPRequestedAttribute;
+import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 import net.shibboleth.utilities.java.support.annotation.constraint.NullableElements;
@@ -41,7 +42,9 @@
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 import org.opensaml.messaging.context.BaseContext;
-
+import org.opensaml.saml.common.messaging.context.SAMLMetadataContext;
+
+import com.google.common.base.Function;
 import com.google.common.base.Predicates;
 import com.google.common.collect.MapConstraints;
 import com.google.common.collect.Multimap;
@@ -76,6 +79,12 @@
 
     /** How was the principal Authenticated? */
     @Nullable private String principalAuthenticationMethod;
+
+    /** Cache of the metadata context. */
+    private SAMLMetadataContext requesterMetadataContext;
+
+    /** How to get from hus to the SP metadata context. */
+    private Function<AttributeFilterContext, SAMLMetadataContext> requesterMetadataContextLookupStrategy;
 
     /** Constructor. */
     public AttributeFilterContext() {
@@ -122,7 +131,7 @@
      * @return collection of attribute values, indexed by ID, that are permitted to be released,
      */
     @Nonnull @NonnullElements @Unmodifiable public Map<String, Set<IdPAttributeValue>> 
-                       getPermittedIdPAttributeValues() {
+            getPermittedIdPAttributeValues() {

[... 718 lines stripped ...]