[java-opensaml COMMIT] in /trunk: opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/profile/SAML2ActionSupport....

[noreply at shibboleth.net]

Author: scantor
Date: Sun Nov 16 15:20:49 2014
New Revision: 4147

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4147&view=rev
Log:
Relax error handling in NameID actions, and allow auto-creation of SAML 2 assertions.

Modified:
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/profile/SAML2ActionSupport.java
    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-api/src/main/java/org/opensaml/saml/saml2/profile/SAML2ActionSupport.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/profile/SAML2ActionSupport.java?rev=4147&r1=4146&r2=4147&view=diff
==============================================================================
--- trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/profile/SAML2ActionSupport.java (original)
+++ trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/profile/SAML2ActionSupport.java Sun Nov 16 15:20:49 2014
@@ -18,8 +18,8 @@
 package org.opensaml.saml.saml2.profile;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 import net.shibboleth.utilities.java.support.security.IdentifierGenerationStrategy;
 
 import org.joda.time.DateTime;
@@ -54,25 +54,26 @@
      * @return the assertion
      */
     @Nonnull public static Assertion buildAssertion(@Nonnull final AbstractProfileAction action,
-            @Nonnull final IdentifierGenerationStrategy idGenerator, @Nonnull @NotEmpty final String issuer) {
+            @Nonnull final IdentifierGenerationStrategy idGenerator, @Nullable final String issuer) {
    
         final SAMLObjectBuilder<Assertion> assertionBuilder = (SAMLObjectBuilder<Assertion>)
                 XMLObjectProviderRegistrySupport.getBuilderFactory().<Assertion>getBuilderOrThrow(
                         Assertion.DEFAULT_ELEMENT_NAME);
 
-        final SAMLObjectBuilder<Issuer> issuerBuilder = (SAMLObjectBuilder<Issuer>)
-                XMLObjectProviderRegistrySupport.getBuilderFactory().<Issuer>getBuilderOrThrow(
-                        Issuer.DEFAULT_ELEMENT_NAME);
-
-        final Issuer issuerObject = issuerBuilder.buildObject();
-        issuerObject.setValue(issuer);
-
         final Assertion assertion = assertionBuilder.buildObject();
         assertion.setID(idGenerator.generateIdentifier());
         assertion.setIssueInstant(new DateTime());
-        assertion.setIssuer(issuerObject);
         assertion.setVersion(SAMLVersion.VERSION_20);
 
+        if (issuer != null) {
+            final SAMLObjectBuilder<Issuer> issuerBuilder = (SAMLObjectBuilder<Issuer>)
+                    XMLObjectProviderRegistrySupport.getBuilderFactory().<Issuer>getBuilderOrThrow(
+                            Issuer.DEFAULT_ELEMENT_NAME);
+            final Issuer issuerObject = issuerBuilder.buildObject();
+            issuerObject.setValue(issuer);
+            assertion.setIssuer(issuerObject);
+        }
+        
         getLogger().debug("Profile Action {}: Created Assertion {}", action.getClass().getSimpleName(),
                 assertion.getID());
 
@@ -92,7 +93,7 @@
      */
     @Nonnull public static Assertion addAssertionToResponse(@Nonnull final AbstractProfileAction action,
             @Nonnull final Response response, @Nonnull final IdentifierGenerationStrategy idGenerator,
-            @Nonnull @NotEmpty final String issuer) {
+            @Nullable final String issuer) {
 
         final Assertion assertion = buildAssertion(action, idGenerator, issuer);
         assertion.setIssueInstant(response.getIssueInstant());

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=4147&r1=4146&r2=4147&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 Sun Nov 16 15:20:49 2014
@@ -24,8 +24,6 @@
 import javax.annotation.Nullable;
 
 import org.opensaml.profile.action.AbstractProfileAction;
-import org.opensaml.profile.action.ActionSupport;
-import org.opensaml.profile.action.EventIds;
 import org.opensaml.profile.context.ProfileRequestContext;
 
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
@@ -61,8 +59,7 @@

[... 366 lines stripped ...]