From ae1edf3c5ced9efc249edfd94ff00663c32e2f6f Mon Sep 17 00:00:00 2001 From: gram-signal <84339875+gram-signal@users.noreply.github.com> Date: Wed, 31 Aug 2022 12:10:46 -0600 Subject: [PATCH] Remove experiment associated with auth1->auth2 rollout. --- .../textsecuregcm/WhisperServerService.java | 4 ++-- .../textsecuregcm/auth/AccountAuthenticator.java | 4 ++-- .../auth/BaseAccountAuthenticator.java | 13 ++++--------- .../auth/DisabledPermittedAccountAuthenticator.java | 4 ++-- .../auth/BaseAccountAuthenticatorTest.java | 4 +--- .../textsecuregcm/tests/util/AuthHelper.java | 6 ++---- 6 files changed, 13 insertions(+), 22 deletions(-) diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java index ae235bd4c..000c32f7f 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java @@ -477,8 +477,8 @@ public class WhisperServerService extends Application { - public AccountAuthenticator(AccountsManager accountsManager, ExperimentEnrollmentManager enrollmentManager) { - super(accountsManager, enrollmentManager); + public AccountAuthenticator(AccountsManager accountsManager) { + super(accountsManager); } @Override diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/auth/BaseAccountAuthenticator.java b/service/src/main/java/org/whispersystems/textsecuregcm/auth/BaseAccountAuthenticator.java index 0847bfa7f..1f2f5a9a4 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/auth/BaseAccountAuthenticator.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/auth/BaseAccountAuthenticator.java @@ -17,7 +17,6 @@ import java.time.temporal.ChronoUnit; import java.util.Optional; import java.util.UUID; import org.apache.commons.lang3.StringUtils; -import org.whispersystems.textsecuregcm.experiment.ExperimentEnrollmentManager; import org.whispersystems.textsecuregcm.storage.Account; import org.whispersystems.textsecuregcm.storage.AccountsManager; import org.whispersystems.textsecuregcm.storage.Device; @@ -34,21 +33,18 @@ public class BaseAccountAuthenticator { private static final String DAYS_SINCE_LAST_SEEN_DISTRIBUTION_NAME = name(BaseAccountAuthenticator.class, "daysSinceLastSeen"); private static final String IS_PRIMARY_DEVICE_TAG = "isPrimary"; - private static final String AUTH_V2_REWRITE_EXPERIMENT_NAME = "authv2-rewrite"; private final AccountsManager accountsManager; private final Clock clock; - private final ExperimentEnrollmentManager enrollmentManager; - public BaseAccountAuthenticator(AccountsManager accountsManager, ExperimentEnrollmentManager enrollmentManager) { - this(accountsManager, Clock.systemUTC(), enrollmentManager); + public BaseAccountAuthenticator(AccountsManager accountsManager) { + this(accountsManager, Clock.systemUTC()); } @VisibleForTesting - public BaseAccountAuthenticator(AccountsManager accountsManager, Clock clock, ExperimentEnrollmentManager enrollmentManager) { + public BaseAccountAuthenticator(AccountsManager accountsManager, Clock clock) { this.accountsManager = accountsManager; this.clock = clock; - this.enrollmentManager = enrollmentManager; } static Pair getIdentifierAndDeviceId(final String basicUsername) { @@ -112,8 +108,7 @@ public class BaseAccountAuthenticator { if (deviceAuthenticationCredentials.verify(basicCredentials.getPassword())) { succeeded = true; Account authenticatedAccount = updateLastSeen(account.get(), device.get()); - if (deviceAuthenticationCredentials.getVersion() != AuthenticationCredentials.CURRENT_VERSION - && enrollmentManager.isEnrolled(accountUuid, AUTH_V2_REWRITE_EXPERIMENT_NAME)) { + if (deviceAuthenticationCredentials.getVersion() != AuthenticationCredentials.CURRENT_VERSION) { authenticatedAccount = accountsManager.updateDeviceAuthentication( authenticatedAccount, device.get(), diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/auth/DisabledPermittedAccountAuthenticator.java b/service/src/main/java/org/whispersystems/textsecuregcm/auth/DisabledPermittedAccountAuthenticator.java index 658408435..03a365ad8 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/auth/DisabledPermittedAccountAuthenticator.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/auth/DisabledPermittedAccountAuthenticator.java @@ -14,8 +14,8 @@ import org.whispersystems.textsecuregcm.storage.AccountsManager; public class DisabledPermittedAccountAuthenticator extends BaseAccountAuthenticator implements Authenticator { - public DisabledPermittedAccountAuthenticator(AccountsManager accountsManager, ExperimentEnrollmentManager enrollmentManager) { - super(accountsManager, enrollmentManager); + public DisabledPermittedAccountAuthenticator(AccountsManager accountsManager) { + super(accountsManager); } @Override diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/auth/BaseAccountAuthenticatorTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/auth/BaseAccountAuthenticatorTest.java index 79841a4f0..78d919ac8 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/auth/BaseAccountAuthenticatorTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/auth/BaseAccountAuthenticatorTest.java @@ -56,9 +56,7 @@ class BaseAccountAuthenticatorTest { void setup() { accountsManager = mock(AccountsManager.class); clock = mock(Clock.class); - ExperimentEnrollmentManager enrollmentManager = mock(ExperimentEnrollmentManager.class); - when(enrollmentManager.isEnrolled(any(UUID.class), any())).thenReturn(true); - baseAccountAuthenticator = new BaseAccountAuthenticator(accountsManager, clock, enrollmentManager); + baseAccountAuthenticator = new BaseAccountAuthenticator(accountsManager, clock); // We use static UUIDs here because the UUID affects the "date last seen" offset acct1 = AccountsHelper.generateTestAccount("+14088675309", UUID.fromString("c139cb3e-f70c-4460-b221-815e8bdf778f"), UUID.randomUUID(), List.of(generateTestDevice(yesterday)), null); diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/tests/util/AuthHelper.java b/service/src/test/java/org/whispersystems/textsecuregcm/tests/util/AuthHelper.java index c219ab112..8ea5d23ab 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/tests/util/AuthHelper.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/tests/util/AuthHelper.java @@ -191,12 +191,10 @@ public class AuthHelper { testAccount.setup(ACCOUNTS_MANAGER); } - ExperimentEnrollmentManager experimentEnrollmentManager = mock(ExperimentEnrollmentManager.class); - when(experimentEnrollmentManager.isEnrolled(any(UUID.class), any())).thenReturn(true); AuthFilter accountAuthFilter = new BasicCredentialAuthFilter.Builder().setAuthenticator( - new AccountAuthenticator(ACCOUNTS_MANAGER, experimentEnrollmentManager)).buildAuthFilter(); + new AccountAuthenticator(ACCOUNTS_MANAGER)).buildAuthFilter(); AuthFilter disabledPermittedAccountAuthFilter = new BasicCredentialAuthFilter.Builder().setAuthenticator( - new DisabledPermittedAccountAuthenticator(ACCOUNTS_MANAGER, experimentEnrollmentManager)).buildAuthFilter(); + new DisabledPermittedAccountAuthenticator(ACCOUNTS_MANAGER)).buildAuthFilter(); return new PolymorphicAuthDynamicFeature<>(ImmutableMap.of(AuthenticatedAccount.class, accountAuthFilter, DisabledPermittedAuthenticatedAccount.class, disabledPermittedAccountAuthFilter));