self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-24 10:27:10 +02:00
Code Issues Releases Activity

Cli: Improve handling of encrypted items

Browse Source
This commit is contained in:
Laurent Cozic 2020-05-13 16:28:54 +01:00
parent 17fd8ee504
commit 3265fafd76
4 changed files with 34 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
CliClient/app/command-cat.js
View File

@ -2,6 +2,7 @@ const { BaseCommand } = require('./base-command.js');
const { app } = require('./app.js');
const { _ } = require('lib/locale.js');
const BaseModel = require('lib/BaseModel.js');
const BaseItem = require('lib/models/BaseItem.js');
const Note = require('lib/models/Note.js');
class Command extends BaseCommand {
@ -23,15 +24,17 @@ class Command extends BaseCommand {
const item = await app().loadItem(BaseModel.TYPE_NOTE, title, { parent: app().currentFolder() });
if (!item) throw new Error(_('Cannot find "%s".', title));
const content = args.options.verbose ? await Note.serialize(item) : await Note.serializeForEdit(item);
this.stdout(content);
let content = '';
app()
.gui()
.showConsole();
app()
.gui()
.maximizeConsole();
if (item.encryption_applied) {
content = BaseItem.displayTitle(item);
} else {
content = args.options.verbose ? await Note.serialize(item) : await Note.serializeForEdit(item);
}
this.stdout(content);
app().gui().showConsole();
app().gui().maximizeConsole();
}
}

6
CliClient/app/command-e2ee.js
View File

@ -48,7 +48,11 @@ class Command extends BaseCommand {
while (true) {
try {
await DecryptionWorker.instance().start();
const result = await DecryptionWorker.instance().start();
const line = [];
line.push(_('Decrypted items: %d', result.decryptedItemCount));
if (result.skippedItemCount) line.push(_('Skipped items: %d (use --retry-failed-items to retry decrypting them)', result.skippedItemCount));
this.stdout(line.join('\n'));
break;
} catch (error) {
if (error.code === 'masterKeyNotLoaded') {

2
ReactNativeClient/lib/reducer.js
View File

@ -46,6 +46,8 @@ const defaultState = {
itemIndex: 0,
itemCount: 0,
decryptedItemCounts: {},
decryptedItemCount: 0,
skippedItemCount: 0,
},
selectedNoteTags: [],
resourceFetcher: {

20
ReactNativeClient/lib/services/DecryptionWorker.js
View File

@ -138,6 +138,7 @@ class DecryptionWorker {
const excludedIds = [];
const decryptedItemCounts = {};
let skippedItemCount = 0;
this.dispatch({ type: 'ENCRYPTION_HAS_DISABLED_ITEMS', value: false });
this.dispatchReport({ state: 'started' });
@ -172,6 +173,7 @@ class DecryptionWorker {
if (decryptCounter > this.maxDecryptionAttempts_) {
this.logger().debug(`DecryptionWorker: ${BaseModel.modelTypeToName(item.type_)} ${item.id}: Decryption has failed more than 2 times - skipping it`);
this.dispatch({ type: 'ENCRYPTION_HAS_DISABLED_ITEMS', value: true });
skippedItemCount++;
excludedIds.push(item.id);
continue;
}
@ -245,24 +247,34 @@ class DecryptionWorker {
this.state_ = 'idle';
this.dispatchReport({
state: 'idle',
let decryptedItemCount = 0;
for (const itemType in decryptedItemCounts) decryptedItemCount += decryptedItemCounts[itemType];
const finalReport = {
skippedItemCount: skippedItemCount,
decryptedItemCounts: decryptedItemCounts,
});
decryptedItemCount: decryptedItemCount,
};
this.dispatchReport(Object.assign({}, finalReport, { state: 'idle' }));
if (downloadedButEncryptedBlobCount) {
this.logger().info(`DecryptionWorker: Some resources have been downloaded but are not decrypted yet. Scheduling another decryption. Resource count: ${downloadedButEncryptedBlobCount}`);
this.scheduleStart();
}
return finalReport;
}
async start(options) {
this.startCalls_.push(true);
let output = null;
try {
await this.start_(options);
output = await this.start_(options);
} finally {
this.startCalls_.pop();
}
return output;
}
async destroy() {