Add default ID length for RSNv3

The Repository classes have been modified to generate 128-bit IDs for RSNv3 if the *.id.length param is not specified.
dogtagpki · Jan 15, 2024 · 095a481 · 095a481
1 parent d9dae8b
commit 095a481
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 11 deletions.
diff --git a/.github/workflows/ca-rsnv1-test.yml b/.github/workflows/ca-rsnv1-test.yml
@@ -88,7 +88,6 @@ jobs:
           docker exec pki pki-server ca-config-unset dbs.requestRangeDN
 
           docker exec pki pki-server ca-config-set dbs.request.id.generator random
-          docker exec pki pki-server ca-config-set dbs.request.id.length 128
 
           # switch cert ID generator to RSNv3
           docker exec pki pki-server ca-config-unset dbs.beginSerialNumber
@@ -101,7 +100,6 @@ jobs:
           docker exec pki pki-server ca-config-unset dbs.randomSerialNumberCounter
 
           docker exec pki pki-server ca-config-set dbs.cert.id.generator random
-          docker exec pki pki-server ca-config-set dbs.cert.id.length 128
 
           # restart CA subsystem
           docker exec pki pki-server ca-redeploy --wait

diff --git a/.github/workflows/ca-sequential-test.yml b/.github/workflows/ca-sequential-test.yml
@@ -86,7 +86,6 @@ jobs:
           docker exec pki pki-server ca-config-unset dbs.requestRangeDN
 
           docker exec pki pki-server ca-config-set dbs.request.id.generator random
-          docker exec pki pki-server ca-config-set dbs.request.id.length 128
 
           # switch cert ID generator to RSNv3
           docker exec pki pki-server ca-config-unset dbs.beginSerialNumber
@@ -97,7 +96,6 @@ jobs:
           docker exec pki pki-server ca-config-unset dbs.serialRangeDN
 
           docker exec pki pki-server ca-config-set dbs.cert.id.generator random
-          docker exec pki pki-server ca-config-set dbs.cert.id.length 128
 
           # restart CA subsystem
           docker exec pki pki-server ca-redeploy --wait

diff --git a/.github/workflows/kra-sequential-test.yml b/.github/workflows/kra-sequential-test.yml
@@ -103,7 +103,6 @@ jobs:
           docker exec pki pki-server ca-config-unset dbs.requestRangeDN
 
           docker exec pki pki-server ca-config-set dbs.request.id.generator random
-          docker exec pki pki-server ca-config-set dbs.request.id.length 128
 
           # switch cert ID generator to RSNv3
           docker exec pki pki-server ca-config-unset dbs.beginSerialNumber
@@ -114,7 +113,6 @@ jobs:
           docker exec pki pki-server ca-config-unset dbs.serialRangeDN
 
           docker exec pki pki-server ca-config-set dbs.cert.id.generator random
-          docker exec pki pki-server ca-config-set dbs.cert.id.length 128
 
           # switch key request ID generator to RSNv3
           docker exec pki pki-server kra-config-unset dbs.beginRequestNumber
@@ -125,7 +123,6 @@ jobs:
           docker exec pki pki-server kra-config-unset dbs.requestRangeDN
 
           docker exec pki pki-server kra-config-set dbs.request.id.generator random
-          docker exec pki pki-server kra-config-set dbs.request.id.length 128
 
           # switch key ID generator to RSNv3
           docker exec pki pki-server kra-config-unset dbs.beginSerialNumber
@@ -136,7 +133,6 @@ jobs:
           docker exec pki pki-server kra-config-unset dbs.serialRangeDN
 
           docker exec pki pki-server kra-config-set dbs.key.id.generator random
-          docker exec pki pki-server kra-config-set dbs.key.id.length 128
 
           # restart PKI server
           docker exec pki pki-server start --wait

diff --git a/base/ca/src/main/java/com/netscape/cmscore/dbs/CertificateRepository.java b/base/ca/src/main/java/com/netscape/cmscore/dbs/CertificateRepository.java
@@ -83,6 +83,7 @@ public class CertificateRepository extends Repository {
     public static final String DEFAULT_CERT_ID_GENERATOR = "legacy";
 
     public static final String PROP_CERT_ID_LENGTH = "cert.id.length";
+    public static final int DEFAULT_CERT_ID_LENGTH = 128;
 
     private boolean mConsistencyCheck = false;
 
@@ -123,7 +124,7 @@ public void init() throws Exception {
 
         if (idGenerator == IDGenerator.RANDOM) {
 
-            idLength = mDBConfig.getInteger(PROP_CERT_ID_LENGTH);
+            idLength = mDBConfig.getInteger(PROP_CERT_ID_LENGTH, DEFAULT_CERT_ID_LENGTH);
             logger.debug("CertificateRepository: - cert ID length: " + idLength);
 
         } else {

diff --git a/base/kra/src/main/java/com/netscape/cmscore/dbs/KeyRepository.java b/base/kra/src/main/java/com/netscape/cmscore/dbs/KeyRepository.java
@@ -45,6 +45,7 @@ public class KeyRepository extends Repository {
     public static final String DEFAULT_KEY_ID_GENERATOR = "legacy";
 
     public static final String PROP_KEY_ID_LENGTH = "key.id.length";
+    public static final int DEFAULT_KEY_ID_LENGTH = 128;
 
     /**
      * Constructs a key repository. It checks if the key repository
@@ -79,7 +80,7 @@ public void init() throws Exception {
 
         if (idGenerator == IDGenerator.RANDOM) {
 
-            idLength = dbConfig.getInteger(PROP_KEY_ID_LENGTH);
+            idLength = dbConfig.getInteger(PROP_KEY_ID_LENGTH, DEFAULT_KEY_ID_LENGTH);
             logger.info("KeyRepository: - key ID length: " + idLength);
 
         } else {

diff --git a/base/server/src/main/java/com/netscape/cmscore/request/RequestRepository.java b/base/server/src/main/java/com/netscape/cmscore/request/RequestRepository.java
@@ -58,6 +58,7 @@ public class RequestRepository extends Repository {
     public static final String DEFAULT_REQUEST_ID_GENERATOR = "legacy";
 
     public static final String PROP_REQUEST_ID_LENGTH = "request.id.length";
+    public static final int DEFAULT_REQUEST_ID_LENGTH = 128;
 
     protected String filter;
 
@@ -96,7 +97,7 @@ public void init() throws Exception {
 
         if (idGenerator == IDGenerator.RANDOM) {
 
-            idLength = dbConfig.getInteger(PROP_REQUEST_ID_LENGTH);
+            idLength = dbConfig.getInteger(PROP_REQUEST_ID_LENGTH, DEFAULT_REQUEST_ID_LENGTH);
             logger.debug("RequestRepository: - request ID length: " + idLength);
 
         } else {