diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/workers/UnlinkDevicesWithIdlePrimaryCommand.java b/service/src/main/java/org/whispersystems/textsecuregcm/workers/UnlinkDevicesWithIdlePrimaryCommand.java index fa1d1d355..3ce8fac31 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/workers/UnlinkDevicesWithIdlePrimaryCommand.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/workers/UnlinkDevicesWithIdlePrimaryCommand.java @@ -36,9 +36,6 @@ public class UnlinkDevicesWithIdlePrimaryCommand extends AbstractSinglePassCrawl @VisibleForTesting static final String PRIMARY_IDLE_DAYS_ARGUMENT = "primary-idle-days"; - @VisibleForTesting - static final String ENROLLMENT_PERCENTAGE_ARGUMENT = "enrollment-percentage"; - @VisibleForTesting static final int DEFAULT_PRIMARY_IDLE_DAYS = 90; @@ -75,19 +72,12 @@ public class UnlinkDevicesWithIdlePrimaryCommand extends AbstractSinglePassCrawl .setDefault(DEFAULT_PRIMARY_IDLE_DAYS) .help("The number of inactivity after which a primary device is considered idle"); - subparser.addArgument("--enrollment-percentage") - .type(Integer.class) - .dest(ENROLLMENT_PERCENTAGE_ARGUMENT) - .required(true) - .help("The percentage of eligible accounts from which to unlink devices"); - super.configure(subparser); } @Override protected void crawlAccounts(final Flux accounts) { final boolean isDryRun = getNamespace().getBoolean(DRY_RUN_ARGUMENT); - final int enrollmentPercentage = getNamespace().getInt(ENROLLMENT_PERCENTAGE_ARGUMENT); final Duration idleDurationThreshold = Duration.ofDays(getNamespace().getInt(PRIMARY_IDLE_DAYS_ARGUMENT)); final AccountsManager accountsManager = getCommandDependencies().accountsManager(); @@ -98,7 +88,6 @@ public class UnlinkDevicesWithIdlePrimaryCommand extends AbstractSinglePassCrawl final Instant currentTime = clock.instant(); accounts - .filter(account -> isEnrolled(account, enrollmentPercentage)) .filter(account -> isPrimaryDeviceIdle(account, currentTime, idleDurationThreshold)) .flatMap(accountWithIdlePrimaryDevice -> Flux.fromIterable(accountWithIdlePrimaryDevice.getDevices()) .filter(device -> !device.isPrimary()) @@ -128,8 +117,4 @@ public class UnlinkDevicesWithIdlePrimaryCommand extends AbstractSinglePassCrawl return durationSincePrimaryLastSeen.compareTo(idleDurationThreshold) > 0; } - - private static boolean isEnrolled(final Account account, final int enrollmentPercentage) { - return (account.getIdentifier(IdentityType.ACI).hashCode() & Integer.MAX_VALUE) % 100 < enrollmentPercentage; - } } diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/workers/UnlinkDevicesWithIdlePrimaryCommandTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/workers/UnlinkDevicesWithIdlePrimaryCommandTest.java index 6cd6d2316..dfa736798 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/workers/UnlinkDevicesWithIdlePrimaryCommandTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/workers/UnlinkDevicesWithIdlePrimaryCommandTest.java @@ -21,7 +21,6 @@ import java.util.Map; import java.util.UUID; import java.util.concurrent.CompletableFuture; import net.sourceforge.argparse4j.inf.Namespace; -import org.junit.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; import org.whispersystems.textsecuregcm.identity.IdentityType; @@ -41,8 +40,7 @@ class UnlinkDevicesWithIdlePrimaryCommandTest { public TestUnlinkDevicesWithIdlePrimaryCommand(final Clock clock, final AccountsManager accountsManager, - final boolean isDryRun, - final int enrollmentPercentage) { + final boolean isDryRun) { super(clock); @@ -51,7 +49,6 @@ class UnlinkDevicesWithIdlePrimaryCommandTest { namespace = new Namespace(Map.of( UnlinkDevicesWithIdlePrimaryCommand.DRY_RUN_ARGUMENT, isDryRun, - UnlinkDevicesWithIdlePrimaryCommand.ENROLLMENT_PERCENTAGE_ARGUMENT, enrollmentPercentage, UnlinkDevicesWithIdlePrimaryCommand.MAX_CONCURRENCY_ARGUMENT, 16, UnlinkDevicesWithIdlePrimaryCommand.PRIMARY_IDLE_DAYS_ARGUMENT, UnlinkDevicesWithIdlePrimaryCommand.DEFAULT_PRIMARY_IDLE_DAYS )); @@ -121,7 +118,7 @@ class UnlinkDevicesWithIdlePrimaryCommandTest { } final UnlinkDevicesWithIdlePrimaryCommand unlinkDevicesWithIdlePrimaryCommand = - new TestUnlinkDevicesWithIdlePrimaryCommand(CLOCK, accountsManager, isDryRun, 100); + new TestUnlinkDevicesWithIdlePrimaryCommand(CLOCK, accountsManager, isDryRun); unlinkDevicesWithIdlePrimaryCommand.crawlAccounts(Flux.just(accountWithIdlePrimaryAndNoLinkedDevice, accountWithActivePrimaryAndLinkedDevice, @@ -134,65 +131,6 @@ class UnlinkDevicesWithIdlePrimaryCommandTest { verifyNoMoreInteractions(accountsManager); } - @Test - void crawlAccountsPartialEnrollment() { - final AccountsManager accountsManager = mock(AccountsManager.class); - when(accountsManager.removeDevice(any(), anyByte())) - .thenReturn(CompletableFuture.completedFuture(null)); - - final UUID enrolledAccountIdentifier = randomUUIDWithEnrollmentHash(1); - final UUID unenrolledAccountIdentifier = randomUUIDWithEnrollmentHash(25); - - final byte linkedDeviceId = Device.PRIMARY_ID + 1; - - final Duration idleDeviceLastSeenDuration = - Duration.ofDays(UnlinkDevicesWithIdlePrimaryCommand.DEFAULT_PRIMARY_IDLE_DAYS).plus(Duration.ofDays(1)); - - final Account enrolledAccount = mock(Account.class); - { - when(enrolledAccount.getIdentifier(IdentityType.ACI)).thenReturn(enrolledAccountIdentifier); - - final Device primaryDevice = - generateMockDevice(Device.PRIMARY_ID, idleDeviceLastSeenDuration); - - final Device linkedDevice = generateMockDevice(linkedDeviceId, idleDeviceLastSeenDuration); - - when(enrolledAccount.getPrimaryDevice()).thenReturn(primaryDevice); - when(enrolledAccount.getDevices()).thenReturn(List.of(primaryDevice, linkedDevice)); - } - - final Account unenrolledAccount = mock(Account.class); - { - when(unenrolledAccount.getIdentifier(IdentityType.ACI)).thenReturn(unenrolledAccountIdentifier); - - final Device primaryDevice = - generateMockDevice(Device.PRIMARY_ID, idleDeviceLastSeenDuration); - - final Device linkedDevice = generateMockDevice(linkedDeviceId, idleDeviceLastSeenDuration); - - when(unenrolledAccount.getPrimaryDevice()).thenReturn(primaryDevice); - when(unenrolledAccount.getDevices()).thenReturn(List.of(primaryDevice, linkedDevice)); - } - - final UnlinkDevicesWithIdlePrimaryCommand unlinkDevicesWithIdlePrimaryCommand = - new TestUnlinkDevicesWithIdlePrimaryCommand(CLOCK, accountsManager, false, 10); - - unlinkDevicesWithIdlePrimaryCommand.crawlAccounts(Flux.just(enrolledAccount, unenrolledAccount)); - - verify(accountsManager).removeDevice(enrolledAccount, linkedDeviceId); - verifyNoMoreInteractions(accountsManager); - } - - private static UUID randomUUIDWithEnrollmentHash(final int enrollmentHash) { - UUID uuid; - - do { - uuid = UUID.randomUUID(); - } while ((uuid.hashCode() & Integer.MAX_VALUE) % 100 != enrollmentHash); - - return uuid; - } - private static Device generateMockDevice(final byte deviceId, final Duration primaryIdleDuration) { final Device device = mock(Device.class); when(device.getId()).thenReturn(deviceId);