self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-01-02 12:47:41 +02:00
Code Issues Releases Activity

Desktop, Mobile: Fixes #5391: Fixed crash when a required master key does not exist

Browse Source
This commit is contained in:
Laurent Cozic 2021-08-28 15:36:05 +01:00
parent ad51090cdb
commit dec0a08954
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/lib/services/e2ee/utils.test.ts
View File

@ -1,4 +1,4 @@
import { afterAllCleanUp, setupDatabaseAndSynchronizer, switchClient, encryptionService } from '../../testing/test-utils'; import { afterAllCleanUp, setupDatabaseAndSynchronizer, switchClient, encryptionService, expectNotThrow } from '../../testing/test-utils';
import MasterKey from '../../models/MasterKey'; import MasterKey from '../../models/MasterKey';
import { showMissingMasterKeyMessage } from './utils'; import { showMissingMasterKeyMessage } from './utils';
import { localSyncInfo, setMasterKeyEnabled } from '../synchronizer/syncInfoUtils'; import { localSyncInfo, setMasterKeyEnabled } from '../synchronizer/syncInfoUtils';
@ -34,6 +34,8 @@ describe('e2ee/utils', function() {
setMasterKeyEnabled(mk2.id, true); setMasterKeyEnabled(mk2.id, true);
expect(showMissingMasterKeyMessage(localSyncInfo(), [mk1.id, mk2.id])).toBe(true); expect(showMissingMasterKeyMessage(localSyncInfo(), [mk1.id, mk2.id])).toBe(true);
await expectNotThrow(async () => showMissingMasterKeyMessage(localSyncInfo(), ['not_downloaded_yet']));
const syncInfo = localSyncInfo(); const syncInfo = localSyncInfo();
syncInfo.masterKeys = []; syncInfo.masterKeys = [];
expect(showMissingMasterKeyMessage(syncInfo, [mk1.id, mk2.id])).toBe(false); expect(showMissingMasterKeyMessage(syncInfo, [mk1.id, mk2.id])).toBe(false);

8
packages/lib/services/e2ee/utils.ts
View File

@ -98,6 +98,14 @@ export function showMissingMasterKeyMessage(syncInfo: SyncInfo, notLoadedMasterK
for (let i = notLoadedMasterKeys.length - 1; i >= 0; i--) { for (let i = notLoadedMasterKeys.length - 1; i >= 0; i--) {
const mk = syncInfo.masterKeys.find(mk => mk.id === notLoadedMasterKeys[i]); const mk = syncInfo.masterKeys.find(mk => mk.id === notLoadedMasterKeys[i]);
// A "notLoadedMasterKey" is a key that either doesn't exist or for
// which a password hasn't been set yet. For the purpose of this
// function, we only want to notify the user about unset passwords.
// Master keys that haven't been downloaded yet should normally be
// downloaded at some point.
// https://github.com/laurent22/joplin/issues/5391
if (!mk) continue;
if (!masterKeyEnabled(mk)) notLoadedMasterKeys.pop(); if (!masterKeyEnabled(mk)) notLoadedMasterKeys.pop();
} }