Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-03 20:06:08 +01:00
Code Issues Packages Projects Releases Activity

split out note's content into separate entity, WIP

Browse Source
This commit is contained in:
zadam
2019-02-06 20:19:25 +01:00
parent 8b250ed523
commit 8884177d9f
18 changed files with 417 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/services/protected_session.js
View File

@@ -47,28 +47,25 @@ function decryptNoteTitle(noteId, encryptedTitle) {
}
function decryptNote(note) {
const dataKey = getDataKey();
if (!note.isProtected) {
return;
}
try {
if (note.title) {
note.title = dataEncryptionService.decryptString(dataKey, note.title);
}
if (note.title) {
note.title = decryptNoteTitle(note.noteId)
}
}
if (note.content) {
if (note.type === 'file' || note.type === 'image') {
note.content = dataEncryptionService.decrypt(dataKey, note.content);
}
else {
note.content = dataEncryptionService.decryptString(dataKey, note.content);
}
}
function decryptNoteContent(noteContent) {
if (!noteContent.isProtected) {
return;
}
try {
noteContent.content = dataEncryptionService.decrypt(getDataKey(), noteContent.content);
}
catch (e) {
e.message = `Cannot decrypt note for noteId=${note.noteId}: ` + e.message;
e.message = `Cannot decrypt note content for noteContentId=${noteContent.noteContentId}: ` + e.message;
throw e;
}
}
@@ -96,10 +93,11 @@ function decryptNoteRevision(hist) {
}
function encryptNote(note) {
const dataKey = getDataKey();
note.title = dataEncryptionService.encrypt(getDataKey(), note.title);
}
note.title = dataEncryptionService.encrypt(dataKey, note.title);
note.content = dataEncryptionService.encrypt(dataKey, note.content);
function encryptNoteContent(noteContent) {
noteContent.content = dataEncryptionService.encrypt(getDataKey(), noteContent.content);
}
function encryptNoteRevision(revision) {
@@ -115,9 +113,11 @@ module.exports = {
isProtectedSessionAvailable,
decryptNoteTitle,
decryptNote,
decryptNoteContent,
decryptNotes,
decryptNoteRevision,
encryptNote,
encryptNoteContent,
encryptNoteRevision,
setProtectedSessionId
};