Control signed pre-key deletion via a dynamic configuration flag to f…

…acilitate migration
signalapp · Jul 5, 2023 · b593d49 · b593d49
1 parent 4a91fc3
commit b593d49
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/...ain/java/org/whispersystems/textsecuregcm/configuration/dynamic/DynamicConfiguration.java b/...ain/java/org/whispersystems/textsecuregcm/configuration/dynamic/DynamicConfiguration.java
@@ -57,7 +57,7 @@ public class DynamicConfiguration {
 
   @JsonProperty
   @Valid
-  DynamicECPreKeyMigrationConfiguration ecPreKeyMigration = new DynamicECPreKeyMigrationConfiguration(false);
+  DynamicECPreKeyMigrationConfiguration ecPreKeyMigration = new DynamicECPreKeyMigrationConfiguration(true, false);
 
   public Optional<DynamicExperimentEnrollmentConfiguration> getExperimentEnrollmentConfiguration(
       final String experimentName) {

diff --git a/...persystems/textsecuregcm/configuration/dynamic/DynamicECPreKeyMigrationConfiguration.java b/...persystems/textsecuregcm/configuration/dynamic/DynamicECPreKeyMigrationConfiguration.java
@@ -5,5 +5,5 @@
 
 package org.whispersystems.textsecuregcm.configuration.dynamic;
 
-public record DynamicECPreKeyMigrationConfiguration(boolean storeEcSignedPreKeys) {
+public record DynamicECPreKeyMigrationConfiguration(boolean deleteEcSignedPreKeys, boolean storeEcSignedPreKeys) {
 }
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/KeysManager.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/KeysManager.java
@@ -124,7 +124,9 @@ public void delete(final UUID accountUuid) {
     CompletableFuture.allOf(
             ecPreKeys.delete(accountUuid),
             pqPreKeys.delete(accountUuid),
-            ecSignedPreKeys.delete(accountUuid),
+            dynamicConfigurationManager.getConfiguration().getEcPreKeyMigrationConfiguration().deleteEcSignedPreKeys()
+                ? ecSignedPreKeys.delete(accountUuid)
+                : CompletableFuture.completedFuture(null),
             pqLastResortKeys.delete(accountUuid))
         .join();
   }
@@ -133,7 +135,9 @@ public void delete(final UUID accountUuid, final long deviceId) {
     CompletableFuture.allOf(
             ecPreKeys.delete(accountUuid, deviceId),
             pqPreKeys.delete(accountUuid, deviceId),
-            ecSignedPreKeys.delete(accountUuid, deviceId),
+            dynamicConfigurationManager.getConfiguration().getEcPreKeyMigrationConfiguration().deleteEcSignedPreKeys()
+                ? ecSignedPreKeys.delete(accountUuid, deviceId)
+                : CompletableFuture.completedFuture(null),
             pqLastResortKeys.delete(accountUuid, deviceId))
         .join();
   }

diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/storage/KeysManagerTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/storage/KeysManagerTest.java
@@ -53,6 +53,7 @@ void setup() {
     when(dynamicConfigurationManager.getConfiguration()).thenReturn(dynamicConfiguration);
     when(dynamicConfiguration.getEcPreKeyMigrationConfiguration()).thenReturn(ecPreKeyMigrationConfiguration);
     when(ecPreKeyMigrationConfiguration.storeEcSignedPreKeys()).thenReturn(true);
+    when(ecPreKeyMigrationConfiguration.deleteEcSignedPreKeys()).thenReturn(true);
 
     keysManager = new KeysManager(
         DYNAMO_DB_EXTENSION.getDynamoDbAsyncClient(),