Page MenuHomePhorge
Files F33150623

D14610.1768511758.diff
No OneTemporary
Actions

Size
3 KB
Referenced Files
None
Subscribers
None

D14610.1768511758.diff
View Options

diff --git a/web/shared-worker/worker/worker-crypto.js b/web/shared-worker/worker/worker-crypto.js
--- a/web/shared-worker/worker/worker-crypto.js
+++ b/web/shared-worker/worker/worker-crypto.js
@@ -1,6 +1,10 @@
// @flow
-import olm, { type Utility as OlmUtility } from '@commapp/olm';
+import olm, {
+ type Account as OlmAccount,
+ type Utility as OlmUtility,
+} from '@commapp/olm';
+import base64 from 'base-64';
import localforage from 'localforage';
import uuid from 'uuid';
@@ -434,6 +438,41 @@
return signedIdentityKeysBlob;
}
+// sync version of olmAPI.verifyMessage()
+function olmVerifyMessage(
+ message: string | Uint8Array,
+ signature: string,
+ signingPublicKey: string,
+) {
+ const olmUtility: OlmUtility = getOlmUtility();
+ try {
+ olmUtility.ed25519_verify(signingPublicKey, message, signature);
+ return true;
+ } catch (err) {
+ const isSignatureInvalid =
+ getMessageForException(err)?.includes('BAD_MESSAGE_MAC');
+ if (isSignatureInvalid) {
+ return false;
+ }
+ throw err;
+ }
+}
+
+function isPrekeySignatureValid(account: OlmAccount): boolean {
+ const signingPublicKey = JSON.parse(account.identity_keys()).ed25519;
+ const { prekey, prekeySignature } = getAccountPrekeysSet(account);
+ if (!prekey || !prekeySignature) {
+ return false;
+ }
+
+ const prekeyRawUTFString = base64.decode(prekey);
+ const prekeyBytes = new Uint8Array(
+ prekeyRawUTFString.split('').map(c => c.charCodeAt(0)),
+ );
+
+ return olmVerifyMessage(prekeyBytes, prekeySignature, signingPublicKey);
+}
+
async function getNewDeviceKeyUpload(): Promise<IdentityNewDeviceKeyUpload> {
if (!cryptoStore) {
throw new Error('Crypto account not initialized');
@@ -983,9 +1022,13 @@
const notifsCryptoAccount =
await getNotifsCryptoAccount_WITH_MANUAL_MEMORY_MANAGEMENT();
+ const isPrekeyCorrupt =
+ !isPrekeySignatureValid(contentAccount) ||
+ !isPrekeySignatureValid(notifsCryptoAccount.notificationAccount);
+
// Content and notification accounts' keys are always rotated at the same
// time so we only need to check one of them.
- if (shouldRotatePrekey(contentAccount)) {
+ if (shouldRotatePrekey(contentAccount) || isPrekeyCorrupt) {
contentAccount.generate_prekey();
notifsCryptoAccount.notificationAccount.generate_prekey();
}
@@ -1030,22 +1073,11 @@
return contentAccount.sign(message);
},
async verifyMessage(
- message: string,
+ message: string | Uint8Array,
signature: string,
signingPublicKey: string,
): Promise<boolean> {
- const olmUtility: OlmUtility = getOlmUtility();
- try {
- olmUtility.ed25519_verify(signingPublicKey, message, signature);
- return true;
- } catch (err) {
- const isSignatureInvalid =
- getMessageForException(err)?.includes('BAD_MESSAGE_MAC');
- if (isSignatureInvalid) {
- return false;
- }
- throw err;
- }
+ return olmVerifyMessage(message, signature, signingPublicKey);
},
async markPrekeysAsPublished(): Promise<void> {
if (!cryptoStore) {

File Metadata

Mime Type
text/plain
Expires
Thu, Jan 15, 9:15 PM (9 h, 5 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5940088
Default Alt Text
D14610.1768511758.diff (3 KB)

Event Timeline