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

more complete support for network-less electron frontend-backend communication including protected session

Browse Source
This commit is contained in:
azivner
2017-11-29 23:30:35 -05:00
parent 8bd76721ad
commit d0a0366b05
7 changed files with 41 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/protected_session.js
View File

@@ -1,12 +1,13 @@
"use strict";
const utils = require('./utils');
const session = {};
function setDataKey(req, decryptedDataKey) {
req.session.decryptedDataKey = Array.from(decryptedDataKey); // can't store buffer in session
req.session.protectedSessionId = utils.randomSecureToken(32);
session.decryptedDataKey = Array.from(decryptedDataKey); // can't store buffer in session
session.protectedSessionId = utils.randomSecureToken(32);
return req.session.protectedSessionId;
return session.protectedSessionId;
}
function getProtectedSessionId(req) {
@@ -16,8 +17,8 @@ function getProtectedSessionId(req) {
function getDataKey(req) {
const protectedSessionId = getProtectedSessionId(req);
if (protectedSessionId && req.session.protectedSessionId === protectedSessionId) {
return req.session.decryptedDataKey;
if (protectedSessionId && session.protectedSessionId === protectedSessionId) {
return session.decryptedDataKey;
}
else {
return null;
@@ -27,7 +28,7 @@ function getDataKey(req) {
function isProtectedSessionAvailable(req) {
const protectedSessionId = getProtectedSessionId(req);
return protectedSessionId && req.session.protectedSessionId === protectedSessionId;
return protectedSessionId && session.protectedSessionId === protectedSessionId;
}
module.exports = {