colin/Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

AccountManager: Simplify key rotation pre-check

Browse Source
This commit is contained in:
Scott Nonnenberg
2021-08-20 11:27:12 -07:00
committed by GitHub
parent 79c976668b
commit f11c366f53
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ts/textsecure/AccountManager.ts
View File

@@ -36,7 +36,7 @@ import { SignalService as Proto } from '../protobuf';
const DAY = 24 * 60 * 60 * 1000; const DAY = 24 * 60 * 60 * 1000;
const MINIMUM_SIGNED_PREKEYS = 5; const MINIMUM_SIGNED_PREKEYS = 5;
const ARCHIVE_AGE = 30 * DAY; const ARCHIVE_AGE = 30 * DAY;
const PREKEY_ROTATION_AGE = DAY; const PREKEY_ROTATION_AGE = DAY * 1.5;
const PROFILE_KEY_LENGTH = 32; const PROFILE_KEY_LENGTH = 32;
const SIGNED_KEY_GEN_BATCH_SIZE = 100; const SIGNED_KEY_GEN_BATCH_SIZE = 100;
@@ -323,10 +323,7 @@ export default class AccountManager extends EventTarget {
const confirmedKeys = existingKeys.filter(key => key.confirmed); const confirmedKeys = existingKeys.filter(key => key.confirmed);
const mostRecent = confirmedKeys[0]; const mostRecent = confirmedKeys[0];
if ( if (isMoreRecentThan(mostRecent?.created_at || 0, PREKEY_ROTATION_AGE)) {
confirmedKeys.length >= 2 ||
isMoreRecentThan(mostRecent?.created_at || 0, PREKEY_ROTATION_AGE)
) {
window.log.warn( window.log.warn(
`rotateSignedPreKey: ${confirmedKeys.length} confirmed keys, most recent was created ${mostRecent?.created_at}. Cancelling rotation.` `rotateSignedPreKey: ${confirmedKeys.length} confirmed keys, most recent was created ${mostRecent?.created_at}. Cancelling rotation.`
); );