Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-29 09:16:45 +01:00
Code Issues Packages Projects Releases Activity

note titles are now encrypted as well - plus auto-decryption of note tree and unloading

Browse Source
This commit is contained in:
azivner
2017-09-06 23:13:39 -04:00
parent 91245ab5b8
commit fe3d3c1995
4 changed files with 55 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
static/js/encryption.js
View File

@@ -91,6 +91,16 @@ $("#encryptionPasswordForm").submit(function() {
globalEncryptionKey = key;
for (const noteId of globalAllNoteIds) {
const note = getNodeByKey(noteId);
if (note.data.encryption > 0) {
const title = decryptString(note.data.note_title);
note.setTitle(title);
}
}
if (globalEncryptionCallback !== null) {
globalEncryptionCallback();
@@ -110,6 +120,14 @@ function getAes() {
if (globalNote.detail.encryption > 0) {
loadNote(globalNote.detail.note_id);
for (const noteId of globalAllNoteIds) {
const note = getNodeByKey(noteId);
if (note.data.encryption > 0) {
note.setTitle("[encrypted]");
}
}
}
}
}, globalEncryptionKeyTimeToLive + 1000);
@@ -126,16 +144,29 @@ function encryptNoteIfNecessary(note) {
}
}
function encryptNote(note) {
function encryptString(str) {
const aes = getAes();
const noteJson = note.detail.note_text;
const bytes = aesjs.utils.utf8.toBytes(str);
const noteBytes = aesjs.utils.utf8.toBytes(noteJson);
const encryptedBytes = aes.encrypt(bytes);
const encryptedBytes = aes.encrypt(noteBytes);
return uint8ToBase64(encryptedBytes);
}
// To print or store the binary data, you may convert it to hex
note.detail.note_text = uint8ToBase64(encryptedBytes);
function decryptString(encryptedBase64) {
const aes = getAes();
const encryptedBytes = base64ToUint8Array(encryptedBase64);
const decryptedBytes = aes.decrypt(encryptedBytes);
return aesjs.utils.utf8.fromBytes(decryptedBytes);
}
function encryptNote(note) {
note.detail.note_title = encryptString(note.detail.note_title);
note.detail.note_text = encryptString(note.detail.note_text);
note.detail.encryption = 1;
return note;
}
@@ -148,8 +179,6 @@ function encryptNoteAndSendToServer() {
encryptNote(note);
note.detail.encryption = 1;
saveNoteToServer(note);
setNoteBackgroundIfEncrypted(note);
@@ -171,19 +200,12 @@ function decryptNoteAndSendToServer() {
}
function decryptNoteIfNecessary(note) {
if (note.detail.encryption === 1) {
return decryptNote(note.detail.note_text);
}
else {
return note.detail.note_text;
if (note.detail.encryption > 0) {
return decryptNote(note);
}
}
function decryptNote(encryptedBase64) {
const aes = getAes();
const encryptedBytes = base64ToUint8Array(encryptedBase64);
const decryptedBytes = aes.decrypt(encryptedBytes);
return aesjs.utils.utf8.fromBytes(decryptedBytes);
function decryptNote(note) {
note.detail.note_title = decryptString(note.detail.note_title);
note.detail.note_text = decryptString(note.detail.note_text);
}