rename enrolledFingerprints to enrolledBiometrics

Author: thestinger

src/main/java/app/attestation/server/AttestationProtocol.java

@@ -1098,7 +1098,7 @@ private static void verify(final byte[] fingerprint,
                         "pinnedVerifiedBootKey = ?, verifiedBootHash = ?, " +
                         "pinnedOsVersion = ?, pinnedOsPatchLevel = ?, " +
                         "pinnedVendorPatchLevel = ?, pinnedBootPatchLevel = ?, " +
-                        "pinnedAppVersion = ?, pinnedSecurityLevel = ?, userProfileSecure = ?, enrolledFingerprints = ?, " +
+                        "pinnedAppVersion = ?, pinnedSecurityLevel = ?, userProfileSecure = ?, enrolledBiometrics = ?, " +
                         "accessibility = ?, deviceAdmin = ?, adbEnabled = ?, " +
                         "addUsersWhenLocked = ?, denyNewUsb = ?, oemUnlockAllowed = ?, " +
                         "systemUser = ?, verifiedTimeLast = ? " +
@@ -1138,7 +1138,7 @@ private static void verify(final byte[] fingerprint,
                         "(fingerprint, pinnedCertificate0, pinnedCertificate1, pinnedCertificate2, pinnedCertificate3, " +
                         "pinnedVerifiedBootKey, verifiedBootHash, pinnedOsVersion, pinnedOsPatchLevel, " +
                         "pinnedVendorPatchLevel, pinnedBootPatchLevel, pinnedAppVersion, pinnedSecurityLevel, " +
-                        "userProfileSecure, enrolledFingerprints, accessibility, deviceAdmin, " +
+                        "userProfileSecure, enrolledBiometrics, accessibility, deviceAdmin, " +
                         "adbEnabled, addUsersWhenLocked, denyNewUsb, oemUnlockAllowed, systemUser, " +
                         "verifiedTimeFirst, verifiedTimeLast, userId) " +
                         "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");

src/main/java/app/attestation/server/AttestationServer.java

@@ -153,7 +153,7 @@ private static void createDevicesTable(final SQLiteConnection conn) throws SQLit
                 "pinnedAppVersion INTEGER NOT NULL,\n" +
                 "pinnedSecurityLevel INTEGER NOT NULL,\n" +
                 "userProfileSecure INTEGER NOT NULL CHECK (userProfileSecure in (0, 1)),\n" +
-                "enrolledFingerprints INTEGER NOT NULL CHECK (enrolledFingerprints in (0, 1)),\n" +
+                "enrolledBiometrics INTEGER NOT NULL CHECK (enrolledBiometrics in (0, 1)),\n" +
                 "accessibility INTEGER NOT NULL CHECK (accessibility in (0, 1)),\n" +
                 "deviceAdmin INTEGER NOT NULL CHECK (deviceAdmin in (0, 1, 2)),\n" +
                 "adbEnabled INTEGER NOT NULL CHECK (adbEnabled in (0, 1)),\n" +
@@ -215,7 +215,7 @@ public static void main(final String[] args) throws Exception {
 
             final SQLiteStatement selectCreated = attestationConn.prepare("SELECT 1 FROM sqlite_master WHERE type='table' AND name='Configuration'");
             if (!selectCreated.step()) {
-                attestationConn.exec("PRAGMA user_version = 3");
+                attestationConn.exec("PRAGMA user_version = 4");
             }
             selectCreated.dispose();
 
@@ -322,6 +322,25 @@ public static void main(final String[] args) throws Exception {
                 attestationConn.exec("PRAGMA foreign_keys = ON");
             }
 
+            // rename enrolledFingerprints to enrolledBiometrics
+            if (userVersion == 3) {
+                attestationConn.exec("PRAGMA foreign_keys = OFF");
+                attestationConn.exec("BEGIN TRANSACTION");
+                attestationConn.exec("ALTER TABLE Devices RENAME TO DevicesOld");
+                createDevicesTable(attestationConn);
+                attestationConn.exec("INSERT INTO Devices " +
+                        "(fingerprint, pinnedCertificate0, pinnedCertificate1, pinnedCertificate2, pinnedCertificate3, pinnedVerifiedBootKey, verifiedBootHash, pinnedOsVersion, pinnedOsPatchLevel, pinnedVendorPatchLevel, pinnedBootPatchLevel, pinnedAppVersion, pinnedSecurityLevel, userProfileSecure, enrolledBiometrics, accessibility, deviceAdmin, adbEnabled, addUsersWhenLocked, denyNewUsb, oemUnlockAllowed, systemUser, verifiedTimeFirst, verifiedTimeLast, expiredTimeLast, failureTimeLast, userId, deletionTime) " +
+                        "SELECT " +
+                        "fingerprint, pinnedCertificate0, pinnedCertificate1, pinnedCertificate2, pinnedCertificate3, pinnedVerifiedBootKey, verifiedBootHash, pinnedOsVersion, pinnedOsPatchLevel, pinnedVendorPatchLevel, pinnedBootPatchLevel, pinnedAppVersion, pinnedSecurityLevel, userProfileSecure, enrolledFingerprints, accessibility, deviceAdmin, adbEnabled, addUsersWhenLocked, denyNewUsb, oemUnlockAllowed, systemUser, verifiedTimeFirst, verifiedTimeLast, expiredTimeLast, failureTimeLast, userId, deletionTime " +
+                        "FROM DevicesOld");
+                attestationConn.exec("DROP TABLE DevicesOld");
+                createDevicesIndices(attestationConn);
+                attestationConn.exec("PRAGMA user_version = 4");
+                userVersion = 4;
+                attestationConn.exec("END TRANSACTION");
+                attestationConn.exec("PRAGMA foreign_keys = ON");
+            }
+
             logger.info("New schema version: " + userVersion);
 
             logger.info("Analyze database");
@@ -1058,7 +1077,7 @@ private static void writeDevicesJson(final HttpExchange exchange, final long use
                     "(SELECT hex(verifiedBootHash) where verifiedBootHash IS NOT NULL), " +
                     "pinnedOsVersion, pinnedOsPatchLevel, pinnedVendorPatchLevel, " +
                     "pinnedBootPatchLevel, pinnedAppVersion, pinnedSecurityLevel, " +
-                    "userProfileSecure, enrolledFingerprints, accessibility, deviceAdmin, " +
+                    "userProfileSecure, enrolledBiometrics, accessibility, deviceAdmin, " +
                     "adbEnabled, addUsersWhenLocked, denyNewUsb, oemUnlockAllowed, " +
                     "systemUser, verifiedTimeFirst, verifiedTimeLast " +
                     "FROM Devices WHERE userId is ? AND deletionTime IS NULL " +