[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: Wed Jul 10 11:20:23 2013
New Revision: 4551

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4551&view=rev
Log:
IDP-287 Better tests for the -api

Added:
    trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/BaseBridgingClassTester.java   (with props)
    trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/MatcherFromPolicyTest.java   (with props)
    trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/PolicyFromMatcherIdTest.java   (with props)
    trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/PolicyFromMatcherTest.java   (with props)
    trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/RequestedAttributeTest.java   (with props)
Modified:
    trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/AttributeRule.java
    trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/Matcher.java
    trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/MatcherException.java
    trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/PolicyFromMatcherId.java
    trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/PolicyRequirementRule.java
    trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/AttributeFilterContextTest.java
    trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/AttributeFilterPolicyTest.java
    trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/AttributeFilteringEngineTest.java
    trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/MockMatcher.java

Modified: trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/AttributeRule.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/AttributeRule.java?rev=4551&r1=4550&r2=4551&view=diff
==============================================================================
--- trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/AttributeRule.java (original)
+++ trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/AttributeRule.java Wed Jul 10 11:20:23 2013
@@ -177,16 +177,27 @@
                 .getValues().size());
 
         if (permitValueRule != null) {
-            Set<AttributeValue> matchingValues = permitValueRule.getMatchingValues(attribute, filterContext);
-            log.debug("Filter has permitted the release of {} values for attribute '{}'", matchingValues.size(),
+            final Set<AttributeValue> matchingValues = permitValueRule.getMatchingValues(attribute, filterContext);
+            
+            if (null == matchingValues) {
+                log.warn("Filter failed.  Not attributes released for attribute '{}'", getAttributeId());
+            } else {
+                log.debug("Filter has permitted the release of {} values for attribute '{}'", matchingValues.size(),
+                        attribute.getId());
+                filterContext.addPermittedAttributeValues(attribute.getId(), matchingValues);
+            }
+        }
+        if (denyValueRule != null) {
+            final Set<AttributeValue> matchingValues = denyValueRule.getMatchingValues(attribute, filterContext);
+            
+            if (null == matchingValues) {
+                log.warn("Filter failed.  all attributed denied for attribute '{}'", getAttributeId());
+                filterContext.addDeniedAttributeValues(attribute.getId(), attribute.getValues());
+            } else {
+                log.debug("Filter has denied the release of {} values for attribute '{}'", matchingValues.size(),
                     attribute.getId());
-            filterContext.addPermittedAttributeValues(attribute.getId(), matchingValues);
-        }
-        if (denyValueRule != null) {
-            Set<AttributeValue> matchingValues = denyValueRule.getMatchingValues(attribute, filterContext);
-            log.debug("Filter has denied the release of {} values for attribute '{}'", matchingValues.size(),
-                    attribute.getId());
-            filterContext.addDeniedAttributeValues(attribute.getId(), matchingValues);
+                filterContext.addDeniedAttributeValues(attribute.getId(), matchingValues);
+            }
         }
     }
 

Modified: trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/Matcher.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/Matcher.java?rev=4551&r1=4550&r2=4551&view=diff
==============================================================================
--- trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/Matcher.java (original)

[... 275 lines stripped ...]