self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-07-03 23:50:33 +02:00
Code Issues Releases Activity

Mobile,Desktop: Fix unable to change incorrect decryption password if the same as the master password (#11026)

Browse Source
This commit is contained in:
Henry Heino
2024-09-11 11:01:57 -07:00
committed by GitHub
parent 69168f1ec2
commit 79773dab95
4 changed files with 97 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/lib/components/EncryptionConfigScreen/utils.ts
View File

@ -160,15 +160,20 @@ export const usePasswordChecker = (masterKeys: MasterKeyEntity[], activeMasterKe
const newPasswordChecks: PasswordChecks = {};
const newMasterPasswordKeys: PasswordChecks = {};
const masterPasswordOk = masterPassword ? await masterPasswordIsValid(masterPassword, masterKeys.find(mk => mk.id === activeMasterKeyId)) : true;
newPasswordChecks['master'] = masterPasswordOk;
for (let i = 0; i < masterKeys.length; i++) {
const mk = masterKeys[i];
const password = await findMasterKeyPassword(EncryptionService.instance(), mk, passwords);
const ok = password ? await EncryptionService.instance().checkMasterKeyPassword(mk, password) : false;
newPasswordChecks[mk.id] = ok;
newMasterPasswordKeys[mk.id] = password === masterPassword;
// Even if the password matches the master password, it isn't a master password key if the
// master password can't decrypt this key.
newMasterPasswordKeys[mk.id] = password === masterPassword && (ok || !masterPasswordOk);
}
newPasswordChecks['master'] = masterPassword ? await masterPasswordIsValid(masterPassword, masterKeys.find(mk => mk.id === activeMasterKeyId)) : true;
if (event.cancelled) return;