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

Identify specific cases with invalid identity keys

This commit is contained in:
Jon Chambers 2023-06-06 14:27:41 -04:00 committed by Jon Chambers
parent 2b266c7beb
commit cac04146de
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,7 +80,8 @@ public class Accounts extends AbstractDynamoDbStore {
private static final Timer GET_ALL_FROM_OFFSET_TIMER = Metrics.timer(name(Accounts.class, "getAllFromOffset"));
private static final Timer DELETE_TIMER = Metrics.timer(name(Accounts.class, "delete"));
private static final Counter INVALID_IDENTITY_KEY_COUNTER = Metrics.counter(name(Accounts.class, "invalidIdentityKey"));
private static final Counter INVALID_ACI_IDENTITY_KEY_COUNTER = Metrics.counter(name(Accounts.class, "invalidIdentityKey"), "type", "aci");
private static final Counter INVALID_PNI_IDENTITY_KEY_COUNTER = Metrics.counter(name(Accounts.class, "invalidIdentityKey"), "type", "pni");
private static final String CONDITIONAL_CHECK_FAILED = "ConditionalCheckFailed";
@ -918,7 +919,17 @@ public class Accounts extends AbstractDynamoDbStore {
try {
new IdentityKey(account.getIdentityKey());
} catch (final InvalidKeyException e) {
INVALID_IDENTITY_KEY_COUNTER.increment();
log.debug("Account {} has an invalid ACI identity key", account.getUuid());
INVALID_ACI_IDENTITY_KEY_COUNTER.increment();
}
}
if (account.getPhoneNumberIdentityKey() != null && account.getPhoneNumberIdentityKey().length > 0) {
try {
new IdentityKey(account.getPhoneNumberIdentityKey());
} catch (final InvalidKeyException e) {
log.debug("Account {} has an invalid PNI identity key", account.getUuid());
INVALID_PNI_IDENTITY_KEY_COUNTER.increment();
}
}