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

websocket requires logged in session in upgrade request

Browse Source
This commit is contained in:
azivner
2017-11-30 23:50:42 -05:00
parent 5f3a11af47
commit ff3f14c3e2
3 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
services/messaging.js
View File

@@ -1,9 +1,25 @@
const WebSocket = require('ws');
const utils = require('./utils');
const log = require('./log');
let webSocketServer;
function init(httpServer) {
webSocketServer = new WebSocket.Server({server: httpServer});
function init(httpServer, sessionParser) {
webSocketServer = new WebSocket.Server({
verifyClient: (info, done) => {
sessionParser(info.req, {}, () => {
const allowed = utils.isElectron() || info.req.session.loggedIn;
if (!allowed) {
log.error("WebSocket connection not allowed because session is neither electron nor logged in.");
}
done(allowed)
});
},
server: httpServer
});
webSocketServer.on('connection', function connection(ws, req) {
console.log("websocket client connected");
});