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

Translate TransactionCanceledException to ContestedOptimisticLockException in Accounts#changeNumber

Browse Source
This commit is contained in:
Chris Eager
2024-01-30 15:49:27 -06:00
committed by Chris Eager
parent 84af984c4b
commit 2d4d37f96a
2 changed files with 53 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
service/src/test/java/org/whispersystems/textsecuregcm/storage/AccountsTest.java
View File

@@ -885,6 +885,41 @@ class AccountsTest {
assertThrows(TransactionCanceledException.class, () -> accounts.changeNumber(account, targetNumber, existingPhoneNumberIdentifier, Optional.empty(), Collections.emptyList()));
}
@Test
public void testChangeNumberContestedOptimisticLock() {
final String originalNumber = "+14151112222";
final String targetNumber = "+14151113333";
final UUID originalPni = UUID.randomUUID();
final UUID targetPni = UUID.randomUUID();
final Device device = generateDevice(DEVICE_ID_1);
final Account firstAccountInstance = generateAccount(originalNumber, UUID.randomUUID(), originalPni,
List.of(device));
createAccount(firstAccountInstance);
final Account secondAccountInstance = accounts.getByAccountIdentifier(firstAccountInstance.getUuid()).orElseThrow();
// update via the first instance, which will update the version
firstAccountInstance.setCurrentProfileVersion("1");
accounts.update(firstAccountInstance);
assertThrows(ContestedOptimisticLockException.class,
() -> accounts.changeNumber(secondAccountInstance, targetNumber, targetPni, Optional.empty(),
Collections.emptyList()), "Second account instance has stale version");
final Account refreshedAccountInstance = accounts.getByAccountIdentifier(firstAccountInstance.getUuid())
.orElseThrow();
accounts.changeNumber(refreshedAccountInstance, targetNumber, targetPni, Optional.empty(),
Collections.emptyList());
assertPhoneNumberConstraintDoesNotExist(originalNumber);
assertPhoneNumberIdentifierConstraintDoesNotExist(originalPni);
assertPhoneNumberConstraintExists(targetNumber, firstAccountInstance.getUuid());
assertPhoneNumberIdentifierConstraintExists(targetPni, firstAccountInstance.getUuid());
}
@Test
void testSwitchUsernameHashes() {
final Account account = generateAccount("+18005551234", UUID.randomUUID(), UUID.randomUUID());