Merge branch 'side-channel'

This commit is contained in:
tigerbot 2017-06-06 17:30:09 -06:00
commit c9f2c52afd
3 changed files with 273 additions and 205 deletions

View File

@ -2,7 +2,7 @@
var http = require('http'); var http = require('http');
var tls = require('tls'); var tls = require('tls');
var packerStream = require('tunnel-packer').Stream; var wrapSocket = require('tunnel-packer').wrapSocket;
var redirectHttps = require('redirect-https')(); var redirectHttps = require('redirect-https')();
module.exports.create = function (program) { module.exports.create = function (program) {
@ -57,19 +57,8 @@ module.exports.create = function (program) {
// tlsServer.emit('connection', socket); // this didn't work either // tlsServer.emit('connection', socket); // this didn't work either
//console.log('chunkLen', firstChunk.byteLength); //console.log('chunkLen', firstChunk.byteLength);
var myDuplex = packerStream.create(socket);
console.log('httpsInvalid servername', servername); console.log('httpsInvalid servername', servername);
program.tlsInvalidSniServer.emit('connection', myDuplex); program.tlsInvalidSniServer.emit('connection', wrapSocket(socket));
socket.on('data', function (chunk) {
console.log('[' + Date.now() + '] socket data', chunk.byteLength);
myDuplex.push(chunk);
});
socket.on('error', function (err) {
console.error('[error] httpsInvalid TODO close');
console.error(err);
});
}; };
// //
@ -97,18 +86,7 @@ module.exports.create = function (program) {
// tlsServer.emit('connection', socket); // this didn't work either // tlsServer.emit('connection', socket); // this didn't work either
//console.log('chunkLen', firstChunk.byteLength); //console.log('chunkLen', firstChunk.byteLength);
var myDuplex = packerStream.create(socket);
console.log('httpsTunnel (Admin) servername', servername); console.log('httpsTunnel (Admin) servername', servername);
program.tlsTunnelServer.emit('connection', myDuplex); program.tlsTunnelServer.emit('connection', wrapSocket(socket));
socket.on('data', function (chunk) {
console.log('[' + Date.now() + '] socket data', chunk.byteLength);
myDuplex.push(chunk);
});
socket.on('error', function (err) {
console.error('[error] httpsTunnel (Admin) TODO close');
console.error(err);
});
}; };
}; };

View File

@ -46,14 +46,15 @@
}, },
"homepage": "https://github.com/Daplie/node-tunnel-server#readme", "homepage": "https://github.com/Daplie/node-tunnel-server#readme",
"dependencies": { "dependencies": {
"bluebird": "^3.5.0",
"cluster-store": "^2.0.4", "cluster-store": "^2.0.4",
"commander": "^2.9.0", "commander": "^2.9.0",
"greenlock": "^2.1.12", "greenlock": "^2.1.12",
"jsonwebtoken": "^7.1.9", "jsonwebtoken": "^7.1.9",
"localhost.daplie.me-certificates": "^1.3.0", "localhost.daplie.me-certificates": "^1.3.3",
"redirect-https": "^1.1.0", "redirect-https": "^1.1.0",
"sni": "^1.0.0", "sni": "^1.0.0",
"tunnel-packer": "^1.0.0", "tunnel-packer": "^1.3.0",
"ws": "^2.2.3" "ws": "^2.2.3"
} }
} }

View File

@ -2,31 +2,56 @@
var sni = require('sni'); var sni = require('sni');
var url = require('url'); var url = require('url');
var PromiseA = require('bluebird');
var jwt = require('jsonwebtoken'); var jwt = require('jsonwebtoken');
var packer = require('tunnel-packer'); var packer = require('tunnel-packer');
function timeoutPromise(duration) {
return new PromiseA(function (resolve) {
setTimeout(resolve, duration);
});
}
var Devices = {}; var Devices = {};
Devices.add = function (store, servername, newDevice) { Devices.add = function (store, servername, newDevice) {
var devices = Devices.list(store, servername); var devices = store[servername] || [];
devices.push(newDevice); devices.push(newDevice);
store[servername] = devices; store[servername] = devices;
}; };
Devices.remove = function (store, servername, device) { Devices.remove = function (store, servername, device) {
var devices = Devices.list(store, servername); var devices = store[servername] || [];
var index = devices.indexOf(device); var index = devices.indexOf(device);
if (index < 0) { if (index < 0) {
var id = device.deviceId || device.servername || device.id; console.warn('attempted to remove non-present device', device.deviceId, 'from', servername);
console.warn('attempted to remove non-present device', id, 'from', servername);
return null; return null;
} }
return devices.splice(index, 1)[0]; return devices.splice(index, 1)[0];
}; };
Devices.list = function (store, servername) { Devices.list = function (store, servername) {
return store[servername] || []; if (store[servername] && store[servername].length) {
return store[servername];
}
// There wasn't an exact match so check any of the wildcard domains, sorted longest
// first so the one with the biggest natural match with be found first.
var deviceList = [];
Object.keys(store).filter(function (pattern) {
return pattern[0] === '*' && store[pattern].length;
}).sort(function (a, b) {
return b.length - a.length;
}).some(function (pattern) {
var subPiece = pattern.slice(1);
if (subPiece === servername.slice(-subPiece.length)) {
console.log('"'+servername+'" matches "'+pattern+'"');
deviceList = store[pattern];
return true;
}
});
return deviceList;
}; };
Devices.exist = function (store, servername) { Devices.exist = function (store, servername) {
return (store[servername] || []).length; return !!(Devices.list(store, servername).length);
}; };
Devices.next = function (store, servername) { Devices.next = function (store, servername) {
var devices = Devices.list(store, servername); var devices = Devices.list(store, servername);
@ -48,121 +73,226 @@ module.exports.create = function (copts) {
var pongTimeout = copts.pongTimeout || 10*1000; var pongTimeout = copts.pongTimeout || 10*1000;
function onWsConnection(ws) { function onWsConnection(ws) {
var location = url.parse(ws.upgradeReq.url, true); var socketId = packer.socketToId(ws.upgradeReq.socket);
var remotes = {};
function logName() {
var result = Object.keys(remotes).map(function (jwtoken) {
return remotes[jwtoken].deviceId;
}).join(';');
return result || socketId;
}
function closeBrowserConn(cid) {
var remote;
Object.keys(remotes).some(function (jwtoken) {
if (remotes[jwtoken].clients[cid]) {
remote = remotes[jwtoken];
return true;
}
});
if (!remote) {
return;
}
PromiseA.resolve()
.then(function () {
remote.clients[cid].end();
return timeoutPromise(500);
})
.then(function () {
if (remote.clients[cid]) {
console.warn(cid, 'browser connection still present after calling `end`');
remote.clients[cid].destroy();
return timeoutPromise(500);
}
})
.then(function () {
if (remote.clients[cid]) {
console.error(cid, 'browser connection still present after calling `destroy`');
delete remote.clients[cid];
}
})
.catch(function (err) {
console.warn('failed to close browser connection', cid, err);
})
;
}
function addToken(jwtoken) {
if (remotes[jwtoken]) {
// return { message: "token sent multiple times", code: "E_TOKEN_REPEAT" };
return null;
}
var token;
try {
token = jwt.verify(jwtoken, copts.secret);
} catch (e) {
token = null;
}
if (!token) {
return { message: "invalid access token", code: "E_INVALID_TOKEN" };
}
if (!Array.isArray(token.domains)) {
if ('string' === typeof token.name) {
token.domains = [ token.name ];
}
}
if (!Array.isArray(token.domains) || !token.domains.length) {
return { message: "invalid server name", code: "E_INVALID_NAME" };
}
if (token.domains.some(function (name) { return typeof name !== 'string'; })) {
return { message: "invalid server name", code: "E_INVALID_NAME" };
}
// Add the custom properties we need to manage this remote, then add it to all the relevant
// domains and the list of all this websocket's remotes.
token.deviceId = (token.device && (token.device.id || token.device.hostname)) || token.domains.join(',');
token.ws = ws;
token.clients = {};
token.domains.forEach(function (domainname) {
console.log('domainname', domainname);
Devices.add(deviceLists, domainname, token);
});
remotes[jwtoken] = token;
console.log("added token '" + token.deviceId + "' to websocket", socketId);
return null;
}
function removeToken(jwtoken) {
var remote = remotes[jwtoken];
if (!remote) {
return { message: 'specified token not present', code: 'E_INVALID_TOKEN'};
}
// Prevent any more browser connections being sent to this remote, and any existing
// connections from trying to send more data across the connection.
remote.domains.forEach(function (domainname) {
Devices.remove(deviceLists, domainname, remote);
});
remote.ws = null;
// Close all of the existing browser connections associated with this websocket connection.
Object.keys(remote.clients).forEach(function (cid) {
closeBrowserConn(cid);
});
delete remotes[jwtoken];
console.log("removed token '" + remote.deviceId + "' from websocket", socketId);
return null;
}
var firstToken;
var authn = (ws.upgradeReq.headers.authorization||'').split(/\s+/); var authn = (ws.upgradeReq.headers.authorization||'').split(/\s+/);
var jwtoken; if (authn[0] && 'basic' === authn[0].toLowerCase()) {
var token; try {
authn = new Buffer(authn[1], 'base64').toString('ascii').split(':');
try { firstToken = authn[1];
if (authn[0]) { } catch (err) { }
if ('basic' === authn[0].toLowerCase()) {
authn = new Buffer(authn[1], 'base64').toString('ascii').split(':');
}
/*
if (-1 !== [ 'bearer', 'jwk' ].indexOf(authn[0].toLowerCase())) {
jwtoken = authn[1];
}
*/
}
jwtoken = authn[1] || location.query.access_token;
} catch(e) {
jwtoken = null;
} }
if (!firstToken) {
try { firstToken = url.parse(ws.upgradeReq.url, true).query.access_token;
token = jwt.verify(jwtoken, copts.secret);
} catch(e) {
token = null;
} }
if (firstToken) {
/* var err = addToken(firstToken);
if (!token || !token.name) { if (err) {
console.log('location, token'); ws.send(packer.pack(null, [0, err], 'control'));
console.log(location.query.access_token); ws.close();
console.log(token); return;
}
*/
if (!token) {
ws.send(JSON.stringify({ error: { message: "invalid access token", code: "E_INVALID_TOKEN" } }));
ws.close();
return;
}
//console.log('[wstunneld.js] DEBUG', token);
if (!Array.isArray(token.domains)) {
if ('string' === typeof token.name) {
token.domains = [ token.name ];
} }
} }
if (!Array.isArray(token.domains)) { var commandHandlers = {
ws.send(JSON.stringify({ error: { message: "invalid server name", code: "E_INVALID_NAME" } })); add_token: addToken
ws.close(); , delete_token: function (token) {
return; if (token !== '*') {
} return removeToken(token);
}
var err;
Object.keys(remotes).some(function (jwtoken) {
err = removeToken(jwtoken);
return err;
});
return err;
}
};
var remote = {}; var packerHandlers = {
remote.ws = ws; oncontrol: function (opts) {
remote.servername = (token.device && token.device.hostname) || token.domains.join(','); var cmd, err;
remote.deviceId = (token.device && token.device.id) || null; try {
remote.id = packer.socketToId(ws.upgradeReq.socket); cmd = JSON.parse(opts.data.toString());
console.log("remote.id", remote.id); } catch (err) {}
remote.domains = token.domains; if (!Array.isArray(cmd) || typeof cmd[0] !== 'number') {
remote.clients = {}; var msg = 'received bad command "' + opts.data.toString() + '"';
// TODO allow tls to be decrypted by server if client is actually a browser console.warn(msg, 'from websocket', socketId);
// and we haven't implemented tls in the browser yet ws.send(packer.pack(null, [0, {message: msg, code: 'E_BAD_COMMAND'}], 'control'));
// remote.decrypt = token.decrypt;
var handlers = {
onmessage: function (opts) {
// opts.data
var cid = packer.addrToId(opts);
var cstream = remote.clients[cid];
console.log("remote '" + remote.servername + " : " + remote.id + "' has data for '" + cid + "'", opts.data.byteLength);
if (!cstream) {
remote.ws.send(packer.pack(opts, null, 'error'));
return; return;
} }
cstream.browser.write(opts.data); if (cmd[0] < 0) {
// We only ever send one command and we send it once, so we just hard coded the ID as 1.
if (cmd[0] === -1) {
if (cmd[1]) {
console.log('received error response to hello from', socketId, cmd[1]);
}
}
else {
console.warn('received response to unknown command', cmd, 'from', socketId);
}
return;
}
if (cmd[0] === 0) {
console.warn('received dis-associated error from', socketId, cmd[1]);
return;
}
if (commandHandlers[cmd[1]]) {
err = commandHandlers[cmd[1]].apply(null, cmd.slice(2));
}
else {
err = { message: 'unknown command "'+cmd[1]+'"', code: 'E_UNKNOWN_COMMAND' };
}
ws.send(packer.pack(null, [-cmd[0], err], 'control'));
}
, onmessage: function (opts) {
var cid = packer.addrToId(opts);
console.log("remote '" + logName() + "' has data for '" + cid + "'", opts.data.byteLength);
var browserConn;
Object.keys(remotes).some(function (jwtoken) {
if (remotes[jwtoken].clients[cid]) {
browserConn = remotes[jwtoken].clients[cid];
return true;
}
});
if (browserConn) {
browserConn.write(opts.data);
}
else {
ws.send(packer.pack(opts, null, 'error'));
}
} }
, onend: function (opts) { , onend: function (opts) {
var cid = packer.addrToId(opts); var cid = packer.addrToId(opts);
console.log('[TunnelEnd]', cid); console.log('[TunnelEnd]', cid);
handlers._onend(cid); closeBrowserConn(cid);
} }
, onerror: function (opts) { , onerror: function (opts) {
var cid = packer.addrToId(opts); var cid = packer.addrToId(opts);
console.log('[TunnelError]', cid); console.log('[TunnelError]', cid);
handlers._onend(cid); closeBrowserConn(cid);
}
, _onend: function (cid) {
var c = remote.clients[cid];
delete remote.clients[cid];
try {
c.browser.end();
} catch(e) {
// ignore
}
try {
c.wrapped.end();
} catch(e) {
// ignore
}
} }
}; };
remote.unpacker = packer.create(handlers); var unpacker = packer.create(packerHandlers);
// Now that we have created our remote object we need to store it in the deviceList for
// each domainname we are supposed to be handling.
token.domains.forEach(function (domainname) {
console.log('domainname', domainname);
Devices.add(deviceLists, domainname, remote);
});
var lastActivity = Date.now(); var lastActivity = Date.now();
var timeoutId; var timeoutId;
@ -182,11 +312,11 @@ module.exports.create = function (copts) {
// Otherwise we check to see if the pong has also timed out, and if not we send a ping // Otherwise we check to see if the pong has also timed out, and if not we send a ping
// and call this function again when the pong will have timed out. // and call this function again when the pong will have timed out.
else if (silent < activityTimeout + pongTimeout) { else if (silent < activityTimeout + pongTimeout) {
console.log('pinging', remote.deviceId || remote.servername); console.log('pinging', logName());
try { try {
remote.ws.ping(); ws.ping();
} catch (err) { } catch (err) {
console.warn('failed to ping home cloud', remote.deviceId || remote.servername); console.warn('failed to ping home cloud', logName());
} }
timeoutId = setTimeout(checkTimeout, pongTimeout); timeoutId = setTimeout(checkTimeout, pongTimeout);
} }
@ -194,8 +324,8 @@ module.exports.create = function (copts) {
// Last case means the ping we sent before didn't get a response soon enough, so we // Last case means the ping we sent before didn't get a response soon enough, so we
// need to close the websocket connection. // need to close the websocket connection.
else { else {
console.log('home cloud', remote.deviceId || remote.servername, 'connection timed out'); console.log('home cloud', logName(), 'connection timed out');
remote.ws.close(1013, 'connection timeout'); ws.close(1013, 'connection timeout');
} }
} }
timeoutId = setTimeout(checkTimeout, activityTimeout); timeoutId = setTimeout(checkTimeout, activityTimeout);
@ -208,95 +338,54 @@ module.exports.create = function (copts) {
refreshTimeout(); refreshTimeout();
console.log('message from home cloud to tunneler to browser', chunk.byteLength); console.log('message from home cloud to tunneler to browser', chunk.byteLength);
//console.log(chunk.toString()); //console.log(chunk.toString());
remote.unpacker.fns.addChunk(chunk); unpacker.fns.addChunk(chunk);
}); });
function hangup() { function hangup() {
clearTimeout(timeoutId); clearTimeout(timeoutId);
console.log('home cloud', remote.deviceId || remote.servername, 'connection closing'); console.log('home cloud', logName(), 'connection closing');
// the remote will handle closing its local connections Object.keys(remotes).forEach(function (jwtoken) {
Object.keys(remote.clients).forEach(function (cid) { removeToken(jwtoken);
try {
remote.clients[cid].browser.end();
} catch(e) {
// ignore
}
});
token.domains.forEach(function (domainname) {
Devices.remove(deviceLists, domainname, remote);
}); });
ws.terminate();
} }
ws.on('close', hangup); ws.on('close', hangup);
ws.on('error', hangup); ws.on('error', hangup);
// We only ever send one command and we send it once, so we just hard code the ID as 1
ws.send(packer.pack(null, [1, 'hello', [unpacker._version], Object.keys(commandHandlers)], 'control'));
} }
function pipeWs(servername, service, browser, remote) { function pipeWs(servername, service, browserConn, remote) {
console.log('pipeWs'); console.log('[pipeWs] servername:', servername, 'service:', service);
//var remote = deviceLists[servername]; var browserAddr = packer.socketToAddr(browserConn);
var ws = remote.ws; browserAddr.service = service;
//var address = packer.socketToAddr(ws.upgradeReq.socket); var cid = packer.addrToId(browserAddr);
var baddress = packer.socketToAddr(browser); console.log('[pipeWs] browser is', cid, 'home-cloud is', packer.socketToId(remote.ws.upgradeReq.socket));
var cid = packer.addrToId(baddress);
console.log('servername:', servername); function sendWs(data, serviceOverride) {
console.log('service:', service); if (remote.ws) {
baddress.service = service;
var wrapForRemote = packer.Transform.create({
id: cid
//, remoteId: remote.id
, address: baddress
, servername: servername
, service: service
});
console.log('home-cloud is', packer.socketToId(remote.ws.upgradeReq.socket));
console.log('browser is', cid);
var bstream = remote.clients[cid] = {
wrapped: browser.pipe(wrapForRemote)
, browser: browser
, address: baddress
};
//var bstream = remote.clients[cid] = wrapForRemote.pipe(browser);
bstream.wrapped.on('data', function (pchunk) {
// var chunk = socket.read();
console.log('[bstream] data from browser to tunneler', pchunk.byteLength);
//console.log(JSON.stringify(pchunk.toString()));
try {
ws.send(pchunk, { binary: true });
} catch(e) {
try { try {
bstream.browser.end(); remote.ws.send(packer.pack(browserAddr, data, serviceOverride), { binary: true });
} catch(e) { } catch (err) {
// ignore console.warn('[pipeWs] error sending websocket message', err);
} }
} }
}
remote.clients[cid] = browserConn;
browserConn.on('data', function (chunk) {
console.log('[pipeWs] data from browser to tunneler', chunk.byteLength);
sendWs(chunk);
}); });
bstream.wrapped.on('error', function (err) { browserConn.on('error', function (err) {
console.error('[error] bstream.wrapped.error'); console.warn('[pipeWs] browser connection error', err);
console.error(err);
try {
ws.send(packer.pack(baddress, null, 'error'), { binary: true });
} catch(e) {
// ignore
}
try {
bstream.browser.end();
} catch(e) {
// ignore
}
delete remote.clients[cid];
}); });
bstream.wrapped.on('end', function () { browserConn.on('close', function (hadErr) {
try { console.log('[pipeWs] browser connection closing');
ws.send(packer.pack(baddress, null, 'end'), { binary: true }); sendWs(null, hadErr ? 'error': 'end');
} catch(e) {
// ignore
}
try {
bstream.browser.end();
} catch(e) {
// ignore
}
delete remote.clients[cid]; delete remote.clients[cid];
}); });
} }