[utilities COMMIT] in /java-support/trunk: doc/RELEASE-NOTES.txt src/main/java/net/shibboleth/utilities/java/support/...

[noreply at shibboleth.net]

Author: iay
Date: Wed Apr 10 14:35:06 2013
New Revision: 370

URL: http://svn.shibboleth.net/view/utilities?rev=370&view=rev
Log:
[JSPT-24] Type4UuidIdentifier and RandomIdentifier generation strategies do not generate a valid XML ID

Added:
    java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/security/
    java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/security/RandomIdentifierGenerationStrategyTest.java   (with props)
    java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/security/Type4UuidIdentifierGenerationStrategyTest.java   (with props)
Modified:
    java-support/trunk/doc/RELEASE-NOTES.txt
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/security/RandomIdentifierGenerationStrategy.java
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/security/Type4UuidIdentifierGenerationStrategy.java

Modified: java-support/trunk/doc/RELEASE-NOTES.txt
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/doc/RELEASE-NOTES.txt?rev=370&r1=369&r2=370&view=diff
==============================================================================
--- java-support/trunk/doc/RELEASE-NOTES.txt (original)
+++ java-support/trunk/doc/RELEASE-NOTES.txt Wed Apr 10 14:35:06 2013
@@ -2,4 +2,5 @@
 ===============================
 [JSPT-3] - Providers helpers for dealing with idle connections in HttpClient
 [JSPT-16] - Add a ServletListener that configures logback with a specified configuration file
-[JSPT-23] - SerializeSupport prettyPrintXML has reverted impl to diverge from writeNode and nodeToString 
+[JSPT-23] - SerializeSupport prettyPrintXML has reverted impl to diverge from writeNode and nodeToString
+[JSPT-24] - Type4UuidIdentifier and RandomIdentifier generation strategies do not generate a valid XML ID

Modified: java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/security/RandomIdentifierGenerationStrategy.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/security/RandomIdentifierGenerationStrategy.java?rev=370&r1=369&r2=370&view=diff
==============================================================================
--- java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/security/RandomIdentifierGenerationStrategy.java (original)
+++ java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/security/RandomIdentifierGenerationStrategy.java Wed Apr 10 14:35:06 2013
@@ -98,7 +98,7 @@
         byte[] buf = new byte[sizeOfIdentifier];
         random.nextBytes(buf);
         try {
-            return StringUtils.newStringUsAscii(encoder.encode(buf));
+            return "_" + StringUtils.newStringUsAscii(encoder.encode(buf));
         } catch (EncoderException e) {
             throw new RuntimeException(e);
         }

Modified: java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/security/Type4UuidIdentifierGenerationStrategy.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/security/Type4UuidIdentifierGenerationStrategy.java?rev=370&r1=369&r2=370&view=diff
==============================================================================
--- java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/security/Type4UuidIdentifierGenerationStrategy.java (original)
+++ java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/security/Type4UuidIdentifierGenerationStrategy.java Wed Apr 10 14:35:06 2013
@@ -28,6 +28,6 @@
 
     /** {@inheritDoc} */
     @Nonnull public String generateIdentifier() {
-        return UUID.randomUUID().toString();
+        return "_" + UUID.randomUUID().toString();
     }
 }