X-Git-Url: https://www.kengrimes.com/gitweb/?p=henge%2Fkiak.git;a=blobdiff_plain;f=router.js;fp=router.js;h=8fe523585553cdd48516529dc99a5906a8c2382d;hp=0da13e6e1d55602f170639ad1512ea7336167e40;hb=68d808b03537c8cbe71d895f2ebc0bd9ab232bea;hpb=ac8d4e6df37f875e7f2b7e6d56cc9c3dab8c23a5 diff --git a/router.js b/router.js index 0da13e6..8fe5235 100644 --- a/router.js +++ b/router.js @@ -136,10 +136,12 @@ exports = { this.serveBind(response, route.bind, htArgv) } //TODO: auth better than this (ip spoofing is easy) - else if (route.origin == (request.headers['x-forwarded-for'] || + // but this will require a more involved host-creation process + // that isn't just "give you a route if it's available" on visit + /* else if (route.origin == (request.headers['x-forwarded-for'] || request.connection.remoteAddress)) this.serveHost(response, route, htArgv) - else + else */ this.serveClient(request, response, route) } /* If it's a valid routename that doesn't exist, make this client a host */ @@ -274,16 +276,12 @@ exports = { socket: undefined } route.httpd.listen(port) - route.wsd = new (require('ws').Server)({ - server: httpd - //verifyClient: (info) => - //info.origin == origin && (info.secure || !this.httpsOpts) - }) - route.wsd.on('connection', (socket) => { - route.socket = socket - socket.on('message', (msg) => - this.hostMessage(msg,route)) - }) + route.wsd = new (require('ws').Server)({ server: httpd }) + .on('connection', (socket) => { + route.socket = socket + socket.on('message', (msg) => + this.hostMessage(msg,route)) + }) route.pendingResponses.addResponse = function (key, response_p) { let responses = this.get(key) || [] this.set(key, responses.push(response_p))