Skip to content

Commit

Permalink
Rename pre key id offset field
Browse files Browse the repository at this point in the history
  • Loading branch information
@AsamK
AsamK committed Oct 9, 2023
1 parent c2ea704 commit 91ab0b1
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 38 deletions.
6 changes: 3 additions & 3 deletions lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ public void refreshPreKeysIfNecessary(ServiceIdType serviceIdType) throws IOExce

private List<PreKeyRecord> generatePreKeys(ServiceIdType serviceIdType) {
final var accountData = account.getAccountData(serviceIdType);
final var offset = accountData.getPreKeyMetadata().getPreKeyIdOffset();
final var offset = accountData.getPreKeyMetadata().getNextPreKeyId();

var records = KeyUtils.generatePreKeyRecords(offset);
account.addPreKeys(serviceIdType, records);
Expand Down Expand Up @@ -158,7 +158,7 @@ private List<KyberPreKeyRecord> generateKyberPreKeys(
ServiceIdType serviceIdType, final IdentityKeyPair identityKeyPair
) {
final var accountData = account.getAccountData(serviceIdType);
final var offset = accountData.getPreKeyMetadata().getKyberPreKeyIdOffset();
final var offset = accountData.getPreKeyMetadata().getNextKyberPreKeyId();

var records = KeyUtils.generateKyberPreKeyRecords(offset, identityKeyPair.getPrivateKey());
account.addKyberPreKeys(serviceIdType, records);
Expand Down Expand Up @@ -186,7 +186,7 @@ private KyberPreKeyRecord generateLastResortKyberPreKey(
ServiceIdType serviceIdType, IdentityKeyPair identityKeyPair
) {
final var accountData = account.getAccountData(serviceIdType);
final var signedPreKeyId = accountData.getPreKeyMetadata().getKyberPreKeyIdOffset();
final var signedPreKeyId = accountData.getPreKeyMetadata().getNextKyberPreKeyId();

var record = KeyUtils.generateKyberPreKeyRecord(signedPreKeyId, identityKeyPair.getPrivateKey());
account.addLastResortKyberPreKey(serviceIdType, record);
Expand Down
2 changes: 1 addition & 1 deletion lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ private PreKeyCollection generatePreKeysForType(ServiceIdType serviceIdType) {
final var signedPreKey = KeyUtils.generateSignedPreKeyRecord(nextSignedPreKeyId, keyPair);

final var privateKey = keyPair.getPrivateKey();
final var kyberPreKeyIdOffset = preKeyMetadata.getKyberPreKeyIdOffset();
final var kyberPreKeyIdOffset = preKeyMetadata.getNextKyberPreKeyId();
final var lastResortKyberPreKey = KeyUtils.generateKyberPreKeyRecord(kyberPreKeyIdOffset, privateKey);

return new PreKeyCollection(keyPair.getPublicKey(), signedPreKey, lastResortKyberPreKey);
Expand Down
68 changes: 34 additions & 34 deletions lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -561,10 +561,10 @@ private <SERVICE_ID extends ServiceId> void setAccountData(
final var keyPair = KeyUtils.getIdentityKeyPair(publicKeyBytes, privateKeyBytes);
accountData.setIdentityKeyPair(keyPair);
}
accountData.preKeyMetadata.preKeyIdOffset = storage.nextPreKeyId;
accountData.preKeyMetadata.nextPreKeyId = storage.nextPreKeyId;
accountData.preKeyMetadata.nextSignedPreKeyId = storage.nextSignedPreKeyId;
accountData.preKeyMetadata.activeSignedPreKeyId = storage.activeSignedPreKeyId;
accountData.preKeyMetadata.kyberPreKeyIdOffset = storage.nextKyberPreKeyId;
accountData.preKeyMetadata.nextKyberPreKeyId = storage.nextKyberPreKeyId;
accountData.preKeyMetadata.activeLastResortKyberPreKeyId = storage.activeLastResortKyberPreKeyId;
}

Expand Down Expand Up @@ -653,9 +653,9 @@ private void loadLegacyFile(final File userPath, final JsonNode rootNode) throws
getKeyValueStore().storeEntry(storageManifestVersion, rootNode.get("storageManifestVersion").asLong());
}
if (rootNode.hasNonNull("preKeyIdOffset")) {
aciAccountData.preKeyMetadata.preKeyIdOffset = rootNode.get("preKeyIdOffset").asInt(1);
aciAccountData.preKeyMetadata.nextPreKeyId = rootNode.get("preKeyIdOffset").asInt(1);
} else {
aciAccountData.preKeyMetadata.preKeyIdOffset = getRandomPreKeyIdOffset();
aciAccountData.preKeyMetadata.nextPreKeyId = getRandomPreKeyIdOffset();
}
if (rootNode.hasNonNull("nextSignedPreKeyId")) {
aciAccountData.preKeyMetadata.nextSignedPreKeyId = rootNode.get("nextSignedPreKeyId").asInt(1);
Expand All @@ -668,9 +668,9 @@ private void loadLegacyFile(final File userPath, final JsonNode rootNode) throws
aciAccountData.preKeyMetadata.activeSignedPreKeyId = -1;
}
if (rootNode.hasNonNull("pniPreKeyIdOffset")) {
pniAccountData.preKeyMetadata.preKeyIdOffset = rootNode.get("pniPreKeyIdOffset").asInt(1);
pniAccountData.preKeyMetadata.nextPreKeyId = rootNode.get("pniPreKeyIdOffset").asInt(1);
} else {
pniAccountData.preKeyMetadata.preKeyIdOffset = getRandomPreKeyIdOffset();
pniAccountData.preKeyMetadata.nextPreKeyId = getRandomPreKeyIdOffset();
}
if (rootNode.hasNonNull("pniNextSignedPreKeyId")) {
pniAccountData.preKeyMetadata.nextSignedPreKeyId = rootNode.get("pniNextSignedPreKeyId").asInt(1);
Expand All @@ -683,9 +683,9 @@ private void loadLegacyFile(final File userPath, final JsonNode rootNode) throws
pniAccountData.preKeyMetadata.activeSignedPreKeyId = -1;
}
if (rootNode.hasNonNull("kyberPreKeyIdOffset")) {
aciAccountData.preKeyMetadata.kyberPreKeyIdOffset = rootNode.get("kyberPreKeyIdOffset").asInt(1);
aciAccountData.preKeyMetadata.nextKyberPreKeyId = rootNode.get("kyberPreKeyIdOffset").asInt(1);
} else {
aciAccountData.preKeyMetadata.kyberPreKeyIdOffset = getRandomPreKeyIdOffset();
aciAccountData.preKeyMetadata.nextKyberPreKeyId = getRandomPreKeyIdOffset();
}
if (rootNode.hasNonNull("activeLastResortKyberPreKeyId")) {
aciAccountData.preKeyMetadata.activeLastResortKyberPreKeyId = rootNode.get("activeLastResortKyberPreKeyId")
Expand All @@ -694,9 +694,9 @@ private void loadLegacyFile(final File userPath, final JsonNode rootNode) throws
aciAccountData.preKeyMetadata.activeLastResortKyberPreKeyId = -1;
}
if (rootNode.hasNonNull("pniKyberPreKeyIdOffset")) {
pniAccountData.preKeyMetadata.kyberPreKeyIdOffset = rootNode.get("pniKyberPreKeyIdOffset").asInt(1);
pniAccountData.preKeyMetadata.nextKyberPreKeyId = rootNode.get("pniKyberPreKeyIdOffset").asInt(1);
} else {
pniAccountData.preKeyMetadata.kyberPreKeyIdOffset = getRandomPreKeyIdOffset();
pniAccountData.preKeyMetadata.nextKyberPreKeyId = getRandomPreKeyIdOffset();
}
if (rootNode.hasNonNull("pniActiveLastResortKyberPreKeyId")) {
pniAccountData.preKeyMetadata.activeLastResortKyberPreKeyId = rootNode.get(
Expand Down Expand Up @@ -1052,7 +1052,7 @@ private void setPreKeys(ServiceIdType serviceIdType, PreKeyCollection preKeyColl
final var accountData = getAccountData(serviceIdType);
final var preKeyMetadata = accountData.getPreKeyMetadata();
preKeyMetadata.nextSignedPreKeyId = preKeyCollection.getSignedPreKey().getId();
preKeyMetadata.kyberPreKeyIdOffset = preKeyCollection.getLastResortKyberPreKey().getId();
preKeyMetadata.nextKyberPreKeyId = preKeyCollection.getLastResortKyberPreKey().getId();

accountData.getPreKeyStore().removeAllPreKeys();
accountData.getSignedPreKeyStore().removeAllSignedPreKeys();
Expand All @@ -1066,7 +1066,7 @@ private void setPreKeys(ServiceIdType serviceIdType, PreKeyCollection preKeyColl

public void resetPreKeyOffsets(final ServiceIdType serviceIdType) {
final var preKeyMetadata = getAccountData(serviceIdType).getPreKeyMetadata();
preKeyMetadata.preKeyIdOffset = getRandomPreKeyIdOffset();
preKeyMetadata.nextPreKeyId = getRandomPreKeyIdOffset();
preKeyMetadata.nextSignedPreKeyId = getRandomPreKeyIdOffset();
preKeyMetadata.activeSignedPreKeyId = -1;
save();
Expand All @@ -1082,16 +1082,16 @@ public void addPreKeys(ServiceIdType serviceIdType, List<PreKeyRecord> records)
logger.debug("Adding {} {} pre keys with offset {}",
records.size(),
serviceIdType,
preKeyMetadata.preKeyIdOffset);
preKeyMetadata.nextPreKeyId);
accountData.getSignalServiceAccountDataStore()
.markAllOneTimeEcPreKeysStaleIfNecessary(System.currentTimeMillis());
for (var record : records) {
if (preKeyMetadata.preKeyIdOffset != record.getId()) {
logger.error("Invalid pre key id {}, expected {}", record.getId(), preKeyMetadata.preKeyIdOffset);
if (preKeyMetadata.nextPreKeyId != record.getId()) {
logger.error("Invalid pre key id {}, expected {}", record.getId(), preKeyMetadata.nextPreKeyId);
throw new AssertionError("Invalid pre key id");
}
accountData.getPreKeyStore().storePreKey(record.getId(), record);
preKeyMetadata.preKeyIdOffset = (preKeyMetadata.preKeyIdOffset + 1) % PREKEY_MAXIMUM_ID;
preKeyMetadata.nextPreKeyId = (preKeyMetadata.nextPreKeyId + 1) % PREKEY_MAXIMUM_ID;
}
save();
}
Expand All @@ -1114,7 +1114,7 @@ public void addSignedPreKey(ServiceIdType serviceIdType, SignedPreKeyRecord reco

public void resetKyberPreKeyOffsets(final ServiceIdType serviceIdType) {
final var preKeyMetadata = getAccountData(serviceIdType).getPreKeyMetadata();
preKeyMetadata.kyberPreKeyIdOffset = getRandomPreKeyIdOffset();
preKeyMetadata.nextKyberPreKeyId = getRandomPreKeyIdOffset();
preKeyMetadata.activeLastResortKyberPreKeyId = -1;
save();
}
Expand All @@ -1125,18 +1125,18 @@ public void addKyberPreKeys(ServiceIdType serviceIdType, List<KyberPreKeyRecord>
logger.debug("Adding {} {} kyber pre keys with offset {}",
records.size(),
serviceIdType,
preKeyMetadata.kyberPreKeyIdOffset);
preKeyMetadata.nextKyberPreKeyId);
accountData.getSignalServiceAccountDataStore()
.markAllOneTimeEcPreKeysStaleIfNecessary(System.currentTimeMillis());
for (var record : records) {
if (preKeyMetadata.kyberPreKeyIdOffset != record.getId()) {
if (preKeyMetadata.nextKyberPreKeyId != record.getId()) {
logger.error("Invalid kyber pre key id {}, expected {}",
record.getId(),
preKeyMetadata.kyberPreKeyIdOffset);
preKeyMetadata.nextKyberPreKeyId);
throw new AssertionError("Invalid kyber pre key id");
}
accountData.getKyberPreKeyStore().storeKyberPreKey(record.getId(), record);
preKeyMetadata.kyberPreKeyIdOffset = (preKeyMetadata.kyberPreKeyIdOffset + 1) % PREKEY_MAXIMUM_ID;
preKeyMetadata.nextKyberPreKeyId = (preKeyMetadata.nextKyberPreKeyId + 1) % PREKEY_MAXIMUM_ID;
}
save();
}
Expand All @@ -1146,16 +1146,16 @@ public void addLastResortKyberPreKey(ServiceIdType serviceIdType, KyberPreKeyRec
final var preKeyMetadata = accountData.getPreKeyMetadata();
logger.debug("Adding {} last resort kyber pre key with offset {}",
serviceIdType,
preKeyMetadata.kyberPreKeyIdOffset);
if (preKeyMetadata.kyberPreKeyIdOffset != record.getId()) {
preKeyMetadata.nextKyberPreKeyId);
if (preKeyMetadata.nextKyberPreKeyId != record.getId()) {
logger.error("Invalid last resort kyber pre key id {}, expected {}",
record.getId(),
preKeyMetadata.kyberPreKeyIdOffset);
preKeyMetadata.nextKyberPreKeyId);
throw new AssertionError("Invalid last resort kyber pre key id");
}
accountData.getKyberPreKeyStore().storeLastResortKyberPreKey(record.getId(), record);
preKeyMetadata.activeLastResortKyberPreKeyId = record.getId();
preKeyMetadata.kyberPreKeyIdOffset = (preKeyMetadata.kyberPreKeyIdOffset + 1) % PREKEY_MAXIMUM_ID;
preKeyMetadata.nextKyberPreKeyId = (preKeyMetadata.nextKyberPreKeyId + 1) % PREKEY_MAXIMUM_ID;
save();
}

Expand Down Expand Up @@ -1404,7 +1404,7 @@ public void setNewPniIdentity(
preKeyMetadata.nextSignedPreKeyId = pniSignedPreKey.getId();
addSignedPreKey(ServiceIdType.PNI, pniSignedPreKey);
if (lastResortKyberPreKey != null) {
preKeyMetadata.kyberPreKeyIdOffset = lastResortKyberPreKey.getId();
preKeyMetadata.nextKyberPreKeyId = lastResortKyberPreKey.getId();
addLastResortKyberPreKey(ServiceIdType.PNI, lastResortKyberPreKey);
}
save();
Expand Down Expand Up @@ -1695,14 +1695,14 @@ private interface Callable {

public static class PreKeyMetadata {

private int preKeyIdOffset = 1;
private int nextPreKeyId = 1;
private int nextSignedPreKeyId = 1;
private int activeSignedPreKeyId = -1;
private int kyberPreKeyIdOffset = 1;
private int nextKyberPreKeyId = 1;
private int activeLastResortKyberPreKeyId = -1;

public int getPreKeyIdOffset() {
return preKeyIdOffset;
public int getNextPreKeyId() {
return nextPreKeyId;
}

public int getNextSignedPreKeyId() {
Expand All @@ -1713,8 +1713,8 @@ public int getActiveSignedPreKeyId() {
return activeSignedPreKeyId;
}

public int getKyberPreKeyIdOffset() {
return kyberPreKeyIdOffset;
public int getNextKyberPreKeyId() {
return nextKyberPreKeyId;
}

public int getActiveLastResortKyberPreKeyId() {
Expand Down Expand Up @@ -1853,10 +1853,10 @@ private static AccountData from(final SignalAccount.AccountData<?> accountData)
accountData.getIdentityKeyPair() == null
? null
: base64.encodeToString(accountData.getIdentityKeyPair().getPublicKey().serialize()),
preKeyMetadata.getPreKeyIdOffset(),
preKeyMetadata.getNextPreKeyId(),
preKeyMetadata.getNextSignedPreKeyId(),
preKeyMetadata.getActiveSignedPreKeyId(),
preKeyMetadata.getKyberPreKeyIdOffset(),
preKeyMetadata.getNextKyberPreKeyId(),
preKeyMetadata.getActiveLastResortKyberPreKeyId());
}
}
Expand Down

0 comments on commit 91ab0b1

Please sign in to comment.