MirrorMirror
/
Signal-Server
mirror of https://github.com/signalapp/Signal-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don’t use an existing record's number in `AccountsManager` re-registration handling

This commit is contained in:
Chris Eager 2024-11-22 15:57:46 -06:00 committed by Chris Eager
parent 9a19ef82fd
commit 739ed56b4c
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountsManager.java
View File

@ -271,17 +271,17 @@ public class AccountsManager extends RedisPubSubAdapter<String, String> implemen
@Nullable final String userAgent) throws InterruptedException { @Nullable final String userAgent) throws InterruptedException {
final Account account = new Account(); final Account account = new Account();
final UUID phoneNumberIdentifier = phoneNumberIdentifiers.getPhoneNumberIdentifier(number).join(); final UUID pni = phoneNumberIdentifiers.getPhoneNumberIdentifier(number).join();
return createTimer.record(() -> { return createTimer.record(() -> {
accountLockManager.withLock(List.of(phoneNumberIdentifier), () -> { accountLockManager.withLock(List.of(pni), () -> {
final Optional<UUID> maybeRecentlyDeletedAccountIdentifier = final Optional<UUID> maybeRecentlyDeletedAccountIdentifier =
accounts.findRecentlyDeletedAccountIdentifier(number); accounts.findRecentlyDeletedAccountIdentifier(number);
// Reuse the ACI from any recently-deleted account with this number to cover cases where somebody is // Reuse the ACI from any recently-deleted account with this number to cover cases where somebody is
// re-registering. // re-registering.
account.setNumber(number, phoneNumberIdentifier);
account.setUuid(maybeRecentlyDeletedAccountIdentifier.orElseGet(UUID::randomUUID)); account.setUuid(maybeRecentlyDeletedAccountIdentifier.orElseGet(UUID::randomUUID));
account.setNumber(number, pni);
account.setIdentityKey(aciIdentityKey); account.setIdentityKey(aciIdentityKey);
account.setPhoneNumberIdentityKey(pniIdentityKey); account.setPhoneNumberIdentityKey(pniIdentityKey);
account.addDevice(primaryDeviceSpec.toDevice(Device.PRIMARY_ID, clock)); account.addDevice(primaryDeviceSpec.toDevice(Device.PRIMARY_ID, clock));
@ -325,10 +325,7 @@ public class AccountsManager extends RedisPubSubAdapter<String, String> implemen
} }
final UUID aci = e.getExistingAccount().getIdentifier(IdentityType.ACI); final UUID aci = e.getExistingAccount().getIdentifier(IdentityType.ACI);
final UUID pni = e.getExistingAccount().getIdentifier(IdentityType.PNI);
account.setUuid(aci); account.setUuid(aci);
account.setNumber(e.getExistingAccount().getNumber(), pni);
final List<TransactWriteItem> additionalWriteItems = Stream.concat( final List<TransactWriteItem> additionalWriteItems = Stream.concat(
keysManager.buildWriteItemsForNewDevice(account.getIdentifier(IdentityType.ACI), keysManager.buildWriteItemsForNewDevice(account.getIdentifier(IdentityType.ACI),

16
service/src/test/java/org/whispersystems/textsecuregcm/storage/AccountsManagerTest.java
View File

@ -66,6 +66,7 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout; import org.junit.jupiter.api.Timeout;
import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.CsvSource;
import org.junit.jupiter.params.provider.MethodSource; import org.junit.jupiter.params.provider.MethodSource;
import org.junit.jupiter.params.provider.ValueSource; import org.junit.jupiter.params.provider.ValueSource;
import org.mockito.stubbing.Answer; import org.mockito.stubbing.Answer;
@ -837,11 +838,17 @@ class AccountsManagerTest {
verifyNoInteractions(profilesManager); verifyNoInteractions(profilesManager);
} }
@Test @ParameterizedTest
void testReregisterAccount() throws InterruptedException, AccountAlreadyExistsException { @CsvSource({
"+18005550123, +18005550123",
// the canonical form of numbers may change over time, so an existing account might have not-identical e164 that
// maps to the same PNI, and the number used by the caller must be present on the re-registered account
"+2290123456789, +22923456789"
})
void testReregisterAccount(final String e164, final String existingAccountE164)
throws InterruptedException, AccountAlreadyExistsException {
final UUID existingUuid = UUID.randomUUID(); final UUID existingUuid = UUID.randomUUID();
final String e164 = "+18005550123";
final AccountAttributes attributes = new AccountAttributes(false, 1, 2, null, null, true, null); final AccountAttributes attributes = new AccountAttributes(false, 1, 2, null, null, true, null);
when(accounts.create(any(), any())) when(accounts.create(any(), any()))
@ -851,7 +858,7 @@ class AccountsManagerTest {
final Account existingAccount = mock(Account.class); final Account existingAccount = mock(Account.class);
when(existingAccount.getUuid()).thenReturn(existingUuid); when(existingAccount.getUuid()).thenReturn(existingUuid);
when(existingAccount.getIdentifier(IdentityType.ACI)).thenReturn(existingUuid); when(existingAccount.getIdentifier(IdentityType.ACI)).thenReturn(existingUuid);
when(existingAccount.getNumber()).thenReturn(e164); when(existingAccount.getNumber()).thenReturn(existingAccountE164);
when(existingAccount.getPhoneNumberIdentifier()).thenReturn(requestedAccount.getIdentifier(IdentityType.PNI)); when(existingAccount.getPhoneNumberIdentifier()).thenReturn(requestedAccount.getIdentifier(IdentityType.PNI));
when(existingAccount.getIdentifier(IdentityType.PNI)).thenReturn(requestedAccount.getIdentifier(IdentityType.PNI)); when(existingAccount.getIdentifier(IdentityType.PNI)).thenReturn(requestedAccount.getIdentifier(IdentityType.PNI));
when(existingAccount.getPrimaryDevice()).thenReturn(mock(Device.class)); when(existingAccount.getPrimaryDevice()).thenReturn(mock(Device.class));
@ -864,6 +871,7 @@ class AccountsManagerTest {
final Account reregisteredAccount = createAccount(e164, attributes); final Account reregisteredAccount = createAccount(e164, attributes);
assertTrue(phoneNumberIdentifiersByE164.containsKey(e164)); assertTrue(phoneNumberIdentifiersByE164.containsKey(e164));
assertEquals(e164, reregisteredAccount.getNumber());
verify(accounts) verify(accounts)
.create(argThat(account -> e164.equals(account.getNumber()) && existingUuid.equals(account.getUuid())), any()); .create(argThat(account -> e164.equals(account.getNumber()) && existingUuid.equals(account.getUuid())), any());