From 3d3fac508703ad424ce96cd27765704cc4333f02 Mon Sep 17 00:00:00 2001
From: tigerbot <seth.gibelyou@daplie.com>
Date: Tue, 3 Oct 2017 17:26:44 -0600
Subject: [PATCH 01/22] simplified how the admin routes are handled

---
 .../index.js => lib/admin/apis.js             |   0
 lib/admin/index.js                            |  38 ++
 lib/app.js                                    | 325 ------------------
 lib/modules/admin.js                          |  67 ----
 lib/modules/http.js                           |   4 +-
 lib/worker.js                                 |  12 +-
 packages/apis/com.daplie.goldilocks/test.js   |  23 --
 7 files changed, 51 insertions(+), 418 deletions(-)
 rename packages/apis/com.daplie.goldilocks/index.js => lib/admin/apis.js (100%)
 create mode 100644 lib/admin/index.js
 delete mode 100644 lib/app.js
 delete mode 100644 lib/modules/admin.js
 delete mode 100644 packages/apis/com.daplie.goldilocks/test.js

diff --git a/packages/apis/com.daplie.goldilocks/index.js b/lib/admin/apis.js
similarity index 100%
rename from packages/apis/com.daplie.goldilocks/index.js
rename to lib/admin/apis.js
diff --git a/lib/admin/index.js b/lib/admin/index.js
new file mode 100644
index 0000000..e8c146b
--- /dev/null
+++ b/lib/admin/index.js
@@ -0,0 +1,38 @@
+var adminDomains = [
+  'localhost.alpha.daplie.me'
+, 'localhost.admin.daplie.me'
+, 'alpha.localhost.daplie.me'
+, 'admin.localhost.daplie.me'
+, 'localhost.daplie.invalid'
+];
+module.exports.adminDomains = adminDomains;
+
+module.exports.create = function (deps, conf) {
+  'use strict';
+
+  var path = require('path');
+  var express = require('express');
+  var app = express();
+
+  var apis = require('./apis').create(deps, conf);
+  function handleApis(req, res, next) {
+    if (typeof apis[req.params.name] === 'function') {
+      apis[req.params.name](req, res);
+    } else {
+      next();
+    }
+  }
+  app.use('/api/goldilocks@daplie.com/:name', handleApis);
+  app.use('/api/com.daplie.goldilocks/:name', handleApis);
+
+  // Serve the static assets for the UI (even though it probably won't be used very
+  // often since it only works on localhost domains). Note that we are using the default
+  // .well-known directory from the oauth3 library even though it indicates we have
+  // capabilities we don't support because it's simpler and it's unlikely anything will
+  // actually use it to determine our API (it is needed to log into the web page).
+  app.use('/.well-known', express.static(path.join(__dirname, '../../packages/assets/well-known')));
+  app.use('/assets',      express.static(path.join(__dirname, '../../packages/assets')));
+  app.use('/',            express.static(path.join(__dirname, '../../admin/public')));
+
+  return require('http').createServer(app);
+};
diff --git a/lib/app.js b/lib/app.js
deleted file mode 100644
index f633712..0000000
--- a/lib/app.js
+++ /dev/null
@@ -1,325 +0,0 @@
-'use strict';
-
-module.exports = function (myDeps, conf, overrideHttp) {
-  var express = require('express');
-  //var finalhandler = require('finalhandler');
-  var serveStatic = require('serve-static');
-  var serveIndex = require('serve-index');
-  //var assetServer = serveStatic(opts.assetsPath);
-  var path = require('path');
-  //var wellKnownServer = serveStatic(path.join(opts.assetsPath, 'well-known'));
-
-  var serveStaticMap = {};
-  var serveIndexMap = {};
-  var content = conf.content;
-  //var server;
-  var goldilocksApis;
-  var app;
-  var request;
-
-  function createGoldilocksApis() {
-    var PromiseA = require('bluebird');
-    var OAUTH3 = require('../packages/assets/org.oauth3');
-    require('../packages/assets/org.oauth3/oauth3.domains.js');
-    require('../packages/assets/org.oauth3/oauth3.dns.js');
-    require('../packages/assets/org.oauth3/oauth3.tunnel.js');
-    OAUTH3._hooks = require('../packages/assets/org.oauth3/oauth3.node.storage.js');
-
-    request = request || PromiseA.promisify(require('request'));
-
-    myDeps.PromiseA = PromiseA;
-    myDeps.OAUTH3 = OAUTH3;
-    myDeps.recase = require('recase').create({});
-    myDeps.request = request;
-
-    return require('../packages/apis/com.daplie.goldilocks').create(myDeps, conf);
-  }
-
-  app = express();
-
-  var Sites = {
-    add: function (sitesMap, site) {
-      if (!sitesMap[site.$id]) {
-        sitesMap[site.$id] = site;
-      }
-
-      if (!site.paths) {
-        site.paths = [];
-      }
-      if (!site.paths._map) {
-        site.paths._map = {};
-      }
-      site.paths.forEach(function (path) {
-
-        site.paths._map[path.$id] = path;
-
-        if (!path.modules) {
-          path.modules = [];
-        }
-        if (!path.modules._map) {
-          path.modules._map = {};
-        }
-        path.modules.forEach(function (module) {
-
-          path.modules._map[module.$id] = module;
-        });
-      });
-    }
-  };
-
-  var opts = overrideHttp || conf.http;
-  if (!opts.defaults) {
-    opts.defaults = {};
-  }
-  if (!opts.global) {
-    opts.global = {};
-  }
-  if (!opts.sites) {
-    opts.sites = [];
-  }
-  opts.sites._map = {};
-  opts.sites.forEach(function (site) {
-
-    Sites.add(opts.sites._map, site);
-  });
-
-  function mapMap(el, i, arr) {
-    arr._map[el.$id] = el;
-  }
-  opts.global.modules._map = {};
-  opts.global.modules.forEach(mapMap);
-  opts.global.paths._map = {};
-  opts.global.paths.forEach(function (path, i, arr) {
-    mapMap(path, i, arr);
-    //opts.global.paths._map[path.$id] = path;
-    path.modules._map = {};
-    path.modules.forEach(mapMap);
-  });
-  opts.sites.forEach(function (site) {
-    site.paths._map = {};
-    site.paths.forEach(function (path, i, arr) {
-      mapMap(path, i, arr);
-      //site.paths._map[path.$id] = path;
-      path.modules._map = {};
-      path.modules.forEach(mapMap);
-    });
-  });
-  opts.defaults.modules._map = {};
-  opts.defaults.modules.forEach(mapMap);
-  opts.defaults.paths._map = {};
-  opts.defaults.paths.forEach(function (path, i, arr) {
-    mapMap(path, i, arr);
-    //opts.global.paths._map[path.$id] = path;
-    path.modules._map = {};
-    path.modules.forEach(mapMap);
-  });
-
-  function _goldApis(req, res, next) {
-    if (!goldilocksApis) {
-      goldilocksApis = createGoldilocksApis();
-    }
-
-    if (typeof goldilocksApis[req.params.name] === 'function') {
-      goldilocksApis[req.params.name](req, res);
-    } else {
-      next();
-    }
-  }
-  return app
-  .use('/api/com.daplie.goldilocks/:name', _goldApis)
-  .use('/api/goldilocks@daplie.com/:name', _goldApis)
-  .use('/', function (req, res, next) {
-    if (!req.headers.host) {
-      next(new Error('missing HTTP Host header'));
-      return;
-    }
-
-    if (content && '/' === req.url) {
-      // res.setHeader('Content-Type', 'application/octet-stream');
-      res.end(content);
-      return;
-    }
-
-    //var done = finalhandler(req, res);
-    var host = req.headers.host;
-    var hostname = (host||'').split(':')[0].toLowerCase();
-
-    console.log('opts.global', opts.global);
-    var sites = [ opts.global || null, opts.sites._map[hostname] || null, opts.defaults || null ];
-    var loadables = {
-      serve: function (config, hostname, pathname, req, res, next) {
-        var originalUrl = req.url;
-        var dirpaths = config.paths.slice(0);
-
-        function nextServe() {
-          var dirname = dirpaths.pop();
-          if (!dirname) {
-            req.url = originalUrl;
-            next();
-            return;
-          }
-
-          console.log('[serve]', req.url, hostname, pathname, dirname);
-          dirname = path.resolve(conf.cwd, dirname.replace(/:hostname/, hostname));
-          if (!serveStaticMap[dirname]) {
-            serveStaticMap[dirname] = serveStatic(dirname);
-          }
-
-          serveStaticMap[dirname](req, res, nextServe);
-        }
-
-        req.url = req.url.substr(pathname.length - 1);
-        nextServe();
-      }
-    , indexes: function (config, hostname, pathname, req, res, next) {
-        var originalUrl = req.url;
-        var dirpaths = config.paths.slice(0);
-
-        function nextIndex() {
-          var dirname = dirpaths.pop();
-          if (!dirname) {
-            req.url = originalUrl;
-            next();
-            return;
-          }
-
-          console.log('[indexes]', req.url, hostname, pathname, dirname);
-          dirname = path.resolve(conf.cwd, dirname.replace(/:hostname/, hostname));
-          if (!serveStaticMap[dirname]) {
-            serveIndexMap[dirname] = serveIndex(dirname);
-          }
-          serveIndexMap[dirname](req, res, nextIndex);
-        }
-
-        req.url = req.url.substr(pathname.length - 1);
-        nextIndex();
-      }
-    , app: function (config, hostname, pathname, req, res, next) {
-        //var appfile = path.resolve(/*process.cwd(), */config.path.replace(/:hostname/, hostname));
-        var appfile = config.path.replace(/:hostname/, hostname);
-        try {
-          var app = require(appfile);
-          app(req, res, next);
-        } catch (err) {
-          next();
-        }
-      }
-    };
-
-    function runModule(module, hostname, pathname, modulename, req, res, next) {
-      if (!loadables[modulename]) {
-        next(new Error("no module '" + modulename + "' found"));
-        return;
-      }
-      loadables[modulename](module, hostname, pathname, req, res, next);
-    }
-
-    function iterModules(modules, hostname, pathname, req, res, next) {
-      console.log('modules');
-      console.log(modules);
-      var modulenames = Object.keys(modules._map);
-
-      function nextModule() {
-        var modulename = modulenames.pop();
-        if (!modulename) {
-          next();
-          return;
-        }
-
-        console.log('modules', modules);
-        runModule(modules._map[modulename], hostname, pathname, modulename, req, res, nextModule);
-      }
-
-      nextModule();
-    }
-
-    function iterPaths(site, hostname, req, res, next) {
-      console.log('site', hostname);
-      console.log(site);
-      var pathnames = Object.keys(site.paths._map);
-      console.log('pathnames', pathnames);
-      pathnames = pathnames.filter(function (pathname) {
-        // TODO ensure that pathname has trailing /
-        return (0 === req.url.indexOf(pathname));
-        //return req.url.match(pathname);
-      });
-      pathnames.sort(function (a, b) {
-        return b.length - a.length;
-      });
-      console.log('pathnames', pathnames);
-
-      function nextPath() {
-        var pathname = pathnames.shift();
-        if (!pathname) {
-          next();
-          return;
-        }
-
-        console.log('iterPaths', hostname, pathname, req.url);
-        iterModules(site.paths._map[pathname].modules, hostname, pathname, req, res, nextPath);
-      }
-
-      nextPath();
-    }
-
-    function nextSite() {
-      console.log('hostname', hostname, sites);
-      var site;
-      if (!sites.length) {
-        next(); // 404
-        return;
-      }
-      site = sites.shift();
-      if (!site) {
-        nextSite();
-        return;
-      }
-      iterPaths(site, hostname, req, res, nextSite);
-    }
-
-    nextSite();
-
-    /*
-    function serveStaticly(server) {
-      function serveTheStatic() {
-        server.serve(req, res, function (err) {
-          if (err) { return done(err); }
-          server.index(req, res, function (err) {
-            if (err) { return done(err); }
-            req.url = req.url.replace(/\/assets/, '');
-            assetServer(req, res, function  () {
-              if (err) { return done(err); }
-              req.url = req.url.replace(/\/\.well-known/, '');
-              wellKnownServer(req, res, done);
-            });
-          });
-        });
-      }
-
-      if (server.expressApp) {
-        server.expressApp(req, res, serveTheStatic);
-        return;
-      }
-
-      serveTheStatic();
-    }
-
-    if (opts.livereload) {
-      res.__my_livereload = '<script src="//'
-        + (host || opts.sites[0].name).split(':')[0]
-        + ':35729/livereload.js?snipver=1"></script>';
-      res.__my_addLen = res.__my_livereload.length;
-
-      // TODO modify prototype instead of each instance?
-      res.__write = res.write;
-      res.write = _reloadWrite;
-    }
-
-    console.log('hostname:', hostname, opts.sites[0].paths);
-
-    addServer(hostname);
-    server = hostsMap[hostname] || hostsMap[opts.sites[0].name];
-    serveStaticly(server);
-    */
-  });
-};
diff --git a/lib/modules/admin.js b/lib/modules/admin.js
deleted file mode 100644
index d22b168..0000000
--- a/lib/modules/admin.js
+++ /dev/null
@@ -1,67 +0,0 @@
-var adminDomains = [
-  'localhost.alpha.daplie.me'
-, 'localhost.admin.daplie.me'
-, 'alpha.localhost.daplie.me'
-, 'admin.localhost.daplie.me'
-, 'localhost.daplie.invalid'
-];
-module.exports.adminDomains = adminDomains;
-
-module.exports.create = function (deps, conf) {
-  'use strict';
-
-  var path = require('path');
-  //var defaultServername = 'localhost.daplie.me';
-  //var defaultWebRoot = '.';
-  var assetsPath = path.join(__dirname, '..', '..', 'packages', 'assets');
-  var opts = {};
-
-  opts.global = opts.global || {};
-  opts.sites = opts.sites || [];
-  opts.sites._map = {};
-
-  // argv.sites
-
-  opts.groups = [];
-
-  // 'packages', 'assets', 'com.daplie.goldilocks'
-  opts.global = {
-    modules: [ // TODO uh-oh we've got a mixed bag of modules (various types), a true map
-      { $id: 'greenlock', email: opts.email, tos: opts.tos }
-    , { $id: 'rvpn', email: opts.email, tos: opts.tos }
-    //, { $id: 'content', content: content }
-    , { $id: 'livereload', on: opts.livereload }
-    , { $id: 'app', path: opts.expressApp }
-    ]
-  , paths: [
-      { $id: '/assets/', modules: [ { $id: 'serve', paths: [ assetsPath ] } ] }
-      // TODO figure this b out
-    , { $id: '/.well-known/', modules: [
-        { $id: 'serve', paths: [ path.join(assetsPath, 'well-known') ] }
-      ] }
-    ]
-  };
-  opts.defaults = {
-    modules: []
-  , paths: [
-      /*
-      { $id: '/', modules: [
-        { $id: 'serve', paths: [ defaultWebRoot ] }
-      , { $id: 'indexes', paths: [ defaultWebRoot ] }
-      ] }
-      */
-    ]
-  };
-  adminDomains.forEach(function (id) {
-    opts.sites.push({
-      $id: id
-    , paths: [
-        { $id: '/', modules: [ { $id: 'serve', paths: [ path.resolve(__dirname, '..', '..', 'admin', 'public') ] } ] }
-      , { $id: '/api/', modules: [ { $id: 'app', path: path.join(__dirname, 'admin') } ] }
-      ]
-    });
-  });
-
-  var app = require('../app.js')(deps, conf, opts);
-  return require('http').createServer(app);
-};
diff --git a/lib/modules/http.js b/lib/modules/http.js
index 636b6bc..365b09a 100644
--- a/lib/modules/http.js
+++ b/lib/modules/http.js
@@ -202,11 +202,11 @@ module.exports.create = function (deps, conf, greenlockMiddleware) {
     var host = separatePort(headers.host).host;
 
     if (!adminDomains) {
-      adminDomains = require('./admin').adminDomains;
+      adminDomains = require('../admin').adminDomains;
     }
     if (adminDomains.indexOf(host) !== -1) {
       if (!adminServer) {
-        adminServer = require('./admin').create(deps, conf);
+        adminServer = require('../admin').create(deps, conf);
       }
       return emitConnection(adminServer, conn, opts);
     }
diff --git a/lib/worker.js b/lib/worker.js
index 56991bc..d7ad1c1 100644
--- a/lib/worker.js
+++ b/lib/worker.js
@@ -19,10 +19,20 @@ function update(conf) {
 }
 
 function create(conf) {
+  var PromiseA = require('bluebird');
+  var OAUTH3 = require('../packages/assets/org.oauth3');
+  require('../packages/assets/org.oauth3/oauth3.domains.js');
+  require('../packages/assets/org.oauth3/oauth3.dns.js');
+  require('../packages/assets/org.oauth3/oauth3.tunnel.js');
+  OAUTH3._hooks = require('../packages/assets/org.oauth3/oauth3.node.storage.js');
+
   config = conf;
   var deps = {
     messenger: process
-  , PromiseA: require('bluebird')
+  , PromiseA: PromiseA
+  , OAUTH3: OAUTH3
+  , request: PromiseA.promisify(require('request'))
+  , recase: require('recase').create({})
     // Note that if a custom createConnections is used it will be called with different
     // sets of custom options based on what is actually being proxied. Most notably the
     // HTTP proxying connection creation is not something we currently control.
diff --git a/packages/apis/com.daplie.goldilocks/test.js b/packages/apis/com.daplie.goldilocks/test.js
deleted file mode 100644
index 77b55de..0000000
--- a/packages/apis/com.daplie.goldilocks/test.js
+++ /dev/null
@@ -1,23 +0,0 @@
-'use strict';
-
-var api = require('./index.js').api;
-var OAUTH3 = require('../../assets/org.oauth3/');
-// these all auto-register
-require('../../assets/org.oauth3/oauth3.domains.js');
-require('../../assets/org.oauth3/oauth3.dns.js');
-require('../../assets/org.oauth3/oauth3.tunnel.js');
-OAUTH3._hooks = require('../../assets/org.oauth3/oauth3.node.storage.js');
-
-api.tunnel(
-  {
-    OAUTH3: OAUTH3
-  , options: {
-      device: {
-        hostname: 'test.local'
-      , id: ''
-      }
-    }
-  }
-  // OAUTH3.hooks.session.get('oauth3.org').then(function (result) { console.log(result) });
-, require('./test.session.json')
-);

From f25a0191bd701eabb316c7059bd753735b8048b7 Mon Sep 17 00:00:00 2001
From: tigerbot <seth.gibelyou@daplie.com>
Date: Tue, 3 Oct 2017 19:11:49 -0600
Subject: [PATCH 02/22] changed config API to use an express router

---
 lib/admin/apis.js  | 68 ++++++++++++++++++++++++++++++----------------
 lib/admin/index.js | 11 ++------
 2 files changed, 47 insertions(+), 32 deletions(-)

diff --git a/lib/admin/apis.js b/lib/admin/apis.js
index 3c3e54c..6c22ca0 100644
--- a/lib/admin/apis.js
+++ b/lib/admin/apis.js
@@ -38,6 +38,13 @@ module.exports.create = function (deps, conf) {
       return true;
     }
   }
+  function makeCorsHandler(methods) {
+    return function corsHandler(req, res, next) {
+      if (!handleCors(req, res, methods)) {
+        next();
+      }
+    };
+  }
 
   function isAuthorized(req, res, fn) {
     var auth = jwt.decode((req.headers.authorization||'').replace(/^bearer\s+/i, ''));
@@ -139,7 +146,10 @@ module.exports.create = function (deps, conf) {
     ;
   }
 
-  return {
+  // This object contains all of the API endpoints written before we changed how
+  // the API routing is handled. Eventually it will hopefully disappear, but for
+  // now we're focusing on the things that need changing more.
+  var oldEndPoints = {
     init: function (req, res) {
       if (handleCors(req, res, ['GET', 'POST'])) {
         return;
@@ -262,28 +272,6 @@ module.exports.create = function (deps, conf) {
         });
       });
     }
-  , config: function (req, res) {
-      if (handleCors(req, res)) {
-        return;
-      }
-      isAuthorized(req, res, function () {
-        if ('POST' !== req.method) {
-          res.setHeader('Content-Type', 'application/json;');
-          res.end(JSON.stringify(deps.recase.snakeCopy(conf)));
-          return;
-        }
-
-        jsonParser(req, res, function () {
-          console.log('config POST body', req.body);
-
-          // Since we are sending the changes to another process we don't really
-          // have a good way of seeing if it worked, so always report success
-          deps.storage.config.save(req.body);
-          res.setHeader('Content-Type', 'application/json;');
-          res.end('{"success":true}');
-        });
-      });
-    }
   , request: function (req, res) {
       if (handleCors(req, res, '*')) {
         return;
@@ -381,4 +369,38 @@ module.exports.create = function (deps, conf) {
       });
     }
   };
+
+  function handleOldApis(req, res, next) {
+    if (typeof oldEndPoints[req.params.name] === 'function') {
+      oldEndPoints[req.params.name](req, res);
+    } else {
+      next();
+    }
+  }
+
+  var config = { restful: {} };
+  config.restful.readConfig = function (req, res) {
+    res.send(deps.recase.snakeCopy(conf));
+  };
+  config.restful.saveConfig = function (req, res) {
+    console.log('config POST body', req.body);
+
+    // Since we are sending the changes to another process we don't really
+    // have a good way of seeing if it worked, so always report success
+    deps.storage.config.save(req.body);
+    res.send({ success: true });
+  };
+
+  var app = require('express')();
+
+  // Handle all of the API endpoints using the old definition style, and then we can
+  // add middleware without worrying too much about the consequences to older code.
+  app.use('/:name', handleOldApis);
+
+  app.use('/', isAuthorized, jsonParser);
+
+  app.use(   '/config', makeCorsHandler());
+  app.get(   '/config', config.restful.readConfig);
+  app.post(  '/config', config.restful.saveConfig);
+  return app;
 };
diff --git a/lib/admin/index.js b/lib/admin/index.js
index e8c146b..e317d39 100644
--- a/lib/admin/index.js
+++ b/lib/admin/index.js
@@ -15,15 +15,8 @@ module.exports.create = function (deps, conf) {
   var app = express();
 
   var apis = require('./apis').create(deps, conf);
-  function handleApis(req, res, next) {
-    if (typeof apis[req.params.name] === 'function') {
-      apis[req.params.name](req, res);
-    } else {
-      next();
-    }
-  }
-  app.use('/api/goldilocks@daplie.com/:name', handleApis);
-  app.use('/api/com.daplie.goldilocks/:name', handleApis);
+  app.use('/api/goldilocks@daplie.com', apis);
+  app.use('/api/com.daplie.goldilocks', apis);
 
   // Serve the static assets for the UI (even though it probably won't be used very
   // often since it only works on localhost domains). Note that we are using the default

From 12e4a47855dc8a0eb0b5eb05022385029cde75de Mon Sep 17 00:00:00 2001
From: tigerbot <seth.gibelyou@daplie.com>
Date: Wed, 4 Oct 2017 11:49:05 -0600
Subject: [PATCH 03/22] removed addresses and cwd from the config

---
 bin/goldilocks.js | 32 --------------------------------
 1 file changed, 32 deletions(-)

diff --git a/bin/goldilocks.js b/bin/goldilocks.js
index 51d77d2..908da13 100755
--- a/bin/goldilocks.js
+++ b/bin/goldilocks.js
@@ -178,38 +178,6 @@ function fillConfig(config, args) {
     config.email = args.email;
     config.tls.acme.email = args.email;
   }
-
-  // maybe this should not go in config... but be ephemeral in some way?
-  config.cwd = args.cwd || config.cwd || process.cwd();
-
-  var ipaddr = require('ipaddr.js');
-  var addresses = [];
-  var ifaces = require('../lib/local-ip.js').find();
-
-  Object.keys(ifaces).forEach(function (ifacename) {
-    var iface = ifaces[ifacename];
-    iface.ipv4.forEach(function (ip) {
-      addresses.push(ip);
-    });
-    iface.ipv6.forEach(function (ip) {
-      addresses.push(ip);
-    });
-  });
-
-  addresses.sort(function (a, b) {
-    if (a.family !== b.family) {
-      return 'IPv4' === a.family ? 1 : -1;
-    }
-
-    return a.address > b.address ? 1 : -1;
-  });
-
-  addresses.forEach(function (addr) {
-    addr.range = ipaddr.parse(addr.address).range();
-  });
-
-  // TODO maybe move to config.state.addresses (?)
-  config.addresses = addresses;
   config.device = { hostname: require('os').hostname() };
 
   config.tunnel = args.tunnel || config.tunnel;

From cc6b34dd46b3db890002824caea8eb611a0a3c1c Mon Sep 17 00:00:00 2001
From: tigerbot <seth.gibelyou@daplie.com>
Date: Wed, 4 Oct 2017 14:42:19 -0600
Subject: [PATCH 04/22] made it possible to GET specific parts of the config

---
 lib/admin/apis.js | 32 +++++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/lib/admin/apis.js b/lib/admin/apis.js
index 6c22ca0..0a3a7c9 100644
--- a/lib/admin/apis.js
+++ b/lib/admin/apis.js
@@ -379,8 +379,29 @@ module.exports.create = function (deps, conf) {
   }
 
   var config = { restful: {} };
-  config.restful.readConfig = function (req, res) {
-    res.send(deps.recase.snakeCopy(conf));
+  config.restful.readConfig = function (req, res, next) {
+    var part = conf;
+    if (req.params.group) {
+      part = part[req.params.group];
+    }
+    if (part && req.params.name) {
+      part = part[req.params.name];
+    }
+    if (part && req.params.id) {
+      part = part.find(function (mod) { return mod.id === req.params.id; });
+    }
+    if (part && req.params.name2) {
+      part = part[req.params.name2];
+    }
+    if (part && req.params.id2) {
+      part = part.find(function (mod) { return mod.id === req.params.id2; });
+    }
+
+    if (part) {
+      res.send(deps.recase.snakeCopy(part));
+    } else {
+      next();
+    }
   };
   config.restful.saveConfig = function (req, res) {
     console.log('config POST body', req.body);
@@ -400,7 +421,12 @@ module.exports.create = function (deps, conf) {
   app.use('/', isAuthorized, jsonParser);
 
   app.use(   '/config', makeCorsHandler());
-  app.get(   '/config', config.restful.readConfig);
+  app.get(   '/config',                                                config.restful.readConfig);
+  app.get(   '/config/:group',                                         config.restful.readConfig);
+  app.get(   '/config/:group/:name(modules|domains)',                  config.restful.readConfig);
+  app.get(   '/config/:group/:name(modules|domains)/:id',              config.restful.readConfig);
+  app.get(   '/config/:group/:name(domains)/:id/:name2(modules)',      config.restful.readConfig);
+  app.get(   '/config/:group/:name(domains)/:id/:name2(modules)/:id2', config.restful.readConfig);
   app.post(  '/config', config.restful.saveConfig);
   return app;
 };

From d04b750f87d8c5cf894e57564e3250753602a504 Mon Sep 17 00:00:00 2001
From: tigerbot <seth.gibelyou@daplie.com>
Date: Wed, 4 Oct 2017 18:26:27 -0600
Subject: [PATCH 05/22] changed the default config

---
 bin/goldilocks.js | 49 +++++++++++++++++++++++++++++++----------------
 1 file changed, 32 insertions(+), 17 deletions(-)

diff --git a/bin/goldilocks.js b/bin/goldilocks.js
index 908da13..6b71c75 100755
--- a/bin/goldilocks.js
+++ b/bin/goldilocks.js
@@ -148,26 +148,42 @@ var tcpProm;
 function fillConfig(config, args) {
   config.debug = config.debug || args.debug;
 
-  if (!config.dns) {
-    config.dns = { bind: [ 53 ], modules: [{ name: 'proxy', port: 3053 }] };
-  }
   if (!config.ddns) {
     config.ddns = { enabled: false };
   }
-  // Use Object.assign to add any properties needed but not defined in the mdns config.
-  // It will first copy the defaults into an empty object, then copy any real config over that.
-  var mdnsDefaults = { port: 5353, broadcast: '224.0.0.251', ttl: 300 };
-  config.mdns = Object.assign({}, mdnsDefaults, config.mdns);
+  // Use Object.assign to copy any real config values over the default values so we can
+  // easily make sure all the fields we need exist .
+  var mdnsDefaults = { disabled: false, port: 5353, broadcast: '224.0.0.251', ttl: 300 };
+  config.mdns = Object.assign(mdnsDefaults, config.mdns);
 
-  if (!config.tcp) {
-    config.tcp = {};
-  }
-  if (!config.http) {
-    config.http = { modules: [{ name: 'proxy', domains: ['*'], port: 3000 }] };
-  }
-  if (!config.tls) {
-    config.tls = {};
+  function fillComponent(name, fillBind, fillDomains) {
+    if (!config[name]) {
+      config[name] = {};
+    }
+    if (!Array.isArray(config[name].modules)) {
+      config[name].modules = [];
+    }
+
+    if (fillBind && !Array.isArray(config[name].bind)) {
+      config[name].bind = [];
+    }
+
+    if (fillDomains) {
+      if (!Array.isArray(config[name].domains)) {
+        config[name].domains = [];
+      }
+      config[name].domains.forEach(function (domain) {
+        if (!Array.isArray(domain.modules)) {
+          domain.modules = [];
+        }
+      });
+    }
   }
+  fillComponent('dns',   true,  false);
+  fillComponent('tcp',   true,  false);
+  fillComponent('http',  false, true);
+  fillComponent('tls',   false, true);
+
   if (!config.tls.acme && (args.email || args.agreeTos)) {
     config.tls.acme = {};
   }
@@ -175,14 +191,13 @@ function fillConfig(config, args) {
     config.tls.acme.approvedDomains = args.agreeTos.split(',');
   }
   if (args.email) {
-    config.email = args.email;
     config.tls.acme.email = args.email;
   }
   config.device = { hostname: require('os').hostname() };
 
   config.tunnel = args.tunnel || config.tunnel;
 
-  if (Array.isArray(config.tcp.bind)) {
+  if (Array.isArray(config.tcp.bind) && config.tcp.bind.length) {
     return PromiseA.resolve(config);
   }
 

From 0380a8087feb932fcc2480463ddd35205038b294 Mon Sep 17 00:00:00 2001
From: tigerbot <seth.gibelyou@daplie.com>
Date: Wed, 4 Oct 2017 18:27:29 -0600
Subject: [PATCH 06/22] automatically add `id` to modules and domains

---
 bin/goldilocks.js | 172 ++++++++++++++++++++++++++++++----------------
 1 file changed, 111 insertions(+), 61 deletions(-)

diff --git a/bin/goldilocks.js b/bin/goldilocks.js
index 6b71c75..456e9a9 100755
--- a/bin/goldilocks.js
+++ b/bin/goldilocks.js
@@ -8,6 +8,7 @@ if (!cluster.isMaster) {
   return;
 }
 
+var crypto = require('crypto');
 var PromiseA = require('bluebird');
 var fs = PromiseA.promisifyAll(require('fs'));
 var configStorage;
@@ -25,7 +26,45 @@ function mergeSettings(orig, changes) {
     }
   });
 }
-function createStorage(filename, filetype) {
+
+function fixRawConfig(config) {
+  var updated = false;
+
+  function updateModules(list) {
+    if (!Array.isArray(list)) {
+      return;
+    }
+    list.forEach(function (mod) {
+      if (!mod.id) {
+        mod.id = crypto.randomBytes(8).toString('hex');
+        updated = true;
+      }
+    });
+  }
+  function updateDomains(list) {
+    if (!Array.isArray(list)) {
+      return;
+    }
+    list.forEach(function (mod) {
+      if (!mod.id) {
+        mod.id = crypto.randomBytes(8).toString('hex');
+        updated = true;
+      }
+      updateModules(mod.modules);
+    });
+  }
+
+  [ 'dns', 'tcp', 'http', 'tls' ].forEach(function (key) {
+    if (!config[key]) {
+      return;
+    }
+    updateModules(config[key].modules);
+    updateDomains(config[key].domains);
+  });
+
+  return updated;
+}
+async function createStorage(filename, filetype) {
   var recase = require('recase').create({});
   var snakeCopy = recase.snakeCopy.bind(recase);
   var camelCopy = recase.camelCopy.bind(recase);
@@ -40,13 +79,25 @@ function createStorage(filename, filetype) {
     dump  = yaml.safeDump;
   }
 
-  function read() {
-    return fs.readFileAsync(filename).then(parse).catch(function (err) {
+  async function read() {
+    var text;
+    try {
+      text = await fs.readFileAsync(filename);
+    } catch (err) {
       if (err.code === 'ENOENT') {
-        return '';
+        return {};
       }
-      return PromiseA.reject(err);
-    });
+      throw err;
+    }
+
+    var rawConfig = parse(text);
+    if (fixRawConfig(rawConfig)) {
+      await fs.writeFileAsync(filename, dump(rawConfig));
+      text = await fs.readFileAsync(filename);
+      rawConfig = parse(text);
+    }
+
+    return rawConfig;
   }
 
   var result = {
@@ -76,72 +127,71 @@ function createStorage(filename, filetype) {
   };
   return result;
 }
-function checkConfigLocation(cwd, configFile) {
+async function checkConfigLocation(cwd, configFile) {
   cwd = cwd || process.cwd();
   var path = require('path');
-  var filename;
+  var filename, text;
 
-  var prom;
   if (configFile) {
     filename = path.resolve(cwd, configFile);
-    prom = fs.readFileAsync(filename)
-      .catch(function (err) {
-        if (err.code !== 'ENOENT') {
-          return PromiseA.reject(err);
-        }
-        if (path.extname(filename) === '.json') {
-          return '{}';
-        }
-        return '';
-      })
-      ;
+    try {
+      text = await fs.readFileAsync(filename);
+    } catch (err) {
+      if (err.code !== 'ENOENT') {
+        throw err;
+      }
+      if (path.extname(filename) === '.json') {
+        return { name: filename, type: 'json' };
+      } else {
+        return { name: filename, type: 'yaml' };
+      }
+    }
   } else {
-    prom = PromiseA.reject('blah')
-      .catch(function () {
-        filename = path.resolve(cwd, 'goldilocks.yml');
-        return fs.readFileAsync(filename);
-      })
-      .catch(function () {
-        filename = path.resolve(cwd, 'goldilocks.json');
-        return fs.readFileAsync(filename);
-      })
-      .catch(function () {
-        filename = path.resolve(cwd, 'etc/goldilocks/goldilocks.yml');
-        return fs.readFileAsync(filename);
-      })
-      .catch(function () {
-        filename = '/etc/goldilocks/goldilocks.yml';
-        return fs.readFileAsync(filename);
-      })
-      .catch(function () {
-        filename = path.resolve(cwd, 'goldilocks.yml');
-        return '';
-      })
-      ;
+    // Note that `path.resolve` can handle both relative and absolute paths.
+    var defLocations = [
+      path.resolve(cwd, 'goldilocks.yml')
+    , path.resolve(cwd, 'goldilocks.json')
+    , path.resolve(cwd, 'etc/goldilocks/goldilocks.yml')
+    , '/etc/goldilocks/goldilocks.yml'
+    , path.resolve(cwd, 'goldilocks.yml')
+    ];
+
+    var ind;
+    for (ind = 0; ind < defLocations.length; ind += 1) {
+      try {
+        text = await fs.readFileAsync(defLocations[ind]);
+        filename = defLocations[ind];
+        break;
+      } catch (err) {
+        if (err.code !== 'ENOENT') {
+          throw err;
+        }
+      }
+    }
+
+    if (!filename) {
+      filename = defLocations[0];
+      text = '';
+    }
   }
 
-  return prom.then(function (text) {
-    try {
-      JSON.parse(text);
-      return { name: filename, type: 'json' };
-    } catch (err) {}
+  try {
+    JSON.parse(text);
+    return { name: filename, type: 'json' };
+  } catch (err) {}
 
-    try {
-      require('js-yaml').safeLoad(text);
-      return { name: filename, type: 'yaml' };
-    } catch (err) {}
+  try {
+    require('js-yaml').safeLoad(text);
+    return { name: filename, type: 'yaml' };
+  } catch (err) {}
 
-    throw new Error('Could not load "' + filename + '" as JSON nor YAML');
-  });
+  throw new Error('Could not load "' + filename + '" as JSON nor YAML');
 }
-function createConfigStorage(args) {
-  return checkConfigLocation(args.cwd, args.config)
-    .then(function (result) {
-      console.log('config file', result.name, 'is of type', result.type);
-      configStorage = createStorage(result.name, result.type);
-      return configStorage.read();
-    })
-    ;
+async function createConfigStorage(args) {
+  var result = await checkConfigLocation(args.cwd, args.config);
+  console.log('config file', result.name, 'is of type', result.type);
+  configStorage = await createStorage(result.name, result.type);
+  return configStorage.read();
 }
 
 var tcpProm;

From ded53cf45cc8ead718f7dc1917cacdd9df6a86cc Mon Sep 17 00:00:00 2001
From: tigerbot <seth.gibelyou@daplie.com>
Date: Thu, 5 Oct 2017 18:10:59 -0600
Subject: [PATCH 07/22] reduced a few lines of code

---
 bin/goldilocks.js |  3 +--
 lib/admin/apis.js | 10 ++++------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/bin/goldilocks.js b/bin/goldilocks.js
index 456e9a9..ea936b6 100755
--- a/bin/goldilocks.js
+++ b/bin/goldilocks.js
@@ -36,7 +36,7 @@ function fixRawConfig(config) {
     }
     list.forEach(function (mod) {
       if (!mod.id) {
-        mod.id = crypto.randomBytes(8).toString('hex');
+        mod.id = crypto.randomBytes(4).toString('hex');
         updated = true;
       }
     });
@@ -153,7 +153,6 @@ async function checkConfigLocation(cwd, configFile) {
     , path.resolve(cwd, 'goldilocks.json')
     , path.resolve(cwd, 'etc/goldilocks/goldilocks.yml')
     , '/etc/goldilocks/goldilocks.yml'
-    , path.resolve(cwd, 'goldilocks.yml')
     ];
 
     var ind;
diff --git a/lib/admin/apis.js b/lib/admin/apis.js
index 0a3a7c9..902ec15 100644
--- a/lib/admin/apis.js
+++ b/lib/admin/apis.js
@@ -421,12 +421,10 @@ module.exports.create = function (deps, conf) {
   app.use('/', isAuthorized, jsonParser);
 
   app.use(   '/config', makeCorsHandler());
-  app.get(   '/config',                                                config.restful.readConfig);
-  app.get(   '/config/:group',                                         config.restful.readConfig);
-  app.get(   '/config/:group/:name(modules|domains)',                  config.restful.readConfig);
-  app.get(   '/config/:group/:name(modules|domains)/:id',              config.restful.readConfig);
-  app.get(   '/config/:group/:name(domains)/:id/:name2(modules)',      config.restful.readConfig);
-  app.get(   '/config/:group/:name(domains)/:id/:name2(modules)/:id2', config.restful.readConfig);
+  app.get(   '/config',                                                 config.restful.readConfig);
+  app.get(   '/config/:group',                                          config.restful.readConfig);
+  app.get(   '/config/:group/:name(modules|domains)/:id?',              config.restful.readConfig);
+  app.get(   '/config/:group/:name(domains)/:id/:name2(modules)/:id2?', config.restful.readConfig);
   app.post(  '/config', config.restful.saveConfig);
   return app;
 };

From 8f4a733391e5323dc6b718fb047b75f17d6dad9e Mon Sep 17 00:00:00 2001
From: tigerbot <seth.gibelyou@daplie.com>
Date: Thu, 5 Oct 2017 18:11:58 -0600
Subject: [PATCH 08/22] changed module config property name

---
 bin/goldilocks.js   | 5 +++++
 lib/goldilocks.js   | 4 ++--
 lib/modules/http.js | 8 ++++----
 lib/modules/tls.js  | 8 ++++----
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/bin/goldilocks.js b/bin/goldilocks.js
index ea936b6..f7b59c3 100755
--- a/bin/goldilocks.js
+++ b/bin/goldilocks.js
@@ -39,6 +39,11 @@ function fixRawConfig(config) {
         mod.id = crypto.randomBytes(4).toString('hex');
         updated = true;
       }
+      if (mod.name) {
+        mod.type = mod.type || mod.name;
+        delete mod.name;
+        updated = true;
+      }
     });
   }
   function updateDomains(list) {
diff --git a/lib/goldilocks.js b/lib/goldilocks.js
index a0b3fcc..3e3ee28 100644
--- a/lib/goldilocks.js
+++ b/lib/goldilocks.js
@@ -101,7 +101,7 @@ module.exports.create = function (deps, config) {
     }
     var socket = require('dgram').createSocket('udp4');
     config.dns.modules.forEach(function (mod) {
-      if (mod.name !== 'proxy') {
+      if (mod.type !== 'proxy') {
         console.warn('found bad DNS module', mod);
         return;
       }
@@ -213,7 +213,7 @@ module.exports.create = function (deps, config) {
 
   addPorts(config.tcp.bind);
   (config.tcp.modules || []).forEach(function (mod) {
-    if (mod.name === 'forward') {
+    if (mod.type === 'forward') {
       var forwarder = createTcpForwarder(mod);
       mod.ports.forEach(function (port) {
         if (!tcpPortMap[port]) {
diff --git a/lib/modules/http.js b/lib/modules/http.js
index 365b09a..ed3c571 100644
--- a/lib/modules/http.js
+++ b/lib/modules/http.js
@@ -426,10 +426,10 @@ module.exports.create = function (deps, conf, greenlockMiddleware) {
 
             var subProm = PromiseA.resolve(false);
             dom.modules.forEach(function (mod) {
-              if (moduleChecks[mod.name]) {
+              if (moduleChecks[mod.type]) {
                 subProm = subProm.then(function (handled) {
                   if (handled) { return handled; }
-                  return moduleChecks[mod.name](mod, conn, opts, headers);
+                  return moduleChecks[mod.type](mod, conn, opts, headers);
                 });
               } else {
                 console.warn('unknown HTTP module under domains', dom.names.join(','), mod);
@@ -447,8 +447,8 @@ module.exports.create = function (deps, conf, greenlockMiddleware) {
               return false;
             }
 
-            if (moduleChecks[mod.name]) {
-              return moduleChecks[mod.name](mod, conn, opts, headers);
+            if (moduleChecks[mod.type]) {
+              return moduleChecks[mod.type](mod, conn, opts, headers);
             }
             console.warn('unknown HTTP module found', mod);
           });
diff --git a/lib/modules/tls.js b/lib/modules/tls.js
index 19bb2f1..c8191d2 100644
--- a/lib/modules/tls.js
+++ b/lib/modules/tls.js
@@ -142,7 +142,7 @@ module.exports.create = function (deps, config, netHandler) {
           }
 
           return dom.modules.some(function (mod) {
-            if (mod.name !== 'acme') {
+            if (mod.type !== 'acme') {
               return false;
             }
             complete(mod, dom.names);
@@ -156,7 +156,7 @@ module.exports.create = function (deps, config, netHandler) {
 
       if (Array.isArray(config.tls.modules)) {
         handled = config.tls.modules.some(function (mod) {
-          if (mod.name !== 'acme') {
+          if (mod.type !== 'acme') {
             return false;
           }
           if (!nameMatchesDomains(opts.domain, mod.domains)) {
@@ -322,10 +322,10 @@ module.exports.create = function (deps, config, netHandler) {
     }
 
     function checkModule(mod) {
-      if (mod.name === 'proxy') {
+      if (mod.type === 'proxy') {
         return proxy(socket, opts, mod);
       }
-      if (mod.name !== 'acme') {
+      if (mod.type !== 'acme') {
         console.error('saw unknown TLS module', mod);
       }
     }

From 5761ab9d620630e2da4df75bbfb943ca7cd19340 Mon Sep 17 00:00:00 2001
From: tigerbot <seth.gibelyou@daplie.com>
Date: Fri, 6 Oct 2017 17:50:16 -0600
Subject: [PATCH 09/22] added JSON Schema to validate the config

---
 bin/goldilocks.js   |   6 +-
 lib/admin/config.js | 201 ++++++++++++++++++++++++++++++++++++++++++++
 package-lock.json   |  13 ++-
 package.json        |   1 +
 4 files changed, 210 insertions(+), 11 deletions(-)
 create mode 100644 lib/admin/config.js

diff --git a/bin/goldilocks.js b/bin/goldilocks.js
index f7b59c3..abca131 100755
--- a/bin/goldilocks.js
+++ b/bin/goldilocks.js
@@ -202,9 +202,9 @@ var tcpProm;
 function fillConfig(config, args) {
   config.debug = config.debug || args.debug;
 
-  if (!config.ddns) {
-    config.ddns = { enabled: false };
-  }
+  config.socks5 = config.socks5 || { enabled: false };
+  config.ddns   = config.ddns   || { enabled: false };
+
   // Use Object.assign to copy any real config values over the default values so we can
   // easily make sure all the fields we need exist .
   var mdnsDefaults = { disabled: false, port: 5353, broadcast: '224.0.0.251', ttl: 300 };
diff --git a/lib/admin/config.js b/lib/admin/config.js
new file mode 100644
index 0000000..9bcb688
--- /dev/null
+++ b/lib/admin/config.js
@@ -0,0 +1,201 @@
+'use strict';
+
+var validator = new (require('jsonschema').Validator)();
+var recase = require('recase').create({});
+
+function deepCopy(obj) {
+  if (!obj || typeof obj !== 'object') {
+    return obj;
+  }
+
+  var result;
+  if (Array.isArray(obj)) {
+    result = [];
+  } else {
+    result = {};
+  }
+  Object.keys(obj).forEach(function (key) {
+    result[key] = deepCopy(obj[key]);
+  });
+  return result;
+}
+
+var portSchema = { type: 'number', minimum: 1, maximum: 65535 };
+
+var moduleSchemas = {
+  // the proxy module is common to basically all categories.
+  proxy: {
+    type: 'object'
+  , oneOf: [
+      { required: [ 'address' ] }
+    , { required: [ 'port' ] }
+    ]
+  , properties: {
+      address: { type: 'string' }
+    , host:    { type: 'string' }
+    , port:    portSchema
+    }
+  }
+
+  // redirect and static modules are for HTTP
+, redirect: {
+    type: 'object'
+  , required: [ 'to', 'from' ]
+  , properties: {
+      to:     { type: 'string'}
+    , from:   { type: 'string'}
+    , status: { type: 'integer', minimum: 1, maximum: 999 }
+  , }
+  }
+, static: {
+    type: 'object'
+  , required: [ 'root' ]
+  , properties: {
+      root: { type: 'string' }
+    }
+  }
+
+  // the acme module is for TLS
+, acme: {
+    type: 'object'
+  , required: [ 'email' ]
+  , properties: {
+      email:         { type: 'string' }
+    , server:        { type: 'string' }
+    , challengeType: { type: 'string' }
+    }
+  }
+};
+// forward is basically the name for the TCP proxy
+moduleSchemas.forward = deepCopy(moduleSchemas.proxy);
+moduleSchemas.forward.required = [ 'ports' ];
+moduleSchemas.forward.properties.ports = { type: 'array', items: portSchema };
+
+Object.keys(moduleSchemas).forEach(function (name) {
+  var schema = moduleSchemas[name];
+  schema.id = '/modules/'+name;
+  schema.required = ['id', 'type'].concat(schema.required || []);
+  schema.properties.id   = { type: 'string' };
+  schema.properties.type = { type: 'string', const: name };
+  validator.addSchema(schema, schema.id);
+});
+
+function addDomainsSchema(base, modList) {
+  var modSchemas = modList.map(function (name) {
+    return { '$ref': '/modules/'+name };
+  });
+
+  base.required = [ 'modules', 'domains' ].concat(base.required || []);
+  base.properties.modules = {
+    type: 'array'
+  , items: {
+      type: 'object'
+    , required: [ 'domains' ]
+    , properties: {
+        domains: { type: 'array', items: { type: 'string' }, minLength: 1}
+      }
+    , oneOf: modSchemas
+    }
+  };
+  base.properties.domains = {
+    type: 'array'
+  , items: {
+      type: 'object'
+    , required: [ 'id', 'names', ]
+    , properties: {
+        id:      { type: 'string' }
+      , names:   { type: 'array', items: { type: 'string' }, minLength: 1}
+      , modules: { type: 'array', items: { oneOf: modSchemas }}
+      }
+    }
+  };
+}
+
+var httpSchema = {
+  type: 'object'
+, properties: {
+    // These properties should be snake_case to match the API and config format
+    primary_domain: { type: 'string' }
+  , allow_insecure: { type: 'boolean' }
+  , trust_proxy:    { type: 'boolean' }
+, }
+};
+addDomainsSchema(httpSchema, ['proxy', 'static', 'redirect']);
+
+var tlsSchema = {
+  type: 'object'
+, properties: {
+    acme: {
+      type: 'object'
+      // These properties should be snake_case to match the API and config format
+    , required: [ 'email', 'approved_domains' ]
+    , properties: {
+        email:            { type: 'string' }
+      , server:           { type: 'string' }
+      , challenge_type:   { type: 'string' }
+      , approved_domains: { type: 'array', items: { type: 'string' }, minLength: 1}
+      }
+    }
+  }
+};
+addDomainsSchema(tlsSchema, ['proxy', 'acme']);
+
+var tcpSchema = {
+  type: 'object'
+, required: [ 'bind' ]
+, properties: {
+    bind:    { type: 'array', items: portSchema, minLength: 1 }
+  , modules: { type: 'array', items: { '$ref': '/modules/forward' }}
+  }
+};
+
+var dnsSchema = {
+  type: 'object'
+, properties: {
+    bind:    { type: 'array', items: portSchema }
+  , modules: { type: 'array', items: { '$ref': '/modules/proxy' }}
+  }
+};
+
+var mdnsSchema = {
+  type: 'object'
+, required: [ 'port', 'broadcast', 'ttl' ]
+, properties: {
+    port:      portSchema
+  , broadcast: { type: 'string' }
+  , ttl:       { type: 'integer', minimum: 0, maximum: 2147483647 }
+  }
+};
+
+var ddnsSchema = {
+  type: 'object'
+, properties: {
+    enabled: { type: 'boolean' }
+  }
+};
+var socks5Schema = {
+  type: 'object'
+, properties: {
+    enabled: { type: 'boolean' }
+  , port:    portSchema
+  }
+};
+
+var mainSchema = {
+  type: 'object'
+, required: [ 'http', 'tls', 'tcp', 'dns', 'mdns', 'ddns' ]
+, properties: {
+    http:   httpSchema
+  , tls:    tlsSchema
+  , tcp:    tcpSchema
+  , dns:    dnsSchema
+  , mdns:   mdnsSchema
+  , ddns:   ddnsSchema
+  , socks5: socks5Schema
+  }
+, additionalProperties: false
+};
+
+module.exports.validate = function (config) {
+  return validator.validate(recase.snakeCopy(config), mainSchema).errors;
+};
diff --git a/package-lock.json b/package-lock.json
index 11aca53..a09087b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1029,6 +1029,11 @@
       "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
       "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM="
     },
+    "jsonschema": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/jsonschema/-/jsonschema-1.2.0.tgz",
+      "integrity": "sha512-XDJApzBauMg0TinJNP4iVcJl99PQ4JbWKK7nwzpOIkAOVveDKgh/2xm41T3x7Spu4PWMhnnQpNJmUSIUgl6sKg=="
+    },
     "jsonwebtoken": {
       "version": "7.4.1",
       "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-7.4.1.tgz",
@@ -1967,14 +1972,6 @@
       "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
       "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4="
     },
-    "stream-pair": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/stream-pair/-/stream-pair-1.0.3.tgz",
-      "integrity": "sha1-vIdY/jnTgQuva3VMj5BI8PuRNn0=",
-      "requires": {
-        "readable-stream": "2.2.11"
-      }
-    },
     "string_decoder": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.2.tgz",
diff --git a/package.json b/package.json
index c5e56ee..e764379 100644
--- a/package.json
+++ b/package.json
@@ -49,6 +49,7 @@
     "human-readable-ids": "git+https://git.daplie.com/Daplie/human-readable-ids-js#master",
     "ipaddr.js": "git+https://github.com/whitequark/ipaddr.js.git#v1.3.0",
     "js-yaml": "^3.8.3",
+    "jsonschema": "^1.2.0",
     "jsonwebtoken": "^7.4.0",
     "le-challenge-ddns": "git+https://git.daplie.com/Daplie/le-challenge-ddns.git#master",
     "le-challenge-fs": "git+https://git.daplie.com/Daplie/le-challenge-webroot.git#master",

From 485a223f86fe48a0307e74e78feb7587f87d9460 Mon Sep 17 00:00:00 2001
From: tigerbot <seth.gibelyou@daplie.com>
Date: Tue, 10 Oct 2017 11:08:19 -0600
Subject: [PATCH 10/22] implemented better management of arrays in the config

---
 lib/admin/apis.js   | 115 +++++++++++++++++++++++++++++--
 lib/admin/config.js | 162 ++++++++++++++++++++++++++++++++++++++------
 lib/storage.js      |  20 ++++++
 lib/worker.js       |  23 +++++--
 4 files changed, 287 insertions(+), 33 deletions(-)

diff --git a/lib/admin/apis.js b/lib/admin/apis.js
index 902ec15..2d817f9 100644
--- a/lib/admin/apis.js
+++ b/lib/admin/apis.js
@@ -403,13 +403,108 @@ module.exports.create = function (deps, conf) {
       next();
     }
   };
-  config.restful.saveConfig = function (req, res) {
-    console.log('config POST body', req.body);
 
-    // Since we are sending the changes to another process we don't really
-    // have a good way of seeing if it worked, so always report success
-    deps.storage.config.save(req.body);
-    res.send({ success: true });
+  config.restful.saveBaseConfig = function (req, res) {
+    console.log('config POST body', JSON.stringify(req.body));
+
+    deps.PromiseA.resolve().then(function () {
+      var update;
+      if (req.params.group) {
+        update = {};
+        update[req.params.group] = req.body;
+      } else {
+        update = req.body;
+      }
+
+      var changer = new (require('./config').ConfigChanger)(conf);
+      var errors = changer.update(update);
+      if (errors.length) {
+        throw Object.assign(new Error(), errors[0], {statusCode: 400});
+      }
+
+      return deps.storage.config.save(changer);
+    }).then(function (config) {
+      if (req.params.group) {
+        config = config[req.params.group];
+      }
+      res.send(deps.recase.snakeCopy(config));
+    }, function (err) {
+      res.statusCode = err.statusCode || 500;
+      err.message = err.message || err.toString();
+      res.end(JSON.stringify({error: {message: err.message, code: err.code}}));
+    });
+  };
+  config.restful.createModule = function (req, res) {
+    var group = req.params.group;
+    var err;
+    deps.PromiseA.resolve().then(function () {
+      var changer = new (require('./config').ConfigChanger)(conf);
+      if (!changer[group] || !changer[group].modules) {
+        err = new Error("'"+group+"' is not a valid settings group or has not modules");
+        err.statusCode = 404;
+        throw err;
+      }
+
+      var modList;
+      if (req.params.id) {
+        if (changer[group].domains) {
+          modList = (changer[group].domains.find(req.params.id) || {}).modules;
+        }
+      } else {
+        modList = changer[group].modules;
+      }
+      if (!modList) {
+        err = new Error("'"+group+"' has no domains list or '"+req.params.id+"' does not exist");
+        err.statusCode = 404;
+        throw err;
+      }
+
+      modList.add(req.body);
+      var errors = changer.validate();
+      if (errors.length) {
+        throw Object.assign(new Error(), errors[0], {statusCode: 400});
+      }
+
+      return deps.storage.config.save(changer);
+    }).then(function (config) {
+      var base;
+      if (!req.params.id) {
+        base = config[group];
+      } else {
+        base = config[group].domains.find(function (dom) { return dom.id === req.params.id; });
+      }
+      res.send(deps.recase.snakeCopy(base.modules));
+    }, function (err) {
+      res.statusCode = err.statusCode || 500;
+      err.message = err.message || err.toString();
+      res.end(JSON.stringify({error: {message: err.message, code: err.code}}));
+    });
+  };
+  config.restful.createDomain = function (req, res) {
+    var group = req.params.group;
+    var err;
+    deps.PromiseA.resolve().then(function () {
+      var changer = new (require('./config').ConfigChanger)(conf);
+      if (!changer[group] || !changer[group].domains) {
+        err = new Error("'"+group+"' is not a valid settings group or has no domains list");
+        err.statusCode = 404;
+        throw err;
+      }
+
+      changer[group].domains.add(req.body);
+      var errors = changer.validate();
+      if (errors.length) {
+        throw Object.assign(new Error(), errors[0], {statusCode: 400});
+      }
+
+      return deps.storage.config.save(changer);
+    }).then(function (config) {
+      res.send(deps.recase.snakeCopy(config[group].domains));
+    }, function (err) {
+      res.statusCode = err.statusCode || 500;
+      err.message = err.message || err.toString();
+      res.end(JSON.stringify({error: {message: err.message, code: err.code}}));
+    });
   };
 
   var app = require('express')();
@@ -425,6 +520,12 @@ module.exports.create = function (deps, conf) {
   app.get(   '/config/:group',                                          config.restful.readConfig);
   app.get(   '/config/:group/:name(modules|domains)/:id?',              config.restful.readConfig);
   app.get(   '/config/:group/:name(domains)/:id/:name2(modules)/:id2?', config.restful.readConfig);
-  app.post(  '/config', config.restful.saveConfig);
+
+  app.post(  '/config',                              config.restful.saveBaseConfig);
+  app.post(  '/config/:group',                       config.restful.saveBaseConfig);
+  app.post(  '/config/:group/modules',               config.restful.createModule);
+  app.post(  '/config/:group/domains',               config.restful.createDomain);
+  app.post(  '/config/:group/domains/:id/modules',   config.restful.createModule);
+
   return app;
 };
diff --git a/lib/admin/config.js b/lib/admin/config.js
index 9bcb688..4651f09 100644
--- a/lib/admin/config.js
+++ b/lib/admin/config.js
@@ -3,23 +3,6 @@
 var validator = new (require('jsonschema').Validator)();
 var recase = require('recase').create({});
 
-function deepCopy(obj) {
-  if (!obj || typeof obj !== 'object') {
-    return obj;
-  }
-
-  var result;
-  if (Array.isArray(obj)) {
-    result = [];
-  } else {
-    result = {};
-  }
-  Object.keys(obj).forEach(function (key) {
-    result[key] = deepCopy(obj[key]);
-  });
-  return result;
-}
-
 var portSchema = { type: 'number', minimum: 1, maximum: 65535 };
 
 var moduleSchemas = {
@@ -67,7 +50,7 @@ var moduleSchemas = {
   }
 };
 // forward is basically the name for the TCP proxy
-moduleSchemas.forward = deepCopy(moduleSchemas.proxy);
+moduleSchemas.forward = JSON.parse(JSON.stringify(moduleSchemas.proxy));
 moduleSchemas.forward.required = [ 'ports' ];
 moduleSchemas.forward.properties.ports = { type: 'array', items: portSchema };
 
@@ -180,6 +163,12 @@ var socks5Schema = {
   , port:    portSchema
   }
 };
+var deviceSchema = {
+  type: 'object'
+, properties: {
+    hostname: { type: 'string' }
+  }
+};
 
 var mainSchema = {
   type: 'object'
@@ -192,10 +181,143 @@ var mainSchema = {
   , mdns:   mdnsSchema
   , ddns:   ddnsSchema
   , socks5: socks5Schema
+  , device: deviceSchema
   }
 , additionalProperties: false
 };
 
-module.exports.validate = function (config) {
+function validate(config) {
   return validator.validate(recase.snakeCopy(config), mainSchema).errors;
-};
+}
+module.exports.validate = validate;
+
+
+class ModuleList extends Array {
+  constructor(rawList) {
+    super();
+    if (Array.isArray(rawList)) {
+      Object.assign(this, JSON.parse(JSON.stringify(rawList)));
+    }
+  }
+
+  find(id) {
+    return Array.prototype.find.call(this, function (mod) {
+      return mod.id === id;
+    });
+  }
+  add(mod) {
+    if (!mod.type) {
+      throw new Error("module must have a 'type' defined");
+    }
+    if (!moduleSchemas[mod.type]) {
+      throw new Error("invalid module type '"+mod.type+"'");
+    }
+
+    mod.id = require('crypto').randomBytes(4).toString('hex');
+    this.push(mod);
+  }
+}
+class DomainList extends Array {
+  constructor(rawList) {
+    super();
+    if (Array.isArray(rawList)) {
+      Object.assign(this, JSON.parse(JSON.stringify(rawList)));
+    }
+    this.forEach(function (dom) {
+      dom.modules = new ModuleList(dom.modules);
+    });
+  }
+
+  find(id) {
+    return Array.prototype.find.call(this, function (dom) {
+      return dom.id === id;
+    });
+  }
+  add(dom) {
+    if (!Array.isArray(dom.names) || !dom.names.length) {
+      throw new Error("domains must have a non-empty array for 'names'");
+    }
+    if (dom.names.some(function (name) { return typeof name !== 'string'; })) {
+      throw new Error("all domain names must be strings");
+    }
+
+    var modList = new ModuleList();
+    if (Array.isArray(dom.modules)) {
+      dom.modules.forEach(function (mod) {
+        modList.add(mod);
+      });
+    }
+
+    dom.id = require('crypto').randomBytes(4).toString('hex');
+    dom.modules = modList;
+    this.push(dom);
+  }
+}
+
+class ConfigChanger {
+  constructor(start) {
+    Object.assign(this, JSON.parse(JSON.stringify(start)));
+    delete this.device;
+
+    this.http.modules = new ModuleList(this.http.modules);
+    this.http.domains = new DomainList(this.http.domains);
+    this.tls.modules  = new ModuleList(this.tls.modules);
+    this.tls.domains  = new DomainList(this.tls.domains);
+    this.tcp.modules  = new ModuleList(this.tcp.modules);
+    this.dns.modules  = new ModuleList(this.dns.modules);
+  }
+
+  update(update) {
+    var self = this;
+
+    if (update.http && update.http.modules) {
+      update.http.modules.forEach(self.http.modules.add.bind(self.http.modules));
+      delete update.http.modules;
+    }
+    if (update.http && update.http.domains) {
+      update.http.domains.forEach(self.http.domains.add.bind(self.http.domains));
+      delete update.http.domains;
+    }
+
+    if (update.tls && update.tls.modules) {
+      update.tls.modules.forEach(self.tls.modules.add.bind(self.tls.modules));
+      delete update.tls.modules;
+    }
+    if (update.tls && update.tls.domains) {
+      update.tls.domains.forEach(self.tls.domains.add.bind(self.tls.domains));
+      delete update.tls.domains;
+    }
+
+    if (update.tcp && update.tcp.modules) {
+      update.tcp.modules.forEach(self.tcp.modules.add.bind(self.tcp.modules));
+      delete update.tcp.modules;
+    }
+    if (update.dns && update.dns.modules) {
+      update.dns.modules.forEach(self.dns.modules.add.bind(self.dns.modules));
+      delete update.dns.modules;
+    }
+
+    function mergeSettings(orig, changes) {
+      Object.keys(changes).forEach(function (key) {
+        // TODO: use an API that can properly handle updating arrays.
+        if (!changes[key] || (typeof changes[key] !== 'object') || Array.isArray(changes[key])) {
+          orig[key] = changes[key];
+        }
+        else if (!orig[key] || typeof orig[key] !== 'object') {
+          orig[key] = changes[key];
+        }
+        else {
+          mergeSettings(orig[key], changes[key]);
+        }
+      });
+    }
+    mergeSettings(this, update);
+
+    return validate(this);
+  }
+
+  validate() {
+    return validate(this);
+  }
+}
+module.exports.ConfigChanger = ConfigChanger;
diff --git a/lib/storage.js b/lib/storage.js
index 4651f2d..33fc8f6 100644
--- a/lib/storage.js
+++ b/lib/storage.js
@@ -65,14 +65,33 @@ module.exports.create = function (deps, conf) {
     }
   };
 
+  var confCb;
   var config = {
     save: function (changes) {
       deps.messenger.send({
         type: 'com.daplie.goldilocks/config'
       , changes: changes
       });
+
+      return new deps.PromiseA(function (resolve, reject) {
+        var timeoutId = setTimeout(function () {
+          reject(new Error('Did not receive config update from main process in a reasonable time'));
+          confCb = null;
+        }, 15*1000);
+
+        confCb = function (config) {
+          confCb = null;
+          clearTimeout(timeoutId);
+          resolve(config);
+        };
+      });
     }
   };
+  function updateConf(config) {
+    if (confCb) {
+      confCb(config);
+    }
+  }
 
   var mdnsId = {
     _filename: 'mdns-id'
@@ -99,6 +118,7 @@ module.exports.create = function (deps, conf) {
   return {
     owners: owners
   , config: config
+  , updateConf: updateConf
   , mdnsId: mdnsId
   };
 };
diff --git a/lib/worker.js b/lib/worker.js
index d7ad1c1..c219b96 100644
--- a/lib/worker.js
+++ b/lib/worker.js
@@ -1,6 +1,7 @@
 'use strict';
 
 var config;
+var modules;
 
 // Everything that uses the config should be reading it when relevant rather than
 // just at the beginning, so we keep the reference for the main object and just
@@ -15,7 +16,13 @@ function update(conf) {
       config[key] = conf[key];
     }
   });
-  console.log('config', JSON.stringify(config));
+
+  console.log('config update', JSON.stringify(config));
+  Object.values(modules).forEach(function (mod) {
+    if (typeof mod.updateConf === 'function') {
+      mod.updateConf(config);
+    }
+  });
 }
 
 function create(conf) {
@@ -38,11 +45,15 @@ function create(conf) {
     // HTTP proxying connection creation is not something we currently control.
   , net: require('net')
   };
-  deps.storage = require('./storage').create(deps, conf);
-  deps.proxy = require('./proxy-conn').create(deps, conf);
-  deps.socks5 = require('./socks5-server').create(deps, conf);
-  deps.loopback = require('./loopback').create(deps, conf);
-  deps.ddns = require('./ddns').create(deps, conf);
+
+  modules = {
+    storage:  require('./storage').create(deps, conf)
+  , proxy:    require('./proxy-conn').create(deps, conf)
+  , socks5:   require('./socks5-server').create(deps, conf)
+  , loopback: require('./loopback').create(deps, conf)
+  , ddns:     require('./ddns').create(deps, conf)
+  };
+  Object.assign(deps, modules);
 
   require('./goldilocks.js').create(deps, conf);
   process.removeListener('message', create);

From 8371170a141e568d3bfdaa0c9cfb6b58206fe5d7 Mon Sep 17 00:00:00 2001
From: tigerbot <seth.gibelyou@daplie.com>
Date: Tue, 10 Oct 2017 11:32:18 -0600
Subject: [PATCH 11/22] renamed `dns` settings to `udp`

---
 bin/goldilocks.js   |  6 ++++++
 lib/admin/config.js | 14 +++++++-------
 lib/goldilocks.js   | 12 ++++++------
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/bin/goldilocks.js b/bin/goldilocks.js
index abca131..eacacd4 100755
--- a/bin/goldilocks.js
+++ b/bin/goldilocks.js
@@ -67,6 +67,12 @@ function fixRawConfig(config) {
     updateDomains(config[key].domains);
   });
 
+  if (config.dns) {
+    config.udp = config.dns;
+    delete config.dns;
+    updated = true;
+  }
+
   return updated;
 }
 async function createStorage(filename, filetype) {
diff --git a/lib/admin/config.js b/lib/admin/config.js
index 4651f09..09d7a08 100644
--- a/lib/admin/config.js
+++ b/lib/admin/config.js
@@ -132,7 +132,7 @@ var tcpSchema = {
   }
 };
 
-var dnsSchema = {
+var udpSchema = {
   type: 'object'
 , properties: {
     bind:    { type: 'array', items: portSchema }
@@ -172,12 +172,12 @@ var deviceSchema = {
 
 var mainSchema = {
   type: 'object'
-, required: [ 'http', 'tls', 'tcp', 'dns', 'mdns', 'ddns' ]
+, required: [ 'http', 'tls', 'tcp', 'udp', 'mdns', 'ddns' ]
 , properties: {
     http:   httpSchema
   , tls:    tlsSchema
   , tcp:    tcpSchema
-  , dns:    dnsSchema
+  , udp:    udpSchema
   , mdns:   mdnsSchema
   , ddns:   ddnsSchema
   , socks5: socks5Schema
@@ -264,7 +264,7 @@ class ConfigChanger {
     this.tls.modules  = new ModuleList(this.tls.modules);
     this.tls.domains  = new DomainList(this.tls.domains);
     this.tcp.modules  = new ModuleList(this.tcp.modules);
-    this.dns.modules  = new ModuleList(this.dns.modules);
+    this.udp.modules  = new ModuleList(this.udp.modules);
   }
 
   update(update) {
@@ -292,9 +292,9 @@ class ConfigChanger {
       update.tcp.modules.forEach(self.tcp.modules.add.bind(self.tcp.modules));
       delete update.tcp.modules;
     }
-    if (update.dns && update.dns.modules) {
-      update.dns.modules.forEach(self.dns.modules.add.bind(self.dns.modules));
-      delete update.dns.modules;
+    if (update.udp && update.udp.modules) {
+      update.udp.modules.forEach(self.udp.modules.add.bind(self.udp.modules));
+      delete update.udp.modules;
     }
 
     function mergeSettings(orig, changes) {
diff --git a/lib/goldilocks.js b/lib/goldilocks.js
index 3e3ee28..14c5f25 100644
--- a/lib/goldilocks.js
+++ b/lib/goldilocks.js
@@ -96,11 +96,11 @@ module.exports.create = function (deps, config) {
   }
 
   function dnsListener(msg) {
-    if (!Array.isArray(config.dns.modules)) {
+    if (!Array.isArray(config.udp.modules)) {
       return;
     }
     var socket = require('dgram').createSocket('udp4');
-    config.dns.modules.forEach(function (mod) {
+    config.udp.modules.forEach(function (mod) {
       if (mod.type !== 'proxy') {
         console.warn('found bad DNS module', mod);
         return;
@@ -240,13 +240,13 @@ module.exports.create = function (deps, config) {
     listenPromises.push(listeners.tcp.add(port, netHandler));
   });
 
-  if (config.dns.bind) {
-    if (Array.isArray(config.dns.bind)) {
-      config.dns.bind.map(function (port) {
+  if (config.udp.bind) {
+    if (Array.isArray(config.udp.bind)) {
+      config.udp.bind.map(function (port) {
         listenPromises.push(listeners.udp.add(port, dnsListener));
       });
     } else {
-      listenPromises.push(listeners.udp.add(config.dns.bind, dnsListener));
+      listenPromises.push(listeners.udp.add(config.udp.bind, dnsListener));
     }
   }
 

From ea55d3cc7309dfd8aeb66eccd1748c18fb644dce Mon Sep 17 00:00:00 2001
From: tigerbot <seth.gibelyou@daplie.com>
Date: Tue, 10 Oct 2017 12:34:32 -0600
Subject: [PATCH 12/22] removed `bind` from the `http` and `tls` settings

---
 bin/goldilocks.js   | 17 +++++++++++++++++
 lib/admin/config.js |  6 +++++-
 lib/goldilocks.js   | 23 +++--------------------
 3 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/bin/goldilocks.js b/bin/goldilocks.js
index eacacd4..dd2907a 100755
--- a/bin/goldilocks.js
+++ b/bin/goldilocks.js
@@ -67,6 +67,23 @@ function fixRawConfig(config) {
     updateDomains(config[key].domains);
   });
 
+  if (config.tcp && config.tcp && !Array.isArray(config.tcp)) {
+    config.tcp.bind = [ config.tcp.bind ];
+    updated = true;
+  }
+  if (config.http && config.http.bind) {
+    config.tcp = config.tcp || { bind: [] };
+    config.tcp.bind = (config.tcp.bind || []).concat(config.http.bind);
+    delete config.http.bind;
+    updated = true;
+  }
+  if (config.tls && config.tls.bind) {
+    config.tcp = config.tcp || { bind: [] };
+    config.tcp.bind = (config.tcp.bind || []).concat(config.tls.bind);
+    delete config.tls.bind;
+    updated = true;
+  }
+
   if (config.dns) {
     config.udp = config.dns;
     delete config.dns;
diff --git a/lib/admin/config.js b/lib/admin/config.js
index 09d7a08..e45a3c2 100644
--- a/lib/admin/config.js
+++ b/lib/admin/config.js
@@ -101,7 +101,9 @@ var httpSchema = {
     primary_domain: { type: 'string' }
   , allow_insecure: { type: 'boolean' }
   , trust_proxy:    { type: 'boolean' }
-, }
+
+  , bind: { not: {} } // this is a forbidden deprecated setting.
+  }
 };
 addDomainsSchema(httpSchema, ['proxy', 'static', 'redirect']);
 
@@ -117,6 +119,8 @@ var tlsSchema = {
       , server:           { type: 'string' }
       , challenge_type:   { type: 'string' }
       , approved_domains: { type: 'array', items: { type: 'string' }, minLength: 1}
+
+      , bind: { not: {} } // this is a forbidden deprecated setting.
       }
     }
   }
diff --git a/lib/goldilocks.js b/lib/goldilocks.js
index 14c5f25..917a5bb 100644
--- a/lib/goldilocks.js
+++ b/lib/goldilocks.js
@@ -197,21 +197,10 @@ module.exports.create = function (deps, config) {
 
   var listenPromises = [];
   var tcpPortMap = {};
-  function addPorts(bindList) {
-    if (!bindList) {
-      return;
-    }
-    if (Array.isArray(bindList)) {
-      bindList.filter(Number).forEach(function (port) {
-        tcpPortMap[port] = true;
-      });
-    }
-    else if (Number(bindList)) {
-      tcpPortMap[bindList] = true;
-    }
-  }
+  config.tcp.bind.filter(Number).forEach(function (port) {
+    tcpPortMap[port] = true;
+  });
 
-  addPorts(config.tcp.bind);
   (config.tcp.modules || []).forEach(function (mod) {
     if (mod.type === 'forward') {
       var forwarder = createTcpForwarder(mod);
@@ -229,12 +218,6 @@ module.exports.create = function (deps, config) {
     }
   });
 
-  // Even though these ports were specified in different places we treat any TCP
-  // connections we haven't been told to just forward exactly as is equal so that
-  // we can potentially use the same ports for different protocols.
-  addPorts(config.tls.bind);
-  addPorts(config.http.bind);
-
   var portList = Object.keys(tcpPortMap).map(Number).sort();
   portList.forEach(function (port) {
     listenPromises.push(listeners.tcp.add(port, netHandler));

From 61af4707eeebc33a1cb1ef869096b9dfc083af20 Mon Sep 17 00:00:00 2001
From: tigerbot <seth.gibelyou@daplie.com>
Date: Wed, 11 Oct 2017 12:11:20 -0600
Subject: [PATCH 13/22] moved domains up a level to allow multiple module
 groups with same domain names

---
 bin/goldilocks.js   | 101 ++++++++++++++++++++++++++++----------------
 lib/modules/http.js |  18 +++++---
 lib/modules/tls.js  |  20 ++++++---
 3 files changed, 89 insertions(+), 50 deletions(-)

diff --git a/bin/goldilocks.js b/bin/goldilocks.js
index dd2907a..5346ec5 100755
--- a/bin/goldilocks.js
+++ b/bin/goldilocks.js
@@ -30,43 +30,6 @@ function mergeSettings(orig, changes) {
 function fixRawConfig(config) {
   var updated = false;
 
-  function updateModules(list) {
-    if (!Array.isArray(list)) {
-      return;
-    }
-    list.forEach(function (mod) {
-      if (!mod.id) {
-        mod.id = crypto.randomBytes(4).toString('hex');
-        updated = true;
-      }
-      if (mod.name) {
-        mod.type = mod.type || mod.name;
-        delete mod.name;
-        updated = true;
-      }
-    });
-  }
-  function updateDomains(list) {
-    if (!Array.isArray(list)) {
-      return;
-    }
-    list.forEach(function (mod) {
-      if (!mod.id) {
-        mod.id = crypto.randomBytes(8).toString('hex');
-        updated = true;
-      }
-      updateModules(mod.modules);
-    });
-  }
-
-  [ 'dns', 'tcp', 'http', 'tls' ].forEach(function (key) {
-    if (!config[key]) {
-      return;
-    }
-    updateModules(config[key].modules);
-    updateDomains(config[key].domains);
-  });
-
   if (config.tcp && config.tcp && !Array.isArray(config.tcp)) {
     config.tcp.bind = [ config.tcp.bind ];
     updated = true;
@@ -90,6 +53,70 @@ function fixRawConfig(config) {
     updated = true;
   }
 
+  function updateModules(list) {
+    if (!Array.isArray(list)) {
+      return;
+    }
+    list.forEach(function (mod) {
+      if (!mod.id) {
+        mod.id = crypto.randomBytes(4).toString('hex');
+        updated = true;
+      }
+      if (mod.name) {
+        mod.type = mod.type || mod.name;
+        delete mod.name;
+        updated = true;
+      }
+    });
+  }
+  function moveDomains(name) {
+    if (!config[name].domains) {
+      return;
+    }
+    updated = true;
+    var domList = config[name].domains;
+    delete config[name].domains;
+
+    if (!Array.isArray(domList)) {
+      return;
+    }
+    if (!Array.isArray(config.domains)) {
+      config.domains = [];
+    }
+    domList.forEach(function (dom) {
+      updateModules(dom.modules);
+
+      var strDoms = dom.names.slice().sort().join(',');
+      var added = config.domain.some(function (existing) {
+        if (strDoms !== existing.names.slice().sort().join(',')) {
+          return;
+        }
+        existing.modules = existing.modules || {};
+        existing.modules[name] = (existing.modules[name] || []).concat(dom.modules);
+        return true;
+      });
+      if (added) {
+        return;
+      }
+
+      var newDom = {
+        id:    crypto.randomBytes(8).toString('hex'),
+        names: dom.names,
+        modules: {}
+      };
+      newDom.modules[name] = dom.modules;
+      config.domains.push(newDom);
+    });
+  }
+
+  [ 'udp', 'tcp', 'http', 'tls' ].forEach(function (key) {
+    if (!config[key]) {
+      return;
+    }
+    updateModules(config[key].modules);
+    moveDomains(key);
+  });
+
   return updated;
 }
 async function createStorage(filename, filetype) {
diff --git a/lib/modules/http.js b/lib/modules/http.js
index ed3c571..a548260 100644
--- a/lib/modules/http.js
+++ b/lib/modules/http.js
@@ -65,18 +65,21 @@ module.exports.create = function (deps, conf, greenlockMiddleware) {
     });
   }
 
-  function hostMatchesDomains(req, domains) {
+  function hostMatchesDomains(req, domainList) {
     var host = separatePort((req.headers || req).host).host.toLowerCase();
 
-    return domains.some(function (pattern) {
+    return domainList.some(function (pattern) {
       return domainMatches(pattern, host);
     });
   }
 
   function determinePrimaryHost() {
     var result;
-    if (Array.isArray(conf.http.domains)) {
-      conf.http.domains.some(function (dom) {
+    if (Array.isArray(conf.domains)) {
+      conf.domains.some(function (dom) {
+        if (!dom.modules || !dom.modules.http) {
+          return false;
+        }
         return dom.names.some(function (domain) {
           if (domain[0] !== '*') {
             result = domain;
@@ -415,17 +418,20 @@ module.exports.create = function (deps, conf, greenlockMiddleware) {
         if (checkAdmin(conn, opts, headers)) { return; }
 
         var prom = PromiseA.resolve(false);
-        (conf.http.domains || []).forEach(function (dom) {
+        (conf.domains || []).forEach(function (dom) {
           prom = prom.then(function (handled) {
             if (handled) {
               return handled;
             }
+            if (!dom.modules || !dom.modules.http) {
+              return false;
+            }
             if (!hostMatchesDomains(headers, dom.names)) {
               return false;
             }
 
             var subProm = PromiseA.resolve(false);
-            dom.modules.forEach(function (mod) {
+            dom.modules.http.forEach(function (mod) {
               if (moduleChecks[mod.type]) {
                 subProm = subProm.then(function (handled) {
                   if (handled) { return handled; }
diff --git a/lib/modules/tls.js b/lib/modules/tls.js
index c8191d2..0c30936 100644
--- a/lib/modules/tls.js
+++ b/lib/modules/tls.js
@@ -27,8 +27,8 @@ module.exports.create = function (deps, config, netHandler) {
     return value || '';
   }
 
-  function nameMatchesDomains(name, domains) {
-    return domains.some(function (pattern) {
+  function nameMatchesDomains(name, domainList) {
+    return domainList.some(function (pattern) {
       return domainMatches(pattern, name);
     });
   }
@@ -135,13 +135,16 @@ module.exports.create = function (deps, config, netHandler) {
       }
 
       var handled = false;
-      if (Array.isArray(config.tls.domains)) {
-        handled = config.tls.domains.some(function (dom) {
+      if (Array.isArray(config.domains)) {
+        handled = config.domains.some(function (dom) {
+          if (!dom.modules || !dom.modules.tls) {
+            return false;
+          }
           if (!nameMatchesDomains(opts.domain, dom.names)) {
             return false;
           }
 
-          return dom.modules.some(function (mod) {
+          return dom.modules.tls.some(function (mod) {
             if (mod.type !== 'acme') {
               return false;
             }
@@ -330,12 +333,15 @@ module.exports.create = function (deps, config, netHandler) {
       }
     }
 
-    var handled = (config.tls.domains || []).some(function (dom) {
+    var handled = (config.domains || []).some(function (dom) {
+      if (!dom.modules || !dom.modules.tls) {
+        return false;
+      }
       if (!nameMatchesDomains(opts.servername, dom.names)) {
         return false;
       }
 
-      return dom.modules.some(checkModule);
+      return dom.modules.tls.some(checkModule);
     });
     if (handled) {
       return;

From 79ef9694b7fbcdce0891610b8c95001b4ca53b33 Mon Sep 17 00:00:00 2001
From: tigerbot <seth.gibelyou@daplie.com>
Date: Wed, 11 Oct 2017 12:18:01 -0600
Subject: [PATCH 14/22] updated API to reflect moved domains

---
 lib/admin/apis.js   |  91 ++++++++++++++-------------
 lib/admin/config.js | 147 ++++++++++++++++++++++----------------------
 2 files changed, 123 insertions(+), 115 deletions(-)

diff --git a/lib/admin/apis.js b/lib/admin/apis.js
index 2d817f9..8eb82be 100644
--- a/lib/admin/apis.js
+++ b/lib/admin/apis.js
@@ -380,21 +380,21 @@ module.exports.create = function (deps, conf) {
 
   var config = { restful: {} };
   config.restful.readConfig = function (req, res, next) {
-    var part = conf;
+    var part = new (require('./config').ConfigChanger)(conf);
     if (req.params.group) {
       part = part[req.params.group];
     }
-    if (part && req.params.name) {
-      part = part[req.params.name];
+    if (part && req.params.domId) {
+      part = part.domains.find(req.params.domId);
     }
-    if (part && req.params.id) {
-      part = part.find(function (mod) { return mod.id === req.params.id; });
+    if (part && req.params.mod) {
+      part = part[req.params.mod];
     }
-    if (part && req.params.name2) {
-      part = part[req.params.name2];
+    if (part && req.params.modGrp) {
+      part = part[req.params.modGrp];
     }
-    if (part && req.params.id2) {
-      part = part.find(function (mod) { return mod.id === req.params.id2; });
+    if (part && req.params.modId) {
+      part = part.find(req.params.modId);
     }
 
     if (part) {
@@ -439,27 +439,35 @@ module.exports.create = function (deps, conf) {
     var err;
     deps.PromiseA.resolve().then(function () {
       var changer = new (require('./config').ConfigChanger)(conf);
-      if (!changer[group] || !changer[group].modules) {
-        err = new Error("'"+group+"' is not a valid settings group or has not modules");
-        err.statusCode = 404;
-        throw err;
-      }
-
       var modList;
-      if (req.params.id) {
-        if (changer[group].domains) {
-          modList = (changer[group].domains.find(req.params.id) || {}).modules;
+      if (req.params.domId) {
+        var dom = changer.domains.find(req.params.domId);
+        if (!dom) {
+          err = new Error("no domain with ID '"+req.params.domId+"'");
+        } else if (!dom.modules[group]) {
+          err = new Error("domains don't contain '"+group+"' modules");
+        } else {
+          modList = dom.modules[group];
         }
       } else {
-        modList = changer[group].modules;
+        if (!changer[group] || !changer[group].modules) {
+          err = new Error("'"+group+"' is not a valid settings group or doesn't support modules");
+        } else {
+          modList = changer[group].modules;
+        }
       }
-      if (!modList) {
-        err = new Error("'"+group+"' has no domains list or '"+req.params.id+"' does not exist");
+
+      if (err) {
         err.statusCode = 404;
         throw err;
       }
 
-      modList.add(req.body);
+      var update = req.body;
+      if (!Array.isArray(update)) {
+        update = [ update ];
+      }
+      update.forEach(modList.add, modList);
+
       var errors = changer.validate();
       if (errors.length) {
         throw Object.assign(new Error(), errors[0], {statusCode: 400});
@@ -467,13 +475,13 @@ module.exports.create = function (deps, conf) {
 
       return deps.storage.config.save(changer);
     }).then(function (config) {
-      var base;
-      if (!req.params.id) {
-        base = config[group];
+      var result;
+      if (!req.params.domId) {
+        result = config[group].modules;
       } else {
-        base = config[group].domains.find(function (dom) { return dom.id === req.params.id; });
+        result = config.domains.find(function (dom) { return dom.id === req.params.domId; }).modules[group];
       }
-      res.send(deps.recase.snakeCopy(base.modules));
+      res.send(deps.recase.snakeCopy(result));
     }, function (err) {
       res.statusCode = err.statusCode || 500;
       err.message = err.message || err.toString();
@@ -481,17 +489,15 @@ module.exports.create = function (deps, conf) {
     });
   };
   config.restful.createDomain = function (req, res) {
-    var group = req.params.group;
-    var err;
     deps.PromiseA.resolve().then(function () {
       var changer = new (require('./config').ConfigChanger)(conf);
-      if (!changer[group] || !changer[group].domains) {
-        err = new Error("'"+group+"' is not a valid settings group or has no domains list");
-        err.statusCode = 404;
-        throw err;
-      }
 
-      changer[group].domains.add(req.body);
+      var update = req.body;
+      if (!Array.isArray(update)) {
+        update = [ update ];
+      }
+      update.forEach(changer.domains.add, changer.domains);
+
       var errors = changer.validate();
       if (errors.length) {
         throw Object.assign(new Error(), errors[0], {statusCode: 400});
@@ -499,7 +505,7 @@ module.exports.create = function (deps, conf) {
 
       return deps.storage.config.save(changer);
     }).then(function (config) {
-      res.send(deps.recase.snakeCopy(config[group].domains));
+      res.send(deps.recase.snakeCopy(config.domains));
     }, function (err) {
       res.statusCode = err.statusCode || 500;
       err.message = err.message || err.toString();
@@ -518,14 +524,15 @@ module.exports.create = function (deps, conf) {
   app.use(   '/config', makeCorsHandler());
   app.get(   '/config',                                                 config.restful.readConfig);
   app.get(   '/config/:group',                                          config.restful.readConfig);
-  app.get(   '/config/:group/:name(modules|domains)/:id?',              config.restful.readConfig);
-  app.get(   '/config/:group/:name(domains)/:id/:name2(modules)/:id2?', config.restful.readConfig);
+  app.get(   '/config/:group/:mod(modules)/:modId?',                    config.restful.readConfig);
+  app.get(   '/config/domains/:domId/:mod(modules)?',                   config.restful.readConfig);
+  app.get(   '/config/domains/:domId/:mod(modules)/:modGrp/:modId?',    config.restful.readConfig);
 
   app.post(  '/config',                              config.restful.saveBaseConfig);
-  app.post(  '/config/:group',                       config.restful.saveBaseConfig);
-  app.post(  '/config/:group/modules',               config.restful.createModule);
-  app.post(  '/config/:group/domains',               config.restful.createDomain);
-  app.post(  '/config/:group/domains/:id/modules',   config.restful.createModule);
+  app.post(  '/config/:group(?!domains)',            config.restful.saveBaseConfig);
+  app.post(  '/config/:group(?!domains)/modules',    config.restful.createModule);
+  app.post(  '/config/domains',                      config.restful.createDomain);
+  app.post(  '/config/domains/:domId/modules/:group',config.restful.createModule);
 
   return app;
 };
diff --git a/lib/admin/config.js b/lib/admin/config.js
index e45a3c2..0cf8646 100644
--- a/lib/admin/config.js
+++ b/lib/admin/config.js
@@ -63,54 +63,64 @@ Object.keys(moduleSchemas).forEach(function (name) {
   validator.addSchema(schema, schema.id);
 });
 
-function addDomainsSchema(base, modList) {
-  var modSchemas = modList.map(function (name) {
-    return { '$ref': '/modules/'+name };
-  });
-
-  base.required = [ 'modules', 'domains' ].concat(base.required || []);
-  base.properties.modules = {
-    type: 'array'
-  , items: {
-      type: 'object'
-    , required: [ 'domains' ]
-    , properties: {
-        domains: { type: 'array', items: { type: 'string' }, minLength: 1}
-      }
-    , oneOf: modSchemas
-    }
-  };
-  base.properties.domains = {
-    type: 'array'
-  , items: {
-      type: 'object'
-    , required: [ 'id', 'names', ]
-    , properties: {
-        id:      { type: 'string' }
-      , names:   { type: 'array', items: { type: 'string' }, minLength: 1}
-      , modules: { type: 'array', items: { oneOf: modSchemas }}
-      }
-    }
-  };
+function toSchemaRef(name) {
+  return { '$ref': '/modules/'+name };
 }
+var moduleRefs = {
+  http: [ 'proxy', 'static', 'redirect' ].map(toSchemaRef)
+, tls:  [ 'proxy', 'acme' ].map(toSchemaRef)
+, tcp:  [ 'forward' ].map(toSchemaRef)
+, udp:  [ 'proxy' ].map(toSchemaRef)
+};
+
+function addDomainRequirement(itemSchema) {
+  itemSchema.required = (itemSchema.required || []).concat('domains');
+  itemSchema.properties = itemSchema.properties || {};
+  itemSchema.domains = { type: 'array', items: { type: 'string' }, minLength: 1};
+  return itemSchema;
+}
+
+var domainSchema = {
+  type: 'array'
+, items: {
+    type: 'object'
+  , properties: {
+      id:      { type: 'string' }
+    , names:   { type: 'array', items: { type: 'string' }, minLength: 1}
+    , modules: {
+        type: 'object'
+      , properties: {
+          tls:  { type: 'array', items: { oneOf: moduleRefs.tls }}
+        , http: { type: 'array', items: { oneOf: moduleRefs.http }}
+        }
+      , additionalProperties: false
+      }
+    }
+  }
+};
 
 var httpSchema = {
   type: 'object'
 , properties: {
+    modules: { type: 'array', items: addDomainRequirement({ oneOf: moduleRefs.http }) }
+
     // These properties should be snake_case to match the API and config format
-    primary_domain: { type: 'string' }
+  , primary_domain: { type: 'string' }
   , allow_insecure: { type: 'boolean' }
   , trust_proxy:    { type: 'boolean' }
 
-  , bind: { not: {} } // this is a forbidden deprecated setting.
+    // these are forbidden deprecated settings.
+  , bind:    { not: {} }
+  , domains: { not: {} }
   }
 };
-addDomainsSchema(httpSchema, ['proxy', 'static', 'redirect']);
 
 var tlsSchema = {
   type: 'object'
 , properties: {
-    acme: {
+    modules: { type: 'array', items: addDomainRequirement({ oneOf: moduleRefs.tls }) }
+
+  , acme: {
       type: 'object'
       // These properties should be snake_case to match the API and config format
     , required: [ 'email', 'approved_domains' ]
@@ -120,19 +130,20 @@ var tlsSchema = {
       , challenge_type:   { type: 'string' }
       , approved_domains: { type: 'array', items: { type: 'string' }, minLength: 1}
 
-      , bind: { not: {} } // this is a forbidden deprecated setting.
+        // these are forbidden deprecated settings.
+      , bind:    { not: {} }
+      , domains: { not: {} }
       }
     }
   }
 };
-addDomainsSchema(tlsSchema, ['proxy', 'acme']);
 
 var tcpSchema = {
   type: 'object'
 , required: [ 'bind' ]
 , properties: {
     bind:    { type: 'array', items: portSchema, minLength: 1 }
-  , modules: { type: 'array', items: { '$ref': '/modules/forward' }}
+  , modules: { type: 'array', items: { oneOf: moduleRefs.tcp }}
   }
 };
 
@@ -140,7 +151,7 @@ var udpSchema = {
   type: 'object'
 , properties: {
     bind:    { type: 'array', items: portSchema }
-  , modules: { type: 'array', items: { '$ref': '/modules/proxy' }}
+  , modules: { type: 'array', items: { oneOf: moduleRefs.udp }}
   }
 };
 
@@ -176,9 +187,10 @@ var deviceSchema = {
 
 var mainSchema = {
   type: 'object'
-, required: [ 'http', 'tls', 'tcp', 'udp', 'mdns', 'ddns' ]
+, required: [ 'domains', 'http', 'tls', 'tcp', 'udp', 'mdns', 'ddns' ]
 , properties: {
-    http:   httpSchema
+    domains:domainSchema
+  , http:   httpSchema
   , tls:    tlsSchema
   , tcp:    tcpSchema
   , udp:    udpSchema
@@ -228,7 +240,10 @@ class DomainList extends Array {
       Object.assign(this, JSON.parse(JSON.stringify(rawList)));
     }
     this.forEach(function (dom) {
-      dom.modules = new ModuleList(dom.modules);
+      dom.modules = {
+        http: new ModuleList((dom.modules || {}).http),
+        tls:  new ModuleList((dom.modules || {}).tls),
+      };
     });
   }
 
@@ -245,15 +260,19 @@ class DomainList extends Array {
       throw new Error("all domain names must be strings");
     }
 
-    var modList = new ModuleList();
-    if (Array.isArray(dom.modules)) {
-      dom.modules.forEach(function (mod) {
-        modList.add(mod);
-      });
+    var modLists = {
+      http: new ModuleList(),
+      tls:  new ModuleList()
+    };
+    if (dom.modules && Array.isArray(dom.modules.http)) {
+      dom.modules.http.forEach(modLists.http.add, modLists.http);
+    }
+    if (dom.modules && Array.isArray(dom.modules.tls)) {
+      dom.modules.tls.forEach(modLists.tls.add, modLists.tls);
     }
 
     dom.id = require('crypto').randomBytes(4).toString('hex');
-    dom.modules = modList;
+    dom.modules = modLists;
     this.push(dom);
   }
 }
@@ -263,10 +282,9 @@ class ConfigChanger {
     Object.assign(this, JSON.parse(JSON.stringify(start)));
     delete this.device;
 
+    this.domains = new DomainList(this.domains);
     this.http.modules = new ModuleList(this.http.modules);
-    this.http.domains = new DomainList(this.http.domains);
     this.tls.modules  = new ModuleList(this.tls.modules);
-    this.tls.domains  = new DomainList(this.tls.domains);
     this.tcp.modules  = new ModuleList(this.tcp.modules);
     this.udp.modules  = new ModuleList(this.udp.modules);
   }
@@ -274,32 +292,15 @@ class ConfigChanger {
   update(update) {
     var self = this;
 
-    if (update.http && update.http.modules) {
-      update.http.modules.forEach(self.http.modules.add.bind(self.http.modules));
-      delete update.http.modules;
-    }
-    if (update.http && update.http.domains) {
-      update.http.domains.forEach(self.http.domains.add.bind(self.http.domains));
-      delete update.http.domains;
-    }
-
-    if (update.tls && update.tls.modules) {
-      update.tls.modules.forEach(self.tls.modules.add.bind(self.tls.modules));
-      delete update.tls.modules;
-    }
-    if (update.tls && update.tls.domains) {
-      update.tls.domains.forEach(self.tls.domains.add.bind(self.tls.domains));
-      delete update.tls.domains;
-    }
-
-    if (update.tcp && update.tcp.modules) {
-      update.tcp.modules.forEach(self.tcp.modules.add.bind(self.tcp.modules));
-      delete update.tcp.modules;
-    }
-    if (update.udp && update.udp.modules) {
-      update.udp.modules.forEach(self.udp.modules.add.bind(self.udp.modules));
-      delete update.udp.modules;
+    if (update.domains) {
+      update.domains.forEach(self.domains.add, self.domains);
     }
+    [ 'http', 'tls', 'tcp', 'udp' ].forEach(function (name) {
+      if (update[name] && update[name].modules) {
+        update[name].modules.forEach(self[name].modules.add, self[name].modules);
+        delete update[name].modules;
+      }
+    });
 
     function mergeSettings(orig, changes) {
       Object.keys(changes).forEach(function (key) {

From 2a57a1e12cc549685c6e753f929c0c5a0ba3ef60 Mon Sep 17 00:00:00 2001
From: tigerbot <seth.gibelyou@daplie.com>
Date: Wed, 11 Oct 2017 13:06:24 -0600
Subject: [PATCH 15/22] fixed a few misc errors that appeared in testing

---
 bin/goldilocks.js | 34 +++++++++++++++-------------------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/bin/goldilocks.js b/bin/goldilocks.js
index 5346ec5..c03e12b 100755
--- a/bin/goldilocks.js
+++ b/bin/goldilocks.js
@@ -30,7 +30,7 @@ function mergeSettings(orig, changes) {
 function fixRawConfig(config) {
   var updated = false;
 
-  if (config.tcp && config.tcp && !Array.isArray(config.tcp)) {
+  if (config.tcp && config.tcp.bind && !Array.isArray(config.tcp.bind)) {
     config.tcp.bind = [ config.tcp.bind ];
     updated = true;
   }
@@ -87,7 +87,7 @@ function fixRawConfig(config) {
       updateModules(dom.modules);
 
       var strDoms = dom.names.slice().sort().join(',');
-      var added = config.domain.some(function (existing) {
+      var added = config.domains.some(function (existing) {
         if (strDoms !== existing.names.slice().sort().join(',')) {
           return;
         }
@@ -100,7 +100,7 @@ function fixRawConfig(config) {
       }
 
       var newDom = {
-        id:    crypto.randomBytes(8).toString('hex'),
+        id:    crypto.randomBytes(4).toString('hex'),
         names: dom.names,
         modules: {}
       };
@@ -260,7 +260,11 @@ function fillConfig(config, args) {
   var mdnsDefaults = { disabled: false, port: 5353, broadcast: '224.0.0.251', ttl: 300 };
   config.mdns = Object.assign(mdnsDefaults, config.mdns);
 
-  function fillComponent(name, fillBind, fillDomains) {
+  if (!Array.isArray(config.domains)) {
+    config.domains = [];
+  }
+
+  function fillComponent(name, fillBind) {
     if (!config[name]) {
       config[name] = {};
     }
@@ -271,22 +275,11 @@ function fillConfig(config, args) {
     if (fillBind && !Array.isArray(config[name].bind)) {
       config[name].bind = [];
     }
-
-    if (fillDomains) {
-      if (!Array.isArray(config[name].domains)) {
-        config[name].domains = [];
-      }
-      config[name].domains.forEach(function (domain) {
-        if (!Array.isArray(domain.modules)) {
-          domain.modules = [];
-        }
-      });
-    }
   }
-  fillComponent('dns',   true,  false);
-  fillComponent('tcp',   true,  false);
-  fillComponent('http',  false, true);
-  fillComponent('tls',   false, true);
+  fillComponent('udp',   true);
+  fillComponent('tcp',   true);
+  fillComponent('http',  false);
+  fillComponent('tls',   false);
 
   if (!config.tls.acme && (args.email || args.agreeTos)) {
     config.tls.acme = {};
@@ -384,6 +377,9 @@ function run(args) {
       // TODO spin up multiple workers
       // TODO use greenlock-cluster
       cluster.fork();
+    }).catch(function (err) {
+      console.error(err);
+      process.exit(1);
     })
     ;
 }

From 503da9efd0ab8278934113b973897a2ef71320e0 Mon Sep 17 00:00:00 2001
From: tigerbot <seth.gibelyou@daplie.com>
Date: Wed, 11 Oct 2017 17:13:33 -0600
Subject: [PATCH 16/22] implemented routes to edit and delete modules and
 domains

---
 lib/admin/apis.js   | 194 +++++++++++++++++++++++++++++++-------------
 lib/admin/config.js |  57 +++++++++----
 2 files changed, 178 insertions(+), 73 deletions(-)

diff --git a/lib/admin/apis.js b/lib/admin/apis.js
index 8eb82be..816c4ac 100644
--- a/lib/admin/apis.js
+++ b/lib/admin/apis.js
@@ -385,7 +385,7 @@ module.exports.create = function (deps, conf) {
       part = part[req.params.group];
     }
     if (part && req.params.domId) {
-      part = part.domains.find(req.params.domId);
+      part = part.domains.findId(req.params.domId);
     }
     if (part && req.params.mod) {
       part = part[req.params.mod];
@@ -394,7 +394,7 @@ module.exports.create = function (deps, conf) {
       part = part[req.params.modGrp];
     }
     if (part && req.params.modId) {
-      part = part.find(req.params.modId);
+      part = part.findId(req.params.modId);
     }
 
     if (part) {
@@ -404,8 +404,20 @@ module.exports.create = function (deps, conf) {
     }
   };
 
-  config.restful.saveBaseConfig = function (req, res) {
+  config.save = function (changer) {
+    var errors = changer.validate();
+    if (errors.length) {
+      throw Object.assign(new Error(), errors[0], {statusCode: 400});
+    }
+
+    return deps.storage.config.save(changer);
+  };
+  config.restful.saveBaseConfig = function (req, res, next) {
     console.log('config POST body', JSON.stringify(req.body));
+    if (req.params.group === 'domains') {
+      next();
+      return;
+    }
 
     deps.PromiseA.resolve().then(function () {
       var update;
@@ -417,12 +429,8 @@ module.exports.create = function (deps, conf) {
       }
 
       var changer = new (require('./config').ConfigChanger)(conf);
-      var errors = changer.update(update);
-      if (errors.length) {
-        throw Object.assign(new Error(), errors[0], {statusCode: 400});
-      }
-
-      return deps.storage.config.save(changer);
+      changer.update(update);
+      return config.save(changer);
     }).then(function (config) {
       if (req.params.group) {
         config = config[req.params.group];
@@ -434,33 +442,41 @@ module.exports.create = function (deps, conf) {
       res.end(JSON.stringify({error: {message: err.message, code: err.code}}));
     });
   };
-  config.restful.createModule = function (req, res) {
-    var group = req.params.group;
+
+  config.extractModList = function (changer, params) {
     var err;
+    if (params.domId) {
+      var dom = changer.domains.find(function (dom) {
+        return dom.id === params.domId;
+      });
+
+      if (!dom) {
+        err = new Error("no domain with ID '"+params.domId+"'");
+      } else if (!dom.modules[params.group]) {
+        err = new Error("domains don't contain '"+params.group+"' modules");
+      } else {
+        return dom.modules[params.group];
+      }
+    } else {
+      if (!changer[params.group] || !changer[params.group].modules) {
+        err = new Error("'"+params.group+"' is not a valid settings group or doesn't support modules");
+      } else {
+        return changer[params.group].modules;
+      }
+    }
+
+    err.statusCode = 404;
+    throw err;
+  };
+  config.restful.createModule = function (req, res, next) {
+    if (req.params.group === 'domains') {
+      next();
+      return;
+    }
+
     deps.PromiseA.resolve().then(function () {
       var changer = new (require('./config').ConfigChanger)(conf);
-      var modList;
-      if (req.params.domId) {
-        var dom = changer.domains.find(req.params.domId);
-        if (!dom) {
-          err = new Error("no domain with ID '"+req.params.domId+"'");
-        } else if (!dom.modules[group]) {
-          err = new Error("domains don't contain '"+group+"' modules");
-        } else {
-          modList = dom.modules[group];
-        }
-      } else {
-        if (!changer[group] || !changer[group].modules) {
-          err = new Error("'"+group+"' is not a valid settings group or doesn't support modules");
-        } else {
-          modList = changer[group].modules;
-        }
-      }
-
-      if (err) {
-        err.statusCode = 404;
-        throw err;
-      }
+      var modList = config.extractModList(changer, req.params);
 
       var update = req.body;
       if (!Array.isArray(update)) {
@@ -468,26 +484,54 @@ module.exports.create = function (deps, conf) {
       }
       update.forEach(modList.add, modList);
 
-      var errors = changer.validate();
-      if (errors.length) {
-        throw Object.assign(new Error(), errors[0], {statusCode: 400});
-      }
-
-      return deps.storage.config.save(changer);
-    }).then(function (config) {
-      var result;
-      if (!req.params.domId) {
-        result = config[group].modules;
-      } else {
-        result = config.domains.find(function (dom) { return dom.id === req.params.domId; }).modules[group];
-      }
-      res.send(deps.recase.snakeCopy(result));
+      return config.save(changer);
+    }).then(function (newConf) {
+      res.send(deps.recase.snakeCopy(config.extractModList(newConf, req.params)));
     }, function (err) {
       res.statusCode = err.statusCode || 500;
       err.message = err.message || err.toString();
       res.end(JSON.stringify({error: {message: err.message, code: err.code}}));
     });
   };
+  config.restful.updateModule = function (req, res, next) {
+    if (req.params.group === 'domains') {
+      next();
+      return;
+    }
+
+    deps.PromiseA.resolve().then(function () {
+      var changer = new (require('./config').ConfigChanger)(conf);
+      var modList = config.extractModList(changer, req.params);
+      modList.update(req.params.modId, req.body);
+      return config.save(changer);
+    }).then(function (newConf) {
+      res.send(deps.recase.snakeCopy(config.extractModList(newConf, req.params)));
+    }, function (err) {
+      res.statusCode = err.statusCode || 500;
+      err.message = err.message || err.toString();
+      res.end(JSON.stringify({error: {message: err.message, code: err.code}}));
+    });
+  };
+  config.restful.removeModule = function (req, res, next) {
+    if (req.params.group === 'domains') {
+      next();
+      return;
+    }
+
+    deps.PromiseA.resolve().then(function () {
+      var changer = new (require('./config').ConfigChanger)(conf);
+      var modList = config.extractModList(changer, req.params);
+      modList.remove(req.params.modId);
+      return config.save(changer);
+    }).then(function (newConf) {
+      res.send(deps.recase.snakeCopy(config.extractModList(newConf, req.params)));
+    }, function (err) {
+      res.statusCode = err.statusCode || 500;
+      err.message = err.message || err.toString();
+      res.end(JSON.stringify({error: {message: err.message, code: err.code}}));
+    });
+  };
+
   config.restful.createDomain = function (req, res) {
     deps.PromiseA.resolve().then(function () {
       var changer = new (require('./config').ConfigChanger)(conf);
@@ -497,13 +541,37 @@ module.exports.create = function (deps, conf) {
         update = [ update ];
       }
       update.forEach(changer.domains.add, changer.domains);
-
-      var errors = changer.validate();
-      if (errors.length) {
-        throw Object.assign(new Error(), errors[0], {statusCode: 400});
+      return config.save(changer);
+    }).then(function (config) {
+      res.send(deps.recase.snakeCopy(config.domains));
+    }, function (err) {
+      res.statusCode = err.statusCode || 500;
+      err.message = err.message || err.toString();
+      res.end(JSON.stringify({error: {message: err.message, code: err.code}}));
+    });
+  };
+  config.restful.updateDomain = function (req, res) {
+    deps.PromiseA.resolve().then(function () {
+      if (req.body.modules) {
+        throw Object.assign(new Error('do not add modules with this route'), {statusCode: 400});
       }
 
-      return deps.storage.config.save(changer);
+      var changer = new (require('./config').ConfigChanger)(conf);
+      changer.domains.update(req.params.domId, req.body);
+      return config.save(changer);
+    }).then(function (config) {
+      res.send(deps.recase.snakeCopy(config.domains));
+    }, function (err) {
+      res.statusCode = err.statusCode || 500;
+      err.message = err.message || err.toString();
+      res.end(JSON.stringify({error: {message: err.message, code: err.code}}));
+    });
+  };
+  config.restful.removeDomain = function (req, res) {
+    deps.PromiseA.resolve().then(function () {
+      var changer = new (require('./config').ConfigChanger)(conf);
+      changer.domains.remove(req.params.domId);
+      return config.save(changer);
     }).then(function (config) {
       res.send(deps.recase.snakeCopy(config.domains));
     }, function (err) {
@@ -521,18 +589,28 @@ module.exports.create = function (deps, conf) {
 
   app.use('/', isAuthorized, jsonParser);
 
-  app.use(   '/config', makeCorsHandler());
+  // Not all config routes support PUT or DELETE, but not worth making this more specific
+  app.use(   '/config', makeCorsHandler(['GET', 'POST', 'PUT', 'DELETE']));
   app.get(   '/config',                                                 config.restful.readConfig);
   app.get(   '/config/:group',                                          config.restful.readConfig);
   app.get(   '/config/:group/:mod(modules)/:modId?',                    config.restful.readConfig);
   app.get(   '/config/domains/:domId/:mod(modules)?',                   config.restful.readConfig);
   app.get(   '/config/domains/:domId/:mod(modules)/:modGrp/:modId?',    config.restful.readConfig);
 
-  app.post(  '/config',                              config.restful.saveBaseConfig);
-  app.post(  '/config/:group(?!domains)',            config.restful.saveBaseConfig);
-  app.post(  '/config/:group(?!domains)/modules',    config.restful.createModule);
-  app.post(  '/config/domains',                      config.restful.createDomain);
-  app.post(  '/config/domains/:domId/modules/:group',config.restful.createModule);
+  app.post(  '/config',                                       config.restful.saveBaseConfig);
+  app.post(  '/config/:group',                                config.restful.saveBaseConfig);
+
+  app.post(  '/config/:group/modules',                        config.restful.createModule);
+  app.put(   '/config/:group/modules/:modId',                 config.restful.updateModule);
+  app.delete('/config/:group/modules/:modId',                 config.restful.removeModule);
+
+  app.post(  '/config/domains/:domId/modules/:group',         config.restful.createModule);
+  app.put(   '/config/domains/:domId/modules/:group/:modId',  config.restful.updateModule);
+  app.delete('/config/domains/:domId/modules/:group/:modId',  config.restful.removeModule);
+
+  app.post(  '/config/domains',                               config.restful.createDomain);
+  app.put(   '/config/domains/:domId',                        config.restful.updateDomain);
+  app.delete('/config/domains/:domId',                        config.restful.removeDomain);
 
   return app;
 };
diff --git a/lib/admin/config.js b/lib/admin/config.js
index 0cf8646..26dcbb7 100644
--- a/lib/admin/config.js
+++ b/lib/admin/config.js
@@ -207,20 +207,54 @@ function validate(config) {
 }
 module.exports.validate = validate;
 
-
-class ModuleList extends Array {
+class IdList extends Array {
   constructor(rawList) {
     super();
     if (Array.isArray(rawList)) {
       Object.assign(this, JSON.parse(JSON.stringify(rawList)));
     }
+    this._itemName = 'item';
   }
 
-  find(id) {
-    return Array.prototype.find.call(this, function (mod) {
-      return mod.id === id;
+  findId(id) {
+    return Array.prototype.find.call(this, function (dom) {
+      return dom.id === id;
     });
   }
+
+  add(item) {
+    item.id = require('crypto').randomBytes(4).toString('hex');
+    this.push(item);
+  }
+
+  update(id, update) {
+    var item = this.findId(id);
+    if (!item) {
+      var error = new Error("no "+this._itemName+" with ID '"+id+"'");
+      error.statusCode = 404;
+      throw error;
+    }
+    Object.assign(this.findId(id), update);
+  }
+
+  remove(id) {
+    var index = this.findIndex(function (dom) {
+      return dom.id === id;
+    });
+    if (index < 0) {
+      var error = new Error("no "+this._itemName+" with ID '"+id+"'");
+      error.statusCode = 404;
+      throw error;
+    }
+    this.splice(index, 1);
+  }
+}
+class ModuleList extends IdList {
+  constructor(rawList) {
+    super(rawList);
+    this._itemName = 'module';
+  }
+
   add(mod) {
     if (!mod.type) {
       throw new Error("module must have a 'type' defined");
@@ -233,12 +267,10 @@ class ModuleList extends Array {
     this.push(mod);
   }
 }
-class DomainList extends Array {
+class DomainList extends IdList {
   constructor(rawList) {
-    super();
-    if (Array.isArray(rawList)) {
-      Object.assign(this, JSON.parse(JSON.stringify(rawList)));
-    }
+    super(rawList);
+    this._itemName = 'domain';
     this.forEach(function (dom) {
       dom.modules = {
         http: new ModuleList((dom.modules || {}).http),
@@ -247,11 +279,6 @@ class DomainList extends Array {
     });
   }
 
-  find(id) {
-    return Array.prototype.find.call(this, function (dom) {
-      return dom.id === id;
-    });
-  }
   add(dom) {
     if (!Array.isArray(dom.names) || !dom.names.length) {
       throw new Error("domains must have a non-empty array for 'names'");

From 0406d0cd93b3da151d77d4f6e5d41623b65b517b Mon Sep 17 00:00:00 2001
From: tigerbot <seth.gibelyou@daplie.com>
Date: Thu, 12 Oct 2017 11:57:43 -0600
Subject: [PATCH 17/22] removed the `acme` property from the `tls` config

---
 bin/goldilocks.js   | 43 ++++++++++++++++++++++++++++++++++++++++---
 lib/admin/config.js | 33 +++++++++++----------------------
 lib/modules/tls.js  | 20 --------------------
 3 files changed, 51 insertions(+), 45 deletions(-)

diff --git a/bin/goldilocks.js b/bin/goldilocks.js
index c03e12b..21717de 100755
--- a/bin/goldilocks.js
+++ b/bin/goldilocks.js
@@ -30,6 +30,8 @@ function mergeSettings(orig, changes) {
 function fixRawConfig(config) {
   var updated = false;
 
+  // First converge all of the `bind` properties for protocols that are on top
+  // of TCP to `tcp.bind`.
   if (config.tcp && config.tcp.bind && !Array.isArray(config.tcp.bind)) {
     config.tcp.bind = [ config.tcp.bind ];
     updated = true;
@@ -47,12 +49,47 @@ function fixRawConfig(config) {
     updated = true;
   }
 
+  // Then we rename dns to udp since the only thing we currently do with those
+  // modules is proxy the packets without inspecting them at all.
   if (config.dns) {
     config.udp = config.dns;
     delete config.dns;
     updated = true;
   }
 
+  // This we take the old way of defining ACME options and put them into a tls module.
+  if (config.tls) {
+    var oldPropMap = {
+      email:              'email'
+    , acme_directory_url: 'server'
+    , challenge_type:     'challenge_type'
+    , servernames:        'approved_domains'
+    };
+    if (Object.keys(oldPropMap).some(config.tls.hasOwnProperty, config.tls)) {
+      updated = true;
+      if (config.tls.acme) {
+        console.warn('TLS config has `acme` field and old style definitions');
+      } else {
+        config.tls.acme = {};
+        Object.keys(oldPropMap).forEach(function (oldKey) {
+          if (config.tls[oldKey]) {
+            config.tls.acme[oldPropMap[oldKey]] = config.tls[oldKey];
+          }
+        });
+      }
+    }
+    if (config.tls.acme) {
+      updated = true;
+      config.tls.acme.domains = config.tls.acme.approved_domains;
+      delete config.tls.acme.approved_domains;
+      config.tls.modules = config.tls.modules || [];
+      config.tls.modules.push(Object.assign({}, config.tls.acme, {type: 'acme'}));
+      delete config.tls.acme;
+    }
+  }
+
+  // Then we make sure all modules have an ID and type, and makes sure all domains
+  // are in the right spot and also have an ID.
   function updateModules(list) {
     if (!Array.isArray(list)) {
       return;
@@ -100,9 +137,9 @@ function fixRawConfig(config) {
       }
 
       var newDom = {
-        id:    crypto.randomBytes(4).toString('hex'),
-        names: dom.names,
-        modules: {}
+        id:    crypto.randomBytes(4).toString('hex')
+      , names: dom.names
+      , modules: {}
       };
       newDom.modules[name] = dom.modules;
       config.domains.push(newDom);
diff --git a/lib/admin/config.js b/lib/admin/config.js
index 26dcbb7..9cdb3a9 100644
--- a/lib/admin/config.js
+++ b/lib/admin/config.js
@@ -43,9 +43,9 @@ var moduleSchemas = {
     type: 'object'
   , required: [ 'email' ]
   , properties: {
-      email:         { type: 'string' }
-    , server:        { type: 'string' }
-    , challengeType: { type: 'string' }
+      email:          { type: 'string' }
+    , server:         { type: 'string' }
+    , challenge_type: { type: 'string' }
     }
   }
 };
@@ -120,21 +120,10 @@ var tlsSchema = {
 , properties: {
     modules: { type: 'array', items: addDomainRequirement({ oneOf: moduleRefs.tls }) }
 
-  , acme: {
-      type: 'object'
-      // These properties should be snake_case to match the API and config format
-    , required: [ 'email', 'approved_domains' ]
-    , properties: {
-        email:            { type: 'string' }
-      , server:           { type: 'string' }
-      , challenge_type:   { type: 'string' }
-      , approved_domains: { type: 'array', items: { type: 'string' }, minLength: 1}
-
-        // these are forbidden deprecated settings.
-      , bind:    { not: {} }
-      , domains: { not: {} }
-      }
-    }
+    // these are forbidden deprecated settings.
+  , acme:    { not: {} }
+  , bind:    { not: {} }
+  , domains: { not: {} }
   }
 };
 
@@ -273,8 +262,8 @@ class DomainList extends IdList {
     this._itemName = 'domain';
     this.forEach(function (dom) {
       dom.modules = {
-        http: new ModuleList((dom.modules || {}).http),
-        tls:  new ModuleList((dom.modules || {}).tls),
+        http: new ModuleList((dom.modules || {}).http)
+      , tls:  new ModuleList((dom.modules || {}).tls)
       };
     });
   }
@@ -288,8 +277,8 @@ class DomainList extends IdList {
     }
 
     var modLists = {
-      http: new ModuleList(),
-      tls:  new ModuleList()
+      http: new ModuleList()
+    , tls:  new ModuleList()
     };
     if (dom.modules && Array.isArray(dom.modules.http)) {
       dom.modules.http.forEach(modLists.http.add, modLists.http);
diff --git a/lib/modules/tls.js b/lib/modules/tls.js
index 0c30936..2b9a614 100644
--- a/lib/modules/tls.js
+++ b/lib/modules/tls.js
@@ -174,26 +174,6 @@ module.exports.create = function (deps, config, netHandler) {
         return;
       }
 
-      var defAcmeConf;
-      if (config.tls.acme) {
-        defAcmeConf = config.tls.acme;
-      } else {
-        defAcmeConf = {
-          email: config.tls.email
-        , server: config.tls.acmeDirectoryUrl || le.server
-        , challengeType: config.tls.challengeType || le.challengeType
-        , approvedDomains: config.tls.servernames
-        };
-      }
-
-      // Check config for domain name
-      // TODO: if `approvedDomains` isn't defined check all other modules to see if they can
-      // handle this domain (and what other domains it's grouped with).
-      if (-1 !== (defAcmeConf.approvedDomains || []).indexOf(opts.domain)) {
-        complete(defAcmeConf, defAcmeConf.approvedDomains);
-        return;
-      }
-
       cb(new Error('domain is not allowed'));
     }
   });

From 663fdba446a1cfa02a29cd98a2bffe22912e7fdd Mon Sep 17 00:00:00 2001
From: tigerbot <seth.gibelyou@daplie.com>
Date: Thu, 12 Oct 2017 14:35:19 -0600
Subject: [PATCH 18/22] changed the valid UDP module from 'proxy' to 'forward'

	forward is based on incoming port, while proxy is based on domains
	and we don't have any domain names for raw UDP or TCP
---
 bin/goldilocks.js   | 21 +++++++++++++++++++++
 lib/admin/config.js |  5 +++--
 lib/goldilocks.js   | 18 +++++++++---------
 3 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/bin/goldilocks.js b/bin/goldilocks.js
index 21717de..06a340b 100755
--- a/bin/goldilocks.js
+++ b/bin/goldilocks.js
@@ -56,6 +56,27 @@ function fixRawConfig(config) {
     delete config.dns;
     updated = true;
   }
+  // Convert all 'proxy' UDP modules to 'forward' modules that specify which
+  // incoming ports are relevant. Primarily to make 'proxy' modules consistent
+  // in needing relevant domain names.
+  if (config.udp && !Array.isArray(config.udp.bind)) {
+    config.udp.bind = [].concat(config.udp.bind || []);
+    updated = true;
+  }
+  if (config.udp && config.udp.modules) {
+    if (!config.udp.bind.length || !Array.isArray(config.udp.modules)) {
+      delete config.udp.modules;
+      updated = true;
+    } else {
+      config.udp.modules.forEach(function (mod) {
+        if (mod.type === 'proxy') {
+          mod.type = 'forward';
+          mod.ports = config.udp.bind.slice();
+          updated = true;
+        }
+      });
+    }
+  }
 
   // This we take the old way of defining ACME options and put them into a tls module.
   if (config.tls) {
diff --git a/lib/admin/config.js b/lib/admin/config.js
index 9cdb3a9..1ac3dd1 100644
--- a/lib/admin/config.js
+++ b/lib/admin/config.js
@@ -49,7 +49,8 @@ var moduleSchemas = {
     }
   }
 };
-// forward is basically the name for the TCP proxy
+// forward is basically the same as proxy, but specifies the relevant incoming port(s).
+// only allows for the raw transport layers (TCP/UDP)
 moduleSchemas.forward = JSON.parse(JSON.stringify(moduleSchemas.proxy));
 moduleSchemas.forward.required = [ 'ports' ];
 moduleSchemas.forward.properties.ports = { type: 'array', items: portSchema };
@@ -70,7 +71,7 @@ var moduleRefs = {
   http: [ 'proxy', 'static', 'redirect' ].map(toSchemaRef)
 , tls:  [ 'proxy', 'acme' ].map(toSchemaRef)
 , tcp:  [ 'forward' ].map(toSchemaRef)
-, udp:  [ 'proxy' ].map(toSchemaRef)
+, udp:  [ 'forward' ].map(toSchemaRef)
 };
 
 function addDomainRequirement(itemSchema) {
diff --git a/lib/goldilocks.js b/lib/goldilocks.js
index 917a5bb..8ad86b3 100644
--- a/lib/goldilocks.js
+++ b/lib/goldilocks.js
@@ -95,16 +95,20 @@ module.exports.create = function (deps, config) {
     });
   }
 
-  function dnsListener(msg) {
+  function dnsListener(port, msg) {
     if (!Array.isArray(config.udp.modules)) {
       return;
     }
     var socket = require('dgram').createSocket('udp4');
     config.udp.modules.forEach(function (mod) {
-      if (mod.type !== 'proxy') {
+      if (mod.type !== 'forward') {
         console.warn('found bad DNS module', mod);
         return;
       }
+      if (mod.ports.indexOf(port) < 0) {
+        return;
+      }
+
       var dest = require('./domain-utils').separatePort(mod.address || '');
       dest.port = dest.port || mod.port;
       dest.host = dest.host || mod.host || 'localhost';
@@ -224,13 +228,9 @@ module.exports.create = function (deps, config) {
   });
 
   if (config.udp.bind) {
-    if (Array.isArray(config.udp.bind)) {
-      config.udp.bind.map(function (port) {
-        listenPromises.push(listeners.udp.add(port, dnsListener));
-      });
-    } else {
-      listenPromises.push(listeners.udp.add(config.udp.bind, dnsListener));
-    }
+    config.udp.bind.forEach(function (port) {
+      listenPromises.push(listeners.udp.add(port, dnsListener.bind(port)));
+    });
   }
 
   if (!config.mdns.disabled) {

From 5e9e2662e0033fb34976440884f20271f88c02e1 Mon Sep 17 00:00:00 2001
From: tigerbot <seth.gibelyou@daplie.com>
Date: Thu, 12 Oct 2017 18:57:17 -0600
Subject: [PATCH 19/22] updated the config documentation in the README

---
 README.md | 327 +++++++++++++++++++++++++++++++-----------------------
 1 file changed, 189 insertions(+), 138 deletions(-)

diff --git a/README.md b/README.md
index dae6727..fb73509 100644
--- a/README.md
+++ b/README.md
@@ -53,50 +53,90 @@ curl https://git.daplie.com/Daplie/goldilocks.js/raw/master/install.sh | bash
 Modules & Configuration
 -----
 
-Goldilocks has several core systems, which all have their own configuration and some of which have modules:
+Goldilocks has several core systems, which all have their own configuration and
+some of which have modules:
 
-```
-* http
-  - static
-  - redirect
-  - proxy (reverse proxy)
-* tls
-  - acme
-  - proxy (reverse proxy)
-* tcp
-  - forward
-* tunnel_server
-* tunnel_client
-* mdns
+* [http](#http)
+  - [proxy (reverse proxy)](#httpproxy-how-to-reverse-proxy-ruby-python-etc)
+  - [static](#httpstatic-how-to-serve-a-web-page)
+  - [redirect](#httpredirect-how-to-redirect-urls)
+* [tls](#tls)
+  - [proxy (reverse proxy)](#tlsproxy)
+  - [acme](#tlsacme)
+* [tcp](#tcp)
+  - [forward](#tcpforward)
+* [udp](#udp)
+  - [forward](#udpforward)
+* [domains](#domains)
+* [tunnel_server](#tunnel_server)
+* [tunnel_client](#tunnel)
+* [mdns](#mdns)
 * api
-```
+
+All modules require a `type` and an `id`, and any modules not defined inside the
+`domains` system also require a `domains` field (with the exception of the `forward`
+modules that require the `ports` field).
 
 ### http
 
 The HTTP system handles plain http (TLS / SSL is handled by the tls system)
 
+Example config:
 ```yml
 http:
   trust_proxy: true                 # allow localhost, 192.x, 10.x, 172.x, etc to set headers
   allow_insecure: false             # allow non-https even without proxy https headers
   primary_domain: example.com       # attempts to access via IP address will redirect here
 
-  # modules can be nested in domains
-  domains:
-    - names:
-        - example.com
-      modules:
-        - name: static
-          root: /srv/www/:hostname
-
-  # The configuration above could also be represented as follows:
+  # An array of modules that define how to handle incoming HTTP requests
   modules:
-    - name: static
+    - type: static
       domains:
         - example.com
       root: /srv/www/:hostname
 ```
 
+### http.proxy - how to reverse proxy (ruby, python, etc)
+
+The proxy module is for reverse proxying, typically to an application on the same machine.
+(Though it can also reverse proxy to other devices on the local network.)
+
+It has the following options:
+```
+address     The DNS-resolvable hostname (or IP address) and port connected by `:` to proxy the request to.
+            Takes priority over host and port if they are also specified.
+            ex: locahost:3000
+            ex: 192.168.1.100:80
+
+host        The DNS-resolvable hostname (or IP address) of the system to which the request will be proxied.
+            Defaults to localhost if only the port is specified.
+            ex: localhost
+            ex: 192.168.1.100
+
+port        The port on said system to which the request will be proxied
+            ex: 3000
+            ex: 80
+```
+
+Example config:
+```yml
+http:
+  modules:
+    - type: proxy
+      domains:
+        - api.example.com
+      host: 192.168.1.100
+      port: 80
+    - type: proxy
+      domains:
+        - www.example.com
+      address: 192.168.1.16:80
+    - type: proxy
+      domains:
+        - '*'
+      port: 3000
+```
+
 ### http.static - how to serve a web page
 
 The static module is for serving static web pages and assets and has the following options:
@@ -109,50 +149,20 @@ root        The path to serve as a string.
 ```
 
 Example config:
-
 ```yml
 http:
   modules:
-    - name: static
+    - type: static
       domains:
         - example.com
       root: /srv/www/:hostname
 ```
 
-### http.proxy - how to reverse proxy (ruby, python, etc)
-
-The proxy module is for reverse proxying, typically to an application on the same machine.
-
-It has the following options:
-
-```
-host        The DNS-resolvable hostname (or IP address) of the system to which the request will be proxied
-            ex: localhost
-            ex: 192.168.1.100
-
-port        The port on said system to which the request will be proxied
-            ex: 3000
-            ex: 80
-```
-
-Example config:
-
-```yml
-http:
-  modules:
-    - name: proxy
-      domains:
-        - example.com
-      host: localhost
-      port: 3000
-```
-
 ### http.redirect - how to redirect URLs
 
 The redirect module is for, you guessed it, redirecting URLs.
 
 It has the following options:
-
 ```
 status      The HTTP status code to issue (301 is usual permanent redirect, 302 is temporary)
             ex: 301
@@ -169,11 +179,10 @@ to          The new URL path which should be used.
 ```
 
 Example config:
-
 ```yml
 http:
   modules:
-    - name: proxy
+    - type: proxy
       domains:
         - example.com
       status: 301
@@ -184,41 +193,14 @@ http:
 ### tls
 
 The tls system handles encrypted connections, including fetching certificates,
-and uses ServerName Indication (SNI) to determine if the connection should be handled
-by the http system, a tls system module, or rejected.
-
-It has the following options:
-
-```
-acme.email              The default email address for ACME certificate issuance
-                        ex: john.doe@example.com
-
-acme.server             The default ACME server to use
-                        ex: https://acme-v01.api.letsencrypt.org/directory
-                        ex: https://acme-staging.api.letsencrypt.org/directory
-
-acme.challenge_type     The default ACME challenge to request
-                        ex: http-01, dns-01, tls-01
-
-acme.approved_domains   The domains for which to request certificates
-                        ex: example.com
-```
+and uses ServerName Indication (SNI) to determine if the connection should be
+handled by the http system, a tls system module, or rejected.
 
 Example config:
-
 ```yml
 tls:
-  acme:
-    email: 'joe.shmoe@example.com'
-    # IMPORTANT: Switch to in production 'https://acme-v01.api.letsencrypt.org/directory'
-    server: 'https://acme-staging.api.letsencrypt.org/directory'
-    challenge_type: 'http-01'
-    approved_domains:
-      - example.com
-      - example.net
-
   modules:
-    - name: proxy
+    - type: proxy
       domains:
         - example.com
         - example.net
@@ -227,17 +209,44 @@ tls:
 
 Certificates are saved to `~/acme`, which may be `/var/www/acme` if Goldilocks is run as the www-data user.
 
-### tls.acme
+### tls.proxy
 
-The acme module overrides the acme defaults of the tls system and uses the same options except that `approved_domains`
-(in favor of the domains in the scope of the module).
+The proxy module routes the traffic based on the ServerName Indication (SNI) **without decrypting** it.
+
+It has the same options as the [HTTP proxy module](#httpproxy-how-to-reverse-proxy-ruby-python-etc).
 
 Example config:
-
 ```yml
 tls:
   modules:
-    - name: acme
+    - type: proxy
+      domains:
+        - example.com
+      address: '127.0.0.1:5443'
+```
+
+### tls.acme
+
+The acme module defines the setting used when getting new certificates.
+
+It has the following options:
+```
+email              The email address for ACME certificate issuance
+                   ex: john.doe@example.com
+
+server             The ACME server to use
+                   ex: https://acme-v01.api.letsencrypt.org/directory
+                   ex: https://acme-staging.api.letsencrypt.org/directory
+
+challenge_type     The ACME challenge to request
+                   ex: http-01, dns-01, tls-01
+```
+
+Example config:
+```yml
+tls:
+  modules:
+    - type: acme
       domains:
         - example.com
         - example.net
@@ -246,41 +255,18 @@ tls:
       challenge_type: 'http-01'
 ```
 
-### tls.proxy
-
-The proxy module routes the traffic based on the ServerName Indication (SNI) **without decrypting** it.
-
-It has the following options:
-
-```
-address     The hostname (or IP) and port of the system or application that should receive the traffic
-```
-
-Example config:
-
-```yml
-tls:
-  modules:
-    - name: proxy
-      domains:
-        - example.com
-      address: '127.0.0.1:5443'
-```
-
 ### tcp
 
 The tcp system handles all tcp network traffic **before decryption** and may use port numbers
 or traffic sniffing to determine how the connection should be handled.
 
 It has the following options:
-
 ```
 bind      An array of numeric ports on which to bind
           ex: 80
 ```
 
-Example Config
-
+Example Config:
 ```yml
 tcp:
   bind:
@@ -288,7 +274,7 @@ tcp:
     - 80
     - 443
   modules:
-    - name: forward
+    - type: forward
       ports:
         - 22
       address: '127.0.0.1:2222'
@@ -298,18 +284,15 @@ tcp:
 
 The forward module routes traffic based on port number **without decrypting** it.
 
-It has the following options:
+In addition to the same options as the [HTTP proxy module](#httpproxy-how-to-reverse-proxy-ruby-python-etc),
+the TCP forward modules also has the following options:
 
 ```
 ports       A numeric array of source ports
             ex: 22
-
-address     The destination hostname and port
-            ex: 127.0.0.1:2222
 ```
 
-Example Config
-
+Example Config:
 ```yml
 tcp:
   bind:
@@ -317,10 +300,79 @@ tcp:
     - 80
     - 443
   modules:
-    - name: forward
+    - type: forward
       ports:
         - 22
-      address: '127.0.0.1:2222'
+      port: 2222
+```
+
+### udp
+
+The udp system handles all udp network traffic. It currently only supports
+forwarding the messages without any examination.
+
+It has the following options:
+```
+bind      An array of numeric ports on which to bind
+          ex: 53
+```
+
+Example Config:
+```yml
+udp:
+  bind:
+    - 53
+  modules:
+    - type: forward
+      ports:
+        - 53
+      address: '127.0.0.1:8053'
+```
+
+### udp.forward
+
+The forward module routes traffic based on port number **without decrypting** it.
+
+It has the same options as the [TCP forward module](#tcpforward).
+
+Example Config:
+```yml
+udp:
+  bind:
+    - 53
+  modules:
+    - type: forward
+      ports:
+        - 53
+      address: '127.0.0.1:8053'
+```
+
+### domains
+
+To reduce repetition defining multiple modules that operate on the same domain
+name the `domains` field can define multiple modules of multiple types for a
+single list of names. The modules defined this way do not need to have their
+own `domains` field.
+
+Example Config
+
+```yml
+domains:
+  names:
+    - example.com
+    - www.example.com
+    - api.example.com
+  modules:
+    tls:
+      - type: acme
+        email: joe.schmoe@example.com
+        challenge_type: 'http-01'
+    http:
+      - type: redirect
+        from: /deprecated/path
+        to: /new/path
+      - type: proxy
+        port: 3000
 ```
 
 
@@ -417,15 +469,14 @@ See [API.md](/API.md)
 TODO
 ----
 
-* http - nowww module
-* http - Allow match styles of `www.*`, `*`, and `*.example.com` equally
-* http - redirect based on domain name (not just path)
-* tcp - bind should be able to specify localhost, uniquelocal, private, or ip
-* tcp - if destination host is omitted default to localhost, if dst port is missing, default to src
-* sys - handle SIGHUP
-* sys - `curl https://daplie.me/goldilocks | bash -s example.com`
-* oauth3 - `example.com/.well-known/domains@oauth3.org/directives.json`
-* oauth3 - commandline questionnaire
-* modules - use consistent conventions (i.e. address vs host + port)
-  * tls - tls.acme vs tls.modules.acme
-* tls - forward should be able to match on source port to reach different destination ports
+* [ ] http - nowww module
+* [ ] http - Allow match styles of `www.*`, `*`, and `*.example.com` equally
+* [ ] http - redirect based on domain name (not just path)
+* [ ] tcp - bind should be able to specify localhost, uniquelocal, private, or ip
+* [ ] tcp - if destination host is omitted default to localhost, if dst port is missing, default to src
+* [ ] sys - `curl https://daplie.me/goldilocks | bash -s example.com`
+* [ ] oauth3 - `example.com/.well-known/domains@oauth3.org/directives.json`
+* [ ] oauth3 - commandline questionnaire
+* [x] modules - use consistent conventions (i.e. address vs host + port)
+  * [x] tls - tls.acme vs tls.modules.acme
+* [ ] tls - forward should be able to match on source port to reach different destination ports

From e15d4f830e2721a96742df869c3ad8c84d1af47b Mon Sep 17 00:00:00 2001
From: tigerbot <seth.gibelyou@daplie.com>
Date: Fri, 13 Oct 2017 12:39:31 -0600
Subject: [PATCH 20/22] updated the example config

---
 README.md                             |   1 +
 etc/goldilocks/goldilocks.example.yml | 151 +++++++++++++-------------
 2 files changed, 78 insertions(+), 74 deletions(-)

diff --git a/README.md b/README.md
index fb73509..1d89538 100644
--- a/README.md
+++ b/README.md
@@ -71,6 +71,7 @@ some of which have modules:
 * [tunnel_server](#tunnel_server)
 * [tunnel_client](#tunnel)
 * [mdns](#mdns)
+* [socks5](#socks5)
 * api
 
 All modules require a `type` and an `id`, and any modules not defined inside the
diff --git a/etc/goldilocks/goldilocks.example.yml b/etc/goldilocks/goldilocks.example.yml
index 38ec6b5..77bb321 100644
--- a/etc/goldilocks/goldilocks.example.yml
+++ b/etc/goldilocks/goldilocks.example.yml
@@ -4,11 +4,87 @@ tcp:
     - 80
     - 443
   modules:
-    - name: forward
+    - type: forward
       ports:
         - 22
       address: '127.0.0.1:8022'
 
+udp:
+  bind:
+    - 53
+  modules:
+    - type: forward
+      ports:
+        - 53
+      port: 5353
+      # default host is localhost
+
+
+tls:
+  modules:
+    - type: proxy
+      domains:
+        - localhost.bar.daplie.me
+        - localhost.foo.daplie.me
+      address: '127.0.0.1:5443'
+    - type: acme
+      domains:
+        - '*.localhost.daplie.me'
+      email: 'guest@example.com'
+      challenge_type: 'http-01'
+
+http:
+  trust_proxy: true
+  allow_insecure: false
+  primary_domain: localhost.daplie.me
+
+  modules:
+    - type: redirect
+      domains:
+        - localhost.beta.daplie.me
+      status: 301
+      from: /old/path/*/other/*
+      to: /path/new/:2/something/:1
+    - type: proxy
+      domains:
+        - localhost.daplie.me
+      host: localhost
+      port: 4000
+    - type: static
+      domains:
+        - '*.localhost.daplie.me'
+      root: '/srv/www/:hostname'
+
+domains:
+  - names:
+      - localhost.gamma.daplie.me
+    modules:
+      tls:
+        - type: proxy
+          port: 6443
+  - names:
+      - beta.localhost.daplie.me
+      - baz.localhost.daplie.me
+    modules:
+      tls:
+        - type: acme
+          email: 'owner@example.com'
+          challenge_type: 'tls-sni-01'
+          # default server is 'https://acme-v01.api.letsencrypt.org/directory'
+      http:
+        - type: redirect
+          from: /nowhere/in/particular
+          to: /just/an/example
+        - type: proxy
+          address: '127.0.0.1:3001'
+
+
+mdns:
+  disabled: false
+  port: 5353
+  broadcast: '224.0.0.251'
+  ttl: 300
+
 # tunnel: jwt
 # tunnel:
 #   - jwt1
@@ -18,76 +94,3 @@ tunnel_server:
   secret: abc123
   servernames:
     - 'tunnel.localhost.com'
-
-tls:
-  acme:
-    email: 'joe.shmoe@example.com'
-    server: 'https://acme-staging.api.letsencrypt.org/directory'
-    challenge_type: 'http-01'
-    approved_domains:
-      - localhost.baz.daplie.me
-      - localhost.beta.daplie.me
-  domains:
-    - names:
-        - localhost.gamma.daplie.me
-      modules:
-        - name: proxy
-          address: '127.0.0.1:6443'
-    - names:
-        - beta.localhost.daplie.me
-        - baz.localhost.daplie.me
-      modules:
-        - name: acme
-          email: 'owner@example.com'
-          challenge_type: 'tls-sni-01'
-          # default server is 'https://acme-v01.api.letsencrypt.org/directory'
-  modules:
-    - name: proxy
-      domains:
-        - localhost.bar.daplie.me
-        - localhost.foo.daplie.me
-      address: '127.0.0.1:5443'
-    - name: acme
-      email: 'guest@example.com'
-      challenge_type: 'http-01'
-      domains:
-        - foo.localhost.daplie.me
-        - gamma.localhost.daplie.me
-
-
-http:
-  trust_proxy: true
-  allow_insecure: false
-  primary_domain: localhost.foo.daplie.me
-  domains:
-    - names:
-        - localhost.baz.daplie.me
-      modules:
-        - name: redirect
-          from: /nowhere/in/particular
-          to: /just/an/example
-        - name: proxy
-          port: 3001
-
-  modules:
-    - name: redirect
-      domains:
-        - localhost.beta.daplie.me
-      status: 301
-      from: /old/path/*/other/*
-      to: /path/new/:2/something/:1
-    - name: proxy
-      domains:
-        - localhost.daplie.me
-      host: localhost
-      port: 4000
-    - name: static
-      domains:
-        - '*.localhost.daplie.me'
-      root: '/srv/www/:hostname'
-
-mdns:
-  disabled: false
-  port: 5353
-  broadcast: '224.0.0.251'
-  ttl: 300

From 72520679d89fc01bf8c2bf4ff810a6d3f635383a Mon Sep 17 00:00:00 2001
From: tigerbot <seth.gibelyou@daplie.com>
Date: Mon, 16 Oct 2017 12:59:45 -0600
Subject: [PATCH 21/22] updated the documentation for the config API

---
 API.md              | 112 +++++++++++++++++++++++++++++++++++++++++---
 lib/admin/config.js |   2 +
 2 files changed, 108 insertions(+), 6 deletions(-)

diff --git a/API.md b/API.md
index bfb6c54..84da6fc 100644
--- a/API.md
+++ b/API.md
@@ -2,13 +2,113 @@
 The API system is intended for use with Desktop and Mobile clients.
 It must be accessed using one of the following domains as the Host header:
 
-```
-admin.invalid
-localhost.admin.daplie.me
-```
+* localhost.alpha.daplie.me
+* localhost.admin.daplie.me
+* alpha.localhost.daplie.me
+* admin.localhost.daplie.me
+* localhost.daplie.invalid
 
 All requests require an OAuth3 token in the request headers.
 
+## Config
+
+### Get All Settings
+  * **URL** `/api/goldilocks@daplie.com/config`
+  * **Method** `GET`
+  * **Reponse**: The JSON representation of the current config. See the [README.md](/README.md)
+    for the structure of the config.
+
+### Get Group Setting
+  * **URL** `/api/goldilocks@daplie.com/config/:group`
+  * **Method** `GET`
+  * **Reponse**: The sub-object of the config relevant to the group specified in
+    the url (ie http, tls, tcp, etc.)
+
+### Get Group Module List
+  * **URL** `/api/goldilocks@daplie.com/config/:group/modules`
+  * **Method** `GET`
+  * **Reponse**: The list of modules relevant to the group specified in the url
+    (ie http, tls, tcp, etc.)
+
+### Get Specific Module
+  * **URL** `/api/goldilocks@daplie.com/config/:group/modules/:modId`
+  * **Method** `GET`
+  * **Reponse**: The module with the specified module ID.
+
+### Get Domain Group
+  * **URL** `/api/goldilocks@daplie.com/config/domains/:domId`
+  * **Method** `GET`
+  * **Reponse**: The domains specification with the specified domains ID.
+
+### Get Domain Group Modules
+  * **URL** `/api/goldilocks@daplie.com/config/domains/:domId/modules`
+  * **Method** `GET`
+  * **Reponse**: An object containing all of the relevant modules for the group
+    of domains.
+
+### Get Domain Group Module Category
+  * **URL** `/api/goldilocks@daplie.com/config/domains/:domId/modules/:group`
+  * **Method** `GET`
+  * **Reponse**: A list of the specific category of modules for the group of domains.
+
+### Get Specific Domain Group Module
+  * **URL** `/api/goldilocks@daplie.com/config/domains/:domId/modules/:group/:modId`
+  * **Method** `GET`
+  * **Reponse**: The module with the specified module ID.
+
+
+### Change Settings
+  * **URL** `/api/goldilocks@daplie.com/config`
+  * **URL** `/api/goldilocks@daplie.com/config/:group`
+  * **Method** `POST`
+  * **Body**: The changes to be applied on top of the current config. See the
+    [README.md](/README.md) for the settings. If modules or domains are specified
+    they are added to the current list.
+  * **Reponse**: The current config. If the group is specified in the URL it will
+    only be the config relevant to that group.
+
+### Add Module
+  * **URL** `/api/goldilocks@daplie.com/config/:group/modules`
+  * **URL** `/api/goldilocks@daplie.com/config/domains/:domId/modules/:group`
+  * **Method** `POST`
+  * **Body**: The module to be added. Can also be provided an array of modules
+    to add multiple modules in the same request.
+  * **Reponse**: The current list of modules.
+
+### Add Domain Group
+  * **URL** `/api/goldilocks@daplie.com/config/domains`
+  * **Method** `POST`
+  * **Body**: The domains names and modules for the new domain group(s).
+  * **Reponse**: The current list of domain groups.
+
+
+### Edit Module
+  * **URL** `/api/goldilocks@daplie.com/config/:group/modules/:modId`
+  * **URL** `/api/goldilocks@daplie.com/config/domains/:domId/modules/:group/:modId`
+  * **Method** `PUT`
+  * **Body**: The new parameters for the module.
+  * **Reponse**: The editted module.
+
+### Edit Domain Group
+  * **URL** `/api/goldilocks@daplie.com/config/domains/:domId`
+  * **Method** `PUT`
+  * **Body**: The new domains names for the domains group. The module list cannot
+    be editted through this route.
+  * **Reponse**: The editted domain group.
+
+
+### Remove Module
+  * **URL** `/api/goldilocks@daplie.com/config/:group/modules/:modId`
+  * **URL** `/api/goldilocks@daplie.com/config/domains/:domId/modules/:group/:modId`
+  * **Method** `DELETE`
+  * **Reponse**: The list of modules.
+
+### Remove Domain Group
+  * **URL** `/api/goldilocks@daplie.com/config/domains/:domId`
+  * **Method** `DELETE`
+  * **Reponse**: The list of domain groups.
+
+
 ## Tunnel
 
 ### Check Status
@@ -39,9 +139,9 @@ All requests require an OAuth3 token in the request headers.
 ### Start Proxy
   * **URL** `/api/goldilocks@daplie.com/socks5`
   * **Method** `POST`
-  * **Response**: Same response as for the `GET` resquest
+  * **Response**: Same response as for the `GET` request
 
 ### Stop Proxy
   * **URL** `/api/goldilocks@daplie.com/socks5`
   * **Method** `DELETE`
-  * **Response**: Same response as for the `GET` resquest
+  * **Response**: Same response as for the `GET` request
diff --git a/lib/admin/config.js b/lib/admin/config.js
index 1ac3dd1..682052c 100644
--- a/lib/admin/config.js
+++ b/lib/admin/config.js
@@ -281,6 +281,8 @@ class DomainList extends IdList {
       http: new ModuleList()
     , tls:  new ModuleList()
     };
+    // We add these after instead of in the constructor to run the validation and manipulation
+    // in the ModList add function since these are all new modules.
     if (dom.modules && Array.isArray(dom.modules.http)) {
       dom.modules.http.forEach(modLists.http.add, modLists.http);
     }

From 754ace5cb437122e97981718b4ad01a04f399401 Mon Sep 17 00:00:00 2001
From: tigerbot <seth.gibelyou@daplie.com>
Date: Tue, 17 Oct 2017 12:56:25 -0600
Subject: [PATCH 22/22] removed arguments that populate a deprecated config

---
 bin/goldilocks.js | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/bin/goldilocks.js b/bin/goldilocks.js
index 06a340b..2278d8f 100755
--- a/bin/goldilocks.js
+++ b/bin/goldilocks.js
@@ -339,15 +339,6 @@ function fillConfig(config, args) {
   fillComponent('http',  false);
   fillComponent('tls',   false);
 
-  if (!config.tls.acme && (args.email || args.agreeTos)) {
-    config.tls.acme = {};
-  }
-  if (typeof args.agreeTos === 'string') {
-    config.tls.acme.approvedDomains = args.agreeTos.split(',');
-  }
-  if (args.email) {
-    config.tls.acme.email = args.email;
-  }
   config.device = { hostname: require('os').hostname() };
 
   config.tunnel = args.tunnel || config.tunnel;
@@ -452,7 +443,6 @@ function readEnv(args) {
 
   var env = {
     tunnel: process.env.GOLDILOCKS_TUNNEL_TOKEN || process.env.GOLDILOCKS_TUNNEL && true
-  , email: process.env.GOLDILOCKS_EMAIL
   , cwd: process.env.GOLDILOCKS_HOME || process.cwd()
   , debug: process.env.GOLDILOCKS_DEBUG && true
   };
@@ -464,10 +454,8 @@ var program = require('commander');
 
 program
   .version(require('../package.json').version)
-  .option('--agree-tos [url1,url2]', "agree to all Terms of Service for Daplie, Let's Encrypt, etc (or specific URLs only)")
   .option('-c --config <file>', 'Path to config file (Goldilocks.json or Goldilocks.yml) example: --config /etc/goldilocks/Goldilocks.json')
   .option('--tunnel [token]', 'Turn tunnel on. This will enter interactive mode for login if no token is specified.')
-  .option('--email <email>', "(Re)set default email to use for Daplie, Let's Encrypt, ACME, etc.")
   .option('--debug', "Enable debug output")
   .parse(process.argv);