Renamed nonce value column/attribute in ACME database

The nonce value column/attribute in ACME database
has been renamed to id for consistency.

Author: edewata

base/acme/database/ldap/schema.ldif

@@ -18,7 +18,7 @@ attributeTypes: ( acmeStatus-oid NAME 'acmeStatus'
 attributeTypes: ( acmeError-oid NAME 'acmeError'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
   SINGLE-VALUE )
-attributeTypes: ( acmeNonceValue-oid NAME 'acmeNonceValue'
+attributeTypes: ( acmeNonceId-oid NAME 'acmeNonceId'
   SUP name
   SINGLE-VALUE )
 attributeTypes: ( acmeAccountId-oid NAME 'acmeAccountId'
@@ -56,7 +56,7 @@ attributeTypes: ( acmeCertificateId-oid NAME 'acmeCertificateId'
 add: objectClasses
 objectClasses: ( acmeNonce-oid NAME 'acmeNonce'
   STRUCTURAL
-  MUST ( acmeNonceValue $ acmeExpires ) )
+  MUST ( acmeNonceId $ acmeExpires ) )
 objectClasses: ( acmeAccount-oid NAME 'acmeAccount'
   STRUCTURAL
   MUST ( acmeAccountId $ acmeAccountKey $ acmeStatus )

base/acme/database/postgresql/create.sql

@@ -1,5 +1,5 @@
 CREATE TABLE "nonces" (
-    "value"            VARCHAR PRIMARY KEY,
+    "id"               VARCHAR PRIMARY KEY,
     "expires"          TIMESTAMP NOT NULL
 );
 

base/acme/database/postgresql/statements.conf

@@ -4,23 +4,23 @@ SELECT \
 FROM \
     "nonces" \
 WHERE \
-    "value" = ?
+    "id" = ?
 
 addNonce=\
 INSERT INTO \
-    "nonces" ("value", "expires") \
+    "nonces" ("id", "expires") \
 VALUES \
     (?, ?)
 
 removeNonce=\
 DELETE FROM \
     "nonces" \
 WHERE \
-    "value" = ?
+    "id" = ?
 
 getExpiredNonceIDs=\
 SELECT \
-    "value" \
+    "id" \
 FROM \
     "nonces" \
 WHERE \

base/acme/src/main/java/org/dogtagpki/acme/database/LDAPDatabase.java

@@ -82,7 +82,7 @@ public class LDAPDatabase extends ACMEDatabase {
     static final String ATTR_ERROR = "acmeError";
     static final String ATTR_EXPIRES = "acmeExpires";
     static final String ATTR_IDENTIFIER = "acmeIdentifier";
-    static final String ATTR_NONCE_VALUE = "acmeNonceValue";
+    static final String ATTR_NONCE_ID = "acmeNonceId";
     static final String ATTR_ORDER_ID = "acmeOrderId";
     static final String ATTR_STATUS = "acmeStatus";
     static final String ATTR_TOKEN = "acmeToken";
@@ -223,7 +223,7 @@ public void init() throws Exception {
     }
 
     public ACMENonce getNonce(String nonceID) throws Exception {
-        String dn = ATTR_NONCE_VALUE +  "=" + nonceID + "," + RDN_NONCE + "," + basedn;
+        String dn = ATTR_NONCE_ID +  "=" + nonceID + "," + RDN_NONCE + "," + basedn;
         LDAPEntry entry = ldapGet(dn);
         if (entry == null) return null;
 
@@ -239,11 +239,11 @@ public ACMENonce getNonce(String nonceID) throws Exception {
     public void addNonce(ACMENonce nonce) throws Exception {
         LDAPAttribute[] attrs = {
             new LDAPAttribute(ATTR_OBJECTCLASS, OBJ_NONCE),
-            new LDAPAttribute(ATTR_NONCE_VALUE, nonce.getID()),
+            new LDAPAttribute(ATTR_NONCE_ID, nonce.getID()),
             new LDAPAttribute(ATTR_EXPIRES, dateFormat.format(nonce.getExpirationTime()))
         };
         LDAPAttributeSet attrSet = new LDAPAttributeSet(attrs);
-        String dn = ATTR_NONCE_VALUE + "=" + nonce.getID() + "," + RDN_NONCE + "," + basedn;
+        String dn = ATTR_NONCE_ID + "=" + nonce.getID() + "," + RDN_NONCE + "," + basedn;
         LDAPEntry entry = new LDAPEntry(dn, attrSet);
         ldapAdd(entry);
     }
@@ -252,7 +252,7 @@ public ACMENonce removeNonce(String nonceID) throws Exception {
         ACMENonce nonce = getNonce(nonceID);
         if (nonce == null) return null;
 
-        String dn = ATTR_NONCE_VALUE + "=" + nonceID + "," + RDN_NONCE + "," + basedn;
+        String dn = ATTR_NONCE_ID + "=" + nonceID + "," + RDN_NONCE + "," + basedn;
         ldapDelete(dn, OnNoSuchObject.Ignore);
 
         return nonce;

base/acme/src/main/java/org/dogtagpki/acme/database/PostgreSQLDatabase.java

@@ -252,7 +252,7 @@ public Collection<String> getExpiredNonceIDs(Date currentTime) throws Exception
             try (ResultSet rs = ps.executeQuery()) {
 
                 while (rs.next()) {
-                    String nonceID = rs.getString("value");
+                    String nonceID = rs.getString("id");
                     nonces.add(nonceID);
                 }
             }