[java-opensaml COMMIT] in /trunk/opensaml-saml-impl/src: main/java/org/opensaml/saml/saml1/profile/impl/AddNameIdenti...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Jan 28 11:33:46 2014
New Revision: 3579

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3579&view=rev
Log:
IDP-127 / IDP-128: Use arbitrary format if none is prioritized

Modified:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/AddNameIdentifierToSubjects.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddNameIDToSubjects.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/AddNameIdentifierToSubjectsTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddNameIDToSubjectsTest.java

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/AddNameIdentifierToSubjects.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/AddNameIdentifierToSubjects.java?rev=3579&r1=3578&r2=3579&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/AddNameIdentifierToSubjects.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/AddNameIdentifierToSubjects.java Tue Jan 28 11:33:46 2014
@@ -52,6 +52,7 @@
 
 import com.google.common.base.Function;
 import com.google.common.base.Functions;
+import com.google.common.collect.Lists;
 
 /**
  * Action that builds a {@link NameIdentifier} and adds it to the {@link Subject} of all the statements
@@ -179,11 +180,11 @@
         
         formats = formatLookupStrategy.apply(profileRequestContext);
         if (formats == null || formats.isEmpty()) {
-            log.debug("{} No candidate NameIdentifier formats were available, nothing to do", getLogPrefix());
-            return false;
-        }
-        
-        log.debug("{} Candidate NameIdentifier formats: {}", getLogPrefix(), formats);
+            log.debug("{} No candidate NameIdentifier formats, an arbitrary format will be chosen", getLogPrefix());
+            formats = Lists.newArrayList(nameIdGeneratorMap.keySet());
+        } else {
+            log.debug("{} Candidate NameIdentifier formats: {}", getLogPrefix(), formats);
+        }
         
         return super.doPreExecute(profileRequestContext);
     }

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=3579&r1=3578&r2=3579&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 Tue Jan 28 11:33:46 2014
@@ -40,7 +40,6 @@
 import org.opensaml.messaging.context.navigate.MessageLookup;
 import org.opensaml.saml.common.SAMLObjectBuilder;
 import org.opensaml.saml.common.profile.logic.MetadataNameIdentifierFormatStrategy;
-import org.opensaml.saml.saml1.profile.SAML1NameIdentifierGenerator;
 import org.opensaml.saml.saml2.core.Assertion;
 import org.opensaml.saml.saml2.core.NameID;
 import org.opensaml.saml.saml2.core.Response;
@@ -51,6 +50,7 @@
 
 import com.google.common.base.Function;
 import com.google.common.base.Functions;
+import com.google.common.collect.Lists;
 
 /**
  * Action that builds a {@link NameID} and adds it to the {@link Subject} of all the assertions
@@ -178,8 +178,10 @@
         
         formats = formatLookupStrategy.apply(profileRequestContext);
         if (formats == null || formats.isEmpty()) {
-            log.debug("{} No candidate NameID formats were available, nothing to do", getLogPrefix());
-            return false;
+            log.debug("{} No candidate NameIdentifier formats, an arbitrary format will be chosen", getLogPrefix());
+            formats = Lists.newArrayList(nameIdGeneratorMap.keySet());
+        } else {
+            log.debug("{} Candidate NameIdentifier formats: {}", getLogPrefix(), formats);
         }
         
         log.debug("{} Candidate NameID formats: {}", getLogPrefix(), formats);

Modified: trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/AddNameIdentifierToSubjectsTest.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/AddNameIdentifierToSubjectsTest.java?rev=3579&r1=3578&r2=3579&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/AddNameIdentifierToSubjectsTest.java (original)
+++ trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/AddNameIdentifierToSubjectsTest.java Tue Jan 28 11:33:46 2014
@@ -109,7 +109,30 @@
         ActionTestingSupport.assertProceedEvent(prc);

[... 68 lines stripped ...]