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

Repair missing PNIs in JSON blobs on account load

Browse Source
This commit is contained in:
Jon Chambers
2021-12-10 13:08:11 -05:00
committed by Jon Chambers
parent a87b84fbe2
commit 3895871462
2 changed files with 83 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -769,6 +769,66 @@ class AccountsTest {
assertThat(account.getUsername()).hasValueSatisfying(u -> assertThat(u).isEqualTo(username));
}
// TODO Remove when PNI repair pass is complete
@Test
void testRepairMissingPni() throws JsonProcessingException {
final String number = "+18005551234";
final UUID accountIdentifier = UUID.randomUUID();
final UUID phoneNumberIdentifier = UUID.randomUUID();
{
final Account account = generateAccount(number, accountIdentifier, phoneNumberIdentifier);
accounts.create(account);
// Artificially inject data with a null PNI in the JSON blob into the backing table
account.setNumber(number, null);
dynamoDbExtension.getDynamoDbClient().updateItem(UpdateItemRequest.builder()
.tableName(ACCOUNTS_TABLE_NAME)
.key(Map.of(Accounts.KEY_ACCOUNT_UUID, AttributeValues.fromUUID(accountIdentifier)))
.updateExpression("SET #data = :data")
.expressionAttributeNames(Map.of("#data", Accounts.ATTR_ACCOUNT_DATA))
.expressionAttributeValues(
Map.of(":data", AttributeValues.fromByteArray(SystemMapper.getMapper().writeValueAsBytes(account))))
.build());
}
{
final GetItemResponse response = dynamoDbExtension.getDynamoDbClient().getItem(GetItemRequest.builder()
.tableName(ACCOUNTS_TABLE_NAME)
.key(Map.of(Accounts.KEY_ACCOUNT_UUID, AttributeValues.fromUUID(accountIdentifier)))
.consistentRead(true)
.build());
final String accountJson = new String(
AttributeValues.getByteArray(response.item(), Accounts.ATTR_ACCOUNT_DATA, null), StandardCharsets.UTF_8);
final Account accountFromJson = SystemMapper.getMapper().readValue(accountJson, Account.class);
assertThat(accountFromJson.getPhoneNumberIdentifier()).isNull();
}
{
// Loading the account should auto-repair the missing PNI
final Account account = accounts.getByAccountIdentifier(accountIdentifier).orElseThrow();
assertThat(account.getPhoneNumberIdentifier()).isEqualTo(phoneNumberIdentifier);
assertThat(account.isStale()).isFalse();
}
{
final GetItemResponse response = dynamoDbExtension.getDynamoDbClient().getItem(GetItemRequest.builder()
.tableName(ACCOUNTS_TABLE_NAME)
.key(Map.of(Accounts.KEY_ACCOUNT_UUID, AttributeValues.fromUUID(accountIdentifier)))
.consistentRead(true)
.build());
final String accountJson = new String(
AttributeValues.getByteArray(response.item(), Accounts.ATTR_ACCOUNT_DATA, null), StandardCharsets.UTF_8);
final Account accountFromJson = SystemMapper.getMapper().readValue(accountJson, Account.class);
assertThat(accountFromJson.getPhoneNumberIdentifier()).isEqualTo(phoneNumberIdentifier);
}
}
private Device generateDevice(long id) {
Random random = new Random(System.currentTimeMillis());
SignedPreKey signedPreKey = new SignedPreKey(random.nextInt(), "testPublicKey-" + random.nextInt(), "testSignature-" + random.nextInt());
@@ -851,7 +911,7 @@ class AccountsTest {
assertThat(AttributeValues.getBool(get.item(), Accounts.ATTR_CANONICALLY_DISCOVERABLE,
!canonicallyDiscoverable)).isEqualTo(canonicallyDiscoverable);
Account result = Accounts.fromItem(get.item());
Account result = accounts.fromItem(get.item());
verifyStoredState(number, uuid, pni, result, expecting);
} else {
throw new AssertionError("No data");