Joplin
/
joplin
mirror of https://github.com/laurent22/joplin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

All: When resetting the master password, also create a new master key with that password

pull/8265/head
Laurent Cozic 2023-05-31 20:31:44 +01:00
parent 577aa519e0
commit e647775608
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -145,6 +145,11 @@ describe('e2ee/utils', () => {
expect(localSyncInfo().ppk.id).not.toBe(previousPpk.id); expect(localSyncInfo().ppk.id).not.toBe(previousPpk.id);
expect(localSyncInfo().ppk.privateKey.ciphertext).not.toBe(previousPpk.privateKey.ciphertext); expect(localSyncInfo().ppk.privateKey.ciphertext).not.toBe(previousPpk.privateKey.ciphertext);
expect(localSyncInfo().ppk.publicKey).not.toBe(previousPpk.publicKey); expect(localSyncInfo().ppk.publicKey).not.toBe(previousPpk.publicKey);
// Also check that a new master key has been created, that it is active and enabled
expect(localSyncInfo().masterKeys.length).toBe(3);
expect(localSyncInfo().activeMasterKeyId).toBe(localSyncInfo().masterKeys[2].id);
expect(masterKeyEnabled(localSyncInfo().masterKeys[2])).toBe(true);
}); });
it('should fix active key selection issues - 1', async () => { it('should fix active key selection issues - 1', async () => {

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

@ -311,6 +311,10 @@ export async function resetMasterPassword(encryptionService: EncryptionService,
} }
Setting.setValue('encryption.masterPassword', newPassword); Setting.setValue('encryption.masterPassword', newPassword);
const masterKey = await encryptionService.generateMasterKey(newPassword);
await MasterKey.save(masterKey);
await loadMasterKeysFromSettings(encryptionService);
} }
export enum MasterPasswordStatus { export enum MasterPasswordStatus {