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

Canonical discoverability writing.

Browse Source
This commit is contained in:
Graeme Connell
2021-09-03 17:21:04 -06:00
committed by gram-signal
parent 92f035bc2a
commit b4aabd799b
6 changed files with 117 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
service/src/test/java/org/whispersystems/textsecuregcm/storage/AccountsDynamoDbTest.java
View File

@@ -143,11 +143,11 @@ class AccountsDynamoDbTest {
boolean freshUser = accountsDynamoDb.create(account);
assertThat(freshUser).isTrue();
verifyStoredState("+14151112222", account.getUuid(), account);
verifyStoredState("+14151112222", account.getUuid(), account, true);
freshUser = accountsDynamoDb.create(account);
assertThat(freshUser).isTrue();
verifyStoredState("+14151112222", account.getUuid(), account);
verifyStoredState("+14151112222", account.getUuid(), account, true);
}
@@ -161,7 +161,7 @@ class AccountsDynamoDbTest {
accountsDynamoDb.create(account);
verifyStoredState("+14151112222", account.getUuid(), account);
verifyStoredState("+14151112222", account.getUuid(), account, true);
}
@Test
@@ -210,7 +210,7 @@ class AccountsDynamoDbTest {
accountsDynamoDb.create(account);
verifyStoredState("+14151112222", account.getUuid(), account);
verifyStoredState("+14151112222", account.getUuid(), account, true);
account.setProfileName("name");
@@ -223,7 +223,7 @@ class AccountsDynamoDbTest {
final boolean freshUser = accountsDynamoDb.create(account);
assertThat(freshUser).isFalse();
verifyStoredState("+14151112222", firstUuid, account);
verifyStoredState("+14151112222", firstUuid, account, true);
device = generateDevice(1);
Account invalidAccount = generateAccount("+14151113333", firstUuid, Collections.singleton(device));
@@ -250,7 +250,7 @@ class AccountsDynamoDbTest {
retrieved = accountsDynamoDb.get(account.getUuid());
assertThat(retrieved.isPresent()).isTrue();
verifyStoredState("+14151112222", account.getUuid(), account);
verifyStoredState("+14151112222", account.getUuid(), account, true);
device = generateDevice(1);
Account unknownAccount = generateAccount("+14151113333", UUID.randomUUID(), Collections.singleton(device));
@@ -263,7 +263,7 @@ class AccountsDynamoDbTest {
assertThat(account.getVersion()).isEqualTo(2);
verifyStoredState("+14151112222", account.getUuid(), account);
verifyStoredState("+14151112222", account.getUuid(), account, true);
account.setVersion(1);
@@ -274,7 +274,7 @@ class AccountsDynamoDbTest {
accountsDynamoDb.update(account);
verifyStoredState("+14151112222", account.getUuid(), account);
verifyStoredState("+14151112222", account.getUuid(), account, true);
}
@Test
@@ -481,13 +481,13 @@ class AccountsDynamoDbTest {
assertThat(migrated).isTrue();
verifyStoredState("+14151112222", account.getUuid(), account);
verifyStoredState("+14151112222", account.getUuid(), account, true);
migrated = accountsDynamoDb.migrate(account).get();
assertThat(migrated).isFalse();
verifyStoredState("+14151112222", account.getUuid(), account);
verifyStoredState("+14151112222", account.getUuid(), account, true);
UUID secondUuid = UUID.randomUUID();
@@ -497,7 +497,7 @@ class AccountsDynamoDbTest {
migrated = accountsDynamoDb.migrate(accountRemigrationWithDifferentUuid).get();
assertThat(migrated).isFalse();
verifyStoredState("+14151112222", firstUuid, account);
verifyStoredState("+14151112222", firstUuid, account, true);
account.setVersion(account.getVersion() + 1);
@@ -506,6 +506,39 @@ class AccountsDynamoDbTest {
assertThat(migrated).isTrue();
}
@Test
void testCanonicallyDiscoverableSet() {
Device device = generateDevice(1);
UUID uuid = UUID.randomUUID();
Account account = generateAccount("+14151112222", uuid, Collections.singleton(device));
account.setDiscoverableByPhoneNumber(false);
accountsDynamoDb.create(account);
verifyStoredState("+14151112222", account.getUuid(), account, false);
account.setDiscoverableByPhoneNumber(true);
accountsDynamoDb.update(account);
verifyStoredState("+14151112222", account.getUuid(), account, true);
account.setDiscoverableByPhoneNumber(false);
accountsDynamoDb.update(account);
verifyStoredState("+14151112222", account.getUuid(), account, false);
}
@Test
void testContactDiscoveryWriter() throws Exception {
Device device = generateDevice(1);
UUID uuid = UUID.randomUUID();
Account account = generateAccount("+14151112222", uuid, Collections.singleton(device));
accountsDynamoDb.create(account);
verifyStoredState("+14151112222", account.getUuid(), account, true);
ContactDiscoveryWriter writer = new ContactDiscoveryWriter(accountsDynamoDb);
account.setCanonicallyDiscoverable(false);
writer.onCrawlChunk(null, List.of(account));
verifyStoredState("+14151112222", account.getUuid(), account, true);
account.setCanonicallyDiscoverable(true);
account.setDiscoverableByPhoneNumber(false);
writer.onCrawlChunk(null, List.of(account));
verifyStoredState("+14151112222", account.getUuid(), account, false);
}
private Device generateDevice(long id) {
Random random = new Random(System.currentTimeMillis());
SignedPreKey signedPreKey = new SignedPreKey(random.nextInt(), "testPublicKey-" + random.nextInt(), "testSignature-" + random.nextInt());
@@ -527,7 +560,7 @@ class AccountsDynamoDbTest {
return new Account(number, uuid, devices, unidentifiedAccessKey);
}
private void verifyStoredState(String number, UUID uuid, Account expecting) {
private void verifyStoredState(String number, UUID uuid, Account expecting, boolean canonicallyDiscoverable) {
final DynamoDbClient db = dynamoDbExtension.getDynamoDbClient();
final GetItemResponse get = db.getItem(GetItemRequest.builder()
@@ -543,6 +576,8 @@ class AccountsDynamoDbTest {
assertThat(AttributeValues.getInt(get.item(), AccountsDynamoDb.ATTR_VERSION, -1))
.isEqualTo(expecting.getVersion());
assertThat(AttributeValues.getBool(get.item(), AccountsDynamoDb.ATTR_CANONICALLY_DISCOVERABLE, !canonicallyDiscoverable)).isEqualTo(canonicallyDiscoverable);
Account result = AccountsDynamoDb.fromItem(get.item());
verifyStoredState(number, uuid, result, expecting);
} else {