From 077c259d5b9903a9e91cbae66a9f922f4b85eac6 Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie+github@signal.org>
Date: Sun, 23 Feb 2020 17:59:30 -0800
Subject: [PATCH] Migrate keys to accountsdb

---
 .../WhisperServerConfiguration.java           |  12 --
 .../textsecuregcm/WhisperServerService.java   |  10 +-
 service/src/main/resources/accountsdb.xml     |  11 +
 service/src/main/resources/keysdb.xml         | 189 ------------------
 4 files changed, 12 insertions(+), 210 deletions(-)
 delete mode 100644 service/src/main/resources/keysdb.xml

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerConfiguration.java b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerConfiguration.java
index 75f65f414..e9089e603 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerConfiguration.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerConfiguration.java
@@ -98,19 +98,11 @@ public class WhisperServerConfiguration extends Configuration {
   @JsonProperty
   private List<MaxDeviceConfiguration> maxDevices = new LinkedList<>();
 
-  @Valid
-  @NotNull
-  @JsonProperty
-  private DatabaseConfiguration keysDatabase;
-
   @Valid
   @NotNull
   @JsonProperty
   private DatabaseConfiguration accountsDatabase;
 
-  @JsonProperty
-  private DatabaseConfiguration read_database;
-
   @Valid
   @NotNull
   @JsonProperty
@@ -238,10 +230,6 @@ public class WhisperServerConfiguration extends Configuration {
     return abuseDatabase;
   }
 
-  public DatabaseConfiguration getKeysDatabase() {
-    return keysDatabase;
-  }
-
   public DatabaseConfiguration getAccountsDatabaseConfiguration() {
     return accountsDatabase;
   }
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
index 05e3ca20d..6b5ddcdef 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
@@ -115,12 +115,6 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
     bootstrap.addCommand(new DeleteUserCommand());
     bootstrap.addCommand(new CertificateCommand());
     bootstrap.addCommand(new ZkParamsCommand());
-    bootstrap.addBundle(new NameableMigrationsBundle<WhisperServerConfiguration>("keysdb", "keysdb.xml") {
-      @Override
-      public DataSourceFactory getDataSourceFactory(WhisperServerConfiguration configuration) {
-        return configuration.getKeysDatabase();
-      }
-    });
 
     bootstrap.addBundle(new NameableMigrationsBundle<WhisperServerConfiguration>("accountdb", "accountsdb.xml") {
       @Override
@@ -161,11 +155,9 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
 
     JdbiFactory jdbiFactory = new JdbiFactory(DefaultNameStrategy.CHECK_EMPTY);
     Jdbi        accountJdbi = jdbiFactory.build(environment, config.getAccountsDatabaseConfiguration(), "accountdb");
-    Jdbi        keysJdbi    = jdbiFactory.build(environment, config.getKeysDatabase(), "keysdb");
     Jdbi        messageJdbi = jdbiFactory.build(environment, config.getMessageStoreConfiguration(), "messagedb" );
     Jdbi        abuseJdbi   = jdbiFactory.build(environment, config.getAbuseDatabaseConfiguration(), "abusedb"  );
 
-    FaultTolerantDatabase keysDatabase    = new FaultTolerantDatabase("keys_database", keysJdbi, config.getKeysDatabase().getCircuitBreakerConfiguration());
     FaultTolerantDatabase accountDatabase = new FaultTolerantDatabase("accounts_database", accountJdbi, config.getAccountsDatabaseConfiguration().getCircuitBreakerConfiguration());
     FaultTolerantDatabase messageDatabase = new FaultTolerantDatabase("message_database", messageJdbi, config.getMessageStoreConfiguration().getCircuitBreakerConfiguration());
     FaultTolerantDatabase abuseDatabase   = new FaultTolerantDatabase("abuse_database", abuseJdbi, config.getAbuseDatabaseConfiguration().getCircuitBreakerConfiguration());
@@ -176,7 +168,7 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
     Usernames         usernames         = new Usernames(accountDatabase);
     ReservedUsernames reservedUsernames = new ReservedUsernames(accountDatabase);
     Profiles          profiles          = new Profiles(accountDatabase);
-    Keys              keys              = new Keys(keysDatabase);
+    Keys              keys              = new Keys(accountDatabase);
     Messages          messages          = new Messages(messageDatabase);
     AbusiveHostRules  abusiveHostRules  = new AbusiveHostRules(abuseDatabase);
     RemoteConfigs     remoteConfigs     = new RemoteConfigs(accountDatabase);
diff --git a/service/src/main/resources/accountsdb.xml b/service/src/main/resources/accountsdb.xml
index 1b38dc76c..8de8ae955 100644
--- a/service/src/main/resources/accountsdb.xml
+++ b/service/src/main/resources/accountsdb.xml
@@ -293,4 +293,15 @@
         </createTable>
     </changeSet>
 
+    <changeSet id="13" author="moxie">
+        <addColumn tableName="keys">
+            <column name="deleted" type="boolean"/>
+        </addColumn>
+    </changeSet>
+
+    <changeSet id="14" author="moxie" runInTransaction="false">
+        <sql>CREATE INDEX CONCURRENTLY deleted_key_index ON keys (deleted);</sql>
+    </changeSet>
+
+
 </databaseChangeLog>
diff --git a/service/src/main/resources/keysdb.xml b/service/src/main/resources/keysdb.xml
deleted file mode 100644
index f2a9c315c..000000000
--- a/service/src/main/resources/keysdb.xml
+++ /dev/null
@@ -1,189 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<databaseChangeLog
-        xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
-         http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-2.0.xsd"
-        logicalFilePath="migrations.xml">
-
-    <changeSet id="1" author="moxie">
-        <createTable tableName="accounts">
-            <column name="id" type="bigint" autoIncrement="true">
-                <constraints primaryKey="true" nullable="false"/>
-            </column>
-
-            <column name="number" type="varchar(255)">
-                <constraints unique="true" nullable="false"/>
-            </column>
-
-            <column name="auth_token" type="varchar(255)">
-                <constraints nullable="false"/>
-            </column>
-
-            <column name="salt" type="varchar(255)">
-                <constraints nullable="false"/>
-            </column>
-
-            <column name="signaling_key" type="varchar(255)"/>
-
-            <column name="gcm_id" type="text"/>
-
-            <column name="apn_id" type="text"/>
-
-            <column name="supports_sms" type="smallint" defaultValue="0"/>
-        </createTable>
-
-        <createTable tableName="pending_accounts">
-            <column name="id" type="bigint" autoIncrement="true">
-                <constraints primaryKey="true" nullable="false"/>
-            </column>
-
-            <column name="number" type="varchar(255)">
-                <constraints unique="true" nullable="false"/>
-            </column>
-
-            <column name="verification_code" type="varchar(255)">
-                <constraints nullable="false"/>
-            </column>
-        </createTable>
-
-        <createTable tableName="keys">
-            <column name="id" type="bigint" autoIncrement="true">
-                <constraints primaryKey="true" nullable="false"/>
-            </column>
-
-            <column name="number" type="varchar(255)">
-                <constraints nullable="false"/>
-            </column>
-
-            <column name="key_id" type="bigint">
-                <constraints nullable="false"/>
-            </column>
-
-            <column name="public_key" type="text">
-                <constraints nullable="false"/>
-            </column>
-
-            <column name="identity_key" type="text">
-                <constraints nullable="false"/>
-            </column>
-
-            <column name="last_resort" type="smallint" defaultValue="0"/>
-        </createTable>
-
-        <createIndex tableName="keys" indexName="keys_number_index">
-            <column name="number"/>
-        </createIndex>
-    </changeSet>
-
-    <changeSet id="2" author="matt">
-
-        <addColumn tableName="accounts">
-            <column name="data" type="json" />
-        </addColumn>
-
-        <sql>CREATE type device_t AS (id integer, "authToken" varchar(255), salt varchar(255), "signalingKey" varchar(255), "gcmId" text, "apnId" text);</sql>
-        <sql>CREATE type account_t AS (number varchar(255), "supportsSms" smallint, devices device_t array);</sql>
-        <sql>UPDATE accounts SET data = row_to_json(row(number, supports_sms, array[row(1, auth_token, salt, signaling_key, gcm_id, apn_id)::device_t])::account_t)</sql>
-
-        <addNotNullConstraint tableName="accounts" columnName="data"/>
-
-        <dropColumn tableName="accounts" columnName="auth_token"/>
-        <dropColumn tableName="accounts" columnName="salt"/>
-        <dropColumn tableName="accounts" columnName="signaling_key"/>
-        <dropColumn tableName="accounts" columnName="gcm_id"/>
-        <dropColumn tableName="accounts" columnName="apn_id"/>
-        <dropColumn tableName="accounts" columnName="supports_sms"/>
-
-        <sql>DROP type account_t;</sql>
-        <sql>DROP type device_t;</sql>
-
-        <addColumn tableName="keys">
-            <column name="device_id" type="bigint" defaultValue="1">
-                <constraints nullable="false" />
-            </column>
-        </addColumn>
-
-        <createTable tableName="pending_devices">
-            <column name="id" type="bigint" autoIncrement="true">
-                <constraints primaryKey="true" nullable="false"/>
-            </column>
-
-            <column name="number" type="text">
-                <constraints unique="true" nullable="false"/>
-            </column>
-
-            <column name="verification_code" type="text">
-                <constraints nullable="false"/>
-            </column>
-        </createTable>
-
-        <createTable tableName="messages">
-            <column name="id" type="bigint" autoIncrement="true">
-                <constraints primaryKey="true" nullable="false"/>
-            </column>
-
-            <column name="account_id" type="bigint">
-                <constraints nullable="false"/>
-            </column>
-
-            <column name="device_id" type="bigint">
-                <constraints nullable="false"/>
-            </column>
-
-            <column name="encrypted_message" type="text">
-                <constraints nullable="false"/>
-            </column>
-        </createTable>
-
-        <createIndex tableName="messages" indexName="messages_account_and_device">
-            <column name="account_id"/>
-            <column name="device_id"/>
-        </createIndex>
-
-    </changeSet>
-
-    <changeSet id="3" author="moxie">
-        <sql>CREATE OR REPLACE FUNCTION "custom_json_object_set_key"(
-            "json"          json,
-            "key_to_set"    TEXT,
-            "value_to_set"  anyelement
-            )
-            RETURNS json
-            LANGUAGE sql
-            IMMUTABLE
-            STRICT
-            AS $function$
-            SELECT COALESCE(
-            (SELECT ('{' || string_agg(to_json("key") || ':' || "value", ',') || '}')
-            FROM (SELECT *
-            FROM json_each("json")
-            WHERE "key" &lt;&gt; "key_to_set"
-            UNION ALL
-            SELECT "key_to_set", to_json("value_to_set")) AS "fields"),
-            '{}'
-            )::json
-            $function$;</sql>
-        <sql>UPDATE accounts SET data = custom_json_object_set_key(data, 'identityKey', k.identity_key) FROM keys k WHERE (data->>'identityKey')::text is null AND k.number = data->>'number' AND k.last_resort = 1;</sql>
-        <sql>UPDATE accounts SET data = custom_json_object_set_key(data, 'identityKey', k.identity_key) FROM keys k WHERE (data->>'identityKey')::text is null AND k.number = data->>'number';</sql>
-    </changeSet>
-
-    <changeSet id="4" author="moxie">
-        <dropColumn tableName="keys" columnName="identity_key"/>
-    </changeSet>
-
-    <changeSet id="5" author="moxie">
-        <addColumn tableName="pending_accounts">
-            <column name="timestamp" type="bigint" defaultValueComputed="extract(epoch from now()) * 1000">
-                <constraints nullable="false"/>
-            </column>
-        </addColumn>
-
-        <addColumn tableName="pending_devices">
-            <column name="timestamp" type="bigint" defaultValueComputed="extract(epoch from now()) * 1000">
-                <constraints nullable="false"/>
-            </column>
-        </addColumn>
-    </changeSet>
-</databaseChangeLog>