diff options
author | John McLear <john@mclear.co.uk> | 2014-11-23 14:15:03 +0000 |
---|---|---|
committer | John McLear <john@mclear.co.uk> | 2014-11-23 14:15:03 +0000 |
commit | 73bcbbcb8985568d8b76af8d49443eec7d52f12e (patch) | |
tree | ac655b1ea7d3f8d2d56fc9d1f8ca5bebb6322c8f /src/node/hooks | |
parent | 0eb7cc7864419c0a112b984c180ed4d58b13d25d (diff) | |
download | etherpad-lite-73bcbbcb8985568d8b76af8d49443eec7d52f12e.zip |
final commit
Diffstat (limited to 'src/node/hooks')
-rw-r--r-- | src/node/hooks/express/adminplugins.js | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/node/hooks/express/adminplugins.js b/src/node/hooks/express/adminplugins.js index ccc100dc..ded1f660 100644 --- a/src/node/hooks/express/adminplugins.js +++ b/src/node/hooks/express/adminplugins.js @@ -25,8 +25,7 @@ exports.socketio = function (hook_name, args, cb) { var io = args.io.of("/pluginfw/installer"); io.on('connection', function (socket) { - console.warn ("The middleware now handles auth but I'm not convinced SocketIO is being responsible enough here so this needs reviewing before hitting master"); - // if (!socket.handshake.session || !socket.handshake.session.user || !socket.handshake.session.user.is_admin) return; + if (!socket.conn.request.session || !socket.conn.request.session.user || !socket.conn.request.session.user.is_admin) return; socket.on("getInstalled", function (query) { // send currently installed plugins |