mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

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
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
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); await this.server.getMyKeyCounts(serviceIdKind);
let preKeys: Array<UploadPreKeyType> | undefined; 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( log.info(
`${logId}: Server prekey count is ${preKeyCount}, generating a new set` `${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; let pqPreKeys: Array<UploadKyberPreKeyType> | undefined;
if (kyberPreKeyCount < PRE_KEY_MINIMUM || forceUpdate) { if (
kyberPreKeyCount < PRE_KEY_MINIMUM ||
preKeyCount > PRE_KEY_MAX_COUNT ||
forceUpdate
) {
log.info( log.info(
`${logId}: Server kyber prekey count is ${kyberPreKeyCount}, generating a new set` `${logId}: Server kyber prekey count is ${kyberPreKeyCount}, generating a new set`
); );