Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 18:36:30 +01:00
Code Issues Packages Projects Releases Activity

fix protecting files/images

Browse Source
This commit is contained in:
zadam
2019-05-04 16:05:28 +02:00
parent a9762c5139
commit 47d28b4eef
3 changed files with 33 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/services/data_encryption.js
View File

@@ -56,25 +56,38 @@ function decrypt(key, cipherText, ivLength = 13) {
return "[protected]"; return "[protected]";
} }
const cipherTextBufferWithIv = Buffer.from(cipherText, 'base64'); try {
const iv = cipherTextBufferWithIv.slice(0, ivLength); const cipherTextBufferWithIv = Buffer.from(cipherText.toString(), 'base64');
const iv = cipherTextBufferWithIv.slice(0, ivLength);
const cipherTextBuffer = cipherTextBufferWithIv.slice(ivLength); const cipherTextBuffer = cipherTextBufferWithIv.slice(ivLength);
const decipher = crypto.createDecipheriv('aes-128-cbc', pad(key), pad(iv)); const decipher = crypto.createDecipheriv('aes-128-cbc', pad(key), pad(iv));
const decryptedBytes = Buffer.concat([decipher.update(cipherTextBuffer), decipher.final()]); const decryptedBytes = Buffer.concat([decipher.update(cipherTextBuffer), decipher.final()]);
const digest = decryptedBytes.slice(0, 4); const digest = decryptedBytes.slice(0, 4);
const payload = decryptedBytes.slice(4); const payload = decryptedBytes.slice(4);
const computedDigest = shaArray(payload).slice(0, 4); const computedDigest = shaArray(payload).slice(0, 4);
if (!arraysIdentical(digest, computedDigest)) { if (!arraysIdentical(digest, computedDigest)) {
return false; return false;
}
return payload;
} }
catch (e) {
// recovery from https://github.com/zadam/trilium/issues/510
if (e.message && e.message.includes("WRONG_FINAL_BLOCK_LENGTH")) {
log.info("Caught WRONG_FINAL_BLOCK_LENGTH, returning cipherText instead");
return payload; return cipherText;
}
else {
throw e;
}
}
} }
function decryptString(dataKey, cipherText) { function decryptString(dataKey, cipherText) {

8
src/services/notes.js
View File

@@ -346,6 +346,11 @@ async function updateNote(noteId, noteUpdates) {
await saveNoteRevision(note); await saveNoteRevision(note);
// if protected status changed, then we need to encrypt/decrypt the content anyway
if (['file', 'image'].includes(note.type) && note.isProtected !== noteUpdates.isProtected) {
noteUpdates.content = await note.getContent();
}
const noteTitleChanged = note.title !== noteUpdates.title; const noteTitleChanged = note.title !== noteUpdates.title;
note.title = noteUpdates.title; note.title = noteUpdates.title;
@@ -357,6 +362,9 @@ async function updateNote(noteId, noteUpdates) {
await note.setContent(noteUpdates.content); await note.setContent(noteUpdates.content);
} }
else if (noteUpdates.content) {
await note.setContent(noteUpdates.content);
}
if (noteTitleChanged) { if (noteTitleChanged) {
await triggerNoteTitleChanged(note); await triggerNoteTitleChanged(note);

2
src/services/protected_session.js
View File

@@ -59,7 +59,7 @@ function decryptNote(note) {
function decryptNoteContent(note) { function decryptNoteContent(note) {
try { try {
if (note.content != null) { if (note.content != null) {
note.content = dataEncryptionService.decrypt(getDataKey(), note.content.toString()); note.content = dataEncryptionService.decrypt(getDataKey(), note.content);
} }
} }
catch (e) { catch (e) {