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

delete note through its entity instead of manually with SQL, closes #303

Browse Source
This commit is contained in:
azivner
2019-01-13 00:24:51 +01:00
parent 348562352c
commit b115a7cf19
5 changed files with 27 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/entities/note.js
View File

@@ -47,7 +47,18 @@ class Note extends Entity {
if (this.isProtected && this.noteId) { if (this.isProtected && this.noteId) {
this.isContentAvailable = protectedSessionService.isProtectedSessionAvailable(); this.isContentAvailable = protectedSessionService.isProtectedSessionAvailable();
protectedSessionService.decryptNote(this); if (this.isContentAvailable) {
protectedSessionService.decryptNote(this);
}
else {
// saving ciphertexts in case we do want to update protected note outside of protected session
// (which is allowed)
this.titleCipherText = this.title;
this.contentCipherText = this.content;
this.title = "[protected]";
this.content = "";
}
} }
this.setContent(this.content); this.setContent(this.content);
@@ -629,12 +640,21 @@ class Note extends Entity {
// cannot be static! // cannot be static!
updatePojo(pojo) { updatePojo(pojo) {
if (pojo.isProtected) { if (pojo.isProtected) {
protectedSessionService.encryptNote(pojo); if (this.isContentAvailable) {
protectedSessionService.encryptNote(pojo);
}
else {
// updating protected note outside of protected session means we will keep original ciphertexts
pojo.title = pojo.titleCipherText;
pojo.content = pojo.contentCipherText;
}
} }
delete pojo.jsonContent; delete pojo.jsonContent;
delete pojo.isContentAvailable; delete pojo.isContentAvailable;
delete pojo.__attributeCache; delete pojo.__attributeCache;
delete pojo.titleCipherText;
delete pojo.contentCipherText;
} }
} }

5
src/services/data_encryption.js
View File

@@ -26,11 +26,8 @@ function pad(data) {
data = Buffer.concat([data, Buffer.from(zeros)]); data = Buffer.concat([data, Buffer.from(zeros)]);
} }
else {
data = Buffer.from(data);
}
return data; return Buffer.from(data);
} }
function encrypt(key, plainText, ivLength = 13) { function encrypt(key, plainText, ivLength = 13) {

14
src/services/notes.js
View File

@@ -359,18 +359,8 @@ async function deleteNote(branch) {
const notDeletedBranches = await note.getBranches(); const notDeletedBranches = await note.getBranches();
if (notDeletedBranches.length === 0) { if (notDeletedBranches.length === 0) {
// maybe a bit counter-intuitively, protected notes can be deleted also outside of protected session note.isDeleted = true;
// this is because protected notes offer only confidentiality which makes some things simpler - e.g. deletion UI await note.save();
// to allow this, we just set the isDeleted flag, otherwise saving would fail because of attempt to encrypt
// content with non-existent protected session key
// we don't reset content here, that's postponed and done later to give the user a chance to correct a mistake
await sql.execute("UPDATE notes SET isDeleted = 1 WHERE noteId = ?", [note.noteId]);
// need to manually trigger sync since it's not taken care of by note save
await syncTableService.addNoteSync(note.noteId);
for (const noteRevision of await note.getRevisions()) {
await noteRevision.save();
}
for (const childBranch of await note.getChildBranches()) { for (const childBranch of await note.getChildBranches()) {
await deleteNote(childBranch); await deleteNote(childBranch);

2
src/services/password_encryption.js
View File

@@ -14,7 +14,7 @@ async function verifyPassword(password) {
async function setDataKey(password, plainTextDataKey) { async function setDataKey(password, plainTextDataKey) {
const passwordDerivedKey = await myScryptService.getPasswordDerivedKey(password); const passwordDerivedKey = await myScryptService.getPasswordDerivedKey(password);
const newEncryptedDataKey = dataEncryptionService.encrypt(passwordDerivedKey, Buffer.from(plainTextDataKey)); const newEncryptedDataKey = dataEncryptionService.encrypt(passwordDerivedKey, plainTextDataKey, 16);
await optionService.setOption('encryptedDataKey', newEncryptedDataKey); await optionService.setOption('encryptedDataKey', newEncryptedDataKey);
} }

2
src/views/setup.ejs
View File

@@ -7,7 +7,7 @@
</head> </head>
<body> <body>
<div class="container"> <div class="container">
<div id="setup-dialog" class="col-md-12 col-lg-8 col-xl-6 mx-auto" style="padding-top: 25px;"> <div id="setup-dialog" class="col-md-12 col-lg-8 col-xl-6 mx-auto" style="padding-top: 25px; font-size: larger; display: none;">
<h1>Trilium Notes setup</h1> <h1>Trilium Notes setup</h1>
<div class="alert alert-warning" id="alert" style="display: none;"> <div class="alert alert-warning" id="alert" style="display: none;">