svn commit: r1174229 - in /webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/ext: AssertionWrapper.java builder/SAML1ComponentBuilder.java builder/SAML2ComponentBuilder.java

[coheigea]

Author: coheigea
Date: Thu Sep 22 15:55:28 2011
New Revision: 1174229

URL: http://svn.apache.org/viewvc?rev=1174229&view=rev
Log:
[WSS-317] - SAML Assertions have invalid ID values

Modified:
    
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/ext/AssertionWrapper.java
    
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/ext/builder/SAML1ComponentBuilder.java
    
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/ext/builder/SAML2ComponentBuilder.java

Modified: 
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/ext/AssertionWrapper.java
URL: 
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/ext/AssertionWrapper.java?rev=1174229&r1=1174228&r2=1174229&view=diff
==============================================================================
--- 
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/ext/AssertionWrapper.java
 (original)
+++ 
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/ext/AssertionWrapper.java
 Thu Sep 22 15:55:28 2011
@@ -415,7 +415,7 @@ public class AssertionWrapper {
         }
         if (id == null || id.length() == 0) {
             log.error("AssertionWrapper: ID was null, seeting a new ID value");
-            id = UUIDGenerator.getUUID();
+            id = "_" + UUIDGenerator.getUUID();
             if (saml2 != null) {
                 saml2.setID(id);
             } else if (saml1 != null) {

Modified: 
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/ext/builder/SAML1ComponentBuilder.java
URL: 
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/ext/builder/SAML1ComponentBuilder.java?rev=1174229&r1=1174228&r2=1174229&view=diff
==============================================================================
--- 
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/ext/builder/SAML1ComponentBuilder.java
 (original)
+++ 
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/ext/builder/SAML1ComponentBuilder.java
 Thu Sep 22 15:55:28 2011
@@ -135,7 +135,7 @@ public class SAML1ComponentBuilder {
         assertion.setVersion(SAMLVersion.VERSION_11);
         assertion.setIssuer(issuer);
         assertion.setIssueInstant(new DateTime()); // now
-        assertion.setID(UUIDGenerator.getUUID());
+        assertion.setID("_" + UUIDGenerator.getUUID());
         return assertion;
     }
 

Modified: 
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/ext/builder/SAML2ComponentBuilder.java
URL: 
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/ext/builder/SAML2ComponentBuilder.java?rev=1174229&r1=1174228&r2=1174229&view=diff
==============================================================================
--- 
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/ext/builder/SAML2ComponentBuilder.java
 (original)
+++ 
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/ext/builder/SAML2ComponentBuilder.java
 Thu Sep 22 15:55:28 2011
@@ -134,7 +134,7 @@ public class SAML2ComponentBuilder {
         }
         Assertion assertion = 
             assertionBuilder.buildObject(Assertion.DEFAULT_ELEMENT_NAME, 
Assertion.TYPE_NAME);
-        assertion.setID(UUIDGenerator.getUUID());
+        assertion.setID("_" + UUIDGenerator.getUUID());
         assertion.setVersion(SAMLVersion.VERSION_20);
         assertion.setIssueInstant(new DateTime());
         return assertion;