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

Require more provisioning fields when linking

Browse source
This commit is contained in:
Fedor Indutny 2024-05-30 16:31:33 -07:00 • committed by GitHub
parent 534029d2e6
commit 8d07fa840c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 9 deletions

17
ts/textsecure/AccountManager.ts
View file

@ -124,7 +124,7 @@ type CreateAccountSharedOptionsType = Readonly<{
aciKeyPair: KeyPairType; aciKeyPair: KeyPairType;
pniKeyPair: KeyPairType; pniKeyPair: KeyPairType;
profileKey: Uint8Array; profileKey: Uint8Array;
masterKey: Uint8Array | undefined; masterKey: Uint8Array;
backupFile?: Uint8Array; backupFile?: Uint8Array;
}>; }>;
@ -428,8 +428,9 @@ export default class AccountManager extends EventTarget {
!provisionMessage.provisioningCode || !provisionMessage.provisioningCode ||
!provisionMessage.aciKeyPair || !provisionMessage.aciKeyPair ||
!provisionMessage.pniKeyPair || !provisionMessage.pniKeyPair ||
!provisionMessage.profileKey ||
!provisionMessage.aci || !provisionMessage.aci ||
!Bytes.isNotEmpty(provisionMessage.profileKey) ||
!Bytes.isNotEmpty(provisionMessage.masterKey) ||
!isUntaggedPniString(provisionMessage.untaggedPni) !isUntaggedPniString(provisionMessage.untaggedPni)
) { ) {
throw new Error( throw new Error(
@ -1261,13 +1262,11 @@ export default class AccountManager extends EventTarget {
if (userAgent) { if (userAgent) {
await storage.put('userAgent', userAgent); await storage.put('userAgent', userAgent);
} }
if (masterKey) { await storage.put('masterKey', Bytes.toBase64(masterKey));
await storage.put('masterKey', Bytes.toBase64(masterKey)); await storage.put(
await storage.put( 'storageKey',
'storageKey', Bytes.toBase64(deriveStorageServiceKey(masterKey))
Bytes.toBase64(deriveStorageServiceKey(masterKey)) );
);
}
await storage.put('read-receipt-setting', Boolean(readReceipts)); await storage.put('read-receipt-setting', Boolean(readReceipts));