disabled host reconnect for now
authorken <ken@kengrimes.com>
Mon, 10 Jul 2017 18:05:36 +0000 (18:05 +0000)
committerken <ken@kengrimes.com>
Mon, 10 Jul 2017 18:05:36 +0000 (18:05 +0000)
router.js

index 0da13e6..8fe5235 100644 (file)
--- 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))