[java-opensaml] branch maint-3.4 updated: Ignore format during NameIDPolicy evaluation.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch maint-3.4
in repository java-opensaml.

View the commit online:
http://git.shibboleth.net/view/?p=java-opensaml.git;a=commit;h=1ad92255de5d668f01d8e23135cc4ed17be13ff0

The following commit(s) were added to refs/heads/maint-3.4 by this push:
       new  1ad9225   Ignore format during NameIDPolicy evaluation.
1ad9225 is described below

commit 1ad92255de5d668f01d8e23135cc4ed17be13ff0
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Sep 4 10:24:05 2019 -0400

    Ignore format during NameIDPolicy evaluation.
    
    (cherry picked from commit 945b40830469602f52ff0dfc67e837911dd13dcb)
---
 .../common/profile/logic/AbstractNameIDPolicyPredicate.java  | 12 ++----------
 .../saml/saml2/profile/impl/AddNameIDToSubjectsTest.java     |  3 ++-
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/AbstractNameIDPolicyPredicate.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/AbstractNameIDPolicyPredicate.java
index 4778f0f..cc343b3 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/AbstractNameIDPolicyPredicate.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/AbstractNameIDPolicyPredicate.java
@@ -204,15 +204,7 @@ public abstract class AbstractNameIDPolicyPredicate extends AbstractInitializabl
         final String requesterId = requesterIdLookupStrategy != null ? requesterIdLookupStrategy.apply(input) : null;
         final String responderId = responderIdLookupStrategy != null ? responderIdLookupStrategy.apply(input) : null;
 
-        final String format = target.getFormat();
-        if (formats.contains(format != null ? format : NameID.UNSPECIFIED)) {
-            log.debug("Applying policy to NameIDPolicy with Format {}", format != null ? format : NameID.UNSPECIFIED);
-            return doApply(requesterId, responderId, format, null, target.getSPNameQualifier());
-        } else {
-            log.debug("Policy checking disabled for NameIDPolicy with Format {}",
-                    format != null ? format : NameID.UNSPECIFIED);
-            return true;
-        }
+        return doApply(requesterId, responderId, target.getFormat(), null, target.getSPNameQualifier());
     }
     
     /**
@@ -230,4 +222,4 @@ public abstract class AbstractNameIDPolicyPredicate extends AbstractInitializabl
             @Nullable final String format, @Nullable final String nameQualifier,
             @Nullable final String spNameQualifier);
     
-}
\ No newline at end of file
+}
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddNameIDToSubjectsTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddNameIDToSubjectsTest.java
index d8f16087..7113a9f 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddNameIDToSubjectsTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddNameIDToSubjectsTest.java
@@ -219,7 +219,7 @@ public class AddNameIDToSubjectsTest extends XMLObjectBaseTestCase {
         addAssertions();
         final AuthnRequest request = SAML2ActionTestingSupport.buildAuthnRequest();
         final NameIDPolicy policy = policyBuilder.buildObject();
-        policy.setFormat(NameID.PERSISTENT);
+        policy.setFormat(NameID.UNSPECIFIED);
         policy.setSPNameQualifier("foo");
         request.setNameIDPolicy(policy);
         prc.getInboundMessageContext().setMessage(request);
@@ -238,6 +238,7 @@ public class AddNameIDToSubjectsTest extends XMLObjectBaseTestCase {
         Subject subject = assertion.getSubject();
         Assert.assertNull(subject);
         
+        policy.setFormat(NameID.PERSISTENT);
         policy.setSPNameQualifier("http://affiliation.example.org");
         action.execute(prc);
         ActionTestingSupport.assertProceedEvent(prc);

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.