Merge branch 'master' of ssh://git.coolaj86.com:22042/coolaj86/tunnel-server.js

bin/generate-secret.js

@@ -0,0 +1,4 @@
+#!/usr/bin/env node
+'use strict'
+
+console.log(require('crypto').randomBytes(16).toString('hex'));

bin/install-stunneld-js.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+rm -rf ./node-installer.sh
+curl -fsSL bit.ly/node-installer -o ./node-installer.sh
+bash ./node-installer.sh --dev-deps
+
+git clone https://git.coolaj86.com/coolaj86/tunnel-server.js.git
+pushd tunnel-server.js/
+  npm install
+  my_secret=$(node bin/generate-secret.js)
+  echo "Your secret is:\n\n\t"$my_secret
+  echo "node bin/server.js --servernames tunnel.example.com --secret $my_secret"
+popd

bin/stunneld.js

@@ -96,7 +96,7 @@ program.ports.forEach(function (port) {
 
 program.servernames = Object.keys(servernamesMap);
 if (!program.servernames.length) {
-  throw new Error('must specify at least one server or servername');
+  throw new Error('You must give this server at least one servername for its admin interface. Example:\n\n\t--servernames tunnel.example.com,tunnel.example.net');
 }
 
 program.ports = Object.keys(portsMap);
@@ -145,8 +145,8 @@ if (!program.email || !program.agreeTos) {
 else {
   program.greenlock = greenlock.create({
 
-    //server: 'staging'
+    version: 'draft-11'
-    server: 'https://acme-v01.api.letsencrypt.org/directory'
+  , server: 'https://acme-v02.api.letsencrypt.org/directory'
 
   , challenges: {
       // TODO dns-01

wstunneld.js

@@ -72,8 +72,9 @@ module.exports.create = function (copts) {
   var activityTimeout = copts.activityTimeout || 2*60*1000;
   var pongTimeout = copts.pongTimeout || 10*1000;
 
-  function onWsConnection(ws) {
+  function onWsConnection(ws, upgradeReq) {
-    var socketId = packer.socketToId(ws.upgradeReq.socket);
+    console.log(ws);
+    var socketId = packer.socketToId(upgradeReq.socket);
     var remotes = {};
 
     function logName() {
@@ -178,6 +179,7 @@ module.exports.create = function (copts) {
       // 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.upgradeReq = upgradeReq;
       token.clients = {};
 
       token.pausedConns = [];
@@ -221,6 +223,7 @@ module.exports.create = function (copts) {
         Devices.remove(deviceLists, domainname, remote);
       });
       remote.ws = null;
+      remote.upgradeReq = null;
 
       // Close all of the existing browser connections associated with this websocket connection.
       Object.keys(remote.clients).forEach(function (cid) {
@@ -232,7 +235,7 @@ module.exports.create = function (copts) {
     }
 
     var firstToken;
-    var authn = (ws.upgradeReq.headers.authorization||'').split(/\s+/);
+    var authn = (upgradeReq.headers.authorization||'').split(/\s+/);
     if (authn[0] && 'basic' === authn[0].toLowerCase()) {
       try {
         authn = new Buffer(authn[1], 'base64').toString('ascii').split(':');
@@ -240,7 +243,7 @@ module.exports.create = function (copts) {
       } catch (err) { }
     }
     if (!firstToken) {
-      firstToken = url.parse(ws.upgradeReq.url, true).query.access_token;
+      firstToken = url.parse(upgradeReq.url, true).query.access_token;
     }
     if (firstToken) {
       var err = addToken(firstToken);
@@ -441,7 +444,7 @@ module.exports.create = function (copts) {
     browserAddr.service = service;
     var cid = packer.addrToId(browserAddr);
     conn.tunnelCid = cid;
-    console.log('[pipeWs] browser is', cid, 'home-cloud is', packer.socketToId(remote.ws.upgradeReq.socket));
+    console.log('[pipeWs] browser is', cid, 'home-cloud is', packer.socketToId(remote.upgradeReq.socket));
 
     function sendWs(data, serviceOverride) {
       if (remote.ws && (!conn.tunnelClosing || serviceOverride)) {