[java-opensaml COMMIT] /trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddNameIDToSubjec...

[noreply at shibboleth.net]

Author: scantor
Date: Sat Mar 15 20:09:35 2014
New Revision: 3709

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3709&view=rev
Log:
Check for inapplicable formats.

Modified:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddNameIDToSubjects.java

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddNameIDToSubjects.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddNameIDToSubjects.java?rev=3709&r1=3708&r2=3709&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddNameIDToSubjects.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddNameIDToSubjects.java Sat Mar 15 20:09:35 2014
@@ -54,6 +54,7 @@
 import com.google.common.base.Function;
 import com.google.common.base.Functions;
 import com.google.common.base.Predicates;
+import com.google.common.base.Strings;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Collections2;
 import com.google.common.collect.ListMultimap;
@@ -271,21 +272,23 @@
      * 
      * @return a format dictated by the request, or null 
      */
-    @Nullable private String getRequiredFormat(
-            @Nonnull final ProfileRequestContext profileRequestContext) {
-        String format = null;
+    @Nullable private String getRequiredFormat(@Nonnull final ProfileRequestContext profileRequestContext) {
         
         if (profileRequestContext.getInboundMessageContext() != null) {
             final Object request = profileRequestContext.getInboundMessageContext().getMessage();
             if (request != null && request instanceof AuthnRequest) {
                 final NameIDPolicy policy = ((AuthnRequest) request).getNameIDPolicy();
-                if (policy != null && policy.getFormat() != null) {
-                    format = policy.getFormat();
+                if (policy != null) {
+                    final String format = policy.getFormat();
+                    if (!Strings.isNullOrEmpty(format) && !NameID.UNSPECIFIED.equals(format)
+                            && !NameID.ENCRYPTED.equals(format)) {
+                        return format;
+                    }
                 }
             }
         }
         
-        return format;
+        return null;
     }
 
     /**