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

Use pni in DynamoDB account put condition expression

Browse Source
This commit is contained in:
Chris Eager
2024-11-22 15:24:48 -06:00
committed by Chris Eager
parent 5627ed141b
commit 9a19ef82fd
2 changed files with 42 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -235,6 +235,45 @@ class AccountsTest {
assertPhoneNumberIdentifierConstraintExists(account.getPhoneNumberIdentifier(), account.getUuid());
}
@Test
void testStoreAciCollisionFails() {
Device device = generateDevice(DEVICE_ID_1);
Account account = generateAccount("+14151112222", UUID.randomUUID(), UUID.randomUUID(), List.of(device));
boolean freshUser = createAccount(account);
assertThat(freshUser).isTrue();
verifyStoredState("+14151112222", account.getUuid(), account.getPhoneNumberIdentifier(), null, account, true);
assertPhoneNumberConstraintExists("+14151112222", account.getUuid());
assertPhoneNumberIdentifierConstraintExists(account.getPhoneNumberIdentifier(), account.getUuid());
account.setNumber("+14153334444", UUID.randomUUID());
assertThrows(IllegalArgumentException.class, () -> createAccount(account),
"Reusing ACI with different PNI should fail");
}
@Test
void testStorePniCollisionFails() {
Device device1 = generateDevice(DEVICE_ID_1);
Account account1 = generateAccount("+14151112222", UUID.randomUUID(), UUID.randomUUID(), List.of(device1));
boolean freshUser = createAccount(account1);
assertThat(freshUser).isTrue();
verifyStoredState("+14151112222", account1.getUuid(), account1.getPhoneNumberIdentifier(), null, account1, true);
assertPhoneNumberConstraintExists("+14151112222", account1.getUuid());
assertPhoneNumberIdentifierConstraintExists(account1.getPhoneNumberIdentifier(), account1.getUuid());
Device device2 = generateDevice(DEVICE_ID_1);
Account account2 = generateAccount("+14151112222", UUID.randomUUID(), account1.getPhoneNumberIdentifier(),
List.of(device2));
assertThrows(AccountAlreadyExistsException.class, () -> accounts.create(account2, Collections.emptyList()),
"New ACI with same PNI should fail");
}
@Test
void testRetrieve() {
final List<Device> devicesFirst = List.of(generateDevice(DEVICE_ID_1), generateDevice(DEVICE_ID_2));