self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-11-23 22:36:32 +02:00
Code Issues Releases Activity

All: Fixes #6092: Shared resource was not encrypted with correct encryption key

Browse Source
This commit is contained in:
Laurent Cozic
2022-02-09 18:04:27 +00:00
parent 5e8ed8bc24
commit de757026d4
7 changed files with 124 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/lib/BaseApplication.ts
View File

@@ -54,6 +54,7 @@ import { loadMasterKeysFromSettings, migrateMasterPassword } from './services/e2
import SyncTargetNone from './SyncTargetNone';
import { setRSA } from './services/e2ee/ppk';
import RSA from './services/e2ee/RSA.node';
import Resource from './models/Resource';
const appLogger: LoggerWrapper = Logger.create('App');
@@ -855,6 +856,7 @@ export default class BaseApplication {
BaseItem.encryptionService_ = EncryptionService.instance();
BaseItem.shareService_ = ShareService.instance();
Resource.shareService_ = ShareService.instance();
DecryptionWorker.instance().setLogger(globalLogger);
DecryptionWorker.instance().setEncryptionService(EncryptionService.instance());
DecryptionWorker.instance().setKvStore(KvStore.instance());