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

Make Accounts#changeNumber exception handling more resilient to future changes

This commit is contained in:
Chris Eager 2024-02-01 14:15:37 -06:00 committed by Chris Eager
parent b1d10f5817
commit 4475d65780
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
service/src/main/java/org/whispersystems/textsecuregcm/storage/Accounts.java
View File

@ -378,6 +378,7 @@ public class Accounts extends AbstractDynamoDbStore {
account.setNumber(number, phoneNumberIdentifier); account.setNumber(number, phoneNumberIdentifier);
int accountUpdateIndex = -1;
try { try {
final List<TransactWriteItem> writeItems = new ArrayList<>(); final List<TransactWriteItem> writeItems = new ArrayList<>();
final AttributeValue uuidAttr = AttributeValues.fromUUID(account.getUuid()); final AttributeValue uuidAttr = AttributeValues.fromUUID(account.getUuid());
@ -392,6 +393,9 @@ public class Accounts extends AbstractDynamoDbStore {
maybeDisplacedAccountIdentifier.ifPresent(displacedAccountIdentifier -> maybeDisplacedAccountIdentifier.ifPresent(displacedAccountIdentifier ->
writeItems.add(buildPutDeletedAccount(displacedAccountIdentifier, originalNumber))); writeItems.add(buildPutDeletedAccount(displacedAccountIdentifier, originalNumber)));
// The `catch (TransactionCanceledException) block needs to check whether the cancellation reason is the account
// update write item
accountUpdateIndex = writeItems.size();
writeItems.add( writeItems.add(
TransactWriteItem.builder() TransactWriteItem.builder()
.update(Update.builder() .update(Update.builder()
@ -430,17 +434,8 @@ public class Accounts extends AbstractDynamoDbStore {
} catch (final JsonProcessingException e) { } catch (final JsonProcessingException e) {
throw new IllegalArgumentException(e); throw new IllegalArgumentException(e);
} catch (final TransactionCanceledException e) { } catch (final TransactionCanceledException e) {
if (e.hasCancellationReasons() && e.cancellationReasons().size() == 6 + additionalWriteItems.size()) { if (e.hasCancellationReasons()) {
// the cancellation reasons map to the write items: if (CONDITIONAL_CHECK_FAILED.equals(e.cancellationReasons().get(accountUpdateIndex).code())) {
// 0. phone number constraint delete - no conditions
// 1. phone number constraint put - conditional on the key not existing (it is deleted by 0)
// 2. pni constraint delete - no conditions
// 3. pni constraint put - conditional on the key not existing (it is deleted by 2)
// 4. deleted accounts delete - no conditions
// 5. account update - conditional on #version = :version
// 6. additional write items…
// 7. additional write items…
if (CONDITIONAL_CHECK_FAILED.equals(e.cancellationReasons().get(5).code())) {
// the #version = :version condition failed, which indicates a concurrent update // the #version = :version condition failed, which indicates a concurrent update
throw new ContestedOptimisticLockException(); throw new ContestedOptimisticLockException();
} }