[java-idp-testbed] branch main updated: JSSH-9 - Rework IdentifierGenerationStrategy usage

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch main
in repository java-idp-testbed.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-testbed.git;a=commit;h=704cd8311dd6de776c99181c7b966bbb95fcdeb0

The following commit(s) were added to refs/heads/main by this push:
     new 704cd83  JSSH-9 - Rework IdentifierGenerationStrategy usage
704cd83 is described below

commit 704cd8311dd6de776c99181c7b966bbb95fcdeb0
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Oct 13 12:12:05 2022 -0400

    JSSH-9 - Rework IdentifierGenerationStrategy usage
    
    https://shibboleth.atlassian.net/browse/JSSH-9
---
 src/main/java/sp/BaseSAMLController.java | 4 ++--
 src/main/java/sp/SAML1Controller.java    | 7 ++++---
 src/main/java/sp/SAML2Controller.java    | 5 +++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/main/java/sp/BaseSAMLController.java b/src/main/java/sp/BaseSAMLController.java
index 2b273eb..70dc944 100644
--- a/src/main/java/sp/BaseSAMLController.java
+++ b/src/main/java/sp/BaseSAMLController.java
@@ -20,7 +20,7 @@ package sp;
 import jakarta.servlet.http.HttpServletRequest;
 import net.shibboleth.shared.component.ComponentInitializationException;
 import net.shibboleth.shared.security.IdentifierGenerationStrategy;
-import net.shibboleth.shared.security.impl.Type4UUIDIdentifierGenerationStrategy;
+import net.shibboleth.shared.security.IdentifierGenerationStrategy.ProviderType;
 import net.shibboleth.shared.xml.ParserPool;
 
 import java.util.function.Supplier;
@@ -50,7 +50,7 @@ public abstract class BaseSAMLController {
 
     @Autowired protected MarshallerFactory marshallerFactory;
 
-    protected IdentifierGenerationStrategy idGenerator = new Type4UUIDIdentifierGenerationStrategy();
+    protected IdentifierGenerationStrategy idGenerator = IdentifierGenerationStrategy.getInstance(ProviderType.UUID);
 
     @Autowired protected VelocityEngine velocityEngine;
     
diff --git a/src/main/java/sp/SAML1Controller.java b/src/main/java/sp/SAML1Controller.java
index dd26004..dc872d0 100644
--- a/src/main/java/sp/SAML1Controller.java
+++ b/src/main/java/sp/SAML1Controller.java
@@ -31,7 +31,8 @@ import javax.net.ssl.SSLContext;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import net.shibboleth.shared.primitive.StringSupport;
-import net.shibboleth.shared.security.impl.SecureRandomIdentifierGenerationStrategy;
+import net.shibboleth.shared.security.IdentifierGenerationStrategy;
+import net.shibboleth.shared.security.IdentifierGenerationStrategy.ProviderType;
 import net.shibboleth.shared.xml.SerializeSupport;
 import net.shibboleth.shared.xml.XMLParserException;
 
@@ -228,7 +229,7 @@ public class SAML1Controller extends BaseSAMLController {
 
         final Request attributeQuery = buildAttributeQueryRequest(subject);
         attributeQuery.setIssueInstant(Instant.now());
-        attributeQuery.setID(new SecureRandomIdentifierGenerationStrategy().generateIdentifier());
+        attributeQuery.setID(IdentifierGenerationStrategy.getInstance(ProviderType.SECURE).generateIdentifier());
         attributeQuery.getAttributeQuery().setResource(getSpEntityId(servletRequest));
 
         // TODO AttributeDesignator
@@ -284,7 +285,7 @@ public class SAML1Controller extends BaseSAMLController {
                 XMLObjectProviderRegistrySupport.getBuilderFactory().<Request>getBuilderOrThrow(
                         Request.DEFAULT_ELEMENT_NAME);
         final Request request = requestBuilder.buildObject();
-        request.setID(new SecureRandomIdentifierGenerationStrategy().generateIdentifier());
+        request.setID(IdentifierGenerationStrategy.getInstance(ProviderType.SECURE).generateIdentifier());
         request.setIssueInstant(Instant.now());
         request.setQuery(query);
         request.setVersion(SAMLVersion.VERSION_11);
diff --git a/src/main/java/sp/SAML2Controller.java b/src/main/java/sp/SAML2Controller.java
index 0d7832a..a1f286c 100644
--- a/src/main/java/sp/SAML2Controller.java
+++ b/src/main/java/sp/SAML2Controller.java
@@ -96,7 +96,8 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
 import net.shibboleth.shared.component.ComponentInitializationException;
 import net.shibboleth.shared.net.URLBuilder;
 import net.shibboleth.shared.primitive.StringSupport;
-import net.shibboleth.shared.security.impl.SecureRandomIdentifierGenerationStrategy;
+import net.shibboleth.shared.security.IdentifierGenerationStrategy;
+import net.shibboleth.shared.security.IdentifierGenerationStrategy.ProviderType;
 import net.shibboleth.shared.xml.SerializeSupport;
 import net.shibboleth.shared.xml.XMLParserException;
 
@@ -958,7 +959,7 @@ public class SAML2Controller extends BaseSAMLController {
 
         final AttributeQuery attributeQuery = buildAttributeQueryRequest(subject);
         attributeQuery.setIssueInstant(Instant.now());
-        attributeQuery.setID(new SecureRandomIdentifierGenerationStrategy().generateIdentifier());
+        attributeQuery.setID(IdentifierGenerationStrategy.getInstance(ProviderType.SECURE).generateIdentifier());
         attributeQuery.setIssuer(buildIssuer(getSpEntityId(servletRequest)));
 
         // TODO AttributeDesignator

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.