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

[noreply at shibboleth.net]

Author: rdw
Date: Wed Mar 21 11:45:45 2012
New Revision: 4126

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4126&view=rev
Log:
Bug fix in permit rules.  Comment why test coverage is impossible, make the engine return Optional.absert() not Option.present(emptyList).

Modified:
    trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeFilteringEngine.java

Modified: trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeFilteringEngine.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeFilteringEngine.java?rev=4126&r1=4125&r2=4126&view=diff
==============================================================================
--- trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeFilteringEngine.java (original)
+++ trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeFilteringEngine.java Wed Mar 21 11:45:45 2012
@@ -138,6 +138,7 @@
             if (!policy.isApplicable(filterContext)) {
                 log.debug("Attribute filtering engine '{}': filter policy '{}' is not applicable", getId(),
                         policy.getId());
+                continue;
             }
 
             policy.apply(filterContext);
@@ -181,6 +182,10 @@
         if (filteredAttributeValues == null || filteredAttributeValues.isEmpty()) {
             log.debug("Attribute filtering engine '{}': no policy permitted release of attribute {} values", getId(),
                     attributeId);
+            //
+            // Note that this code will not be exercised - empty attributes are stripped out in 
+            // AttributeFilterPolicy#apply
+            //
             return Optional.absent();
         }
 
@@ -191,6 +196,7 @@
         if (filteredAttributeValues.isEmpty()) {
             log.debug("Attribute filtering engine '{}': deny policies filtered out all values for attribute '{}'",
                     getId(), attributeId);
+            return Optional.absent();
         } else {
             log.debug("Attribute filtering engine '{}': {} values for attribute '{}' remained after filtering",
                     new Object[] {getId(), filteredAttributeValues.size(), attributeId,});