From a01f96e0e4d3c1f91f621a81c5852c4adf101f0a Mon Sep 17 00:00:00 2001 From: Jon Chambers Date: Thu, 10 Nov 2022 18:37:07 -0500 Subject: [PATCH] Temporarily disable account freezing on contention --- .../controllers/AccountController.java | 4 ++-- .../controllers/AccountControllerTest.java | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/AccountController.java b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/AccountController.java index 40974c4d8..ec74b84db 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/AccountController.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/AccountController.java @@ -819,7 +819,7 @@ public class AccountController { // Freezing the existing account credentials will definitively start the reglock timeout. // Until the timeout, the current reglock can still be supplied, // along with phone number verification, to restore access. - boolean alreadyLocked = existingAccount.hasLockedCredentials(); + /* boolean alreadyLocked = existingAccount.hasLockedCredentials(); Metrics.counter(LOCKED_ACCOUNT_COUNTER_NAME, LOCK_REASON_TAG_NAME, "verifiedNumberFailedReglock", ALREADY_LOCKED_TAG_NAME, Boolean.toString(alreadyLocked)) @@ -833,7 +833,7 @@ public class AccountController { } List deviceIds = updatedAccount.getDevices().stream().map(Device::getId).toList(); - clientPresenceManager.disconnectAllPresences(updatedAccount.getUuid(), deviceIds); + clientPresenceManager.disconnectAllPresences(updatedAccount.getUuid(), deviceIds); */ throw new WebApplicationException(Response.status(423) .entity(new RegistrationLockFailure(existingRegistrationLock.getTimeRemaining(), diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/controllers/AccountControllerTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/controllers/AccountControllerTest.java index cb159e0f9..e76854196 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/controllers/AccountControllerTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/controllers/AccountControllerTest.java @@ -1068,8 +1068,8 @@ class AccountControllerTest { assertThat(response.getStatus()).isEqualTo(423); - verify(senderRegLockAccount).lockAuthenticationCredentials(); - verify(clientPresenceManager, times(1)).disconnectAllPresences(eq(SENDER_REG_LOCK_UUID), any()); + // verify(senderRegLockAccount).lockAuthenticationCredentials(); + // verify(clientPresenceManager, times(1)).disconnectAllPresences(eq(SENDER_REG_LOCK_UUID), any()); verify(pinLimiter).validate(eq(SENDER_REG_LOCK)); } @@ -1092,8 +1092,8 @@ class AccountControllerTest { assertThat(failure.getBackupCredentials().getPassword().startsWith(SENDER_REG_LOCK_UUID.toString())).isTrue(); assertThat(failure.getTimeRemaining()).isGreaterThan(0); - verify(senderRegLockAccount).lockAuthenticationCredentials(); - verify(clientPresenceManager, atLeastOnce()).disconnectAllPresences(eq(SENDER_REG_LOCK_UUID), any()); + // verify(senderRegLockAccount).lockAuthenticationCredentials(); + // verify(clientPresenceManager, atLeastOnce()).disconnectAllPresences(eq(SENDER_REG_LOCK_UUID), any()); verifyNoInteractions(pinLimiter); } @@ -1338,8 +1338,8 @@ class AccountControllerTest { assertThat(response.getStatus()).isEqualTo(423); - verify(existingAccount).lockAuthenticationCredentials(); - verify(clientPresenceManager, atLeastOnce()).disconnectAllPresences(eq(existingUuid), any()); + // verify(existingAccount).lockAuthenticationCredentials(); + // verify(clientPresenceManager, atLeastOnce()).disconnectAllPresences(eq(existingUuid), any()); verify(changeNumberManager, never()).changeNumber(any(), any(), any(), any(), any(), any()); } @@ -1378,8 +1378,8 @@ class AccountControllerTest { assertThat(response.getStatus()).isEqualTo(423); - verify(existingAccount).lockAuthenticationCredentials(); - verify(clientPresenceManager, atLeastOnce()).disconnectAllPresences(eq(existingUuid), any()); + // verify(existingAccount).lockAuthenticationCredentials(); + // verify(clientPresenceManager, atLeastOnce()).disconnectAllPresences(eq(existingUuid), any()); verify(changeNumberManager, never()).changeNumber(any(), any(), any(), any(), any(), any()); }