Signal/Desktop
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Desktop.git synced 2026-02-15 07:28:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve resiliency to excessive prekey generation

Browse Source
This commit is contained in:
trevor-signal
2024-03-13 21:07:29 -04:00
committed by GitHub
parent f77f9165e1
commit ed94c11d08
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ts/textsecure/AccountManager.ts
View File

@@ -588,7 +588,15 @@ export default class AccountManager extends EventTarget {
await this.server.getMyKeyCounts(serviceIdKind);
let preKeys: Array<UploadPreKeyType> | undefined;
if (preKeyCount < PRE_KEY_MINIMUM || forceUpdate) {
// We want to generate new keys both if there are too few keys, and also if we
// have too many on the server (unlikely, but has happened due to bugs), since
// uploading new keys _should_ replace all existing ones on the server
if (
preKeyCount < PRE_KEY_MINIMUM ||
preKeyCount > PRE_KEY_MAX_COUNT ||
forceUpdate
) {
log.info(
`${logId}: Server prekey count is ${preKeyCount}, generating a new set`
);
@@ -596,7 +604,11 @@ export default class AccountManager extends EventTarget {
}
let pqPreKeys: Array<UploadKyberPreKeyType> | undefined;
if (kyberPreKeyCount < PRE_KEY_MINIMUM || forceUpdate) {
if (
kyberPreKeyCount < PRE_KEY_MINIMUM ||
preKeyCount > PRE_KEY_MAX_COUNT ||
forceUpdate
) {
log.info(
`${logId}: Server kyber prekey count is ${kyberPreKeyCount}, generating a new set`
);