From a1f90cd39b09a249bf26073571715876cc1a2e34 Mon Sep 17 00:00:00 2001 From: Moxie Marlinspike Date: Fri, 3 May 2019 12:04:18 -0700 Subject: [PATCH] Temporarily disable account cleaner --- .../textsecuregcm/storage/AccountCleaner.java | 20 +-- .../tests/storage/AccountCleanerTest.java | 130 +++++++++--------- 2 files changed, 75 insertions(+), 75 deletions(-) diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountCleaner.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountCleaner.java index a6bf05d79..534ba99c4 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountCleaner.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountCleaner.java @@ -59,16 +59,16 @@ public class AccountCleaner implements AccountDatabaseCrawlerListener { { expiredAccountsMeter.mark(); - Device masterDevice = account.getMasterDevice().get(); - masterDevice.setFetchesMessages(false); - masterDevice.setApnId(null); - masterDevice.setGcmId(null); - - if (accountUpdateCount < MAX_ACCOUNT_UPDATES_PER_CHUNK) { - accountUpdateCount++; - accountsManager.update(account); - } - directoryQueue.deleteRegisteredUser(account.getNumber()); +// Device masterDevice = account.getMasterDevice().get(); +// masterDevice.setFetchesMessages(false); +// masterDevice.setApnId(null); +// masterDevice.setGcmId(null); +// +// if (accountUpdateCount < MAX_ACCOUNT_UPDATES_PER_CHUNK) { +// accountUpdateCount++; +// accountsManager.update(account); +// } +// directoryQueue.deleteRegisteredUser(account.getNumber()); } } } diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/tests/storage/AccountCleanerTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/tests/storage/AccountCleanerTest.java index 21fa2138d..d109a4d7f 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/tests/storage/AccountCleanerTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/tests/storage/AccountCleanerTest.java @@ -127,72 +127,72 @@ public class AccountCleanerTest { verifyNoMoreInteractions(directoryQueue); } - @Test - public void testExpiredAccounts() { - AccountCleaner accountCleaner = new AccountCleaner(accountsManager, directoryQueue); - accountCleaner.onCrawlStart(); - accountCleaner.onCrawlChunk(Optional.empty(), Arrays.asList(activeUnexpiredAccount, activeExpiredAccount, inactiveUnexpiredAccount, inactiveExpiredAccount)); - accountCleaner.onCrawlEnd(Optional.empty()); +// @Test +// public void testExpiredAccounts() { +// AccountCleaner accountCleaner = new AccountCleaner(accountsManager, directoryQueue); +// accountCleaner.onCrawlStart(); +// accountCleaner.onCrawlChunk(Optional.empty(), Arrays.asList(activeUnexpiredAccount, activeExpiredAccount, inactiveUnexpiredAccount, inactiveExpiredAccount)); +// accountCleaner.onCrawlEnd(Optional.empty()); +// +// verify(activeExpiredDevice).setGcmId(isNull()); +// verify(activeExpiredDevice).setApnId(isNull()); +// verify(activeExpiredDevice).setFetchesMessages(eq(false)); +// +// verify(accountsManager).update(eq(activeExpiredAccount)); +// verify(directoryQueue).deleteRegisteredUser(eq(AuthHelper.VALID_NUMBER)); +// +// verify(activeUnexpiredDevice, atLeastOnce()).isActive(); +// verify(activeExpiredDevice, atLeastOnce()).isActive(); +// verify(inactiveUnexpiredDevice, atLeastOnce()).isActive(); +// verify(inactiveExpiredDevice, atLeastOnce()).isActive(); +// +// verifyNoMoreInteractions(activeUnexpiredDevice); +// verifyNoMoreInteractions(activeExpiredDevice); +// verifyNoMoreInteractions(inactiveUnexpiredDevice); +// verifyNoMoreInteractions(inactiveExpiredDevice); +// +// verifyNoMoreInteractions(accountsManager); +// verifyNoMoreInteractions(directoryQueue); +// } - verify(activeExpiredDevice).setGcmId(isNull()); - verify(activeExpiredDevice).setApnId(isNull()); - verify(activeExpiredDevice).setFetchesMessages(eq(false)); - - verify(accountsManager).update(eq(activeExpiredAccount)); - verify(directoryQueue).deleteRegisteredUser(eq(AuthHelper.VALID_NUMBER)); - - verify(activeUnexpiredDevice, atLeastOnce()).isActive(); - verify(activeExpiredDevice, atLeastOnce()).isActive(); - verify(inactiveUnexpiredDevice, atLeastOnce()).isActive(); - verify(inactiveExpiredDevice, atLeastOnce()).isActive(); - - verifyNoMoreInteractions(activeUnexpiredDevice); - verifyNoMoreInteractions(activeExpiredDevice); - verifyNoMoreInteractions(inactiveUnexpiredDevice); - verifyNoMoreInteractions(inactiveExpiredDevice); - - verifyNoMoreInteractions(accountsManager); - verifyNoMoreInteractions(directoryQueue); - } - - @Test - public void testMaxAccountUpdates() { - ArrayList accounts = new ArrayList<>(); - accounts.add(activeUnexpiredAccount); - - int activeExpiredAccountCount = AccountCleaner.MAX_ACCOUNT_UPDATES_PER_CHUNK + 1; - for (int addedAccountCount = 0; addedAccountCount < activeExpiredAccountCount; addedAccountCount++) { - accounts.add(activeExpiredAccount); - } - - accounts.add(inactiveUnexpiredAccount); - accounts.add(inactiveExpiredAccount); - - AccountCleaner accountCleaner = new AccountCleaner(accountsManager, directoryQueue); - accountCleaner.onCrawlStart(); - accountCleaner.onCrawlChunk(Optional.empty(), accounts); - accountCleaner.onCrawlEnd(Optional.empty()); - - verify(activeExpiredDevice, atLeast(0)).setGcmId(isNull()); - verify(activeExpiredDevice, atLeast(0)).setApnId(isNull()); - verify(activeExpiredDevice, atLeast(0)).setFetchesMessages(eq(false)); - - verify(accountsManager, times(AccountCleaner.MAX_ACCOUNT_UPDATES_PER_CHUNK)).update(eq(activeExpiredAccount)); - verify(directoryQueue, times(activeExpiredAccountCount)).deleteRegisteredUser(eq(AuthHelper.VALID_NUMBER)); - - verify(activeUnexpiredDevice, atLeastOnce()).isActive(); - verify(activeExpiredDevice, atLeastOnce()).isActive(); - verify(inactiveUnexpiredDevice, atLeastOnce()).isActive(); - verify(inactiveExpiredDevice, atLeastOnce()).isActive(); - - verifyNoMoreInteractions(activeUnexpiredDevice); - verifyNoMoreInteractions(activeExpiredDevice); - verifyNoMoreInteractions(inactiveUnexpiredDevice); - verifyNoMoreInteractions(inactiveExpiredDevice); - - verifyNoMoreInteractions(accountsManager); - verifyNoMoreInteractions(directoryQueue); - } +// @Test +// public void testMaxAccountUpdates() { +// ArrayList accounts = new ArrayList<>(); +// accounts.add(activeUnexpiredAccount); +// +// int activeExpiredAccountCount = AccountCleaner.MAX_ACCOUNT_UPDATES_PER_CHUNK + 1; +// for (int addedAccountCount = 0; addedAccountCount < activeExpiredAccountCount; addedAccountCount++) { +// accounts.add(activeExpiredAccount); +// } +// +// accounts.add(inactiveUnexpiredAccount); +// accounts.add(inactiveExpiredAccount); +// +// AccountCleaner accountCleaner = new AccountCleaner(accountsManager, directoryQueue); +// accountCleaner.onCrawlStart(); +// accountCleaner.onCrawlChunk(Optional.empty(), accounts); +// accountCleaner.onCrawlEnd(Optional.empty()); +// +// verify(activeExpiredDevice, atLeast(0)).setGcmId(isNull()); +// verify(activeExpiredDevice, atLeast(0)).setApnId(isNull()); +// verify(activeExpiredDevice, atLeast(0)).setFetchesMessages(eq(false)); +// +// verify(accountsManager, times(AccountCleaner.MAX_ACCOUNT_UPDATES_PER_CHUNK)).update(eq(activeExpiredAccount)); +// verify(directoryQueue, times(activeExpiredAccountCount)).deleteRegisteredUser(eq(AuthHelper.VALID_NUMBER)); +// +// verify(activeUnexpiredDevice, atLeastOnce()).isActive(); +// verify(activeExpiredDevice, atLeastOnce()).isActive(); +// verify(inactiveUnexpiredDevice, atLeastOnce()).isActive(); +// verify(inactiveExpiredDevice, atLeastOnce()).isActive(); +// +// verifyNoMoreInteractions(activeUnexpiredDevice); +// verifyNoMoreInteractions(activeExpiredDevice); +// verifyNoMoreInteractions(inactiveUnexpiredDevice); +// verifyNoMoreInteractions(inactiveExpiredDevice); +// +// verifyNoMoreInteractions(accountsManager); +// verifyNoMoreInteractions(directoryQueue); +// } @Test