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

fixed encryption of note history

Browse Source
This commit is contained in:
azivner
2017-11-16 00:22:00 -05:00
parent c190c738a2
commit 379431eefd
5 changed files with 22 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
services/data_encryption.js
View File

@@ -4,10 +4,6 @@ const utils = require('./utils');
const aesjs = require('./aes');
const crypto = require('crypto');
function getProtectedSessionId(req) {
return req.headers['x-protected-session-id'];
}
function getDataAes(dataKey) {
return new aesjs.ModeOfOperation.ctr(dataKey, new aesjs.Counter(5));
}
@@ -73,12 +69,8 @@ function sha256Array(content) {
}
function pad(data) {
console.log("Before padding: ", data);
let padded = Array.from(data);
console.log("After arraying: ", padded);
if (data.length >= 16) {
padded = padded.slice(0, 16);
}
@@ -86,19 +78,17 @@ function pad(data) {
padded = padded.concat(Array(16 - padded.length).fill(0));
}
console.log("Before buffering: ", padded);
return Buffer.from(padded);
}
function encryptCbc(dataKey, iv, plainText) {
if (!dataKey) {
function encryptCbc(key, iv, plainText) {
if (!key) {
throw new Error("No data key!");
}
const plainTextBuffer = Buffer.from(plainText);
const cipher = crypto.createCipheriv('aes-128-cbc', pad(dataKey), pad(iv));
const cipher = crypto.createCipheriv('aes-128-cbc', pad(key), pad(iv));
const digest = shaArray(plainTextBuffer).slice(0, 4);
@@ -109,29 +99,25 @@ function encryptCbc(dataKey, iv, plainText) {
return encryptedData.toString('base64');
}
function decryptCbc(dataKey, iv, cipherText) {
if (!dataKey) {
function decryptCbc(key, iv, cipherText) {
if (!key) {
return "[protected]";
}
console.log("Key: ", pad(dataKey));
console.log("key:", key);
console.log("iv:", iv);
console.log("cipherText:", cipherText);
const decipher = crypto.createDecipheriv('aes-128-cbc', pad(dataKey), pad(iv));
const decipher = crypto.createDecipheriv('aes-128-cbc', pad(key), pad(iv));
const cipherTextBuffer = Buffer.from(cipherText, 'base64');
const decryptedBytes = Buffer.concat([decipher.update(cipherTextBuffer), decipher.final()]);
console.log("decrypted: ", decryptedBytes);
const digest = decryptedBytes.slice(0, 4);
const payload = decryptedBytes.slice(4);
console.log("payload: ", payload);
const computedDigest = shaArray(payload).slice(0, 4);
console.log("Hash arr: ", computedDigest);
if (!arraysIdentical(digest, computedDigest)) {
return false;
}
@@ -154,7 +140,6 @@ function noteTextIv(iv) {
}
module.exports = {
getProtectedSessionId,
decrypt,
encrypt,
encryptCbc,