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

Accept masterKey in ProvisionMessage

Browse source
This commit is contained in:
Fedor Indutny 2023-10-30 21:31:39 +01:00 • committed by GitHub
parent 79f7d64fb7
commit f1e8ffe720
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 19 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -198,7 +198,7 @@
"@electron/fuses": "1.5.0", "@electron/fuses": "1.5.0",
"@formatjs/intl": "2.6.7", "@formatjs/intl": "2.6.7",
"@mixer/parallel-prettier": "2.0.3", "@mixer/parallel-prettier": "2.0.3",
"@signalapp/mock-server": "4.2.0", "@signalapp/mock-server": "4.3.0",
"@storybook/addon-a11y": "7.4.5", "@storybook/addon-a11y": "7.4.5",
"@storybook/addon-actions": "7.4.5", "@storybook/addon-actions": "7.4.5",
"@storybook/addon-controls": "7.4.5", "@storybook/addon-controls": "7.4.5",

1
protos/DeviceMessages.proto
View file

@ -26,6 +26,7 @@ message ProvisionMessage {
optional bytes profileKey = 6; optional bytes profileKey = 6;
optional bool readReceipts = 7; optional bool readReceipts = 7;
optional uint32 ProvisioningVersion = 9; optional uint32 ProvisioningVersion = 9;
optional bytes masterKey = 13;
} }
enum ProvisioningVersion { enum ProvisioningVersion {

9
ts/textsecure/AccountManager.ts
View file

@ -67,6 +67,7 @@ const DAY = 24 * 60 * 60 * 1000;
const STARTING_KEY_ID = 1; const STARTING_KEY_ID = 1;
const PROFILE_KEY_LENGTH = 32; const PROFILE_KEY_LENGTH = 32;
const MASTER_KEY_LENGTH = 32;
const KEY_TOO_OLD_THRESHOLD = 14 * DAY; const KEY_TOO_OLD_THRESHOLD = 14 * DAY;
export const KYBER_KEY_ID_KEY: StorageKeyByServiceIdKind = { export const KYBER_KEY_ID_KEY: StorageKeyByServiceIdKind = {
@ -120,6 +121,7 @@ type CreateAccountSharedOptionsType = Readonly<{
aciKeyPair: KeyPairType; aciKeyPair: KeyPairType;
pniKeyPair: KeyPairType; pniKeyPair: KeyPairType;
profileKey: Uint8Array; profileKey: Uint8Array;
masterKey: Uint8Array | undefined;
}>; }>;
type CreatePrimaryDeviceOptionsType = Readonly<{ type CreatePrimaryDeviceOptionsType = Readonly<{
@ -302,6 +304,7 @@ export default class AccountManager extends EventTarget {
const pniKeyPair = generateKeyPair(); const pniKeyPair = generateKeyPair();
const profileKey = getRandomBytes(PROFILE_KEY_LENGTH); const profileKey = getRandomBytes(PROFILE_KEY_LENGTH);
const accessKey = deriveAccessKey(profileKey); const accessKey = deriveAccessKey(profileKey);
const masterKey = getRandomBytes(MASTER_KEY_LENGTH);
const registrationBaton = this.server.startRegistration(); const registrationBaton = this.server.startRegistration();
try { try {
@ -314,6 +317,7 @@ export default class AccountManager extends EventTarget {
pniKeyPair, pniKeyPair,
profileKey, profileKey,
accessKey, accessKey,
masterKey,
readReceipts: true, readReceipts: true,
}); });
} finally { } finally {
@ -428,6 +432,7 @@ export default class AccountManager extends EventTarget {
ourAci, ourAci,
ourPni, ourPni,
readReceipts: Boolean(provisionMessage.readReceipts), readReceipts: Boolean(provisionMessage.readReceipts),
masterKey: provisionMessage.masterKey,
}); });
} finally { } finally {
this.server.finishRegistration(registrationBaton); this.server.finishRegistration(registrationBaton);
@ -968,6 +973,7 @@ export default class AccountManager extends EventTarget {
aciKeyPair, aciKeyPair,
pniKeyPair, pniKeyPair,
profileKey, profileKey,
masterKey,
readReceipts, readReceipts,
userAgent, userAgent,
} = options; } = options;
@ -1202,6 +1208,9 @@ 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('read-receipt-setting', Boolean(readReceipts)); await storage.put('read-receipt-setting', Boolean(readReceipts));

4
ts/textsecure/ProvisioningCipher.ts
View file

@ -24,6 +24,7 @@ type ProvisionDecryptResult = {
userAgent?: string; userAgent?: string;
readReceipts?: boolean; readReceipts?: boolean;
profileKey?: Uint8Array; profileKey?: Uint8Array;
masterKey?: Uint8Array;
}; };
class ProvisioningCipherInner { class ProvisioningCipherInner {
@ -87,6 +88,9 @@ class ProvisioningCipherInner {
if (provisionMessage.profileKey) { if (provisionMessage.profileKey) {
ret.profileKey = provisionMessage.profileKey; ret.profileKey = provisionMessage.profileKey;
} }
if (provisionMessage.masterKey) {
ret.masterKey = provisionMessage.masterKey;
}
return ret; return ret;
} }

8
yarn.lock
View file

@ -3901,10 +3901,10 @@
node-gyp-build "^4.2.3" node-gyp-build "^4.2.3"
uuid "^8.3.0" uuid "^8.3.0"
"@signalapp/mock-server@4.2.0": "@signalapp/mock-server@4.3.0":
version "4.2.0" version "4.3.0"
resolved "https://registry.yarnpkg.com/@signalapp/mock-server/-/mock-server-4.2.0.tgz#836bf1d8cb38b9f66a6f719205e5000cdc7d184b" resolved "https://registry.yarnpkg.com/@signalapp/mock-server/-/mock-server-4.3.0.tgz#501d1e0bc9f9fe811189690e7b053dfe9bac7c88"
integrity sha512-pungaAf3Pel34yIK00nRtHWQHA9VCRjOH11ZBgrEjiMpdA+LPETCU94Do28Q9Un7T8GmNOJ0+cKAhCKuyo1Fow== integrity sha512-zE8+EhuKsQ0byXG1Prkw5hoH0pMySwf+AJNf2sdOTsIJSKLx8/GOP4uG3m/vSOW3m4BoAmVnpNzJryRIjpfAbw==
dependencies: dependencies:
"@signalapp/libsignal-client" "^0.30.2" "@signalapp/libsignal-client" "^0.30.2"
debug "^4.3.2" debug "^4.3.2"