merged in new changes from main

Author: sophia-chen-ttd

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.uid2</groupId>
     <artifactId>uid2-shared</artifactId>
-    <version>10.8.6</version>
+    <version>10.9.4</version>
     <name>${project.groupId}:${project.artifactId}</name>
     <description>Library for all the shared uid2 operations</description>
     <url>https://github.com/IABTechLab/uid2docs</url>
@@ -60,7 +60,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <vertx.version>4.5.13</vertx.version>
+        <vertx.version>4.5.18</vertx.version>
         <!-- check micrometer.version vertx-micrometer-metrics consumes before bumping up -->
         <micrometer.version>1.12.2</micrometer.version>
         <image.version>${project.version}</image.version>

src/main/java/com/uid2/shared/auth/Role.java

@@ -26,6 +26,7 @@ public enum Role {
     SECRET_ROTATION, // corresponds to custom okta scope 'uid2.admin.secret-rotation'
     PRIVATE_OPERATOR_SYNC, // corresponds to custom okta scope 'uid2.admin.site-sync'
     METRICS_EXPORT, // corresponds to custom okta scope 'uid2.admin.metrics-export'
+    ENCLAVE_REGISTRAR, // corresponds to custom okta scope 'uid2.admin.enclave-registrar'
     @JsonEnumDefaultValue
     UNKNOWN
 }

src/main/java/com/uid2/shared/store/salt/SaltFileParser.java

@@ -27,28 +27,24 @@ public SaltEntry[] parseFileLines(String[] saltFileLines, Integer size) {
 
     private SaltEntry parseLine(String line, int lineNumber) {
         try {
-            final String[] fields = line.split(",");
-
+            final String[] fields = line.split(",", -1);
             final long id = Integer.parseInt(fields[0]);
             final String hashedId = this.idHashingScheme.encode(id);
             final long lastUpdated = Long.parseLong(fields[1]);
-            final String salt = fields[2].isEmpty() ? null : fields[2];
-            final Long refreshFrom =  Long.parseLong(fields[3]);
+            final String salt = trimToNull(fields[2]);
+            final long refreshFrom = Long.parseLong(fields[3]);
+            final String previousSalt = trimToNull(fields[4]);
 
-            String previousSalt = null;
+            // TODO: The fields below should stop being optional once refreshable UIDs features get rolled out in production. We can remove them one by one as necessary.
+            // AU, 2025/07/28
             SaltEntry.KeyMaterial currentKeySalt = null;
             SaltEntry.KeyMaterial previousKeySalt = null;
-
-            if (fields.length > 4) {
-                previousSalt = fields[4].isEmpty() ? null : fields[4];
+            if (trimToNull(fields[5]) != null && trimToNull(fields[6]) != null) {
+                currentKeySalt = new SaltEntry.KeyMaterial(Integer.parseInt(fields[5]), fields[6], fields[7]);
             }
 
-            if (fields.length > 7) {
-                currentKeySalt = fields[5].isEmpty() ? null : new SaltEntry.KeyMaterial(Integer.parseInt(fields[5]), fields[6], fields[7]);
-            }
-
-            if (fields.length > 10) {
-                previousKeySalt = fields[8].isEmpty() ? null : new SaltEntry.KeyMaterial(Integer.parseInt(fields[8]), fields[9], fields[10]);
+            if (trimToNull(fields[8]) != null && trimToNull(fields[9]) != null) {
+                previousKeySalt = new SaltEntry.KeyMaterial(Integer.parseInt(fields[8]), fields[9], fields[10]);
             }
 
             return new SaltEntry(id, hashedId, lastUpdated, salt, refreshFrom, previousSalt, currentKeySalt, previousKeySalt);
@@ -57,4 +53,7 @@ private SaltEntry parseLine(String line, int lineNumber) {
         }
     }
 
+    private String trimToNull(String s) {
+        return s == null || s.isBlank() ? null : s.trim();
+    }
 }