[java-identity-provider COMMIT] in /trunk/idp-profile-impl/src: main/java/net/shibboleth/idp/profile/impl/FilterAttri...

[noreply at shibboleth.net]

Author: scantor
Date: Sun Mar  9 16:58:01 2014
New Revision: 5552

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5552&view=rev
Log:
Relax handling of missing AttributeContext when filtering

Modified:
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/FilterAttributes.java
    trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/FilterAttributesTest.java

Modified: trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/FilterAttributes.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/FilterAttributes.java?rev=5552&r1=5551&r2=5552&view=diff
==============================================================================
--- trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/FilterAttributes.java (original)
+++ trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/FilterAttributes.java Sun Mar  9 16:58:01 2014
@@ -56,7 +56,6 @@
  * @event {@link org.opensaml.profile.action.EventIds#PROCEED_EVENT_ID}
  * @event {@link IdPEventIds#INVALID_RELYING_PARTY_CTX}
  * @event {@link IdPEventIds#INVALID_SUBJECT_CTX}
- * @event {@link IdPEventIds#INVALID_ATTRIBUTE_CTX}
  * @event {@link IdPEventIds#UNABLE_FILTER_ATTRIBS}
  * 
  * @post If resolution is successful, the relevant RelyingPartyContext.getSubcontext(AttributeContext.class, false) !=
@@ -224,7 +223,6 @@
         attributeContext = rpContext.getSubcontext(AttributeContext.class, false);
         if (attributeContext == null) {
             log.debug("{} No attribute context, no attributes to filter", getLogPrefix());
-            ActionSupport.buildEvent(profileRequestContext, IdPEventIds.INVALID_ATTRIBUTE_CTX);
             return false;
         }
 

Modified: trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/FilterAttributesTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/FilterAttributesTest.java?rev=5552&r1=5551&r2=5552&view=diff
==============================================================================
--- trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/FilterAttributesTest.java (original)
+++ trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/FilterAttributesTest.java Sun Mar  9 16:58:01 2014
@@ -81,7 +81,7 @@
         ActionTestingSupport.assertEvent(event, IdPEventIds.INVALID_RELYING_PARTY_CTX);
     }
 
-    /** Test that the action errors out properly if there is no attribute context. */
+    /** Test that the action proceeds properly if there is no attribute context. */
     @Test public void testNoAttributeContext() throws Exception {
         prc.getSubcontext(SubjectContext.class, true);
 
@@ -93,7 +93,7 @@
         action.initialize();
 
         final Event event = action.execute(src);
-        ActionTestingSupport.assertEvent(event, IdPEventIds.INVALID_ATTRIBUTE_CTX);
+        ActionTestingSupport.assertProceedEvent(event);
     }
 
     /** Test that the action proceeds properly if there are no attributes to filter . */