Signal/Signal-Server
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Server synced 2026-04-21 06:18:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use one thread per account in the "encrypt timestamps" crawler

Browse Source
This commit is contained in:
Katherine
2025-07-29 09:51:36 -04:00
committed by GitHub
parent 8aa408a3c1
commit 5f5c345f94
2 changed files with 50 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
service/src/test/java/org/whispersystems/textsecuregcm/workers/EncryptDeviceCreationTimestampCommandTest.java
View File

@@ -8,26 +8,25 @@ package org.whispersystems.textsecuregcm.workers;
import net.sourceforge.argparse4j.inf.Namespace;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
import org.mockito.MockedStatic;
import org.signal.libsignal.protocol.IdentityKey;
import org.signal.libsignal.protocol.ecc.ECKeyPair;
import org.whispersystems.textsecuregcm.identity.IdentityType;
import org.whispersystems.textsecuregcm.auth.UnidentifiedAccessUtil;
import org.whispersystems.textsecuregcm.storage.Account;
import org.whispersystems.textsecuregcm.storage.AccountsManager;
import org.whispersystems.textsecuregcm.storage.Device;
import org.whispersystems.textsecuregcm.util.EncryptDeviceCreationTimestampUtil;
import org.whispersystems.textsecuregcm.util.TestRandomUtil;
import org.whispersystems.textsecuregcm.tests.util.AccountsHelper;
import org.whispersystems.textsecuregcm.tests.util.DevicesHelper;
import reactor.core.publisher.Flux;
import java.util.List;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import java.util.function.Consumer;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyByte;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.mockStatic;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -63,44 +62,32 @@ public class EncryptDeviceCreationTimestampCommandTest {
@ParameterizedTest
@ValueSource(booleans = {true, false})
void crawlAccounts(final boolean isDryRun) {
final Account account = mock(Account.class);
final Device device = mock(Device.class);
final String number = "+14152222222";
final UUID uuid = UUID.randomUUID();
final IdentityKey identityKey = new IdentityKey(ECKeyPair.generate().getPublicKey());
final byte deviceId = (byte) 1;
final long createdAt = System.currentTimeMillis();
final int registrationId = 123;
when(account.getDevices()).thenReturn(List.of(device));
when(account.getIdentityKey(IdentityType.ACI)).thenReturn(identityKey);
when(device.getCreated()).thenReturn(createdAt);
when(device.getId()).thenReturn(deviceId);
when(device.getRegistrationId(IdentityType.ACI)).thenReturn(registrationId);
final Account testAccount = AccountsHelper.generateTestAccount(number, uuid, UUID.randomUUID(), List.of(
DevicesHelper.createDevice(Device.PRIMARY_ID)), new byte[UnidentifiedAccessUtil.UNIDENTIFIED_ACCESS_KEY_LENGTH]);
testAccount.setIdentityKey(new IdentityKey(ECKeyPair.generate().getPublicKey()));
final AccountsManager accountsManager = mock(AccountsManager.class);
when(accountsManager.updateDeviceAsync(any(), anyByte(), any())).thenReturn(CompletableFuture.completedFuture(null));
when(accountsManager.updateAsync(any(), any())).thenAnswer(invocation -> {
final Account account = invocation.getArgument(0);
final Consumer<Account> updater = invocation.getArgument(1);
updater.accept(account);
return CompletableFuture.completedFuture(account);
});
final EncryptDeviceCreationTimestampCommand encryptDeviceCreationTimestampCommand =
new TestEncryptDeviceCreationTimestampCommand(accountsManager, isDryRun);
try (MockedStatic<EncryptDeviceCreationTimestampUtil> mockUtil = mockStatic(EncryptDeviceCreationTimestampUtil.class)) {
mockUtil.when(() -> EncryptDeviceCreationTimestampUtil.encrypt(anyLong(), any(), anyByte(), anyInt()))
.thenReturn(TestRandomUtil.nextBytes(56));
encryptDeviceCreationTimestampCommand.crawlAccounts(Flux.just(testAccount));
encryptDeviceCreationTimestampCommand.crawlAccounts(Flux.just(account));
mockUtil.verify(() -> EncryptDeviceCreationTimestampUtil.encrypt(
eq(createdAt),
eq(identityKey),
eq(deviceId),
eq(registrationId)
));
if (isDryRun) {
verify(accountsManager, never()).updateDeviceAsync(any(), anyByte(), any());
} else {
verify(accountsManager).updateDeviceAsync(eq(account), eq(deviceId), any());
}
if (isDryRun) {
verify(accountsManager, never()).updateAsync(any(), any());
assertNull(testAccount.getDevices().getFirst().getCreatedAtCiphertext());
} else {
verify(accountsManager).updateAsync(eq(testAccount), any());
assertNotNull(testAccount.getDevices().getFirst().getCreatedAtCiphertext());
}
}
}