Attempt to bring existing logs or terminal window to the front

This is required since some older cloudrons have a mixed bag of
collations and thus charsets and we add foreign keys across those, which
require the same collation

CHANGES

@@ -1121,3 +1121,33 @@
 * Show documentation URL in the app info dialog
 * Update Lets Encrypt agrement URL (https://letsencrypt.org/documents/LE-SA-v1.2-November-15-2017.pdf)
 
+[1.8.2]
+* Update node modules
+* Allow a restore operation if app is already restoring
+* Remove pre-install bundle support since it was hardly used
+* Make the test email mail address configurable
+* Allow admins to access all apps
+* Send feedback via appstore API (instead of email)
+* Show documentation URL in the app info dialog
+* Update Lets Encrypt agrement URL (https://letsencrypt.org/documents/LE-SA-v1.2-November-15-2017.pdf)
+
+[1.8.3]
+* Ensure domain database record exists
+
+[1.8.4]
+* Fix issue where internal email was not delivered when email relay is enabled
+* Fix display of DNS records when email relay is enabled
+
+[1.8.5]
+* Fix issues where unused addons were not cleaned on an app update causing uninstall to fail
+* Change UI text from 'Waiting' to 'Pending'
+
+[1.9.0]
+* Prepare Cloudron for supporting multiple domains
+* Add Cloudron restore UI
+* Do not put app in errored state if backup fails
+* Display backup progress in CaaS
+* Add Google Cloud Storage backend for backups
+* Update node to 8.9.3 LTS
+* Set max email recepient limit (in outgoing emails) to 500
+

README.md

@@ -9,10 +9,6 @@ a complex task.
 We are building the ultimate platform for self-hosting web apps. The Cloudron allows
 anyone to effortlessly host web applications on their server on their own terms.
 
-Support us on
-[![Flattr Cloudron](https://button.flattr.com/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=cloudron&url=https://cloudron.io&title=Cloudron&tags=opensource&category=software)
-or [pay us a coffee](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=8982CKNM46D8U)
-
 ## Features
 
 * Single click install for apps. Check out the [App Store](https://cloudron.io/appstore.html).
@@ -33,9 +29,9 @@ or [pay us a coffee](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_
 * Trivially migrate to another server keeping your apps and data (for example, switch your
   infrastructure provider or move to a bigger server).
 
-* Comprehensive [REST API](https://cloudron.io/references/api.html).
+* Comprehensive [REST API](https://cloudron.io/documentation/developer/api/).
 
-* [CLI](https://git.cloudron.io/cloudron/cloudron-cli) to configure apps.
+* [CLI](https://cloudron.io/documentation/cli/) to configure apps.
 
 * Alerts, audit logs, graphs, dns management ... and much more
 
@@ -49,33 +45,18 @@ You can install the Cloudron platform on your own server or get a managed server
 from cloudron.io. In either case, the Cloudron platform will keep your server and
 apps up-to-date and secure.
 
-* [Selfhosting](https://cloudron.io/references/selfhosting.html) - [Pricing](https://cloudron.io/pricing.html)
+* [Selfhosting](https://cloudron.io/documentation/installation/) - [Pricing](https://cloudron.io/pricing.html)
 * [Managed Hosting](https://cloudron.io/managed.html)
 
-The wiki has instructions on how you can install and update the Cloudron and the
-apps from source.
-
 ## Documentation
 
-* [User manual](https://cloudron.io/references/usermanual.html)
-* [Developer docs](https://cloudron.io/documentation.html)
-* [Architecture](https://cloudron.io/references/architecture.html)
+* [Documentation](https://cloudron.io/documentation/)
 
 ## Related repos
 
 The [base image repo](https://git.cloudron.io/cloudron/docker-base-image) is the parent image of all
 the containers in the Cloudron.
 
-The [graphite repo](https://git.cloudron.io/cloudron/docker-graphite) contains the graphite code
-that collects metrics for graphs.
-
-The addons are located in separate repositories
-* [Redis](https://git.cloudron.io/cloudron/redis-addon)
-* [Postgresql](https://git.cloudron.io/cloudron/postgresql-addon)
-* [MySQL](https://git.cloudron.io/cloudron/mysql-addon)
-* [Mongodb](https://git.cloudron.io/cloudron/mongodb-addon)
-* [Mail](https://git.cloudron.io/cloudron/mail-addon)
-
 ## Community
 
 * [Chat](https://chat.cloudron.io/)

baseimage/initializeBaseUbuntuImage.sh

@@ -47,10 +47,10 @@ apt-get -y install \
 cp /usr/share/unattended-upgrades/20auto-upgrades /etc/apt/apt.conf.d/20auto-upgrades
 
 echo "==> Installing node.js"
-mkdir -p /usr/local/node-6.11.5
-curl -sL https://nodejs.org/dist/v6.11.5/node-v6.11.5-linux-x64.tar.gz | tar zxvf - --strip-components=1 -C /usr/local/node-6.11.5
-ln -sf /usr/local/node-6.11.5/bin/node /usr/bin/node
-ln -sf /usr/local/node-6.11.5/bin/npm /usr/bin/npm
+mkdir -p /usr/local/node-8.9.3
+curl -sL https://nodejs.org/dist/v8.9.3/node-v8.9.3-linux-x64.tar.gz | tar zxvf - --strip-components=1 -C /usr/local/node-8.9.3
+ln -sf /usr/local/node-8.9.3/bin/node /usr/bin/node
+ln -sf /usr/local/node-8.9.3/bin/npm /usr/bin/npm
 apt-get install -y python   # Install python which is required for npm rebuild
 [[ "$(python --version 2>&1)" == "Python 2.7."* ]] || die "Expecting python version to be 2.7.x"
 

gulpfile.js

@@ -50,7 +50,7 @@ if (argv.help || argv.h) {
     process.exit(1);
 }
 
-gulp.task('js', ['js-index', 'js-setup', 'js-setupdns', 'js-update'], function () {});
+gulp.task('js', ['js-index', 'js-logs', 'js-terminal', 'js-setup', 'js-setupdns', 'js-restore', 'js-update'], function () {});
 
 var oauth = {
     clientId: argv.clientId || 'cid-webadmin',
@@ -82,7 +82,7 @@ gulp.task('js-index', function () {
         'webadmin/src/js/main.js',
         'webadmin/src/views/*.js'
         ])
-        .pipe(ejs({ oauth: oauth }, { ext: '.js' }))
+        .pipe(ejs({ oauth: oauth }, {}, { ext: '.js' }))
         .pipe(sourcemaps.init())
         .pipe(concat('index.js', { newLine: ';' }))
         .pipe(uglifyer)
@@ -90,6 +90,38 @@ gulp.task('js-index', function () {
         .pipe(gulp.dest('webadmin/dist/js'));
 });
 
+gulp.task('js-logs', function () {
+    // needs special treatment for error handling
+    var uglifyer = uglify();
+    uglifyer.on('error', function (error) {
+        console.error(error);
+    });
+
+    gulp.src(['webadmin/src/js/logs.js', 'webadmin/src/js/client.js'])
+        .pipe(ejs({ oauth: oauth }, {}, { ext: '.js' }))
+        .pipe(sourcemaps.init())
+        .pipe(concat('logs.js', { newLine: ';' }))
+        .pipe(uglifyer)
+        .pipe(sourcemaps.write())
+        .pipe(gulp.dest('webadmin/dist/js'));
+});
+
+gulp.task('js-terminal', function () {
+    // needs special treatment for error handling
+    var uglifyer = uglify();
+    uglifyer.on('error', function (error) {
+        console.error(error);
+    });
+
+    gulp.src(['webadmin/src/js/terminal.js', 'webadmin/src/js/client.js'])
+        .pipe(ejs({ oauth: oauth }, {}, { ext: '.js' }))
+        .pipe(sourcemaps.init())
+        .pipe(concat('terminal.js', { newLine: ';' }))
+        .pipe(uglifyer)
+        .pipe(sourcemaps.write())
+        .pipe(gulp.dest('webadmin/dist/js'));
+});
+
 gulp.task('js-setup', function () {
     // needs special treatment for error handling
     var uglifyer = uglify();
@@ -98,7 +130,7 @@ gulp.task('js-setup', function () {
     });
 
     gulp.src(['webadmin/src/js/setup.js', 'webadmin/src/js/client.js'])
-        .pipe(ejs({ oauth: oauth }, { ext: '.js' }))
+        .pipe(ejs({ oauth: oauth }, {}, { ext: '.js' }))
         .pipe(sourcemaps.init())
         .pipe(concat('setup.js', { newLine: ';' }))
         .pipe(uglifyer)
@@ -114,7 +146,7 @@ gulp.task('js-setupdns', function () {
     });
 
     gulp.src(['webadmin/src/js/setupdns.js', 'webadmin/src/js/client.js'])
-        .pipe(ejs({ oauth: oauth }, { ext: '.js' }))
+        .pipe(ejs({ oauth: oauth }, {}, { ext: '.js' }))
         .pipe(sourcemaps.init())
         .pipe(concat('setupdns.js', { newLine: ';' }))
         .pipe(uglifyer)
@@ -122,6 +154,23 @@ gulp.task('js-setupdns', function () {
         .pipe(gulp.dest('webadmin/dist/js'));
 });
 
+gulp.task('js-restore', function () {
+    // needs special treatment for error handling
+    var uglifyer = uglify();
+    uglifyer.on('error', function (error) {
+        console.error(error);
+    });
+
+    gulp.src(['webadmin/src/js/restore.js', 'webadmin/src/js/client.js'])
+        .pipe(ejs({ oauth: oauth }, {}, { ext: '.js' }))
+        .pipe(sourcemaps.init())
+        .pipe(concat('restore.js', { newLine: ';' }))
+        .pipe(uglifyer)
+        .pipe(sourcemaps.write())
+        .pipe(gulp.dest('webadmin/dist/js'));
+});
+
+
 gulp.task('js-update', function () {
     // needs special treatment for error handling
     var uglifyer = uglify();
@@ -143,7 +192,7 @@ gulp.task('js-update', function () {
 // --------------
 
 gulp.task('html', ['html-views', 'html-update', 'html-templates'], function () {
-    return gulp.src('webadmin/src/*.html').pipe(ejs({ apiOriginHostname: oauth.apiOriginHostname }, { ext: '.html' })).pipe(gulp.dest('webadmin/dist'));
+    return gulp.src('webadmin/src/*.html').pipe(ejs({ apiOriginHostname: oauth.apiOriginHostname }, {}, { ext: '.html' })).pipe(gulp.dest('webadmin/dist'));
 });
 
 gulp.task('html-update', function () {
@@ -191,6 +240,9 @@ gulp.task('watch', ['default'], function () {
     gulp.watch(['webadmin/src/js/update.js'], ['js-update']);
     gulp.watch(['webadmin/src/js/setup.js', 'webadmin/src/js/client.js'], ['js-setup']);
     gulp.watch(['webadmin/src/js/setupdns.js', 'webadmin/src/js/client.js'], ['js-setupdns']);
+    gulp.watch(['webadmin/src/js/restore.js', 'webadmin/src/js/client.js'], ['js-restore']);
+    gulp.watch(['webadmin/src/js/logs.js', 'webadmin/src/js/client.js'], ['js-logs']);
+    gulp.watch(['webadmin/src/js/terminal.js', 'webadmin/src/js/client.js'], ['js-terminal']);
     gulp.watch(['webadmin/src/js/index.js', 'webadmin/src/js/client.js', 'webadmin/src/js/appstore.js', 'webadmin/src/js/main.js', 'webadmin/src/views/*.js'], ['js-index']);
     gulp.watch(['webadmin/src/3rdparty/**/*'], ['3rdparty']);
 });

helper/tarjs

@@ -1,32 +0,0 @@
-#!/usr/bin/env node
-
-'use strict';
-
-var tar = require('tar-fs'),
-    fs = require('fs'),
-    path = require('path'),
-    zlib = require('zlib');
-
-if (process.argv.length < 4) {
-    console.error('Usage: tarjs <cwd> <dir>');
-    process.exit(1);
-}
-
-var dir = process.argv[3];
-var cwd = process.argv[2];
-
-console.error('Packing directory "'+ dir +'" from within "' + cwd + '" and stream to stdout');
-
-process.chdir(cwd);
-
-var stat = fs.statSync(dir);
-if (!stat.isDirectory()) throw(dir + ' is not a directory');
-
-var gzipStream = zlib.createGzip({});
-
-tar.pack(path.resolve(dir), {
-    ignore: function (name) {
-        if (name === '.') return true;
-        return false;
-    }
-}).pipe(gzipStream).pipe(process.stdout);

migrations/20160208164735-groups-add-admin.js

@@ -2,7 +2,7 @@
 
 var async = require('async');
 
-var ADMIN_GROUP_ID = 'admin'; // see groups.js
+var ADMIN_GROUP_ID = 'admin'; // see constants.js
 
 exports.up = function(db, callback) {
 	async.series([

migrations/20171118000000-ensure-collation-utf8_bin.js

@@ -0,0 +1,31 @@
+'use strict';
+
+// WARNING!!
+// At this point the default db collation is utf8mb4_unicode_ci however we already have foreign key constraits
+// already with tables on utf8_bin charset, so we cannot convert all tables here to utf8mb4 collation without
+// a reimport from a sql dump, as foreign keys across different collations are not supported
+
+var async = require('async');
+
+exports.up = function(db, callback) {
+    async.series([
+        db.runSql.bind(db, 'ALTER TABLE appPortBindings CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin'),
+        db.runSql.bind(db, 'ALTER TABLE apps CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin'),
+        db.runSql.bind(db, 'ALTER TABLE authcodes CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin'),
+        db.runSql.bind(db, 'ALTER TABLE backups CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin'),
+        db.runSql.bind(db, 'ALTER TABLE clients CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin'),
+        db.runSql.bind(db, 'ALTER TABLE eventlog CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin'),
+        db.runSql.bind(db, 'ALTER TABLE groupMembers CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin'),
+        db.runSql.bind(db, 'ALTER TABLE groups CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin'),
+        db.runSql.bind(db, 'ALTER TABLE mailboxes CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin'),
+        db.runSql.bind(db, 'ALTER TABLE migrations CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin'),
+        db.runSql.bind(db, 'ALTER TABLE settings CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin'),
+        db.runSql.bind(db, 'ALTER TABLE tokens CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin'),
+        db.runSql.bind(db, 'ALTER TABLE users CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin')
+    ], callback);
+};
+
+exports.down = function(db, callback) {
+    // nothing to be done here
+    callback();
+};

migrations/20171118000001-apps-add-domain.js

@@ -0,0 +1,70 @@
+'use strict';
+
+var async = require('async'),
+    safe = require('safetydance');
+
+exports.up = function(db, callback) {
+    // first check precondtion of domain entry in settings
+    db.all('SELECT * FROM settings WHERE name = ?', [ 'domain' ], function (error, result) {
+        if (error) return callback(error);
+
+        var domain = {};
+        if (result[0]) domain = safe.JSON.parse(result[0].value) || {};
+
+        async.series([
+            db.runSql.bind(db, 'START TRANSACTION;'),
+            function addAppsDomainColumn(done) {
+                db.runSql('ALTER TABLE apps ADD COLUMN domain VARCHAR(128)', [], done);
+            },
+            function setAppDomain(done) {
+                if (!domain.fqdn) return done(); // skip for new cloudrons without a domain
+                db.runSql('UPDATE apps SET domain = ?', [ domain.fqdn ], done);
+            },
+            function addAppsLocationDomainUniqueConstraint(done) {
+                db.runSql('ALTER TABLE apps ADD UNIQUE location_domain_unique_index (location, domain)', [], done);
+            },
+            function removePresetupAdminGroupIfNew(done) {
+                // do not delete on update, will update the record in setMailboxesDomain()
+                if (domain.fqdn) return done();
+
+                // this will be finally created once we have a domain when we create the owner in user.js
+                const ADMIN_GROUP_ID = 'admin'; // see constants.js
+                db.runSql('DELETE FROM groups WHERE id = ?', [ ADMIN_GROUP_ID ], function (error) {
+                    if (error) return done(error);
+
+                    db.runSql('DELETE FROM mailboxes WHERE ownerId = ?', [ ADMIN_GROUP_ID ], done);
+                });
+            },
+            function addMailboxesDomainColumn(done) {
+                db.runSql('ALTER TABLE mailboxes ADD COLUMN domain VARCHAR(128)', [], done);
+            },
+            function setMailboxesDomain(done) {
+                if (!domain.fqdn) return done(); // skip for new cloudrons without a domain
+                db.runSql('UPDATE mailboxes SET domain = ?', [ domain.fqdn ], done);
+            },
+            function dropAppsLocationUniqueConstraint(done) {
+                db.runSql('ALTER TABLE apps DROP INDEX location', [], done);
+            },
+            db.runSql.bind(db, 'COMMIT')
+        ], callback);
+    });
+};
+
+exports.down = function(db, callback) {
+    async.series([
+        db.runSql.bind(db, 'START TRANSACTION;'),
+        function dropMailboxesDomainColumn(done) {
+            db.runSql('ALTER TABLE mailboxes DROP COLUMN domain', [], done);
+        },
+        function dropLocationDomainUniqueConstraint(done) {
+            db.runSql('ALTER TABLE apps DROP INDEX location_domain_unique_index', [], done);
+        },
+        function dropAppsDomainColumn(done) {
+            db.runSql('ALTER TABLE apps DROP COLUMN domain', [], done);
+        },
+        function addAppsLocationUniqueConstraint(done) {
+            db.runSql('ALTER TABLE apps ADD UNIQUE location (location)', [], done);
+        },
+        db.runSql.bind(db, 'COMMIT')
+    ], callback);
+};

migrations/20171118000002-domains-add-table.js

@@ -0,0 +1,61 @@
+'use strict';
+
+var async = require('async'),
+    safe = require('safetydance'),
+    tld = require('tldjs');
+
+exports.up = function(db, callback) {
+    var fqdn, zoneName, configJson;
+
+    async.series([
+        function gatherDomain(done) {
+            db.all('SELECT * FROM settings WHERE name = ?', [ 'domain' ], function (error, result) {
+                if (error) return done(error);
+
+                var domain = {};
+                if (result[0]) domain = safe.JSON.parse(result[0].value) || {};
+
+                fqdn = domain.fqdn || ''; // will be null pre-setup
+                zoneName = domain.zoneName || tld.getDomain(fqdn) || fqdn;
+
+                done();
+            });
+        },
+        function gatherDNSConfig(done) {
+            db.all('SELECT * FROM settings WHERE name = ?', [ 'dns_config' ], function (error, result) {
+                if (error) return done(error);
+
+                configJson = (result[0] && result[0].value) ? result[0].value : JSON.stringify({ provider: 'manual'});
+
+                // caas dns config needs an fqdn
+                var config = JSON.parse(configJson);
+                if (config.provider === 'caas') config.fqdn = fqdn;
+                configJson = JSON.stringify(config);
+
+                done();
+            });
+        },
+        db.runSql.bind(db, 'START TRANSACTION;'),
+        function createDomainsTable(done) {
+            var cmd = `
+                CREATE TABLE domains(
+                domain VARCHAR(128) NOT NULL UNIQUE,
+                zoneName VARCHAR(128) NOT NULL,
+                configJson TEXT,
+                PRIMARY KEY (domain)) CHARACTER SET utf8 COLLATE utf8_bin
+            `;
+
+            db.runSql(cmd, [], done);
+        },
+        function addInitialDomain(done) {
+            if (!fqdn) return done();
+
+            db.runSql('INSERT INTO domains (domain, zoneName, configJson) VALUES (?, ?, ?)', [ fqdn, zoneName, configJson ], done);
+        },
+        db.runSql.bind(db, 'COMMIT')
+    ], callback);
+};
+
+exports.down = function(db, callback) {
+    db.runSql('DROP TABLE domains', callback);
+};

migrations/20171118000003-apps-add-domain-constraint.js

@@ -0,0 +1,15 @@
+'use strict';
+
+exports.up = function(db, callback) {
+    db.runSql('ALTER TABLE apps ADD CONSTRAINT apps_domain_constraint FOREIGN KEY(domain) REFERENCES domains(domain)', function (error) {
+        if (error) console.error(error);
+        callback(error);
+    });
+};
+
+exports.down = function(db, callback) {
+    db.runSql('ALTER TABLE apps DROP FOREIGN KEY apps_domain_constraint', function (error) {
+        if (error) console.error(error);
+        callback(error);
+    });
+};

migrations/20171118000004-mailboxes-add-domain-constraint.js

@@ -0,0 +1,15 @@
+'use strict';
+
+exports.up = function(db, callback) {
+    db.runSql('ALTER TABLE mailboxes ADD CONSTRAINT mailboxes_domain_constraint FOREIGN KEY(domain) REFERENCES domains(domain)', function (error) {
+        if (error) console.error(error);
+        callback(error);
+    });
+};
+
+exports.down = function(db, callback) {
+    db.runSql('ALTER TABLE mailboxes DROP FOREIGN KEY mailboxes_domain_constraint', function (error) {
+        if (error) console.error(error);
+        callback(error);
+    });
+};

migrations/20171118000005-mailboxes-drop-name-constraint.js

@@ -0,0 +1,15 @@
+'use strict';
+
+exports.up = function(db, callback) {
+    db.runSql('ALTER TABLE mailboxes DROP PRIMARY KEY', function (error) {
+      if (error) console.error(error);
+      callback(error);
+    });
+};
+
+exports.down = function(db, callback) {
+    db.runSql('ALTER TABLE mailboxes ADD PRIMARY KEY(name)', function (error) {
+        if (error) console.error(error);
+        callback(error);
+    });
+};

migrations/20171118000006-mailboxes-add-name-domain-constraint.js

@@ -0,0 +1,15 @@
+'use strict';
+
+exports.up = function(db, callback) {
+    db.runSql('ALTER TABLE mailboxes ADD UNIQUE mailboxes_name_domain_unique_index (name, domain)', function (error) {
+        if (error) console.error(error);
+        callback(error);
+    });
+};
+
+exports.down = function(db, callback) {
+    db.runSql('ALTER TABLE mailboxes DROP INDEX mailboxes_name_domain_unique_index', function (error) {
+        if (error) console.error(error);
+        callback(error);
+    });
+};

migrations/20171119203452-apps-add-updateTime.js

@@ -0,0 +1,15 @@
+'use strict';
+
+exports.up = function(db, callback) {
+    db.runSql('ALTER TABLE apps ADD COLUMN updateTime TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP', function (error) {
+        if (error) console.error(error);
+        callback(error);
+    });
+};
+
+exports.down = function(db, callback) {
+    db.runSql('ALTER TABLE apps DROP COLUMN updateTime', function (error) {
+        if (error) console.error(error);
+        callback(error);
+    });
+};

migrations/20171119204952-apps-rename-createdAt-to-creationTime.js

@@ -0,0 +1,15 @@
+'use strict';
+
+exports.up = function(db, callback) {
+    db.runSql('ALTER TABLE apps CHANGE createdAt creationTime TIMESTAMP(2) NOT NULL', [], function (error) {
+        if (error) console.error(error);
+        callback(error);
+    });
+};
+
+exports.down = function(db, callback) {
+    db.runSql('ALTER TABLE apps CHANGE creationTime createdAt TIMESTAMP(2) NOT NULL', [], function (error) {
+        if (error) console.error(error);
+        callback(error);
+    });
+};

migrations/20171129005712-settings-add-fqdn-to-caas-backup-config.js

@@ -0,0 +1,28 @@
+'use strict';
+
+var async = require('async');
+
+// NOTE: This migration is incorrect because 'caas' domain is not guaranteed to be present in all Caas cloudrons
+exports.up = function(db, callback) {
+    db.all('SELECT * FROM domains', function (error, domains) {
+        if (error) return callback(error);
+
+        var caasDomains = domains.filter(function (d) { return JSON.parse(d.configJson).provider === 'caas'; });
+        if (caasDomains.length === 0) return callback();
+        var caasDomain = caasDomains[0].domain;
+
+        db.all('SELECT * FROM settings WHERE name=?', [ 'backup_config' ], function (error, settings) {
+            if (error) return callback(error);
+
+            var setting = settings[0];
+            var config = JSON.parse(setting.value);
+            config.fqdn = caasDomain;
+
+            db.runSql('UPDATE settings SET value=? WHERE name=?', [ JSON.stringify(config), setting.name ], callback);
+        });
+    });
+};
+
+exports.down = function(db, callback) {
+    callback();
+};

migrations/20171205124434-settings-default-backupConfig.js

@@ -0,0 +1,23 @@
+'use strict';
+
+exports.up = function(db, callback) {
+    var backupConfig = {
+        "provider": "filesystem",
+        "backupFolder": "/var/backups",
+        "format": "tgz",
+        "retentionSecs": 172800
+    };
+
+    db.runSql('INSERT settings (name, value) VALUES(?, ?)', [ 'backup_config', JSON.stringify(backupConfig) ], function (error) {
+        if (!error || error.code === 'ER_DUP_ENTRY') return callback(); // dup entry is OK for existing cloudrons
+
+        callback(error);
+    });
+};
+
+exports.down = function(db, callback) {
+    db.runSql('DELETE FROM settings WHERE name=?', ['backup_config'], function (error) {
+        if (error) console.error(error);
+        callback(error);
+    });
+};

migrations/20180109225024-domains-add-provider.js

@@ -0,0 +1,33 @@
+'use strict';
+
+var async = require('async');
+
+exports.up = function(db, callback) {
+    // first check precondtion of domain entry in settings
+    db.all('SELECT * FROM domains', [ ], function (error, domains) {
+        if (error) return callback(error);
+
+        async.series([
+            db.runSql.bind(db, 'START TRANSACTION;'),
+            db.runSql.bind(db, 'ALTER TABLE domains ADD COLUMN provider VARCHAR(16) DEFAULT ""'),
+            function setProvider(done) {
+                async.eachSeries(domains, function (domain, iteratorCallback) {
+                    var config = JSON.parse(domain.configJson);
+                    var provider = config.provider;
+                    delete config.provider;
+
+                    db.runSql('UPDATE domains SET provider = ?, configJson = ? WHERE domain = ?', [ provider, JSON.stringify(config), domain.domain ], iteratorCallback);
+                }, done);
+            },
+            db.runSql.bind(db, 'ALTER TABLE domains MODIFY provider VARCHAR(16) NOT NULL'),
+            db.runSql.bind(db, 'COMMIT')
+        ], callback);
+    });
+};
+
+exports.down = function(db, callback) {
+    db.runSql('ALTER TABLE domains DROP COLUMN provider', function (error) {
+        if (error) console.error(error);
+        callback(error);
+    });
+};

migrations/schema.sql

@@ -9,6 +9,10 @@
 #### BLOB - stored offline from table row (use for binary data)
 #### https://dev.mysql.com/doc/refman/5.0/en/storage-requirements.html
 
+# The code uses zero dates. Make sure sql_mode does NOT have NO_ZERO_DATE
+# http://johnemb.blogspot.com/2014/09/adding-or-removing-individual-sql-modes.html
+# SET GLOBAL sql_mode=(SELECT REPLACE(@@sql_mode,'NO_ZERO_DATE',''));
+
 CREATE TABLE IF NOT EXISTS users(
     id VARCHAR(128) NOT NULL UNIQUE,
     username VARCHAR(254) UNIQUE,
@@ -59,23 +63,26 @@ CREATE TABLE IF NOT EXISTS apps(
     containerId VARCHAR(128),
     manifestJson TEXT,
     httpPort INTEGER,                        // this is the nginx proxy port and not manifest.httpPort
-    location VARCHAR(128) NOT NULL UNIQUE,
+    location VARCHAR(128) NOT NULL,
+    domain VARCHAR(128) NOT NULL,
     dnsRecordId VARCHAR(512), // tracks any id that we got back to track dns updates
     accessRestrictionJson TEXT, // { users: [ ], groups: [ ] }
     createdAt TIMESTAMP(2) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    updatedAt TIMESTAMP(2) NOT NULL DEFAULT CURRENT_TIMESTAMP,
     memoryLimit BIGINT DEFAULT 0,
     altDomain VARCHAR(256),
     xFrameOptions VARCHAR(512),
     sso BOOLEAN DEFAULT 1, // whether user chose to enable SSO
     debugModeJson TEXT, // options for development mode
     robotsTxt TEXT,
-    enableBackup BOOLEAN DEFAULT 1,
+    enableBackup BOOLEAN DEFAULT 1, // misnomer: controls automatic daily backups
 
     // the following fields do not belong here, they can be removed when we use a queue for apptask
     restoreConfigJson VARCHAR(256), // used to pass backupId to restore from to apptask
     oldConfigJson TEXT, // used to pass old config for apptask (configure, restore)
     updateConfigJson TEXT, // used to pass new config for apptask (update)
 
+    FOREIGN KEY(domain) REFERENCES domains(domain),
     PRIMARY KEY(id));
 
 CREATE TABLE IF NOT EXISTS appPortBindings(
@@ -135,5 +142,18 @@ CREATE TABLE IF NOT EXISTS mailboxes(
     ownerType VARCHAR(16) NOT NULL, /* 'app' or 'user' or 'group' */
     aliasTarget VARCHAR(128), /* the target name type is an alias */
     creationTime TIMESTAMP,
+    domain VARCHAR(128),
 
+    FOREIGN KEY(domain) REFERENCES domains(domain),
     PRIMARY KEY (name));
+
+CREATE TABLE IF NOT EXISTS domains(
+    domain VARCHAR(128) NOT NULL UNIQUE, /* if this needs to be larger, InnoDB has a limit of 767 bytes for PRIMARY KEY values! */
+    zoneName VARCHAR(128) NOT NULL, /* this mostly contains the domain itself again */
+    provider VARCHAR(16) NOT NULL,
+    configJson TEXT, /* JSON containing the dns backend provider config */
+
+    PRIMARY KEY (domain))
+
+    /* the default db collation is utf8mb4_unicode_ci but for the app table domain constraint we have to use the old one */
+    CHARACTER SET utf8 COLLATE utf8_bin;

package.json

@@ -15,6 +15,7 @@
   },
   "dependencies": {
     "@google-cloud/dns": "^0.7.0",
+    "@google-cloud/storage": "^1.2.1",
     "@sindresorhus/df": "^2.1.0",
     "async": "^2.6.0",
     "aws-sdk": "^2.151.0",
@@ -35,9 +36,7 @@
     "ejs-cli": "^2.0.0",
     "express": "^4.16.2",
     "express-session": "^1.15.6",
-    "gulp-sass": "^3.0.0",
     "hat": "0.0.3",
-    "hock": "https://registry.npmjs.org/hock/-/hock-1.3.2.tgz",
     "json": "^9.0.3",
     "ldapjs": "^1.0.0",
     "lodash.chunk": "^4.2.0",
@@ -59,6 +58,7 @@
     "password-generator": "^2.2.0",
     "progress-stream": "^2.0.0",
     "proxy-middleware": "^0.15.0",
+    "recursive-readdir": "^2.2.1",
     "request": "^2.83.0",
     "s3-block-read-stream": "^0.2.0",
     "safetydance": "^0.7.1",
@@ -84,11 +84,11 @@
     "gulp-concat": "^2.4.3",
     "gulp-cssnano": "^2.1.0",
     "gulp-ejs": "^3.1.0",
-    "gulp-sass": "^3.0.0",
+    "gulp-sass": "^3.1.0",
     "gulp-serve": "^1.0.0",
     "gulp-sourcemaps": "^2.6.1",
     "gulp-uglify": "^3.0.0",
-    "hock": "~1.2.0",
+    "hock": "^1.3.2",
     "istanbul": "*",
     "js2xmlparser": "^3.0.0",
     "mocha": "*",
@@ -96,14 +96,13 @@
     "nock": "^9.0.14",
     "node-sass": "^4.6.1",
     "readdirp": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz",
-    "request": "^2.65.0",
     "yargs": "^10.0.3"
   },
   "scripts": {
     "migrate_local": "DATABASE_URL=mysql://root:@localhost/box node_modules/.bin/db-migrate up",
     "migrate_test": "BOX_ENV=test DATABASE_URL=mysql://root:@localhost/boxtest node_modules/.bin/db-migrate up",
-    "test": "npm run migrate_test && src/test/setupTest && BOX_ENV=test ./node_modules/istanbul/lib/cli.js test $1 ./node_modules/mocha/bin/_mocha -- -R spec ./src/test ./src/routes/test/[^a]*",
-    "test_all": "npm run migrate_test && src/test/setupTest && BOX_ENV=test ./node_modules/istanbul/lib/cli.js test $1 ./node_modules/mocha/bin/_mocha -- -R spec ./src/test ./src/routes/test",
+    "test": "npm run migrate_test && src/test/setupTest && BOX_ENV=test ./node_modules/istanbul/lib/cli.js test $1 ./node_modules/mocha/bin/_mocha -- --exit -R spec ./src/test ./src/routes/test/[^a]*",
+    "test_all": "npm run migrate_test && src/test/setupTest && BOX_ENV=test ./node_modules/istanbul/lib/cli.js test $1 ./node_modules/mocha/bin/_mocha -- --exit -R spec ./src/test ./src/routes/test",
     "postmerge": "/bin/true",
     "precommit": "/bin/true",
     "prepush": "npm test",

scripts/cloudron-setup

@@ -48,9 +48,6 @@ domain=""
 adminLocation="my"
 zoneName=""
 provider=""
-encryptionKey=""
-restoreUrl=""
-dnsProvider="manual"
 tlsProvider="le-prod"
 requestedVersion=""
 apiServerOrigin="https://api.cloudron.io"
@@ -61,8 +58,9 @@ sourceTarballUrl=""
 rebootServer="true"
 baseDataDir=""
 
-# TODO this is still there for the restore case, see other occasions below
-versionsUrl="https://s3.amazonaws.com/prod-cloudron-releases/versions.json"
+# these are here for pre-1.9 compat
+encryptionKey=""
+restoreUrl=""
 
 args=$(getopt -o "" -l "domain:,help,skip-baseimage-init,data:,data-dir:,provider:,encryption-key:,restore-url:,tls-provider:,version:,dns-provider:,env:,admin-location:,prerelease,skip-reboot,source-url:" -n "$0" -- "$@")
 eval set -- "${args}"
@@ -76,17 +74,14 @@ while true; do
     --encryption-key) encryptionKey="$2"; shift 2;;
     --restore-url) restoreUrl="$2"; shift 2;;
     --tls-provider) tlsProvider="$2"; shift 2;;
-    --dns-provider) dnsProvider="$2"; shift 2;;
     --version) requestedVersion="$2"; shift 2;;
     --env)
         if [[ "$2" == "dev" ]]; then
-            versionsUrl="https://s3.amazonaws.com/dev-cloudron-releases/versions.json"
             apiServerOrigin="https://api.dev.cloudron.io"
             webServerOrigin="https://dev.cloudron.io"
             tlsProvider="le-staging"
             prerelease="true"
         elif [[ "$2" == "staging" ]]; then
-            versionsUrl="https://s3.amazonaws.com/staging-cloudron-releases/versions.json"
             apiServerOrigin="https://api.staging.cloudron.io"
             webServerOrigin="https://staging.cloudron.io"
             tlsProvider="le-staging"
@@ -134,14 +129,6 @@ if [[ -z "${dataJson}" ]]; then
         exit 1
     fi
 
-    if [[ -z "${dnsProvider}" ]]; then
-        echo "--dns-provider is required (noop, manual)"
-        exit 1
-    elif [[ "${dnsProvider}" != "noop" && "${dnsProvider}" != "manual" ]]; then
-        echo "--dns-provider must be one of : manual, noop"
-        exit 1
-    fi
-
     if [[ -n "${baseDataDir}" && ! -d "${baseDataDir}" ]]; then
         echo "${baseDataDir} does not exist"
         exit 1
@@ -192,41 +179,39 @@ if [[ "${sourceTarballUrl}" == "" ]]; then
 fi
 
 # Build data
-# TODO versionsUrl is still there for the cloudron restore case
+# tlsConfig, dnsConfig, backupConfig are here for backward compat with < 1.9
+# from 1.9, we use autoprovision.json
 if [[ -z "${dataJson}" ]]; then
     if [[ -z "${restoreUrl}" ]]; then
         data=$(cat <<EOF
     {
-        "boxVersionsUrl": "${versionsUrl}",
         "fqdn": "${domain}",
         "adminLocation": "${adminLocation}",
+        "adminFqdn": "${adminLocation}.${domain}",
         "zoneName": "${zoneName}",
         "provider": "${provider}",
         "apiServerOrigin": "${apiServerOrigin}",
         "webServerOrigin": "${webServerOrigin}",
+        "version": "${version}",
         "tlsConfig": {
             "provider": "${tlsProvider}"
         },
-        "dnsConfig": {
-            "provider": "${dnsProvider}"
-        },
         "backupConfig" : {
             "provider": "filesystem",
             "backupFolder": "/var/backups",
             "key": "${encryptionKey}",
             "format": "tgz",
             "retentionSecs": 172800
-        },
-        "version": "${version}"
+        }
     }
 EOF
     )
     else
         data=$(cat <<EOF
     {
-        "boxVersionsUrl": "${versionsUrl}",
         "fqdn": "${domain}",
         "adminLocation": "${adminLocation}",
+        "adminFqdn": "${adminLocation}.${domain}",
         "zoneName": "${zoneName}",
         "provider": "${provider}",
         "apiServerOrigin": "${apiServerOrigin}",
@@ -279,6 +264,17 @@ while true; do
     sleep 10
 done
 
+autoprovision_data=$(cat <<EOF
+{
+    "tlsConfig": {
+        "provider": "${tlsProvider}"
+    }
+}
+EOF
+)
+
+echo "${autoprovision_data}" > /home/yellowtent/configs/autoprovision.json
+
 if [[ -n "${domain}" ]]; then
     echo -e "\n\nVisit https://my.${domain} to finish setup once the server has rebooted.\n"
 else

scripts/createReleaseTarball

@@ -31,8 +31,8 @@ if ! $(cd "${SOURCE_DIR}" && git diff --exit-code >/dev/null); then
     exit 1
 fi
 
-if [[ "$(node --version)" != "v6.11.5" ]]; then
-    echo "This script requires node 6.11.5"
+if [[ "$(node --version)" != "v8.9.3" ]]; then
+    echo "This script requires node 8.9.3"
     exit 1
 fi
 
@@ -44,7 +44,7 @@ chmod "o+rx,g+rx" "${bundle_dir}" # otherwise extracted tarball director won't b
 echo "Checking out code [${version}] into ${bundle_dir}"
 (cd "${SOURCE_DIR}" && git archive --format=tar ${version} | (cd "${bundle_dir}" && tar xf -))
 
-if diff "${TMPDIR}/boxtarball.cache/npm-shrinkwrap.json.all" "${bundle_dir}/npm-shrinkwrap.json" >/dev/null 2>&1; then
+if diff "${TMPDIR}/boxtarball.cache/package-lock.json.all" "${bundle_dir}/package-lock.json" >/dev/null 2>&1; then
     echo "Reusing dev modules from cache"
     cp -r "${TMPDIR}/boxtarball.cache/node_modules-all/." "${bundle_dir}/node_modules"
 else
@@ -54,7 +54,7 @@ else
     echo "Caching dev dependencies"
     mkdir -p "${TMPDIR}/boxtarball.cache/node_modules-all"
     rsync -a --delete "${bundle_dir}/node_modules/" "${TMPDIR}/boxtarball.cache/node_modules-all/"
-    cp "${bundle_dir}/npm-shrinkwrap.json" "${TMPDIR}/boxtarball.cache/npm-shrinkwrap.json.all"
+    cp "${bundle_dir}/package-lock.json" "${TMPDIR}/boxtarball.cache/package-lock.json.all"
 fi
 
 echo "Building webadmin assets"
@@ -65,7 +65,7 @@ rm -rf "${bundle_dir}/node_modules/"
 rm -rf "${bundle_dir}/webadmin/src"
 rm -rf "${bundle_dir}/gulpfile.js"
 
-if diff "${TMPDIR}/boxtarball.cache/npm-shrinkwrap.json.prod" "${bundle_dir}/npm-shrinkwrap.json" >/dev/null 2>&1; then
+if diff "${TMPDIR}/boxtarball.cache/package-lock.json.prod" "${bundle_dir}/package-lock.json" >/dev/null 2>&1; then
     echo "Reusing prod modules from cache"
     cp -r "${TMPDIR}/boxtarball.cache/node_modules-prod/." "${bundle_dir}/node_modules"
 else
@@ -75,7 +75,7 @@ else
     echo "Caching prod dependencies"
     mkdir -p "${TMPDIR}/boxtarball.cache/node_modules-prod"
     rsync -a --delete "${bundle_dir}/node_modules/" "${TMPDIR}/boxtarball.cache/node_modules-prod/"
-    cp "${bundle_dir}/npm-shrinkwrap.json" "${TMPDIR}/boxtarball.cache/npm-shrinkwrap.json.prod"
+    cp "${bundle_dir}/package-lock.json" "${TMPDIR}/boxtarball.cache/package-lock.json.prod"
 fi
 
 echo "Create final tarball"

scripts/installer.sh

@@ -63,12 +63,12 @@ if [[ $(docker version --format {{.Client.Version}}) != "17.09.0-ce" ]]; then
 fi
 
 echo "==> installer: updating node"
-if [[ "$(node --version)" != "v6.11.5" ]]; then
-    mkdir -p /usr/local/node-6.11.5
-    $curl -sL https://nodejs.org/dist/v6.11.5/node-v6.11.5-linux-x64.tar.gz | tar zxvf - --strip-components=1 -C /usr/local/node-6.11.5
-    ln -sf /usr/local/node-6.11.5/bin/node /usr/bin/node
-    ln -sf /usr/local/node-6.11.5/bin/npm /usr/bin/npm
-    rm -rf /usr/local/node-6.11.3
+if [[ "$(node --version)" != "v8.9.3" ]]; then
+    mkdir -p /usr/local/node-8.9.3
+    $curl -sL https://nodejs.org/dist/v8.9.3/node-v8.9.3-linux-x64.tar.gz | tar zxvf - --strip-components=1 -C /usr/local/node-8.9.3
+    ln -sf /usr/local/node-8.9.3/bin/node /usr/bin/node
+    ln -sf /usr/local/node-8.9.3/bin/npm /usr/bin/npm
+    rm -rf /usr/local/node-6.11.5
 fi
 
 for try in `seq 1 10`; do

setup/argparser.sh

@@ -7,20 +7,14 @@ json="${source_dir}/../node_modules/.bin/json"
 arg_api_server_origin=""
 arg_fqdn=""
 arg_admin_location=""
+arg_admin_fqdn=""
 arg_zone_name=""
-arg_is_custom_domain="false"
-arg_restore_key=""
-arg_restore_url=""
+arg_is_custom_domain="false" # can be removed after 1.9
 arg_retire_reason=""
 arg_retire_info=""
-arg_tls_config=""
-arg_tls_cert=""
-arg_tls_key=""
 arg_token=""
 arg_version=""
 arg_web_server_origin=""
-arg_backup_config=""
-arg_dns_config=""
 arg_provider=""
 arg_is_demo="false"
 
@@ -40,8 +34,11 @@ while true; do
     --data)
         # these params must be valid in all cases
         arg_fqdn=$(echo "$2" | $json fqdn)
+        arg_admin_fqdn=$(echo "$2" | $json adminFqdn)
         arg_zone_name=$(echo "$2" | $json zoneName)
+        [[ "${arg_zone_name}" == "" ]] && arg_zone_name="${arg_fqdn}"
 
+        # can be removed after 1.9
         arg_is_custom_domain=$(echo "$2" | $json isCustomDomain)
         [[ "${arg_is_custom_domain}" == "" ]] && arg_is_custom_domain="true"
 
@@ -61,30 +58,11 @@ while true; do
         arg_is_demo=$(echo "$2" | $json isDemo)
         [[ "${arg_is_demo}" == "" ]] && arg_is_demo="false"
 
-        arg_tls_cert=$(echo "$2" | $json tlsCert)
-        [[ "${arg_tls_cert}" == "null" ]] && arg_tls_cert=""
-        arg_tls_key=$(echo "$2" | $json tlsKey)
-        [[ "${arg_tls_key}" == "null" ]] && arg_tls_key=""
         arg_token=$(echo "$2" | $json token)
 
         arg_provider=$(echo "$2" | $json provider)
         [[ "${arg_provider}" == "" ]] && arg_provider="generic"
 
-        arg_tls_config=$(echo "$2" | $json tlsConfig)
-        [[ "${arg_tls_config}" == "null" ]] && arg_tls_config=""
-
-        arg_restore_url=$(echo "$2" | $json restore.url)
-        [[ "${arg_restore_url}" == "null" ]] && arg_restore_url=""
-
-        arg_restore_key=$(echo "$2" | $json restore.key)
-        [[ "${arg_restore_key}" == "null" ]] && arg_restore_key=""
-
-        arg_backup_config=$(echo "$2" | $json backupConfig)
-        [[ "${arg_backup_config}" == "null" ]] && arg_backup_config=""
-
-        arg_dns_config=$(echo "$2" | $json dnsConfig)
-        [[ "${arg_dns_config}" == "null" ]] && arg_dns_config=""
-
         shift 2
         ;;
     --) break;;
@@ -96,13 +74,8 @@ echo "Parsed arguments:"
 echo "api server: ${arg_api_server_origin}"
 echo "fqdn: ${arg_fqdn}"
 echo "custom domain: ${arg_is_custom_domain}"
-echo "restore url: ${arg_restore_url}"
-echo "tls cert: ${arg_tls_cert}"
 # do not dump these as they might become available via logs API
-#echo "restore key: ${arg_restore_key}"
-#echo "tls key: ${arg_tls_key}"
 #echo "token: ${arg_token}"
-echo "tlsConfig: ${arg_tls_config}"
 echo "version: ${arg_version}"
 echo "web server: ${arg_web_server_origin}"
 echo "provider: ${arg_provider}"

setup/splashpage.sh

@@ -18,8 +18,7 @@ fi
 source "${script_dir}/argparser.sh" "$@" # this injects the arg_* variables used below
 
 # keep this is sync with config.js appFqdn()
-admin_fqdn=$([[ "${arg_is_custom_domain}" == "true" ]] && echo "${arg_admin_location}.${arg_fqdn}" ||  echo "${arg_admin_location}-${arg_fqdn}")
-admin_origin="https://${admin_fqdn}"
+admin_origin="https://${arg_admin_fqdn}"
 
 # copy the website
 rm -rf "${SETUP_WEBSITE_DIR}" && mkdir -p "${SETUP_WEBSITE_DIR}"
@@ -37,7 +36,7 @@ if [[ "${arg_retire_reason}" != "" || "${existing_infra}" != "${current_infra}"
 else
     echo "Show progress bar only on admin domain for normal update"
     ${box_src_dir}/node_modules/.bin/ejs-cli -f "${script_dir}/start/nginx/appconfig.ejs" \
-        -O "{ \"vhost\": \"${admin_fqdn}\", \"adminOrigin\": \"${admin_origin}\", \"endpoint\": \"splash\", \"sourceDir\": \"${SETUP_WEBSITE_DIR}\", \"certFilePath\": \"cert/host.cert\", \"keyFilePath\": \"cert/host.key\", \"xFrameOptions\": \"SAMEORIGIN\", \"robotsTxtQuoted\": null, \"hasIPv6\": false }" > "${PLATFORM_DATA_DIR}/nginx/applications/admin.conf"
+        -O "{ \"vhost\": \"${arg_admin_fqdn}\", \"adminOrigin\": \"${admin_origin}\", \"endpoint\": \"splash\", \"sourceDir\": \"${SETUP_WEBSITE_DIR}\", \"certFilePath\": \"cert/host.cert\", \"keyFilePath\": \"cert/host.key\", \"xFrameOptions\": \"SAMEORIGIN\", \"robotsTxtQuoted\": null, \"hasIPv6\": false }" > "${PLATFORM_DATA_DIR}/nginx/applications/admin.conf"
 fi
 
 if [[ "${arg_retire_reason}" == "migrate" ]]; then

setup/start.sh

@@ -199,42 +199,6 @@ readonly mysql_root_password="password"
 mysqladmin -u root -ppassword password password # reset default root password
 mysql -u root -p${mysql_root_password} -e 'CREATE DATABASE IF NOT EXISTS box'
 
-if [[ -n "${arg_restore_url}" ]]; then
-    set_progress "30" "Downloading restore data"
-
-    readonly restore_dir="${arg_restore_url#file://}"
-
-    if [[ -d "${restore_dir}" ]]; then # rsync backup
-        echo "==> Copying backup: ${restore_dir}"
-        if [[ $(stat -c "%d" "${BOX_DATA_DIR}") == $(stat -c "%d" "${restore_dir}") ]]; then
-            cp -rfl "${restore_dir}/." "${BOX_DATA_DIR}"
-        else
-            cp -rf "${restore_dir}/." "${BOX_DATA_DIR}"
-        fi
-    else # tgz backup
-        decrypt=""
-        if [[ "${arg_restore_url}" == *.tar.gz.enc || -n "${arg_restore_key}" ]]; then
-            echo "==> Downloading encrypted backup: ${arg_restore_url} and key: ${arg_restore_key}"
-            decrypt=(openssl aes-256-cbc -d -nosalt -pass "pass:${arg_restore_key}")
-        elif [[ "${arg_restore_url}" == *.tar.gz ]]; then
-            echo "==> Downloading backup: ${arg_restore_url}"
-            decrypt=(cat -)
-        fi
-
-        while true; do
-            if $curl -L "${arg_restore_url}" | "${decrypt[@]}" \
-            | tar -zxf - --overwrite -C "${BOX_DATA_DIR}"; then break; fi
-            echo "Failed to download data, trying again"
-        done
-    fi
-
-    set_progress "35" "Setting up MySQL"
-    if [[ -f "${BOX_DATA_DIR}/box.mysqldump" ]]; then
-        echo "==> Importing existing database into MySQL"
-        mysql -u root -p${mysql_root_password} box < "${BOX_DATA_DIR}/box.mysqldump"
-    fi
-fi
-
 set_progress "40" "Migrating data"
 sudo -u "${USER}" -H bash <<EOF
 set -eu
@@ -242,22 +206,11 @@ cd "${BOX_SRC_DIR}"
 BOX_ENV=cloudron DATABASE_URL=mysql://root:${mysql_root_password}@127.0.0.1/box "${BOX_SRC_DIR}/node_modules/.bin/db-migrate" up
 EOF
 
-echo "==> Adding automated configs"
-mysql -u root -p${mysql_root_password} -e "REPLACE INTO settings (name, value) VALUES (\"domain\", '{ \"fqdn\": \"$arg_fqdn\", \"zoneName\": \"$arg_zone_name\", \"adminLocation\": \"$arg_admin_location\" }')" box
-
-if [[ ! -z "${arg_backup_config}" ]]; then
-    mysql -u root -p${mysql_root_password} \
-        -e "REPLACE INTO settings (name, value) VALUES (\"backup_config\", '$arg_backup_config')" box
-fi
-
-if [[ ! -z "${arg_dns_config}" ]]; then
-    mysql -u root -p${mysql_root_password} \
-        -e "REPLACE INTO settings (name, value) VALUES (\"dns_config\", '$arg_dns_config')" box
-fi
-
-if [[ ! -z "${arg_tls_config}" ]]; then
-    mysql -u root -p${mysql_root_password} \
-        -e "REPLACE INTO settings (name, value) VALUES (\"tls_config\", '$arg_tls_config')" box
+if [[ -z "${arg_admin_fqdn:-}" ]]; then
+    # can be removed after 1.9
+    admin_fqdn=$([[ "${arg_is_custom_domain}" == "true" ]] && echo "${arg_admin_location}.${arg_fqdn}" ||  echo "${arg_admin_location}-${arg_fqdn}")
+else
+    admin_fqdn="${arg_admin_fqdn}"
 fi
 
 echo "==> Creating cloudron.conf"
@@ -268,18 +221,13 @@ cat > "${CONFIG_DIR}/cloudron.conf" <<CONF_END
     "apiServerOrigin": "${arg_api_server_origin}",
     "webServerOrigin": "${arg_web_server_origin}",
     "fqdn": "${arg_fqdn}",
+    "adminFqdn": "${admin_fqdn}",
     "adminLocation": "${arg_admin_location}",
     "zoneName": "${arg_zone_name}",
-    "isCustomDomain": ${arg_is_custom_domain},
     "provider": "${arg_provider}",
     "isDemo": ${arg_is_demo}
 }
 CONF_END
-# pass these out-of-band because they have new lines which interfere with json
-if [[ -n "${arg_tls_cert}" && -n "${arg_tls_key}" ]]; then
-    echo "${arg_tls_cert}" > "${CONFIG_DIR}/host.cert"
-    echo "${arg_tls_key}" > "${CONFIG_DIR}/host.key"
-fi
 
 echo "==> Creating config.json for webadmin"
 cat > "${BOX_SRC_DIR}/webadmin/dist/config.json" <<CONF_END
@@ -305,6 +253,7 @@ chown "${USER}:${USER}" "${PLATFORM_DATA_DIR}"
 # do not chown the boxdata/mail directory; dovecot gets upset
 chown "${USER}:${USER}" "${BOX_DATA_DIR}"
 find "${BOX_DATA_DIR}" -mindepth 1 -maxdepth 1 -not -path "${BOX_DATA_DIR}/mail" -exec chown -R "${USER}:${USER}" {} \;
+chown "${USER}:${USER}" "${BOX_DATA_DIR}/mail"
 chown "${USER}:${USER}" -R "${BOX_DATA_DIR}/mail/dkim" # this is owned by box currently since it generates the keys
 
 set_progress "60" "Starting Cloudron"

setup/start/sudoers

@@ -34,3 +34,6 @@ yellowtent ALL=(root) NOPASSWD: /home/yellowtent/box/src/scripts/configurelogrot
 Defaults!/home/yellowtent/box/src/backuptask.js env_keep="HOME BOX_ENV"
 yellowtent ALL=(root) NOPASSWD:SETENV: /home/yellowtent/box/src/backuptask.js
 
+Defaults!/home/yellowtent/box/src/scripts/restart.sh env_keep="HOME BOX_ENV"
+yellowtent ALL=(root) NOPASSWD: /home/yellowtent/box/src/scripts/restart.sh
+

src/addons.js

@@ -114,7 +114,7 @@ var RMAPPDIR_CMD = path.join(__dirname, 'scripts/rmappdir.sh');
 function debugApp(app, args) {
     assert(!app || typeof app === 'object');
 
-    var prefix = app ? (app.location || 'naked_domain') : '(no app)';
+    var prefix = app ? app.intrinsicFqdn : '(no app)';
     debug(prefix + ' ' + util.format.apply(util, Array.prototype.slice.call(arguments, 1)));
 }
 
@@ -125,7 +125,7 @@ function setupAddons(app, addons, callback) {
 
     if (!addons) return callback(null);
 
-    debugApp(app, 'setupAddons: Settings up %j', Object.keys(addons));
+    debugApp(app, 'setupAddons: Setting up %j', Object.keys(addons));
 
     async.eachSeries(Object.keys(addons), function iterator(addon, iteratorCallback) {
         if (!(addon in KNOWN_ADDONS)) return iteratorCallback(new Error('No such addon:' + addon));
@@ -245,10 +245,12 @@ function setupOauth(app, options, callback) {
     assert.strictEqual(typeof options, 'object');
     assert.strictEqual(typeof callback, 'function');
 
+    debugApp(app, 'setupOauth');
+
     if (!app.sso) return callback(null);
 
     var appId = app.id;
-    var redirectURI = 'https://' + (app.altDomain || config.appFqdn(app.location));
+    var redirectURI = 'https://' + (app.altDomain || app.intrinsicFqdn);
     var scope = 'profile';
 
     clients.delByAppIdAndType(appId, clients.TYPE_OAUTH, function (error) { // remove existing creds
@@ -645,9 +647,10 @@ function setupRedis(app, options, callback) {
     }
 
     const tag = infra.images.redis.tag, redisName = 'redis-' + app.id;
+    const label = app.intrinsicFqdn;
     // note that we do not add appId label because this interferes with the stop/start app logic
     const cmd = `docker run --restart=always -d --name=${redisName} \
-                --label=location=${app.location} \
+                --label=location=${label} \
                 --net cloudron \
                 --net-alias ${redisName} \
                 -m ${memoryLimit/2} \

src/appdb.js

@@ -59,9 +59,10 @@ var assert = require('assert'),
     util = require('util');
 
 var APPS_FIELDS_PREFIXED = [ 'apps.id', 'apps.appStoreId', 'apps.installationState', 'apps.installationProgress', 'apps.runState',
-    'apps.health', 'apps.containerId', 'apps.manifestJson', 'apps.httpPort', 'apps.location', 'apps.dnsRecordId',
-    'apps.accessRestrictionJson', 'apps.restoreConfigJson', 'apps.oldConfigJson', 'apps.updateConfigJson', 'apps.memoryLimit', 'apps.altDomain',
-    'apps.xFrameOptions', 'apps.sso', 'apps.debugModeJson', 'apps.robotsTxt', 'apps.enableBackup' ].join(',');
+    'apps.health', 'apps.containerId', 'apps.manifestJson', 'apps.httpPort', 'apps.location', 'apps.domain', 'apps.dnsRecordId',
+    'apps.accessRestrictionJson', 'apps.restoreConfigJson', 'apps.oldConfigJson', 'apps.updateConfigJson', 'apps.memoryLimit', 
+    'apps.altDomain', 'apps.xFrameOptions', 'apps.sso', 'apps.debugModeJson', 'apps.robotsTxt', 'apps.enableBackup',
+    'apps.creationTime', 'apps.updateTime' ].join(',');
 
 var PORT_BINDINGS_FIELDS = [ 'hostPort', 'environmentVariable', 'appId' ].join(',');
 
@@ -177,12 +178,13 @@ function getAll(callback) {
     });
 }
 
-function add(id, appStoreId, manifest, location, portBindings, data, callback) {
+function add(id, appStoreId, manifest, location, domain, portBindings, data, callback) {
     assert.strictEqual(typeof id, 'string');
     assert.strictEqual(typeof appStoreId, 'string');
     assert(manifest && typeof manifest === 'object');
     assert.strictEqual(typeof manifest.version, 'string');
     assert.strictEqual(typeof location, 'string');
+    assert.strictEqual(typeof domain, 'string');
     assert.strictEqual(typeof portBindings, 'object');
     assert(data && typeof data === 'object');
     assert.strictEqual(typeof callback, 'function');
@@ -203,8 +205,8 @@ function add(id, appStoreId, manifest, location, portBindings, data, callback) {
 
     var queries = [];
     queries.push({
-        query: 'INSERT INTO apps (id, appStoreId, manifestJson, installationState, location, accessRestrictionJson, memoryLimit, altDomain, xFrameOptions, restoreConfigJson, sso, debugModeJson) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)',
-        args: [ id, appStoreId, manifestJson, installationState, location, accessRestrictionJson, memoryLimit, altDomain, xFrameOptions, restoreConfigJson, sso, debugModeJson ]
+        query: 'INSERT INTO apps (id, appStoreId, manifestJson, installationState, location, domain, accessRestrictionJson, memoryLimit, altDomain, xFrameOptions, restoreConfigJson, sso, debugModeJson) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)',
+        args: [ id, appStoreId, manifestJson, installationState, location, domain, accessRestrictionJson, memoryLimit, altDomain, xFrameOptions, restoreConfigJson, sso, debugModeJson ]
     });
 
     Object.keys(portBindings).forEach(function (env) {
@@ -217,8 +219,8 @@ function add(id, appStoreId, manifest, location, portBindings, data, callback) {
     // only allocate a mailbox if mailboxName is set
     if (data.mailboxName) {
         queries.push({
-            query: 'INSERT INTO mailboxes (name, ownerId, ownerType) VALUES (?, ?, ?)',
-            args: [ data.mailboxName, id, mailboxdb.TYPE_APP ]
+            query: 'INSERT INTO mailboxes (name, domain, ownerId, ownerType) VALUES (?, ?, ?, ?)',
+            args: [ data.mailboxName, domain, id, mailboxdb.TYPE_APP ]
         });
     }
 

src/apphealthmonitor.js

@@ -5,6 +5,7 @@ var appdb = require('./appdb.js'),
     assert = require('assert'),
     async = require('async'),
     DatabaseError = require('./databaseerror.js'),
+    config = require('./config.js'),
     debug = require('debug')('box:apphealthmonitor'),
     docker = require('./docker.js').connection,
     mailer = require('./mailer.js'),
@@ -25,7 +26,7 @@ var gDockerEventStream = null;
 function debugApp(app) {
     assert(!app || typeof app === 'object');
 
-    var prefix = app ? (app.location || 'naked_domain') : '(no app)';
+    var prefix = app ? app.intrinsicFqdn : '(no app)';
     var manifestAppId = app ? app.manifest.id : '';
     var id = app ? app.id : '';
 

src/apps.js

@@ -60,6 +60,9 @@ var addons = require('./addons.js'),
     DatabaseError = require('./databaseerror.js'),
     debug = require('debug')('box:apps'),
     docker = require('./docker.js'),
+    domaindb = require('./domaindb.js'),
+    domains = require('./domains.js'),
+    DomainError = require('./domains.js').DomainError,
     eventlog = require('./eventlog.js'),
     fs = require('fs'),
     groups = require('./groups.js'),
@@ -74,6 +77,7 @@ var addons = require('./addons.js'),
     split = require('split'),
     superagent = require('superagent'),
     taskmanager = require('./taskmanager.js'),
+    tld = require('tldjs'),
     TransformStream = require('stream').Transform,
     updateChecker = require('./updatechecker.js'),
     url = require('url'),
@@ -117,18 +121,34 @@ AppsError.BAD_CERTIFICATE = 'Invalid certificate';
 // Hostname validation comes from RFC 1123 (section 2.1)
 // Domain name validation comes from RFC 2181 (Name syntax)
 // https://en.wikipedia.org/wiki/Hostname#Restrictions_on_valid_host_names
-// We are validating the validity of the location-fqdn as host name
-function validateHostname(location, fqdn) {
-    var RESERVED_LOCATIONS = [ config.adminLocation(), constants.API_LOCATION, constants.SMTP_LOCATION, constants.IMAP_LOCATION, config.mailLocation(), constants.POSTMAN_LOCATION ];
+// We are validating the validity of the location-fqdn as host name (and not dns name)
+function validateHostname(location, domain, hostname) {
+    assert.strictEqual(typeof location, 'string');
+    assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof hostname, 'string');
 
+    const RESERVED_LOCATIONS = [
+        constants.API_LOCATION,
+        constants.SMTP_LOCATION,
+        constants.IMAP_LOCATION,
+        constants.POSTMAN_LOCATION
+    ];
     if (RESERVED_LOCATIONS.indexOf(location) !== -1) return new AppsError(AppsError.BAD_FIELD, location + ' is reserved');
 
-    if (location === '') return null; // bare location
+    if (hostname === config.adminFqdn()) return new AppsError(AppsError.BAD_FIELD, location + ' is reserved');
 
-    if ((location.length + 1 /*+ hyphen */ + fqdn.indexOf('.')) > 63) return new AppsError(AppsError.BAD_FIELD, 'Hostname length cannot be greater than 63');
-    if (location.match(/^[A-Za-z0-9-]+$/) === null) return new AppsError(AppsError.BAD_FIELD, 'Hostname can only contain alphanumerics and hyphen');
-    if (location[0] === '-' || location[location.length-1] === '-') return new AppsError(AppsError.BAD_FIELD, 'Hostname cannot start or end with hyphen');
-    if (location.length + 1 /* hyphen */ + fqdn.length > 253) return new AppsError(AppsError.BAD_FIELD, 'FQDN length exceeds 253 characters');
+    // workaround https://github.com/oncletom/tld.js/issues/73
+    var tmp = hostname.replace('_', '-');
+    if (!tld.isValid(tmp)) return new AppsError(AppsError.BAD_FIELD, 'Hostname is not a valid domain name');
+
+    if (hostname.length > 253) return new AppsError(AppsError.BAD_FIELD, 'Hostname length exceeds 253 characters');
+
+    if (location) {
+        // label validation
+        if (location.length > 63) return new AppsError(AppsError.BAD_FIELD, 'Subdomain exceeds 63 characters');
+        if (location.match(/^[A-Za-z0-9-]+$/) === null) return new AppsError(AppsError.BAD_FIELD, 'Subdomain can only contain alphanumerics and hyphen');
+        if (location.startsWith('-') || location.endsWith('-')) return new AppsError(AppsError.BAD_FIELD, 'Subdomain cannot start or end with hyphen');
+    }
 
     return null;
 }
@@ -291,6 +311,8 @@ function getAppConfig(app) {
     return {
         manifest: app.manifest,
         location: app.location,
+        domain: app.domain,
+        intrinsicFqdn: app.intrinsicFqdn,
         accessRestriction: app.accessRestriction,
         portBindings: app.portBindings,
         memoryLimit: app.memoryLimit,
@@ -338,11 +360,16 @@ function get(appId, callback) {
         if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new AppsError(AppsError.NOT_FOUND, 'No such app'));
         if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
 
-        app.iconUrl = getIconUrlSync(app);
-        app.fqdn = app.altDomain || config.appFqdn(app.location);
-        app.cnameTarget = app.altDomain ? config.appFqdn(app.location) : null;
+        domaindb.get(app.domain, function (error, result) {
+            if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
 
-        callback(null, app);
+            app.intrinsicFqdn = domains.fqdn(app.location, app.domain, result.provider);
+            app.iconUrl = getIconUrlSync(app);
+            app.fqdn = app.altDomain || app.intrinsicFqdn;
+            app.cnameTarget = app.altDomain ? app.intrinsicFqdn : null;
+
+            callback(null, app);
+        });
     });
 }
 
@@ -357,11 +384,16 @@ function getByIpAddress(ip, callback) {
             if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new AppsError(AppsError.NOT_FOUND, 'No such app'));
             if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
 
-            app.iconUrl = getIconUrlSync(app);
-            app.fqdn = app.altDomain || config.appFqdn(app.location);
-            app.cnameTarget = app.altDomain ? config.appFqdn(app.location) : null;
+            domaindb.get(app.domain, function (error, result) {
+                if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
 
-            callback(null, app);
+                app.intrinsicFqdn = domains.fqdn(app.location, app.domain, result.provider);
+                app.iconUrl = getIconUrlSync(app);
+                app.fqdn = app.altDomain || app.intrinsicFqdn;
+                app.cnameTarget = app.altDomain ? app.intrinsicFqdn : null;
+
+                callback(null, app);
+            });
         });
     });
 }
@@ -372,13 +404,22 @@ function getAll(callback) {
     appdb.getAll(function (error, apps) {
         if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
 
-        apps.forEach(function (app) {
-            app.iconUrl = getIconUrlSync(app);
-            app.fqdn = app.altDomain || config.appFqdn(app.location);
-            app.cnameTarget = app.altDomain ? config.appFqdn(app.location) : null;
-        });
+        async.eachSeries(apps, function (app, iteratorDone) {
+            domaindb.get(app.domain, function (error, result) {
+                if (error) return iteratorDone(new AppsError(AppsError.INTERNAL_ERROR, error));
 
-        callback(null, apps);
+                app.intrinsicFqdn = domains.fqdn(app.location, app.domain, result.provider);
+                app.iconUrl = getIconUrlSync(app);
+                app.fqdn = app.altDomain || app.intrinsicFqdn;
+                app.cnameTarget = app.altDomain ? app.intrinsicFqdn : null;
+
+                iteratorDone();
+            });
+        }, function (error) {
+            if (error) return callback(error);
+
+            callback(null, apps);
+        });
     });
 }
 
@@ -409,7 +450,7 @@ function downloadManifest(appStoreId, manifest, callback) {
     superagent.get(url).timeout(30 * 1000).end(function (error, result) {
         if (error && !error.response) return callback(new AppsError(AppsError.EXTERNAL_ERROR, 'Network error downloading manifest:' + error.message));
 
-        if (result.statusCode !== 200) return callback(new AppsError(AppsError.BAD_FIELD, util.format('Failed to get app info from store.', result.statusCode, result.text)));
+        if (result.statusCode !== 200) return callback(new AppsError(AppsError.EXTERNAL_ERROR, util.format('Failed to get app info from store.', result.statusCode, result.text)));
 
         callback(null, parts[0], result.body.manifest);
     });
@@ -421,6 +462,7 @@ function install(data, auditSource, callback) {
     assert.strictEqual(typeof callback, 'function');
 
     var location = data.location.toLowerCase(),
+        domain = data.domain.toLowerCase(),
         portBindings = data.portBindings || null,
         accessRestriction = data.accessRestriction || null,
         icon = data.icon || null,
@@ -447,9 +489,6 @@ function install(data, auditSource, callback) {
         error = checkManifestConstraints(manifest);
         if (error) return callback(error);
 
-        error = validateHostname(location, config.fqdn());
-        if (error) return callback(error);
-
         error = validatePortBindings(portBindings, manifest.tcpPorts);
         if (error) return callback(error);
 
@@ -487,45 +526,56 @@ function install(data, auditSource, callback) {
             }
         }
 
-        error = certificates.validateCertificate(cert, key, config.appFqdn(location));
-        if (error) return callback(new AppsError(AppsError.BAD_CERTIFICATE, error.message));
+        domains.get(domain, function (error, domainObject) {
+            if (error && error.reason === DomainError.NOT_FOUND) return callback(new AppsError(AppsError.NOT_FOUND, 'No such domain'));
+            if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, 'Could not get domain info:' + error.message));
 
-        debug('Will install app with id : ' + appId);
+            var intrinsicFqdn = domains.fqdn(location, domain, domainObject.provider);
 
-        appstore.purchase(appId, appStoreId, function (error) {
-            if (error && error.reason === AppstoreError.NOT_FOUND) return callback(new AppsError(AppsError.NOT_FOUND));
-            if (error && error.reason === AppstoreError.BILLING_REQUIRED) return callback(new AppsError(AppsError.BILLING_REQUIRED, error.message));
-            if (error && error.reason === AppstoreError.EXTERNAL_ERROR) return callback(new AppsError(AppsError.EXTERNAL_ERROR, error.message));
-            if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
+            error = validateHostname(location, domain, intrinsicFqdn);
+            if (error) return callback(error);
 
-            var data = {
-                accessRestriction: accessRestriction,
-                memoryLimit: memoryLimit,
-                altDomain: altDomain,
-                xFrameOptions: xFrameOptions,
-                sso: sso,
-                debugMode: debugMode,
-                mailboxName: (location ? location : manifest.title.toLowerCase().replace(/[^a-zA-Z0-9]/g, '')) + '.app',
-                restoreConfig: backupId ? { backupId: backupId, backupFormat: backupFormat } : null,
-                enableBackup: enableBackup,
-                robotsTxt: robotsTxt
-            };
+            error = certificates.validateCertificate(cert, key, intrinsicFqdn);
+            if (error) return callback(new AppsError(AppsError.BAD_CERTIFICATE, error.message));
 
-            appdb.add(appId, appStoreId, manifest, location, portBindings, data, function (error) {
-                if (error && error.reason === DatabaseError.ALREADY_EXISTS) return callback(getDuplicateErrorDetails(location, portBindings, error));
+            debug('Will install app with id : ' + appId);
+
+            appstore.purchase(appId, appStoreId, function (error) {
+                if (error && error.reason === AppstoreError.NOT_FOUND) return callback(new AppsError(AppsError.NOT_FOUND));
+                if (error && error.reason === AppstoreError.BILLING_REQUIRED) return callback(new AppsError(AppsError.BILLING_REQUIRED, error.message));
+                if (error && error.reason === AppstoreError.EXTERNAL_ERROR) return callback(new AppsError(AppsError.EXTERNAL_ERROR, error.message));
                 if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
 
-                // save cert to boxdata/certs
-                if (cert && key) {
-                    if (!safe.fs.writeFileSync(path.join(paths.APP_CERTS_DIR, config.appFqdn(location) + '.user.cert'), cert)) return callback(new AppsError(AppsError.INTERNAL_ERROR, 'Error saving cert: ' + safe.error.message));
-                    if (!safe.fs.writeFileSync(path.join(paths.APP_CERTS_DIR, config.appFqdn(location) + '.user.key'), key)) return callback(new AppsError(AppsError.INTERNAL_ERROR, 'Error saving key: ' + safe.error.message));
-                }
+                var data = {
+                    accessRestriction: accessRestriction,
+                    memoryLimit: memoryLimit,
+                    altDomain: altDomain,
+                    xFrameOptions: xFrameOptions,
+                    sso: sso,
+                    debugMode: debugMode,
+                    mailboxName: (location ? location : manifest.title.toLowerCase().replace(/[^a-zA-Z0-9]/g, '')) + '.app',
+                    restoreConfig: backupId ? { backupId: backupId, backupFormat: backupFormat } : null,
+                    enableBackup: enableBackup,
+                    robotsTxt: robotsTxt,
+                    intrinsicFqdn: intrinsicFqdn
+                };
 
-                taskmanager.restartAppTask(appId);
+                appdb.add(appId, appStoreId, manifest, location, domain, portBindings, data, function (error) {
+                    if (error && error.reason === DatabaseError.ALREADY_EXISTS) return callback(getDuplicateErrorDetails(location, portBindings, error));
+                    if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
 
-                eventlog.add(eventlog.ACTION_APP_INSTALL, auditSource, { appId: appId, location: location, manifest: manifest, backupId: backupId });
+                    // save cert to boxdata/certs
+                    if (cert && key) {
+                        if (!safe.fs.writeFileSync(path.join(paths.APP_CERTS_DIR, intrinsicFqdn + '.user.cert'), cert)) return callback(new AppsError(AppsError.INTERNAL_ERROR, 'Error saving cert: ' + safe.error.message));
+                        if (!safe.fs.writeFileSync(path.join(paths.APP_CERTS_DIR, intrinsicFqdn + '.user.key'), key)) return callback(new AppsError(AppsError.INTERNAL_ERROR, 'Error saving key: ' + safe.error.message));
+                    }
 
-                callback(null, { id : appId });
+                    taskmanager.restartAppTask(appId);
+
+                    eventlog.add(eventlog.ACTION_APP_INSTALL, auditSource, { appId: appId, location: location, domain: domain, manifest: manifest, backupId: backupId });
+
+                    callback(null, { id : appId });
+                });
             });
         });
     });
@@ -541,14 +591,12 @@ function configure(appId, data, auditSource, callback) {
         if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new AppsError(AppsError.NOT_FOUND, 'No such app'));
         if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
 
-        var location, portBindings, values = { };
-        if ('location' in data) {
-            location = values.location = data.location.toLowerCase();
-            error = validateHostname(values.location, config.fqdn());
-            if (error) return callback(error);
-        } else {
-            location = app.location;
-        }
+        var domain, location, portBindings, values = { };
+        if ('location' in data) location = values.location = data.location.toLowerCase();
+        else location = app.location;
+
+        if ('domain' in data) domain = values.domain = data.domain.toLowerCase();
+        else domain = app.domain;
 
         if ('accessRestriction' in data) {
             values.accessRestriction = data.accessRestriction;
@@ -593,43 +641,53 @@ function configure(appId, data, auditSource, callback) {
             if (error) return callback(error);
         }
 
-        // save cert to boxdata/certs. TODO: move this to apptask when we have a real task queue
-        if ('cert' in data && 'key' in data) {
-            if (data.cert && data.key) {
-                error = certificates.validateCertificate(data.cert, data.key, config.appFqdn(location));
-                if (error) return callback(new AppsError(AppsError.BAD_CERTIFICATE, error.message));
+        domains.get(domain, function (error, domainObject) {
+            if (error && error.reason === DomainError.NOT_FOUND) return callback(new AppsError(AppsError.NOT_FOUND, 'No such domain'));
+            if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, 'Could not get domain info:' + error.message));
 
-                if (!safe.fs.writeFileSync(path.join(paths.APP_CERTS_DIR, config.appFqdn(location) + '.user.cert'), data.cert)) return callback(new AppsError(AppsError.INTERNAL_ERROR, 'Error saving cert: ' + safe.error.message));
-                if (!safe.fs.writeFileSync(path.join(paths.APP_CERTS_DIR, config.appFqdn(location) + '.user.key'), data.key)) return callback(new AppsError(AppsError.INTERNAL_ERROR, 'Error saving key: ' + safe.error.message));
-            } else { // remove existing cert/key
-                if (!safe.fs.unlinkSync(path.join(paths.APP_CERTS_DIR, config.appFqdn(location) + '.user.cert'))) debug('Error removing cert: ' + safe.error.message);
-                if (!safe.fs.unlinkSync(path.join(paths.APP_CERTS_DIR, config.appFqdn(location) + '.user.key'))) debug('Error removing key: ' + safe.error.message);
+            var intrinsicFqdn = domains.fqdn(location, domain, domainObject.provider);
+
+            error = validateHostname(location, domain, intrinsicFqdn);
+            if (error) return callback(error);
+
+            // save cert to boxdata/certs. TODO: move this to apptask when we have a real task queue
+            if ('cert' in data && 'key' in data) {
+                if (data.cert && data.key) {
+                    error = certificates.validateCertificate(data.cert, data.key, intrinsicFqdn);
+                    if (error) return callback(new AppsError(AppsError.BAD_CERTIFICATE, error.message));
+
+                    if (!safe.fs.writeFileSync(path.join(paths.APP_CERTS_DIR, intrinsicFqdn + '.user.cert'), data.cert)) return callback(new AppsError(AppsError.INTERNAL_ERROR, 'Error saving cert: ' + safe.error.message));
+                    if (!safe.fs.writeFileSync(path.join(paths.APP_CERTS_DIR, intrinsicFqdn + '.user.key'), data.key)) return callback(new AppsError(AppsError.INTERNAL_ERROR, 'Error saving key: ' + safe.error.message));
+                } else { // remove existing cert/key
+                    if (!safe.fs.unlinkSync(path.join(paths.APP_CERTS_DIR, intrinsicFqdn + '.user.cert'))) debug('Error removing cert: ' + safe.error.message);
+                    if (!safe.fs.unlinkSync(path.join(paths.APP_CERTS_DIR, intrinsicFqdn + '.user.key'))) debug('Error removing key: ' + safe.error.message);
+                }
             }
-        }
 
-        if ('enableBackup' in data) values.enableBackup = data.enableBackup;
+            if ('enableBackup' in data) values.enableBackup = data.enableBackup;
 
-        values.oldConfig = getAppConfig(app);
+            values.oldConfig = getAppConfig(app);
 
-        debug('Will configure app with id:%s values:%j', appId, values);
+            debug('Will configure app with id:%s values:%j', appId, values);
 
-        var oldName = (app.location ? app.location : app.manifest.title.toLowerCase().replace(/[^a-zA-Z0-9]/g, '')) + '.app';
-        var newName = (location ? location : app.manifest.title.toLowerCase().replace(/[^a-zA-Z0-9]/g, '')) + '.app';
-        mailboxdb.updateName(oldName, newName, function (error) {
-            if (error && error.reason === DatabaseError.ALREADY_EXISTS) return callback(new AppsError(AppsError.ALREADY_EXISTS, 'This mailbox is already taken'));
-            if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new AppsError(AppsError.BAD_STATE));
-            if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
-
-            appdb.setInstallationCommand(appId, appdb.ISTATE_PENDING_CONFIGURE, values, function (error) {
-                if (error && error.reason === DatabaseError.ALREADY_EXISTS) return callback(getDuplicateErrorDetails(location, portBindings, error));
+            var oldName = (app.location ? app.location : app.manifest.title.toLowerCase().replace(/[^a-zA-Z0-9]/g, '')) + '.app';
+            var newName = (location ? location : app.manifest.title.toLowerCase().replace(/[^a-zA-Z0-9]/g, '')) + '.app';
+            mailboxdb.updateName(oldName, values.oldConfig.domain, newName, domain, function (error) {
+                if (error && error.reason === DatabaseError.ALREADY_EXISTS) return callback(new AppsError(AppsError.ALREADY_EXISTS, 'This mailbox is already taken'));
                 if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new AppsError(AppsError.BAD_STATE));
                 if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
 
-                taskmanager.restartAppTask(appId);
+                appdb.setInstallationCommand(appId, appdb.ISTATE_PENDING_CONFIGURE, values, function (error) {
+                    if (error && error.reason === DatabaseError.ALREADY_EXISTS) return callback(getDuplicateErrorDetails(location, portBindings, error));
+                    if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new AppsError(AppsError.BAD_STATE));
+                    if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
 
-                eventlog.add(eventlog.ACTION_APP_CONFIGURE, auditSource, { appId: appId });
+                    taskmanager.restartAppTask(appId);
 
-                callback(null);
+                    eventlog.add(eventlog.ACTION_APP_CONFIGURE, auditSource, { appId: appId });
+
+                    callback(null);
+                });
             });
         });
     });
@@ -814,11 +872,13 @@ function clone(appId, data, auditSource, callback) {
     debug('Will clone app with id:%s', appId);
 
     var location = data.location.toLowerCase(),
+        domain = data.domain.toLowerCase(),
         portBindings = data.portBindings || null,
         backupId = data.backupId;
 
     assert.strictEqual(typeof backupId, 'string');
     assert.strictEqual(typeof location, 'string');
+    assert.strictEqual(typeof domain, 'string');
     assert.strictEqual(typeof portBindings, 'object');
 
     appdb.get(appId, function (error, app) {
@@ -836,39 +896,46 @@ function clone(appId, data, auditSource, callback) {
             error = checkManifestConstraints(backupInfo.manifest);
             if (error) return callback(error);
 
-            error = validateHostname(location, config.fqdn());
-            if (error) return callback(error);
-
             error = validatePortBindings(portBindings, backupInfo.manifest.tcpPorts);
             if (error) return callback(error);
 
-            var newAppId = uuid.v4(), appStoreId = app.appStoreId, manifest = backupInfo.manifest;
+            domains.get(domain, function (error, domainObject) {
+                if (error && error.reason === DomainError.NOT_FOUND) return callback(new AppsError(AppsError.NOT_FOUND, 'No such domain'));
+                if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, 'Could not get domain info:' + error.message));
 
-            appstore.purchase(newAppId, appStoreId, function (error) {
-                if (error && error.reason === AppstoreError.NOT_FOUND) return callback(new AppsError(AppsError.NOT_FOUND));
-                if (error && error.reason === AppstoreError.BILLING_REQUIRED) return callback(new AppsError(AppsError.BILLING_REQUIRED, error.message));
-                if (error && error.reason === AppstoreError.EXTERNAL_ERROR) return callback(new AppsError(AppsError.EXTERNAL_ERROR, error.message));
-                if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
+                var intrinsicFqdn = domains.fqdn(location, domain, domainObject.provider);
 
-                var data = {
-                    installationState: appdb.ISTATE_PENDING_CLONE,
-                    memoryLimit: app.memoryLimit,
-                    accessRestriction: app.accessRestriction,
-                    xFrameOptions: app.xFrameOptions,
-                    restoreConfig: { backupId: backupId, backupFormat: backupInfo.format },
-                    sso: !!app.sso,
-                    mailboxName: (location ? location : manifest.title.toLowerCase().replace(/[^a-zA-Z0-9]/g, '')) + '.app'
-                };
+                error = validateHostname(location, domain, intrinsicFqdn);
+                if (error) return callback(error);
 
-                appdb.add(newAppId, appStoreId, manifest, location, portBindings, data, function (error) {
-                    if (error && error.reason === DatabaseError.ALREADY_EXISTS) return callback(getDuplicateErrorDetails(location, portBindings, error));
+                var newAppId = uuid.v4(), manifest = backupInfo.manifest;
+
+                appstore.purchase(newAppId, app.appStoreId, function (error) {
+                    if (error && error.reason === AppstoreError.NOT_FOUND) return callback(new AppsError(AppsError.NOT_FOUND));
+                    if (error && error.reason === AppstoreError.BILLING_REQUIRED) return callback(new AppsError(AppsError.BILLING_REQUIRED, error.message));
+                    if (error && error.reason === AppstoreError.EXTERNAL_ERROR) return callback(new AppsError(AppsError.EXTERNAL_ERROR, error.message));
                     if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
 
-                    taskmanager.restartAppTask(newAppId);
+                    var data = {
+                        installationState: appdb.ISTATE_PENDING_CLONE,
+                        memoryLimit: app.memoryLimit,
+                        accessRestriction: app.accessRestriction,
+                        xFrameOptions: app.xFrameOptions,
+                        restoreConfig: { backupId: backupId, backupFormat: backupInfo.format },
+                        sso: !!app.sso,
+                        mailboxName: (location ? location : manifest.title.toLowerCase().replace(/[^a-zA-Z0-9]/g, '')) + '.app'
+                    };
 
-                    eventlog.add(eventlog.ACTION_APP_CLONE, auditSource, { appId: newAppId, oldAppId: appId, backupId: backupId, location: location, manifest: manifest });
+                    appdb.add(newAppId, app.appStoreId, manifest, location, domain, portBindings, data, function (error) {
+                        if (error && error.reason === DatabaseError.ALREADY_EXISTS) return callback(getDuplicateErrorDetails(location, portBindings, error));
+                        if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
 
-                    callback(null, { id : newAppId });
+                        taskmanager.restartAppTask(newAppId);
+
+                        eventlog.add(eventlog.ACTION_APP_CLONE, auditSource, { appId: newAppId, oldAppId: appId, backupId: backupId, location: location, manifest: manifest });
+
+                        callback(null, { id : newAppId });
+                    });
                 });
             });
         });
@@ -1106,13 +1173,13 @@ function restoreInstalledApps(callback) {
         if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
 
         async.map(apps, function (app, iteratorDone) {
-            debug('marking %s for restore', app.location || app.id);
+            debug('marking %s for restore', app.intrinsicFqdn);
 
             backups.getByAppIdPaged(1, 1, app.id, function (error, results) {
                 var restoreConfig = !error && results.length ? { backupId: results[0].id, backupFormat: results[0].format } : null;
 
                 appdb.setInstallationCommand(app.id, appdb.ISTATE_PENDING_RESTORE, { restoreConfig: restoreConfig, oldConfig: null }, function (error) {
-                    if (error) debug('did not mark %s for restore', app.location || app.id, error);
+                    if (error) debug('did not mark %s for restore', app.intrinsicFqdn, error);
 
                     iteratorDone(); // always succeed
                 });
@@ -1128,10 +1195,10 @@ function configureInstalledApps(callback) {
         if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
 
         async.map(apps, function (app, iteratorDone) {
-            debug('marking %s for reconfigure', app.location || app.id);
+            debug('marking %s for reconfigure', app.intrinsicFqdn);
 
             appdb.setInstallationCommand(app.id, appdb.ISTATE_PENDING_CONFIGURE, { oldConfig: null }, function (error) {
-                if (error) debug('did not mark %s for reconfigure', app.location || app.id, error);
+                if (error) debug('did not mark %s for reconfigure', app.intrinsicFqdn, error);
 
                 iteratorDone(); // always succeed
             });

src/appstore.js

@@ -158,10 +158,6 @@ function sendAliveStatus(data, callback) {
             if (error) return callback(new AppstoreError(AppstoreError.INTERNAL_ERROR, error));
 
             var backendSettings = {
-                dnsConfig: {
-                    provider: result[settings.DNS_CONFIG_KEY].provider,
-                    wildcard: result[settings.DNS_CONFIG_KEY].provider === 'manual' ? result[settings.DNS_CONFIG_KEY].wildcard : undefined
-                },
                 tlsConfig: {
                     provider: result[settings.TLS_CONFIG_KEY].provider
                 },

src/apptask.js

@@ -38,6 +38,8 @@ var addons = require('./addons.js'),
     DatabaseError = require('./databaseerror.js'),
     debug = require('debug')('box:apptask'),
     docker = require('./docker.js'),
+    domains = require('./domains.js'),
+    DomainError = domains.DomainError,
     ejs = require('ejs'),
     fs = require('fs'),
     manifestFormat = require('cloudron-manifestformat'),
@@ -48,8 +50,6 @@ var addons = require('./addons.js'),
     paths = require('./paths.js'),
     safe = require('safetydance'),
     shell = require('./shell.js'),
-    SubdomainError = require('./subdomains.js').SubdomainError,
-    subdomains = require('./subdomains.js'),
     superagent = require('superagent'),
     sysinfo = require('./sysinfo.js'),
     tld = require('tldjs'),
@@ -72,10 +72,29 @@ function initialize(callback) {
 function debugApp(app) {
     assert.strictEqual(typeof app, 'object');
 
-    var prefix = app ? (app.location || '(bare)') : '(no app)';
+    var prefix = app ? (app.intrinsicFqdn || '(bare)') : '(no app)';
     debug(prefix + ' ' + util.format.apply(util, Array.prototype.slice.call(arguments, 1)));
 }
 
+// updates the app object and the database
+function updateApp(app, values, callback) {
+    assert.strictEqual(typeof app, 'object');
+    assert.strictEqual(typeof values, 'object');
+    assert.strictEqual(typeof callback, 'function');
+
+    debugApp(app, 'updating app with values: %j', values);
+
+    appdb.update(app.id, values, function (error) {
+        if (error) return callback(error);
+
+        for (var value in values) {
+            app[value] = values[value];
+        }
+
+        return callback(null);
+    });
+}
+
 function reserveHttpPort(app, callback) {
     assert.strictEqual(typeof app, 'object');
     assert.strictEqual(typeof callback, 'function');
@@ -252,18 +271,17 @@ function registerSubdomain(app, overwrite, callback) {
         if (error) return callback(error);
 
         async.retry({ times: 200, interval: 5000 }, function (retryCallback) {
-            debugApp(app, 'Registering subdomain location [%s] overwrite: %s', app.location, overwrite);
+            debugApp(app, 'Registering subdomain location [%s] overwrite: %s', app.intrinsicFqdn, overwrite);
 
             // get the current record before updating it
-            subdomains.get(app.location, 'A', function (error, values) {
+            domains.getDNSRecords(app.location, app.domain, 'A', function (error, values) {
                 if (error) return retryCallback(error);
 
                 // refuse to update any existing DNS record for custom domains that we did not create
-                // note that the appstore sets up the naked domain for non-custom domains
-                if (config.isCustomDomain() && values.length !== 0 && !overwrite) return retryCallback(null, new Error('DNS Record already exists'));
+                if (values.length !== 0 && !overwrite) return retryCallback(null, new Error('DNS Record already exists'));
 
-                subdomains.upsert(app.location, 'A', [ ip ], function (error, changeId) {
-                    if (error && (error.reason === SubdomainError.STILL_BUSY || error.reason === SubdomainError.EXTERNAL_ERROR)) return retryCallback(error); // try again
+                domains.upsertDNSRecords(app.location, app.domain, 'A', [ ip ], function (error, changeId) {
+                    if (error && (error.reason === DomainError.STILL_BUSY || error.reason === DomainError.EXTERNAL_ERROR)) return retryCallback(error); // try again
 
                     retryCallback(null, error || changeId);
                 });
@@ -277,17 +295,12 @@ function registerSubdomain(app, overwrite, callback) {
     });
 }
 
-function unregisterSubdomain(app, location, callback) {
+function unregisterSubdomain(app, location, domain, callback) {
     assert.strictEqual(typeof app, 'object');
     assert.strictEqual(typeof location, 'string');
+    assert.strictEqual(typeof domain, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    // do not unregister bare domain because we show a error/cloudron info page there
-    if (!config.isCustomDomain() && location === '') {
-        debugApp(app, 'Skip unregister of empty subdomain');
-        return callback(null);
-    }
-
     if (!app.dnsRecordId) {
         debugApp(app, 'Skip unregister of record not created by cloudron');
         return callback(null);
@@ -297,10 +310,11 @@ function unregisterSubdomain(app, location, callback) {
         if (error) return callback(error);
 
         async.retry({ times: 30, interval: 5000 }, function (retryCallback) {
-            debugApp(app, 'Unregistering subdomain: %s', location);
+            debugApp(app, 'Unregistering subdomain: %s', app.intrinsicFqdn);
 
-            subdomains.remove(location, 'A', [ ip ], function (error) {
-                if (error && (error.reason === SubdomainError.STILL_BUSY || error.reason === SubdomainError.EXTERNAL_ERROR)) return retryCallback(error); // try again
+            domains.removeDNSRecords(location, domain, 'A', [ ip ], function (error) {
+                if (error && error.reason === DomainError.NOT_FOUND) return retryCallback(null, null); // domain can be not found if oldConfig.domain or restoreConfig.domain was removed
+                if (error && (error.reason === DomainError.STILL_BUSY || error.reason === DomainError.EXTERNAL_ERROR)) return retryCallback(error); // try again
 
                 retryCallback(null, error);
             });
@@ -334,7 +348,7 @@ function waitForDnsPropagation(app, callback) {
     sysinfo.getPublicIp(function (error, ip) {
         if (error) return callback(error);
 
-        subdomains.waitForDns(config.appFqdn(app.location), ip, 'A', { interval: 5000, times: 120 }, callback);
+        domains.waitForDNSRecord(app.intrinsicFqdn, app.domain, ip, 'A', { interval: 5000, times: 120 }, callback);
     });
 }
 
@@ -348,32 +362,13 @@ function waitForAltDomainDnsPropagation(app, callback) {
         sysinfo.getPublicIp(function (error, ip) {
             if (error) return callback(error);
 
-            subdomains.waitForDns(app.altDomain, ip, 'A', { interval: 10000, times: 60 }, callback);
+            domains.waitForDNSRecord(app.altDomain, tld.getDomain(app.altDomain), ip, 'A', { interval: 10000, times: 60 }, callback);
         });
     } else {
-        subdomains.waitForDns(app.altDomain, config.appFqdn(app.location) + '.', 'CNAME', { interval: 10000, times: 60 }, callback);
+        domains.waitForDNSRecord(app.altDomain, tld.getDomain(app.altDomain), app.intrinsicFqdn + '.', 'CNAME', { interval: 10000, times: 60 }, callback);
     }
 }
 
-// updates the app object and the database
-function updateApp(app, values, callback) {
-    assert.strictEqual(typeof app, 'object');
-    assert.strictEqual(typeof values, 'object');
-    assert.strictEqual(typeof callback, 'function');
-
-    debugApp(app, 'updating app with values: %j', values);
-
-    appdb.update(app.id, values, function (error) {
-        if (error) return callback(error);
-
-        for (var value in values) {
-            app[value] = values[value];
-        }
-
-        return callback(null);
-    });
-}
-
 // Ordering is based on the following rationale:
 //   - configure nginx, icon, oauth
 //   - register subdomain.
@@ -482,7 +477,7 @@ function backup(app, callback) {
 
     async.series([
         updateApp.bind(null, app, { installationProgress: '10, Backing up' }),
-        backups.backupApp.bind(null, app, app.manifest),
+        backups.backupApp.bind(null, app),
 
         // done!
         function (callback) {
@@ -504,7 +499,7 @@ function configure(app, callback) {
     assert.strictEqual(typeof callback, 'function');
 
     // oldConfig can be null during an infra update
-    var locationChanged = app.oldConfig && app.oldConfig.location !== app.location;
+    var locationChanged = app.oldConfig && (app.oldConfig.intrinsicFqdn !== app.intrinsicFqdn);
 
     async.series([
         updateApp.bind(null, app, { installationProgress: '10, Cleaning up old install' }),
@@ -515,7 +510,9 @@ function configure(app, callback) {
         deleteContainers.bind(null, app),
         function (next) {
             if (!locationChanged) return next();
-            unregisterSubdomain(app, app.oldConfig.location, next);
+
+            // the config.fqdn() fallback can be removed after 1.9
+            unregisterSubdomain(app, app.oldConfig.location, app.oldConfig.domain || config.fqdn(), next);
         },
 
         reserveHttpPort.bind(null, app),
@@ -592,8 +589,11 @@ function update(app, callback) {
 
             async.series([
                 updateApp.bind(null, app, { installationProgress: '15, Backing up app' }),
-                backups.backupApp.bind(null, app, app.manifest)
-            ], next);
+                backups.backupApp.bind(null, app)
+            ], function (error) {
+                if (error) error.backupError = true;
+                next(error);
+            });
         },
 
         // download new image before app is stopped. this is so we can reduce downtime
@@ -645,7 +645,7 @@ function update(app, callback) {
         downloadIcon.bind(null, app),
 
         updateApp.bind(null, app, { installationProgress: '70, Updating addons' }),
-        addons.setupAddons.bind(null, app, app.manifest.addons),
+        addons.setupAddons.bind(null, app, app.updateConfig.manifest.addons),
 
         updateApp.bind(null, app, { installationProgress: '80, Creating container' }),
         createContainer.bind(null, app),
@@ -661,14 +661,18 @@ function update(app, callback) {
         // done!
         function (callback) {
             debugApp(app, 'updated');
-            updateApp(app, { installationState: appdb.ISTATE_INSTALLED, installationProgress: '', health: null, updateConfig: null }, callback);
+            updateApp(app, { installationState: appdb.ISTATE_INSTALLED, installationProgress: '', health: null, updateConfig: null, updateTime: new Date() }, callback);
         }
     ], function seriesDone(error) {
-        if (error) {
+        if (error && error.backupError) {
+            debugApp(app, 'update aborted because backup failed', error);
+            updateApp(app, { installationState: appdb.ISTATE_INSTALLED, installationProgress: '', health: null, updateConfig: null }, callback.bind(null, error));
+        } else if (error) {
             debugApp(app, 'Error updating app: %s', error);
-            return updateApp(app, { installationState: appdb.ISTATE_ERROR, installationProgress: error.message }, callback.bind(null, error));
+            updateApp(app, { installationState: appdb.ISTATE_ERROR, installationProgress: error.message, updateTime: new Date() }, callback.bind(null, error));
+        } else {
+            callback(null);
         }
-        callback(null);
     });
 }
 
@@ -701,7 +705,7 @@ function uninstall(app, callback) {
         docker.deleteImage.bind(null, app.manifest),
 
         updateApp.bind(null, app, { installationProgress: '60, Unregistering subdomain' }),
-        unregisterSubdomain.bind(null, app, app.location),
+        unregisterSubdomain.bind(null, app, app.location, app.domain),
 
         updateApp.bind(null, app, { installationProgress: '80, Cleanup icon' }),
         removeIcon.bind(null, app),
@@ -765,7 +769,7 @@ function startTask(appId, callback) {
     assert.strictEqual(typeof callback, 'function');
 
     // determine what to do
-    appdb.get(appId, function (error, app) {
+    apps.get(appId, function (error, app) {
         if (error) return callback(error);
 
         debugApp(app, 'startTask installationState: %s runState: %s', app.installationState, app.runState);

src/backups.js

@@ -13,13 +13,14 @@ exports = module.exports = {
     ensureBackup: ensureBackup,
 
     backup: backup,
+    restore: restore,
+
     backupApp: backupApp,
     restoreApp: restoreApp,
 
     backupBoxAndApps: backupBoxAndApps,
 
     upload: upload,
-    download: download,
 
     cleanup: cleanup,
     cleanupCacheFilesSync: cleanupCacheFilesSync,
@@ -41,6 +42,7 @@ var addons = require('./addons.js'),
     backupdb = require('./backupdb.js'),
     config = require('./config.js'),
     crypto = require('crypto'),
+    database = require('./database.js'),
     DatabaseError = require('./databaseerror.js'),
     debug = require('debug')('box:backups'),
     eventlog = require('./eventlog.js'),
@@ -68,7 +70,7 @@ var BACKUPTASK_CMD = path.join(__dirname, 'backuptask.js');
 function debugApp(app) {
     assert(!app || typeof app === 'object');
 
-    var prefix = app ? app.location : '(no app)';
+    var prefix = app ? app.intrinsicFqdn : '(no app)';
     debug(prefix + ' ' + util.format.apply(util, Array.prototype.slice.call(arguments, 1)));
 }
 
@@ -102,6 +104,7 @@ function api(provider) {
     switch (provider) {
     case 'caas': return require('./storage/s3.js');
     case 's3': return require('./storage/s3.js');
+    case 'gcs': return require('./storage/gcs.js');
     case 'filesystem': return require('./storage/filesystem.js');
     case 'minio': return require('./storage/s3.js');
     case 's3-v4-compat': return require('./storage/s3.js');
@@ -368,8 +371,10 @@ function restoreFsMetadata(appDataDir, callback) {
 
     log('Recreating empty directories');
 
-    var metadata = safe.JSON.parse(safe.fs.readFileSync(path.join(appDataDir, 'fsmetadata.json'), 'utf8'));
-    if (metadata === null) return callback(new BackupsError(BackupsError.EXTERNAL_ERROR, 'Error loading fsmetadata.txt:' + safe.error.message));
+    var metadataJson = safe.fs.readFileSync(path.join(appDataDir, 'fsmetadata.json'), 'utf8');
+    if (metadataJson === null) return callback(new BackupsError(BackupsError.EXTERNAL_ERROR, 'Error loading fsmetadata.txt:' + safe.error.message));
+    var metadata = safe.JSON.parse(metadataJson);
+    if (metadata === null) return callback(new BackupsError(BackupsError.EXTERNAL_ERROR, 'Error parsing fsmetadata.txt:' + safe.error.message));
 
     async.eachSeries(metadata.emptyDirs, function createPath(emptyDir, iteratorDone) {
         mkdirp(path.join(appDataDir, emptyDir), iteratorDone);
@@ -386,7 +391,8 @@ function restoreFsMetadata(appDataDir, callback) {
     });
 }
 
-function download(backupId, format, dataDir, callback) {
+function download(backupConfig, backupId, format, dataDir, callback) {
+    assert.strictEqual(typeof backupConfig, 'object');
     assert.strictEqual(typeof backupId, 'string');
     assert.strictEqual(typeof format, 'string');
     assert.strictEqual(typeof dataDir, 'string');
@@ -396,24 +402,36 @@ function download(backupId, format, dataDir, callback) {
 
     log(`Downloading ${backupId} of format ${format} to ${dataDir}`);
 
-    settings.getBackupConfig(function (error, backupConfig) {
-        if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error));
+    if (format === 'tgz') {
+        api(backupConfig.provider).download(backupConfig, getBackupFilePath(backupConfig, backupId, format), function (error, sourceStream) {
+            if (error) return callback(error);
 
-        if (format === 'tgz') {
-            api(backupConfig.provider).download(backupConfig, getBackupFilePath(backupConfig, backupId, format), function (error, sourceStream) {
-                if (error) return callback(error);
+            tarExtract(sourceStream, dataDir, backupConfig.key || null, callback);
+        });
+    } else {
+        var events = api(backupConfig.provider).downloadDir(backupConfig, getBackupFilePath(backupConfig, backupId, format), dataDir);
+        events.on('progress', log);
+        events.on('done', function (error) {
+            if (error) return callback(error);
 
-                tarExtract(sourceStream, dataDir, backupConfig.key || null, callback);
-            });
-        } else {
-            var events = api(backupConfig.provider).downloadDir(backupConfig, getBackupFilePath(backupConfig, backupId, format), dataDir);
-            events.on('progress', log);
-            events.on('done', function (error) {
-                if (error) return callback(error);
+            restoreFsMetadata(dataDir, callback);
+        });
+    }
+}
 
-                restoreFsMetadata(dataDir, callback);
-            });
-        }
+function restore(backupConfig, backupId, callback) {
+    assert.strictEqual(typeof backupConfig, 'object');
+    assert.strictEqual(typeof backupId, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    download(backupConfig, backupId, backupConfig.format, paths.BOX_DATA_DIR, function (error) {
+        if (error) return callback(error);
+
+        database.importFromFile(`${paths.BOX_DATA_DIR}/box.mysqldump`, function (error) {
+            if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error));
+
+            callback();
+        });
     });
 }
 
@@ -427,13 +445,17 @@ function restoreApp(app, addonsToRestore, restoreConfig, callback) {
 
     var startTime = new Date();
 
-    async.series([
-        download.bind(null, restoreConfig.backupId, restoreConfig.backupFormat, appDataDir),
-        addons.restoreAddons.bind(null, app, addonsToRestore)
-    ], function (error) {
-        debug('restoreApp: time: %s', (new Date() - startTime)/1000);
+    settings.getBackupConfig(function (error, backupConfig) {
+        if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error));
 
-        callback(error);
+        async.series([
+            download.bind(null, backupConfig, restoreConfig.backupId, restoreConfig.backupFormat, appDataDir),
+            addons.restoreAddons.bind(null, app, addonsToRestore)
+        ], function (error) {
+            debug('restoreApp: time: %s', (new Date() - startTime)/1000);
+
+            callback(error);
+        });
     });
 }
 
@@ -505,13 +527,7 @@ function snapshotBox(callback) {
 
     log('Snapshotting box');
 
-    var password = config.database().password ? '-p' + config.database().password : '--skip-password';
-    var mysqlDumpArgs = [
-        '-c',
-        `/usr/bin/mysqldump -u root ${password} --single-transaction --routines \
-            --triggers ${config.database().name} > "${paths.BOX_DATA_DIR}/box.mysqldump"`
-    ];
-    shell.exec('backupBox', '/bin/bash', mysqlDumpArgs, { }, function (error) {
+    database.exportToFile(`${paths.BOX_DATA_DIR}/box.mysqldump`, function (error) {
         if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error));
 
         return callback();
@@ -602,9 +618,8 @@ function canBackupApp(app) {
             app.installationState === appdb.ISTATE_PENDING_UPDATE; // called from apptask
 }
 
-function snapshotApp(app, manifest, callback) {
+function snapshotApp(app, callback) {
     assert.strictEqual(typeof app, 'object');
-    assert(manifest && typeof manifest === 'object');
     assert.strictEqual(typeof callback, 'function');
 
     log(`Snapshotting app ${app.id}`);
@@ -613,7 +628,7 @@ function snapshotApp(app, manifest, callback) {
         return callback(new BackupsError(BackupsError.EXTERNAL_ERROR, 'Error creating config.json: ' + safe.error.message));
     }
 
-    addons.backupAddons(app, manifest.addons, function (error) {
+    addons.backupAddons(app, app.manifest.addons, function (error) {
         if (error) return callback(new BackupsError(BackupsError.EXTERNAL_ERROR, error.message));
 
         return callback(null);
@@ -656,17 +671,16 @@ function rotateAppBackup(backupConfig, app, timestamp, callback) {
     });
 }
 
-function uploadAppSnapshot(backupConfig, app, manifest, callback) {
+function uploadAppSnapshot(backupConfig, app, callback) {
     assert.strictEqual(typeof backupConfig, 'object');
     assert.strictEqual(typeof app, 'object');
-    assert(manifest && typeof manifest === 'object');
     assert.strictEqual(typeof callback, 'function');
 
     if (!canBackupApp(app)) return callback(); // nothing to do
 
     var startTime = new Date();
 
-    snapshotApp(app, manifest, function (error) {
+    snapshotApp(app, function (error) {
         if (error) return callback(error);
 
         var backupId = util.format('snapshot/app_%s', app.id);
@@ -676,14 +690,13 @@ function uploadAppSnapshot(backupConfig, app, manifest, callback) {
 
             debugApp(app, 'uploadAppSnapshot: %s done time: %s secs', backupId, (new Date() - startTime)/1000);
 
-            setSnapshotInfo(app.id, { timestamp: new Date().toISOString(), manifest: manifest, format: backupConfig.format }, callback);
+            setSnapshotInfo(app.id, { timestamp: new Date().toISOString(), manifest: app.manifest, format: backupConfig.format }, callback);
         });
     });
 }
 
-function backupAppWithTimestamp(app, manifest, timestamp, callback) {
+function backupAppWithTimestamp(app, timestamp, callback) {
     assert.strictEqual(typeof app, 'object');
-    assert(manifest && typeof manifest === 'object');
     assert.strictEqual(typeof timestamp, 'string');
     assert.strictEqual(typeof callback, 'function');
 
@@ -692,7 +705,7 @@ function backupAppWithTimestamp(app, manifest, timestamp, callback) {
     settings.getBackupConfig(function (error, backupConfig) {
         if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error));
 
-        uploadAppSnapshot(backupConfig, app, manifest, function (error) {
+        uploadAppSnapshot(backupConfig, app, function (error) {
             if (error) return callback(error);
 
             rotateAppBackup(backupConfig, app, timestamp, callback);
@@ -700,17 +713,16 @@ function backupAppWithTimestamp(app, manifest, timestamp, callback) {
     });
 }
 
-function backupApp(app, manifest, callback) {
+function backupApp(app, callback) {
     assert.strictEqual(typeof app, 'object');
-    assert(manifest && typeof manifest === 'object');
     assert.strictEqual(typeof callback, 'function');
 
     const timestamp = (new Date()).toISOString().replace(/[T.]/g, '-').replace(/[:Z]/g,'');
     safe.fs.unlinkSync(paths.BACKUP_LOG_FILE); // start fresh log file
 
-    progress.set(progress.BACKUP, 10,  'Backing up ' + (app.altDomain || config.appFqdn(app.location)));
+    progress.set(progress.BACKUP, 10,  'Backing up ' + (app.altDomain || app.intrinsicFqdn));
 
-    backupAppWithTimestamp(app, manifest, timestamp, function (error) {
+    backupAppWithTimestamp(app, timestamp, function (error) {
         progress.set(progress.BACKUP, 100, error ? error.message : '');
 
         callback(error);
@@ -735,22 +747,22 @@ function backupBoxAndApps(auditSource, callback) {
         var step = 100/(allApps.length+2);
 
         async.mapSeries(allApps, function iterator(app, iteratorCallback) {
-            progress.set(progress.BACKUP, step * processed,  'Backing up ' + (app.altDomain || config.appFqdn(app.location)));
+            progress.set(progress.BACKUP, step * processed,  'Backing up ' + (app.altDomain || app.intrinsicFqdn));
 
             ++processed;
 
             if (!app.enableBackup) {
-                progress.set(progress.BACKUP, step * processed, 'Skipped backup ' + (app.altDomain || config.appFqdn(app.location)));
+                progress.set(progress.BACKUP, step * processed, 'Skipped backup ' + (app.altDomain || app.intrinsicFqdn));
                 return iteratorCallback(null, null); // nothing to backup
             }
 
-            backupAppWithTimestamp(app, app.manifest, timestamp, function (error, backupId) {
+            backupAppWithTimestamp(app, timestamp, function (error, backupId) {
                 if (error && error.reason !== BackupsError.BAD_STATE) {
                     debugApp(app, 'Unable to backup', error);
                     return iteratorCallback(error);
                 }
 
-                progress.set(progress.BACKUP, step * processed, 'Backed up ' + (app.altDomain || config.appFqdn(app.location)));
+                progress.set(progress.BACKUP, step * processed, 'Backed up ' + (app.altDomain || app.intrinsicFqdn));
 
                 iteratorCallback(null, backupId || null); // clear backupId if is in BAD_STATE and never backed up
             });
@@ -829,7 +841,7 @@ function cleanupBackup(backupConfig, backup, callback) {
     function done(error) {
         if (error) {
             debug('cleanupBackup: error removing backup %j : %s', backup, error.message);
-            callback();
+            return callback();
         }
 
         // prune empty directory if possible
@@ -1001,3 +1013,4 @@ function cleanup(auditSource, callback) {
         });
     });
 }
+

src/caas.js

@@ -0,0 +1,194 @@
+'use strict';
+
+exports = module.exports = {
+    changePlan: changePlan,
+    upgrade: upgrade,
+    sendHeartbeat: sendHeartbeat,
+    getBoxAndUserDetails: getBoxAndUserDetails,
+    setPtrRecord: setPtrRecord
+};
+
+var assert = require('assert'),
+    backups = require('./backups.js'),
+    config = require('./config.js'),
+    debug = require('debug')('box:caas'),
+    locker = require('./locker.js'),
+    path = require('path'),
+    progress = require('./progress.js'),
+    shell = require('./shell.js'),
+    superagent = require('superagent'),
+    util = require('util'),
+    _ = require('underscore');
+
+const RETIRE_CMD = path.join(__dirname, 'scripts/retire.sh');
+var gBoxAndUserDetails = null;         // cached cloudron details like region,size...
+
+function CaasError(reason, errorOrMessage) {
+    assert.strictEqual(typeof reason, 'string');
+    assert(errorOrMessage instanceof Error || typeof errorOrMessage === 'string' || typeof errorOrMessage === 'undefined');
+
+    Error.call(this);
+    Error.captureStackTrace(this, this.constructor);
+
+    this.name = this.constructor.name;
+    this.reason = reason;
+    if (typeof errorOrMessage === 'undefined') {
+        this.message = reason;
+    } else if (typeof errorOrMessage === 'string') {
+        this.message = errorOrMessage;
+    } else {
+        this.message = 'Internal error';
+        this.nestedError = errorOrMessage;
+    }
+}
+util.inherits(CaasError, Error);
+CaasError.BAD_FIELD = 'Field error';
+CaasError.INTERNAL_ERROR = 'Internal Error';
+CaasError.EXTERNAL_ERROR = 'External Error';
+CaasError.BAD_STATE = 'Bad state';
+
+var NOOP_CALLBACK = function (error) { if (error) debug(error); };
+
+function retire(reason, info, callback) {
+    assert(reason === 'migrate' || reason === 'upgrade');
+    info = info || { };
+    callback = callback || NOOP_CALLBACK;
+
+    var data = {
+        apiServerOrigin: config.apiServerOrigin(),
+        adminFqdn: config.adminFqdn(),
+        fqdn: config.fqdn()
+    };
+    shell.sudo('retire', [ RETIRE_CMD, reason, JSON.stringify(info), JSON.stringify(data) ], callback);
+}
+
+function doMigrate(options, callback) {
+    assert.strictEqual(typeof options, 'object');
+    assert.strictEqual(typeof callback, 'function');
+
+    var error = locker.lock(locker.OP_MIGRATE);
+    if (error) return callback(new CaasError(CaasError.BAD_STATE, error.message));
+
+    function unlock(error) {
+        debug('Failed to migrate', error);
+        locker.unlock(locker.OP_MIGRATE);
+        progress.set(progress.MIGRATE, -1, 'Backup failed: ' + error.message);
+    }
+
+    progress.set(progress.MIGRATE, 10, 'Backing up for migration');
+
+    // initiate the migration in the background
+    backups.backupBoxAndApps({ userId: null, username: 'migrator' }, function (error) {
+        if (error) return unlock(error);
+
+        debug('migrate: domain: %s size %s region %s', options.domain, options.size, options.region);
+
+        superagent
+            .post(config.apiServerOrigin() + '/api/v1/boxes/' + config.fqdn() + '/migrate')
+            .query({ token: config.token() })
+            .send(options)
+            .timeout(30 * 1000)
+            .end(function (error, result) {
+                if (error && !error.response) return unlock(error); // network error
+                if (result.statusCode === 409) return unlock(new CaasError(CaasError.BAD_STATE));
+                if (result.statusCode === 404) return unlock(new CaasError(CaasError.NOT_FOUND));
+                if (result.statusCode !== 202) return unlock(new CaasError(CaasError.EXTERNAL_ERROR, util.format('%s %j', result.status, result.body)));
+
+                progress.set(progress.MIGRATE, 10, 'Migrating');
+
+                retire('migrate', _.pick(options, 'domain', 'size', 'region'));
+            });
+    });
+
+    callback(null);
+}
+
+function changePlan(options, callback) {
+    assert.strictEqual(typeof options, 'object');
+    assert.strictEqual(typeof callback, 'function');
+
+    if (config.isDemo()) return callback(new CaasError(CaasError.BAD_FIELD, 'Not allowed in demo mode'));
+
+    doMigrate(options, callback);
+}
+
+// this function expects a lock
+function upgrade(boxUpdateInfo, callback) {
+    assert(boxUpdateInfo !== null && typeof boxUpdateInfo === 'object');
+
+    function upgradeError(e) {
+        progress.set(progress.UPDATE, -1, e.message);
+        callback(e);
+    }
+
+    progress.set(progress.UPDATE, 5, 'Backing up for upgrade');
+
+    backups.backupBoxAndApps({ userId: null, username: 'upgrader' }, function (error) {
+        if (error) return upgradeError(error);
+
+        superagent.post(config.apiServerOrigin() + '/api/v1/boxes/' + config.fqdn() + '/upgrade')
+            .query({ token: config.token() })
+            .send({ version: boxUpdateInfo.version })
+            .timeout(30 * 1000)
+            .end(function (error, result) {
+                if (error && !error.response) return upgradeError(new Error('Network error making upgrade request: ' + error));
+                if (result.statusCode !== 202) return upgradeError(new Error(util.format('Server not ready to upgrade. statusCode: %s body: %j', result.status, result.body)));
+
+                progress.set(progress.UPDATE, 10, 'Updating base system');
+
+                // no need to unlock since this is the last thing we ever do on this box
+                callback();
+
+                retire('upgrade');
+            });
+    });
+}
+
+function sendHeartbeat() {
+    assert(config.provider() === 'caas', 'Heartbeat is only sent for managed cloudrons');
+
+    var url = config.apiServerOrigin() + '/api/v1/boxes/' + config.fqdn() + '/heartbeat';
+    superagent.post(url).query({ token: config.token(), version: config.version() }).timeout(30 * 1000).end(function (error, result) {
+        if (error && !error.response) debug('Network error sending heartbeat.', error);
+        else if (result.statusCode !== 200) debug('Server responded to heartbeat with %s %s', result.statusCode, result.text);
+        else debug('Heartbeat sent to %s', url);
+    });
+}
+
+function getBoxAndUserDetails(callback) {
+    assert.strictEqual(typeof callback, 'function');
+
+    if (gBoxAndUserDetails) return callback(null, gBoxAndUserDetails);
+
+    if (config.provider() !== 'caas') return callback(null, {});
+
+    superagent
+        .get(config.apiServerOrigin() + '/api/v1/boxes/' + config.fqdn())
+        .query({ token: config.token() })
+        .timeout(30 * 1000)
+        .end(function (error, result) {
+            if (error && !error.response) return callback(new CaasError(CaasError.EXTERNAL_ERROR, 'Cannot reach appstore'));
+            if (result.statusCode !== 200) return callback(new CaasError(CaasError.EXTERNAL_ERROR, util.format('%s %j', result.statusCode, result.body)));
+
+            gBoxAndUserDetails = result.body;
+
+            return callback(null, gBoxAndUserDetails);
+        });
+}
+
+function setPtrRecord(domain, callback) {
+    assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    superagent
+        .post(config.apiServerOrigin() + '/api/v1/boxes/' + config.fqdn() + '/ptr')
+        .query({ token: config.token() })
+        .send({ domain: domain })
+        .timeout(5 * 1000)
+        .end(function (error, result) {
+            if (error && !error.response) return callback(new CaasError(CaasError.EXTERNAL_ERROR, 'Cannot reach appstore'));
+            if (result.statusCode !== 202) return callback(new CaasError(CaasError.EXTERNAL_ERROR, util.format('%s %j', result.statusCode, result.body)));
+
+            return callback(null);
+        });
+}

src/cert/fallback.js

@@ -17,5 +17,5 @@ function getCertificate(domain, options, callback) {
 
     debug('getCertificate: using fallback certificate', domain);
 
-    return callback(null, 'cert/host.cert', 'cert/host.key');
+    return callback(null, '', '');
 }

src/certificates.js

@@ -5,6 +5,7 @@ exports = module.exports = {
 
     ensureFallbackCertificate: ensureFallbackCertificate,
     setFallbackCertificate: setFallbackCertificate,
+    getFallbackCertificate: getFallbackCertificate,
 
     validateCertificate: validateCertificate,
     ensureCertificate: ensureCertificate,
@@ -92,7 +93,7 @@ function getApi(app, callback) {
         if (tlsConfig.provider === 'fallback') return callback(null, fallback, {});
 
         // use acme if we have altDomain or the tlsConfig is not caas
-        var api = (app.altDomain || tlsConfig.provider) !== 'caas' ? acme : caas;
+        var api = (app.altDomain || tlsConfig.provider !== 'caas') ? acme : caas;
 
         var options = { };
         if (tlsConfig.provider === 'caas') {
@@ -121,6 +122,11 @@ function ensureFallbackCertificate(callback) {
     var fallbackCertPath = path.join(paths.NGINX_CERT_DIR, 'host.cert');
     var fallbackKeyPath = path.join(paths.NGINX_CERT_DIR, 'host.key');
 
+    if (fs.existsSync(fallbackCertPath) && fs.existsSync(fallbackKeyPath)) {
+        debug('ensureFallbackCertificate: pre-existing fallback certs');
+        return callback();
+    }
+
     if (fs.existsSync(certFilePath) && fs.existsSync(keyFilePath)) { // existing custom fallback certs (when restarting, restoring, updating)
         debug('ensureFallbackCertificate: using fallback certs provided by user');
         if (!safe.child_process.execSync('cp ' + certFilePath + ' ' + fallbackCertPath)) return callback(new CertificatesError(CertificatesError.INTERNAL_ERROR, safe.error.message));
@@ -129,15 +135,6 @@ function ensureFallbackCertificate(callback) {
         return callback();
     }
 
-    if (config.tlsCert() && config.tlsKey()) {
-        // cert from CaaS or cloudron-setup. these files should _not_ be part of the backup
-        debug('ensureFallbackCertificate: using CaaS/cloudron-setup fallback certs');
-        if (!safe.fs.writeFileSync(fallbackCertPath, config.tlsCert())) return callback(new CertificatesError(CertificatesError.INTERNAL_ERROR, safe.error.message));
-        if (!safe.fs.writeFileSync(fallbackKeyPath, config.tlsKey())) return callback(new CertificatesError(CertificatesError.INTERNAL_ERROR, safe.error.message));
-
-        return callback();
-    }
-
     // generate a self-signed cert. it's in backup dir so that we don't create a new cert across restarts
     // FIXME: this cert does not cover the naked domain. needs SAN
     if (config.fqdn()) {
@@ -177,11 +174,11 @@ function renewAll(auditSource, callback) {
     apps.getAll(function (error, allApps) {
         if (error) return callback(error);
 
-        allApps.push({ location: config.adminLocation() }); // inject fake webadmin app
+        allApps.push({ intrinsicFqdn: config.adminFqdn() }); // inject fake webadmin app
 
         var expiringApps = [ ];
         for (var i = 0; i < allApps.length; i++) {
-            var appDomain = allApps[i].altDomain || config.appFqdn(allApps[i].location);
+            var appDomain = allApps[i].altDomain || allApps[i].instrincFqdn;
 
             var certFilePath = path.join(paths.APP_CERTS_DIR, appDomain + '.user.cert');
             var keyFilePath = path.join(paths.APP_CERTS_DIR, appDomain + '.user.key');
@@ -205,10 +202,10 @@ function renewAll(auditSource, callback) {
             }
         }
 
-        debug('renewAll: %j needs to be renewed', expiringApps.map(function (a) { return a.altDomain || config.appFqdn(a.location); }));
+        debug('renewAll: %j needs to be renewed', expiringApps.map(function (app) { return app.altDomain || app.intrinsicFqdn; }));
 
         async.eachSeries(expiringApps, function iterator(app, iteratorCallback) {
-            var domain = app.altDomain || config.appFqdn(app.location);
+            var domain = app.altDomain || app.intrinsicFqdn;
 
             getApi(app, function (error, api, apiOptions) {
                 if (error) return callback(error);
@@ -232,14 +229,18 @@ function renewAll(auditSource, callback) {
 
                         debug('renewAll: using fallback certs for %s since it expires soon', domain, error);
 
-                        certFilePath = 'cert/host.cert';
-                        keyFilePath = 'cert/host.key';
+                        // if no cert was returned use fallback, the fallback provider will not provide any for example
+                        var fallbackCertFilePath = path.join(paths.NGINX_CERT_DIR, domain + '.cert');
+                        var fallbackKeyFilePath = path.join(paths.NGINX_CERT_DIR, domain + '.key');
+
+                        certFilePath = fs.existsSync(fallbackCertFilePath) ? fallbackCertFilePath : 'cert/host.cert';
+                        keyFilePath = fs.existsSync(fallbackKeyFilePath) ? fallbackKeyFilePath : 'cert/host.key';
                     } else {
                         debug('renewAll: certificate for %s renewed', domain);
                     }
 
                     // reconfigure and reload nginx. this is required for the case where we got a renewed cert after fallback
-                    var configureFunc = app.location === config.adminLocation() ?
+                    var configureFunc = app.intrinsicFqdn === config.adminFqdn() ?
                         nginx.configureAdmin.bind(null, certFilePath, keyFilePath, constants.NGINX_ADMIN_CONFIG_FILE_NAME, config.adminFqdn())
                         : nginx.configureApp.bind(null, app, certFilePath, keyFilePath);
 
@@ -276,51 +277,52 @@ function validateCertificate(cert, key, fqdn) {
     if (cert && !key) return new Error('missing key');
 
     var result = safe.child_process.execSync('openssl x509 -noout -checkhost "' + fqdn + '"', { encoding: 'utf8', input: cert });
-    if (!result) return new Error(util.format('could not get cert subject'));
+    if (!result) return new Error('Invalid certificate. Unable to get certificate subject.');
 
     // if no match, check alt names
     if (result.indexOf('does match certificate') === -1) {
         // https://github.com/drwetter/testssl.sh/pull/383
-        var cmd = `openssl x509 -noout -text | grep -A3 "Subject Alternative Name" | \
+        var cmd = 'openssl x509 -noout -text | grep -A3 "Subject Alternative Name" | \
                    grep "DNS:" | \
-                   sed -e "s/DNS://g" -e "s/ //g" -e "s/,/ /g" -e "s/othername:<unsupported>//g"`;
+                   sed -e "s/DNS://g" -e "s/ //g" -e "s/,/ /g" -e "s/othername:<unsupported>//g"';
         result = safe.child_process.execSync(cmd, { encoding: 'utf8', input: cert });
         var altNames = result ? [ ] : result.trim().split(' '); // might fail if cert has no SAN
         debug('validateCertificate: detected altNames as %j', altNames);
 
         // check altNames
-        if (!altNames.some(matchesDomain)) return new Error(util.format('cert is not valid for this domain. Expecting %s in %j', fqdn, altNames));
+        if (!altNames.some(matchesDomain)) return new Error(util.format('Certificate is not valid for this domain. Expecting %s in %j', fqdn, altNames));
     }
 
     // http://httpd.apache.org/docs/2.0/ssl/ssl_faq.html#verify
     var certModulus = safe.child_process.execSync('openssl x509 -noout -modulus', { encoding: 'utf8', input: cert });
     var keyModulus = safe.child_process.execSync('openssl rsa -noout -modulus', { encoding: 'utf8', input: key });
-    if (certModulus !== keyModulus) return new Error('key does not match the cert');
+    if (certModulus !== keyModulus) return new Error('Key does not match the certificate.');
 
-   // check expiration
+    // check expiration
     result = safe.child_process.execSync('openssl x509 -checkend 0', { encoding: 'utf8', input: cert });
-    if (!result) return new Error('cert expired');
+    if (!result) return new Error('Certificate is expired.');
 
     return null;
 }
 
-function setFallbackCertificate(cert, key, callback) {
+function setFallbackCertificate(cert, key, fqdn, callback) {
     assert.strictEqual(typeof cert, 'string');
     assert.strictEqual(typeof key, 'string');
+    assert.strictEqual(typeof fqdn, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    var error = validateCertificate(cert, key, '*.' + config.fqdn());
+    var error = validateCertificate(cert, key, '*.' + fqdn);
     if (error) return callback(new CertificatesError(CertificatesError.INVALID_CERT, error.message));
 
     // backup the cert
-    if (!safe.fs.writeFileSync(path.join(paths.APP_CERTS_DIR, 'host.cert'), cert)) return callback(new CertificatesError(CertificatesError.INTERNAL_ERROR, safe.error.message));
-    if (!safe.fs.writeFileSync(path.join(paths.APP_CERTS_DIR, 'host.key'), key)) return callback(new CertificatesError(CertificatesError.INTERNAL_ERROR, safe.error.message));
+    if (!safe.fs.writeFileSync(path.join(paths.APP_CERTS_DIR, fqdn + '.cert'), cert)) return callback(new CertificatesError(CertificatesError.INTERNAL_ERROR, safe.error.message));
+    if (!safe.fs.writeFileSync(path.join(paths.APP_CERTS_DIR, fqdn + '.key'), key)) return callback(new CertificatesError(CertificatesError.INTERNAL_ERROR, safe.error.message));
 
     // copy over fallback cert
-    if (!safe.fs.writeFileSync(path.join(paths.NGINX_CERT_DIR, 'host.cert'), cert)) return callback(new CertificatesError(CertificatesError.INTERNAL_ERROR, safe.error.message));
-    if (!safe.fs.writeFileSync(path.join(paths.NGINX_CERT_DIR, 'host.key'), key)) return callback(new CertificatesError(CertificatesError.INTERNAL_ERROR, safe.error.message));
+    if (!safe.fs.writeFileSync(path.join(paths.NGINX_CERT_DIR, fqdn + '.cert'), cert)) return callback(new CertificatesError(CertificatesError.INTERNAL_ERROR, safe.error.message));
+    if (!safe.fs.writeFileSync(path.join(paths.NGINX_CERT_DIR, fqdn + '.key'), key)) return callback(new CertificatesError(CertificatesError.INTERNAL_ERROR, safe.error.message));
 
-    exports.events.emit(exports.EVENT_CERT_CHANGED, '*.' + config.fqdn());
+    exports.events.emit(exports.EVENT_CERT_CHANGED, '*.' + fqdn);
 
     nginx.reload(function (error) {
         if (error) return callback(new CertificatesError(CertificatesError.INTERNAL_ERROR, error));
@@ -329,11 +331,16 @@ function setFallbackCertificate(cert, key, callback) {
     });
 }
 
-function getFallbackCertificatePath(callback) {
+function getFallbackCertificate(fqdn, callback) {
+    assert.strictEqual(typeof fqdn, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    // any user fallback cert is always copied over to nginx cert dir
-    callback(null, path.join(paths.NGINX_CERT_DIR, 'host.cert'), path.join(paths.NGINX_CERT_DIR, 'host.key'));
+    var cert = safe.fs.readFileSync(path.join(paths.NGINX_CERT_DIR, fqdn + '.cert'), 'utf-8');
+    var key = safe.fs.readFileSync(path.join(paths.NGINX_CERT_DIR, fqdn + '.key'), 'utf-8');
+
+    if (!cert || !key) return callback(new CertificatesError(CertificatesError.NOT_FOUND));
+
+    callback(null, { cert: cert, key: key });
 }
 
 function setAdminCertificate(cert, key, callback) {
@@ -371,7 +378,8 @@ function getAdminCertificatePath(callback) {
 
     if (fs.existsSync(certFilePath) && fs.existsSync(keyFilePath)) return callback(null, certFilePath, keyFilePath);
 
-    getFallbackCertificatePath(callback);
+    // any user fallback cert is always copied over to nginx cert dir
+    callback(null, path.join(paths.NGINX_CERT_DIR, 'host.cert'), path.join(paths.NGINX_CERT_DIR, 'host.key'));
 }
 
 function getAdminCertificate(callback) {
@@ -394,7 +402,7 @@ function ensureCertificate(app, callback) {
     assert.strictEqual(typeof app, 'object');
     assert.strictEqual(typeof callback, 'function');
 
-    var domain = app.altDomain || config.appFqdn(app.location);
+    var domain = app.altDomain || app.intrinsicFqdn;
 
     var certFilePath = path.join(paths.APP_CERTS_DIR, domain + '.user.cert');
     var keyFilePath = path.join(paths.APP_CERTS_DIR, domain + '.user.key');
@@ -422,9 +430,15 @@ function ensureCertificate(app, callback) {
         debug('ensureCertificate: getting certificate for %s with options %j', domain, apiOptions);
 
         api.getCertificate(domain, apiOptions, function (error, certFilePath, keyFilePath) {
-            if (error) {
-                debug('ensureCertificate: could not get certificate. using fallback certs', error);
-                return callback(null, 'cert/host.cert', 'cert/host.key'); // use fallback certs
+            if (error) debug('ensureCertificate: could not get certificate. using fallback certs', error);
+
+            // if no cert was returned use fallback, the fallback provider will not provide any for example
+            if (!certFilePath || !keyFilePath) {
+                var fallbackCertFilePath = path.join(paths.NGINX_CERT_DIR, app.domain + '.cert');
+                var fallbackKeyFilePath = path.join(paths.NGINX_CERT_DIR, app.domain + '.key');
+
+                certFilePath = fs.existsSync(fallbackCertFilePath) ? fallbackCertFilePath : 'cert/host.cert';
+                keyFilePath = fs.existsSync(fallbackKeyFilePath) ? fallbackKeyFilePath : 'cert/host.key';
             }
 
             callback(null, certFilePath, keyFilePath);

src/clients.js

@@ -18,7 +18,7 @@ exports = module.exports = {
 
     // keep this in sync with start.sh ADMIN_SCOPES that generates the cid-webadmin
     SCOPE_APPS: 'apps',
-    SCOPE_DEVELOPER: 'developer',
+    SCOPE_DEVELOPER: 'developer', // obsolete
     SCOPE_PROFILE: 'profile',
     SCOPE_CLOUDRON: 'cloudron',
     SCOPE_SETTINGS: 'settings',
@@ -35,7 +35,7 @@ exports = module.exports = {
     TYPE_PROXY: 'addon-proxy'
 };
 
-var appdb = require('./appdb.js'),
+var apps = require('./apps.js'),
     assert = require('assert'),
     async = require('async'),
     clientdb = require('./clientdb.js'),
@@ -80,7 +80,7 @@ function validateName(name) {
     if (name.length < 1) return new ClientsError(ClientsError.BAD_FIELD, 'Name must be atleast 1 character');
     if (name.length > 128) return new ClientsError(ClientsError.BAD_FIELD, 'Name too long');
 
-    if (/[^a-zA-Z0-9\-]/.test(name)) return new ClientsError(ClientsError.BAD_FIELD, 'Username can only contain alphanumerals and dash');
+    if (/[^a-zA-Z0-9-]/.test(name)) return new ClientsError(ClientsError.BAD_FIELD, 'Username can only contain alphanumerals and dash');
 
     return null;
 }
@@ -183,7 +183,7 @@ function getAll(callback) {
                 return callback(null);
             }
 
-            appdb.get(record.appId, function (error, result) {
+            apps.get(record.appId, function (error, result) {
                 if (error) {
                     console.error('Failed to get app details for oauth client', record.appId, error);
                     return callback(null);  // ignore error so we continue listing clients
@@ -192,7 +192,7 @@ function getAll(callback) {
                 if (record.type === exports.TYPE_PROXY) record.name = result.manifest.title + ' Website Proxy';
                 if (record.type === exports.TYPE_OAUTH) record.name = result.manifest.title + ' OAuth';
 
-                record.location = result.location;
+                record.domain = result.altDomain || result.intrinsicFqdn;
 
                 tmp.push(record);
 
@@ -325,7 +325,7 @@ function addDefaultClients(callback) {
 
     // The domain might have changed, therefor we have to update the record
     // !!! This needs to be in sync with the webadmin, specifically login_callback.js
-    const ADMIN_SCOPES="cloudron,developer,profile,users,apps,settings";
+    const ADMIN_SCOPES = 'cloudron,developer,profile,users,apps,settings';
 
     // id, appId, type, clientSecret, redirectURI, scope
     async.series([

src/cloudron.js

@@ -12,12 +12,9 @@ exports = module.exports = {
     dnsSetup: dnsSetup,
     getLogs: getLogs,
 
-    sendCaasHeartbeat: sendCaasHeartbeat,
-
     updateToLatest: updateToLatest,
+    restore: restore,
     reboot: reboot,
-    retire: retire,
-    migrate: migrate,
 
     checkDiskSpace: checkDiskSpace,
 
@@ -31,6 +28,8 @@ var appdb = require('./appdb.js'),
     assert = require('assert'),
     async = require('async'),
     backups = require('./backups.js'),
+    BackupsError = require('./backups.js').BackupsError,
+    caas = require('./caas.js'),
     certificates = require('./certificates.js'),
     child_process = require('child_process'),
     clients = require('./clients.js'),
@@ -39,6 +38,8 @@ var appdb = require('./appdb.js'),
     cron = require('./cron.js'),
     debug = require('debug')('box:cloudron'),
     df = require('@sindresorhus/df'),
+    domains = require('./domains.js'),
+    DomainError = domains.DomainError,
     eventlog = require('./eventlog.js'),
     fs = require('fs'),
     locker = require('./locker.js'),
@@ -50,12 +51,13 @@ var appdb = require('./appdb.js'),
     platform = require('./platform.js'),
     progress = require('./progress.js'),
     safe = require('safetydance'),
+    semver = require('semver'),
     settings = require('./settings.js'),
+    settingsdb = require('./settingsdb.js'),
     SettingsError = settings.SettingsError,
     shell = require('./shell.js'),
     spawn = require('child_process').spawn,
     split = require('split'),
-    subdomains = require('./subdomains.js'),
     superagent = require('superagent'),
     sysinfo = require('./sysinfo.js'),
     tld = require('tldjs'),
@@ -68,25 +70,11 @@ var appdb = require('./appdb.js'),
 
 var REBOOT_CMD = path.join(__dirname, 'scripts/reboot.sh'),
     UPDATE_CMD = path.join(__dirname, 'scripts/update.sh'),
-    RETIRE_CMD = path.join(__dirname, 'scripts/retire.sh');
+    RESTART_CMD = path.join(__dirname, 'scripts/restart.sh');
 
 var NOOP_CALLBACK = function (error) { if (error) debug(error); };
 
-// result to not depend on the appstore
-const BOX_AND_USER_TEMPLATE = {
-    box: {
-        region: null,
-        size: null,
-        plan: 'Custom Plan'
-    },
-    user: {
-        billing: false,
-        currency: ''
-    }
-};
-
-var gBoxAndUserDetails = null,         // cached cloudron details like region,size...
-    gWebadminStatus = { dns: false, tls: false, configuring: false };
+var gWebadminStatus = { dns: false, tls: false, configuring: false, restoring: false };
 
 function CloudronError(reason, errorOrMessage) {
     assert.strictEqual(typeof reason, 'string');
@@ -120,14 +108,14 @@ CloudronError.SELF_UPGRADE_NOT_SUPPORTED = 'Self upgrade not supported';
 function initialize(callback) {
     assert.strictEqual(typeof callback, 'function');
 
-    gWebadminStatus = { dns: false, tls: false, configuring: false };
-    gBoxAndUserDetails = null;
+    gWebadminStatus = { dns: false, tls: false, configuring: false, restoring: false };
 
     async.series([
         certificates.initialize,
         settings.initialize,
         configureDefaultServer,
-        onDomainConfigured
+        onDomainConfigured,
+        onActivated
     ], function (error) {
         if (error) return callback(error);
 
@@ -142,7 +130,6 @@ function uninitialize(callback) {
 
     async.series([
         cron.uninitialize,
-        mailer.stop,
         platform.stop,
         certificates.uninitialize,
         settings.uninitialize
@@ -158,37 +145,95 @@ function onDomainConfigured(callback) {
         clients.addDefaultClients,
         certificates.ensureFallbackCertificate,
         ensureDkimKey,
-        platform.start, // requires fallback certs for mail container
-        mailer.start, // this requires the "mail" container to be running
-        cron.initialize
+        cron.initialize // required for caas heartbeat before activation
     ], callback);
 }
 
-function dnsSetup(dnsConfig, domain, zoneName, callback) {
-    assert.strictEqual(typeof dnsConfig, 'object');
+function onActivated(callback) {
+    callback = callback || NOOP_CALLBACK;
+
+    // Starting the platform after a user is available means:
+    // 1. mail bounces can now be sent to the cloudron owner
+    // 2. the restore code path can run without sudo (since mail/ is non-root)
+    user.count(function (error, count) {
+        if (error) return callback(new CloudronError(CloudronError.INTERNAL_ERROR, error));
+        if (!count) return callback(); // not activated
+
+        platform.start(callback);
+    });
+}
+
+function autoprovision(callback) {
+    assert.strictEqual(typeof callback, 'function');
+
+    const confJson = safe.fs.readFileSync(paths.AUTO_PROVISION_FILE, 'utf8');
+    if (!confJson) return callback();
+
+    const conf = safe.JSON.parse(confJson);
+    if (!conf) return callback();
+
+    async.eachSeries(Object.keys(conf), function (key, iteratorDone) {
+        var name;
+        switch (key) {
+        case 'dnsConfig': name = 'dns_config'; break;
+        case 'tlsConfig': name = 'tls_config'; break;
+        case 'backupConfig': name = 'backup_config'; break;
+        case 'tlsCert':
+            debug(`autoprovision: ${key}`);
+            return fs.writeFile(path.join(paths.NGINX_CERT_DIR, 'host.cert'), conf[key], iteratorDone);
+        case 'tlsKey':
+            debug(`autoprovision: ${key}`);
+            return fs.writeFile(path.join(paths.NGINX_CERT_DIR, 'host.key'), conf[key], iteratorDone);
+        default:
+            debug(`autoprovision: ${key} ignored`);
+            return iteratorDone();
+        }
+
+        debug(`autoprovision: ${name}`);
+        settingsdb.set(name, JSON.stringify(conf[key]), iteratorDone);
+    }, callback);
+}
+
+function dnsSetup(adminFqdn, domain, zoneName, provider, dnsConfig, callback) {
+    assert.strictEqual(typeof adminFqdn, 'string');
     assert.strictEqual(typeof domain, 'string');
     assert.strictEqual(typeof zoneName, 'string');
+    assert.strictEqual(typeof provider, 'string');
+    assert.strictEqual(typeof dnsConfig, 'object');
     assert.strictEqual(typeof callback, 'function');
 
     if (config.fqdn()) return callback(new CloudronError(CloudronError.ALREADY_SETUP));
 
-    if (!zoneName) zoneName = tld.getDomain(domain) || '';
+    if (!zoneName) zoneName = tld.getDomain(domain) || domain;
 
     debug('dnsSetup: Setting up Cloudron with domain %s and zone %s', domain, zoneName);
 
-    settings.setDnsConfig(dnsConfig, domain, zoneName, function (error) {
-        if (error && error.reason === SettingsError.BAD_FIELD) return callback(new CloudronError(CloudronError.BAD_FIELD, error.message));
+    function done(error) {
+        if (error && error.reason === DomainError.BAD_FIELD) return callback(new CloudronError(CloudronError.BAD_FIELD, error.message));
         if (error) return callback(new CloudronError(CloudronError.INTERNAL_ERROR, error));
 
-        config.setFqdn(domain); // set fqdn only after dns config is valid, otherwise cannot re-setup if we failed
-        config.setZoneName(zoneName);
+        autoprovision(function (error) {
+            if (error) return callback(new CloudronError(CloudronError.INTERNAL_ERROR, error));
 
-        async.series([ // do not block
-            onDomainConfigured,
-            configureWebadmin
-        ], NOOP_CALLBACK);
+            config.setFqdn(domain); // set fqdn only after dns config is valid, otherwise cannot re-setup if we failed
+            config.setAdminFqdn(adminFqdn);
+            config.setAdminLocation('my');
+            config.setZoneName(zoneName);
 
-        callback();
+            callback();
+
+            async.series([ // do not block
+                onDomainConfigured,
+                configureWebadmin
+            ], NOOP_CALLBACK);
+        });
+    }
+
+    domains.get(domain, function (error, result) {
+        if (error && error.reason !== DomainError.NOT_FOUND) return callback(new SettingsError(SettingsError.INTERNAL_ERROR, error));
+
+        if (!result) domains.add(domain, zoneName, provider, dnsConfig, null /* cert */, done);
+        else domains.update(domain, provider, dnsConfig, null /* cert */, done);
     });
 }
 
@@ -230,14 +275,14 @@ function configureWebadmin(callback) {
 
     function done(error) {
         gWebadminStatus.configuring = false;
-        debug('configureWebadmin: done error:%j', error);
+        debug('configureWebadmin: done error: %j', error || {});
         callback(error);
     }
 
     function configureNginx(error) {
-        debug('configureNginx: dns update:%j', error);
+        debug('configureNginx: dns update: %j', error || {});
 
-        certificates.ensureCertificate({ location: config.adminLocation() }, function (error, certFilePath, keyFilePath) {
+        certificates.ensureCertificate({ domain: config.fqdn(), location: config.adminLocation(), intrinsicFqdn: config.adminFqdn() }, function (error, certFilePath, keyFilePath) {
             if (error) return done(error);
 
             gWebadminStatus.tls = true;
@@ -254,7 +299,7 @@ function configureWebadmin(callback) {
         addDnsRecords(ip, function (error) {
             if (error) return configureNginx(error);
 
-            subdomains.waitForDns(config.adminFqdn(), ip, 'A', { interval: 30000, times: 50000 }, function (error) {
+            domains.waitForDNSRecord(config.adminFqdn(), config.fqdn(), ip, 'A', { interval: 30000, times: 50000 }, function (error) {
                 if (error) return configureNginx(error);
 
                 gWebadminStatus.dns = true;
@@ -320,7 +365,7 @@ function activate(username, password, email, displayName, ip, auditSource, callb
 
                 eventlog.add(eventlog.ACTION_ACTIVATE, auditSource, { });
 
-                platform.createMailConfig(NOOP_CALLBACK); // bounces can now be sent to the cloudron owner
+                onActivated();
 
                 callback(null, { token: token, expires: expires });
             });
@@ -376,32 +421,23 @@ function getDisks(callback) {
     });
 }
 
-function getBoxAndUserDetails(callback) {
-    assert.strictEqual(typeof callback, 'function');
-
-    if (gBoxAndUserDetails) return callback(null, gBoxAndUserDetails);
-
-    // only supported for caas
-    if (config.provider() !== 'caas') return callback(null, {});
-
-    superagent
-        .get(config.apiServerOrigin() + '/api/v1/boxes/' + config.fqdn())
-        .query({ token: config.token() })
-        .timeout(30 * 1000)
-        .end(function (error, result) {
-            if (error && !error.response) return callback(new CloudronError(CloudronError.EXTERNAL_ERROR, 'Cannot reach appstore'));
-            if (result.statusCode !== 200) return callback(new CloudronError(CloudronError.EXTERNAL_ERROR, util.format('%s %j', result.statusCode, result.body)));
-
-            gBoxAndUserDetails = result.body;
-
-            return callback(null, gBoxAndUserDetails);
-        });
-}
-
 function getConfig(callback) {
     assert.strictEqual(typeof callback, 'function');
 
-    getBoxAndUserDetails(function (error, result) {
+    // result to not depend on the appstore
+    const BOX_AND_USER_TEMPLATE = {
+        box: {
+            region: null,
+            size: null,
+            plan: 'Custom Plan'
+        },
+        user: {
+            billing: false,
+            currency: ''
+        }
+    };
+
+    caas.getBoxAndUserDetails(function (error, result) {
         if (error) debug('Failed to fetch cloudron details.', error.reason, error.message);
 
         result = _.extend(BOX_AND_USER_TEMPLATE, result || {});
@@ -409,47 +445,30 @@ function getConfig(callback) {
         settings.getCloudronName(function (error, cloudronName) {
             if (error) return callback(new CloudronError(CloudronError.INTERNAL_ERROR, error));
 
-            settings.getDeveloperMode(function (error, developerMode) {
-                if (error) return callback(new CloudronError(CloudronError.INTERNAL_ERROR, error));
-
-                callback(null, {
-                    apiServerOrigin: config.apiServerOrigin(),
-                    webServerOrigin: config.webServerOrigin(),
-                    fqdn: config.fqdn(),
-                    adminLocation: config.adminLocation(),
-                    adminFqdn: config.adminFqdn(),
-                    mailFqdn: config.mailFqdn(),
-                    version: config.version(),
-                    update: updateChecker.getUpdateInfo(),
-                    progress: progress.getAll(),
-                    isCustomDomain: config.isCustomDomain(),
-                    isDemo: config.isDemo(),
-                    developerMode: developerMode,
-                    region: result.box.region,
-                    size: result.box.size,
-                    billing: !!result.user.billing,
-                    plan: result.box.plan,
-                    currency: result.user.currency,
-                    memory: os.totalmem(),
-                    provider: config.provider(),
-                    cloudronName: cloudronName
-                });
+            callback(null, {
+                apiServerOrigin: config.apiServerOrigin(),
+                webServerOrigin: config.webServerOrigin(),
+                fqdn: config.fqdn(),
+                adminLocation: config.adminLocation(),
+                adminFqdn: config.adminFqdn(),
+                mailFqdn: config.mailFqdn(),
+                version: config.version(),
+                update: updateChecker.getUpdateInfo(),
+                progress: progress.getAll(),
+                isDemo: config.isDemo(),
+                region: result.box.region,
+                size: result.box.size,
+                billing: !!result.user.billing,
+                plan: result.box.plan,
+                currency: result.user.currency,
+                memory: os.totalmem(),
+                provider: config.provider(),
+                cloudronName: cloudronName
             });
         });
     });
 }
 
-function sendCaasHeartbeat() {
-    assert(config.provider() === 'caas', 'Heartbeat is only sent for managed cloudrons');
-
-    var url = config.apiServerOrigin() + '/api/v1/boxes/' + config.fqdn() + '/heartbeat';
-    superagent.post(url).query({ token: config.token(), version: config.version() }).timeout(30 * 1000).end(function (error, result) {
-        if (error && !error.response) debug('Network error sending heartbeat.', error);
-        else if (result.statusCode !== 200) debug('Server responded to heartbeat with %s %s', result.statusCode, result.text);
-        else debug('Heartbeat sent to %s', url);
-    });
-}
-
 function ensureDkimKey(callback) {
     assert(config.fqdn(), 'fqdn is not set');
 
@@ -501,7 +520,7 @@ function readDkimPublicKeySync() {
 function txtRecordsWithSpf(callback) {
     assert.strictEqual(typeof callback, 'function');
 
-    subdomains.get('', 'TXT', function (error, txtRecords) {
+    domains.getDNSRecords('', config.fqdn(), 'TXT', function (error, txtRecords) {
         if (error) return callback(error);
 
         debug('txtRecordsWithSpf: current txt records - %j', txtRecords);
@@ -540,22 +559,13 @@ function addDnsRecords(ip, callback) {
     var dkimKey = readDkimPublicKeySync();
     if (!dkimKey) return callback(new CloudronError(CloudronError.INTERNAL_ERROR, new Error('Failed to read dkim public key')));
 
-    var webadminRecord = { subdomain: config.adminLocation(), type: 'A', values: [ ip ] };
+    var webadminRecord = { subdomain: config.adminLocation(), domain: config.fqdn(), type: 'A', values: [ ip ] };
     // t=s limits the domainkey to this domain and not it's subdomains
-    var dkimRecord = { subdomain: config.dkimSelector() + '._domainkey', type: 'TXT', values: [ '"v=DKIM1; t=s; p=' + dkimKey + '"' ] };
+    var dkimRecord = { subdomain: config.dkimSelector() + '._domainkey', domain: config.fqdn(), type: 'TXT', values: [ '"v=DKIM1; t=s; p=' + dkimKey + '"' ] };
 
     var records = [ ];
-    if (config.isCustomDomain()) {
-        records.push(webadminRecord);
-        records.push(dkimRecord);
-    } else {
-        // for non-custom domains, we show a noapp.html page
-        var nakedDomainRecord = { subdomain: '', type: 'A', values: [ ip ] };
-
-        records.push(nakedDomainRecord);
-        records.push(webadminRecord);
-        records.push(dkimRecord);
-    }
+    records.push(webadminRecord);
+    records.push(dkimRecord);
 
     debug('addDnsRecords: %j', records);
 
@@ -563,12 +573,12 @@ function addDnsRecords(ip, callback) {
         txtRecordsWithSpf(function (error, txtRecords) {
             if (error) return retryCallback(error);
 
-            if (txtRecords) records.push({ subdomain: '', type: 'TXT', values: txtRecords });
+            if (txtRecords) records.push({ subdomain: '', domain: config.fqdn(), type: 'TXT', values: txtRecords });
 
             debug('addDnsRecords: will update %j', records);
 
             async.mapSeries(records, function (record, iteratorCallback) {
-                subdomains.upsert(record.subdomain, record.type, record.values, iteratorCallback);
+                domains.upsertDNSRecords(record.subdomain, record.domain, record.type, record.values, iteratorCallback);
             }, function (error, changeIds) {
                 if (error) debug('addDnsRecords: failed to update : %s. will retry', error);
                 else debug('addDnsRecords: records %j added with changeIds %j', records, changeIds);
@@ -584,6 +594,42 @@ function addDnsRecords(ip, callback) {
     });
 }
 
+function restore(backupConfig, backupId, version, callback) {
+    assert.strictEqual(typeof backupConfig, 'object');
+    assert.strictEqual(typeof backupId, 'string');
+    assert.strictEqual(typeof version, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    if (!semver.valid(version)) return callback(new CloudronError(CloudronError.BAD_STATE, 'version is not a valid semver'));
+    if (semver.major(config.version()) !== semver.major(version) || semver.minor(config.version()) !== semver.minor(version)) return callback(new CloudronError(CloudronError.BAD_STATE, `Run cloudron-setup with --version ${version} to restore from this backup`));
+
+    user.count(function (error, count) {
+        if (error) return callback(new CloudronError(CloudronError.INTERNAL_ERROR, error));
+        if (count) return callback(new CloudronError(CloudronError.ALREADY_PROVISIONED, 'Already activated'));
+
+        backups.testConfig(backupConfig, function (error) {
+            if (error && error.reason === BackupsError.BAD_FIELD) return callback(new CloudronError(CloudronError.BAD_FIELD, error.message));
+            if (error && error.reason === BackupsError.EXTERNAL_ERROR) return callback(new CloudronError(CloudronError.EXTERNAL_ERROR, error.message));
+            if (error) return callback(new CloudronError(CloudronError.INTERNAL_ERROR, error));
+
+            debug(`restore: restoring from ${backupId} from provider ${backupConfig.provider}`);
+
+            gWebadminStatus.restoring = true;
+
+            callback(null); // do no block
+
+            async.series([
+                backups.restore.bind(null, backupConfig, backupId),
+                autoprovision,
+                shell.sudo.bind(null, 'restart', [ RESTART_CMD ])
+            ], function (error) {
+                debug('restore:', error);
+                gWebadminStatus.restoring = false;
+            });
+        });
+    });
+}
+
 function reboot(callback) {
     shell.sudo('reboot', [ REBOOT_CMD ], callback);
 }
@@ -606,7 +652,7 @@ function update(boxUpdateInfo, auditSource, callback) {
     // initiate the update/upgrade but do not wait for it
     if (boxUpdateInfo.upgrade) {
         debug('Starting upgrade');
-        doUpgrade(boxUpdateInfo, function (error) {
+        caas.upgrade(boxUpdateInfo, function (error) {
             if (error) {
                 debug('Upgrade failed with error:', error);
                 locker.unlock(locker.OP_BOX_UPDATE);
@@ -625,7 +671,6 @@ function update(boxUpdateInfo, auditSource, callback) {
     callback(null);
 }
 
-
 function updateToLatest(auditSource, callback) {
     assert.strictEqual(typeof auditSource, 'object');
     assert.strictEqual(typeof callback, 'function');
@@ -658,36 +703,6 @@ function doShortCircuitUpdate(boxUpdateInfo, callback) {
     callback();
 }
 
-function doUpgrade(boxUpdateInfo, callback) {
-    assert(boxUpdateInfo !== null && typeof boxUpdateInfo === 'object');
-
-    function upgradeError(e) {
-        progress.set(progress.UPDATE, -1, e.message);
-        callback(e);
-    }
-
-    progress.set(progress.UPDATE, 5, 'Backing up for upgrade');
-
-    backups.backupBoxAndApps({ userId: null, username: 'upgrader' }, function (error) {
-        if (error) return upgradeError(error);
-
-        superagent.post(config.apiServerOrigin() + '/api/v1/boxes/' + config.fqdn() + '/upgrade')
-            .query({ token: config.token() })
-            .send({ version: boxUpdateInfo.version })
-            .timeout(30 * 1000)
-            .end(function (error, result) {
-                if (error && !error.response) return upgradeError(new Error('Network error making upgrade request: ' + error));
-                if (result.statusCode !== 202) return upgradeError(new Error(util.format('Server not ready to upgrade. statusCode: %s body: %j', result.status, result.body)));
-
-                progress.set(progress.UPDATE, 10, 'Updating base system');
-
-                // no need to unlock since this is the last thing we ever do on this box
-                callback();
-                retire('upgrade');
-            });
-    });
-}
-
 function doUpdate(boxUpdateInfo, callback) {
     assert(boxUpdateInfo && typeof boxUpdateInfo === 'object');
 
@@ -708,10 +723,8 @@ function doUpdate(boxUpdateInfo, callback) {
             apiServerOrigin: config.apiServerOrigin(),
             webServerOrigin: config.webServerOrigin(),
             fqdn: config.fqdn(),
+            adminFqdn: config.adminFqdn(),
             adminLocation: config.adminLocation(),
-            tlsCert: config.tlsCert(),
-            tlsKey: config.tlsKey(),
-            isCustomDomain: config.isCustomDomain(),
             isDemo: config.isDemo(),
             zoneName: config.zoneName(),
 
@@ -782,79 +795,6 @@ function checkDiskSpace(callback) {
     });
 }
 
-function retire(reason, info, callback) {
-    assert(reason === 'migrate' || reason === 'upgrade');
-    info = info || { };
-    callback = callback || NOOP_CALLBACK;
-
-    var data = {
-        apiServerOrigin: config.apiServerOrigin(),
-        isCustomDomain: config.isCustomDomain(),
-        fqdn: config.fqdn()
-    };
-    shell.sudo('retire', [ RETIRE_CMD, reason, JSON.stringify(info), JSON.stringify(data) ], callback);
-}
-
-function doMigrate(options, callback) {
-    assert.strictEqual(typeof options, 'object');
-    assert.strictEqual(typeof callback, 'function');
-
-    var error = locker.lock(locker.OP_MIGRATE);
-    if (error) return callback(new CloudronError(CloudronError.BAD_STATE, error.message));
-
-    function unlock(error) {
-        debug('Failed to migrate', error);
-        locker.unlock(locker.OP_MIGRATE);
-        progress.set(progress.MIGRATE, -1, 'Backup failed: ' + error.message);
-    }
-
-    progress.set(progress.MIGRATE, 10, 'Backing up for migration');
-
-    // initiate the migration in the background
-    backups.backupBoxAndApps({ userId: null, username: 'migrator' }, function (error) {
-        if (error) return unlock(error);
-
-        debug('migrate: domain: %s size %s region %s', options.domain, options.size, options.region);
-
-        superagent
-            .post(config.apiServerOrigin() + '/api/v1/boxes/' + config.fqdn() + '/migrate')
-            .query({ token: config.token() })
-            .send(options)
-            .timeout(30 * 1000)
-            .end(function (error, result) {
-                if (error && !error.response) return unlock(error); // network error
-                if (result.statusCode === 409) return unlock(new CloudronError(CloudronError.BAD_STATE));
-                if (result.statusCode === 404) return unlock(new CloudronError(CloudronError.NOT_FOUND));
-                if (result.statusCode !== 202) return unlock(new CloudronError(CloudronError.EXTERNAL_ERROR, util.format('%s %j', result.status, result.body)));
-
-                progress.set(progress.MIGRATE, 10, 'Migrating');
-
-                retire('migrate', _.pick(options, 'domain', 'size', 'region'));
-            });
-    });
-
-    callback(null);
-}
-
-function migrate(options, callback) {
-    assert.strictEqual(typeof options, 'object');
-    assert.strictEqual(typeof callback, 'function');
-
-    if (config.isDemo()) return callback(new CloudronError(CloudronError.BAD_FIELD, 'Not allowed in demo mode'));
-
-    if (!options.domain) return doMigrate(options, callback);
-
-    var dnsConfig = _.pick(options, 'domain', 'provider', 'accessKeyId', 'secretAccessKey', 'region', 'endpoint', 'token', 'zoneName');
-
-    settings.setDnsConfig(dnsConfig, options.domain, options.zoneName || tld.getDomain(options.domain), function (error) {
-        if (error && error.reason === SettingsError.BAD_FIELD) return callback(new CloudronError(CloudronError.BAD_FIELD, error.message));
-        if (error) return callback(new CloudronError(CloudronError.INTERNAL_ERROR, error));
-
-        // TODO: should probably rollback dns config if migrate fails
-        doMigrate(options, callback);
-    });
-}
-
 // called for dynamic dns setups where we have to update the IP
 function refreshDNS(callback) {
     callback = callback || NOOP_CALLBACK;
@@ -876,7 +816,7 @@ function refreshDNS(callback) {
                     // do not change state of installing apps since apptask will error if dns record already exists
                     if (app.installationState !== appdb.ISTATE_INSTALLED) return callback();
 
-                    subdomains.upsert(app.location, 'A', [ ip ], callback);
+                    domains.upsertDNSRecords(app.location, app.domain, 'A', [ ip ], callback);
                 }, function (error) {
                     if (error) return callback(error);
 

src/config.js

@@ -19,10 +19,11 @@ exports = module.exports = {
     fqdn: fqdn,
     zoneName: zoneName,
     setFqdn: setFqdn,
+    setAdminFqdn: setAdminFqdn,
+    setAdminLocation: setAdminLocation,
     token: token,
     version: version,
     setVersion: setVersion,
-    isCustomDomain: isCustomDomain,
     database: database,
 
     // these values are derived
@@ -33,22 +34,17 @@ exports = module.exports = {
     adminFqdn: adminFqdn,
     mailLocation: mailLocation,
     mailFqdn: mailFqdn,
-    appFqdn: appFqdn,
     setZoneName: setZoneName,
     hasIPv6: hasIPv6,
     dkimSelector: dkimSelector,
 
     isDemo: isDemo,
 
-    tlsCert: tlsCert,
-    tlsKey: tlsKey,
-
     // for testing resets to defaults
     _reset: _reset
 };
 
 var assert = require('assert'),
-    debug = require('debug')('box:config.js'),
     fs = require('fs'),
     path = require('path'),
     safe = require('safetydance'),
@@ -81,9 +77,9 @@ function saveSync() {
         apiServerOrigin: data.apiServerOrigin,
         webServerOrigin: data.webServerOrigin,
         fqdn: data.fqdn,
+        adminFqdn: data.adminFqdn,
         zoneName: data.zoneName,
         adminLocation: data.adminLocation,
-        isCustomDomain: data.isCustomDomain,
         provider: data.provider,
         isDemo: data.isDemo
     };
@@ -102,12 +98,12 @@ function _reset(callback) {
 function initConfig() {
     // setup defaults
     data.fqdn = '';
+    data.adminFqdn = '';
     data.zoneName = '';
     data.adminLocation = 'my';
     data.port = 3000;
     data.token = null;
     data.version = null;
-    data.isCustomDomain = true;
     data.apiServerOrigin = null;
     data.webServerOrigin = null;
     data.provider = 'caas';
@@ -126,6 +122,7 @@ function initConfig() {
 
     // overrides for local testings
     if (exports.TEST) {
+        data.version = '1.1.1-test';
         data.port = 5454;
         data.token = 'APPSTORE_TOKEN';
         data.apiServerOrigin = 'http://localhost:6060'; // hock doesn't support https
@@ -188,32 +185,33 @@ function zoneName() {
     return tld.getDomain(fqdn()) || '';
 }
 
-// keep this in sync with start.sh admin.conf generation code
-function appFqdn(location) {
-    assert.strictEqual(typeof location, 'string');
-
-    if (location === '') return fqdn();
-    return isCustomDomain() ? location + '.' + fqdn() : location + '-' + fqdn();
-}
-
 function mailLocation() {
     return get('adminLocation'); // not a typo! should be same as admin location until we figure out certificates
 }
 
-function mailFqdn() {
-    return appFqdn(mailLocation());
+function setAdminLocation(location) {
+    set('adminLocation', location);
 }
 
+
 function adminLocation() {
     return get('adminLocation');
 }
 
+function setAdminFqdn(adminFqdn) {
+    set('adminFqdn', adminFqdn);
+}
+
 function adminFqdn() {
-    return appFqdn(adminLocation());
+    return get('adminFqdn');
+}
+
+function mailFqdn() {
+    return adminFqdn();
 }
 
 function adminOrigin() {
-    return 'https://' + appFqdn(adminLocation());
+    return 'https://' + adminFqdn();
 }
 
 function internalAdminOrigin() {
@@ -236,10 +234,6 @@ function setVersion(version) {
     set('version', version);
 }
 
-function isCustomDomain() {
-    return get('isCustomDomain');
-}
-
 function database() {
     return get('database');
 }
@@ -252,16 +246,6 @@ function provider() {
     return get('provider');
 }
 
-function tlsCert() {
-    var certFile = path.join(baseDir(), 'configs/host.cert');
-    return safe.fs.readFileSync(certFile, 'utf8');
-}
-
-function tlsKey() {
-    var keyFile = path.join(baseDir(), 'configs/host.key');
-    return safe.fs.readFileSync(keyFile, 'utf8');
-}
-
 function hasIPv6() {
     const IPV6_PROC_FILE = '/proc/net/if_inet6';
     return fs.existsSync(IPV6_PROC_FILE);

src/constants.js

@@ -19,8 +19,8 @@ exports = module.exports = {
     ADMIN_NAME: 'Settings',
 
     ADMIN_CLIENT_ID: 'webadmin', // oauth client id
-    ADMIN_APPID: 'admin', // admin appid (settingsdb)
 
+    ADMIN_GROUP_NAME: 'admin',
     ADMIN_GROUP_ID: 'admin',
 
     NGINX_ADMIN_CONFIG_FILE_NAME: 'admin.conf',

src/cron.js

@@ -9,6 +9,7 @@ var apps = require('./apps.js'),
     appstore = require('./appstore.js'),
     assert = require('assert'),
     backups = require('./backups.js'),
+    caas = require('./caas.js'),
     certificates = require('./certificates.js'),
     cloudron = require('./cloudron.js'),
     config = require('./config.js'),
@@ -23,21 +24,23 @@ var apps = require('./apps.js'),
     semver = require('semver'),
     updateChecker = require('./updatechecker.js');
 
-var gAliveJob = null, // send periodic stats
-    gAppUpdateCheckerJob = null,
-    gAutoupdaterJob = null,
-    gBackupJob = null,
-    gBoxUpdateCheckerJob = null,
-    gCertificateRenewJob = null,
-    gCheckDiskSpaceJob = null,
-    gCleanupBackupsJob = null,
-    gCleanupEventlogJob = null,
-    gCleanupTokensJob = null,
-    gDockerVolumeCleanerJob = null,
-    gDynamicDNSJob = null,
-    gCaasHeartbeatJob = null, // for CaaS health check
-    gSchedulerSyncJob = null,
-    gDigestEmailJob = null;
+var gJobs = {
+    alive: null, // send periodic stats
+    autoUpdater: null,
+    appUpdateChecker: null,
+    backup: null,
+    boxUpdateChecker: null,
+    caasHeartbeat: null,
+    checkDiskSpace: null,
+    certificateRenew: null,
+    cleanupBackups: null,
+    cleanupEventlog: null,
+    cleanupTokens: null,
+    digestEmail: null,
+    dockerVolumeCleaner: null,
+    dynamicDNS: null,
+    schedulerSync: null
+};
 
 var NOOP_CALLBACK = function (error) { if (error) console.error(error); };
 var AUDIT_SOURCE = { userId: null, username: 'cron' };
@@ -54,22 +57,20 @@ function initialize(callback) {
     assert.strictEqual(typeof callback, 'function');
 
     if (config.provider() === 'caas') {
-        gCaasHeartbeatJob = new CronJob({
-            cronTime: '00 */1 * * * *', // every minute
-            onTick: cloudron.sendCaasHeartbeat,
-            start: false
-        });
         // hack: send the first heartbeat only after we are running for 60 seconds
         // required as we end up sending a heartbeat and then cloudron-setup reboots the server
-        setTimeout(function () {
-            if (!gCaasHeartbeatJob) return; // already uninitalized
-            gCaasHeartbeatJob.start();
-            cloudron.sendCaasHeartbeat();
-        }, 1000 * 60);
+        var seconds = (new Date()).getSeconds() - 1;
+        if (seconds === -1) seconds = 59;
+
+        gJobs.caasHeartbeat = new CronJob({
+            cronTime: `${seconds} */1 * * * *`, // every minute
+            onTick: caas.sendHeartbeat,
+            start: true
+        });
     }
 
     var randomHourMinute = Math.floor(60*Math.random());
-    gAliveJob = new CronJob({
+    gJobs.alive = new CronJob({
         cronTime: '00 ' + randomHourMinute + ' * * * *', // every hour on a random minute
         onTick: appstore.sendAliveStatus,
         start: true
@@ -95,16 +96,16 @@ function recreateJobs(tz) {
 
     debug('Creating jobs with timezone %s', tz);
 
-    if (gBackupJob) gBackupJob.stop();
-    gBackupJob = new CronJob({
+    if (gJobs.backup) gJobs.backup.stop();
+    gJobs.backup = new CronJob({
         cronTime: '00 00 */6 * * *', // every 6 hours. backups.ensureBackup() will only trigger a backup once per day
         onTick: backups.ensureBackup.bind(null, AUDIT_SOURCE, NOOP_CALLBACK),
         start: true,
         timeZone: tz
     });
 
-    if (gCheckDiskSpaceJob) gCheckDiskSpaceJob.stop();
-    gCheckDiskSpaceJob = new CronJob({
+    if (gJobs.checkDiskSpace) gJobs.checkDiskSpace.stop();
+    gJobs.checkDiskSpace = new CronJob({
         cronTime: '00 30 */4 * * *', // every 4 hours
         onTick: cloudron.checkDiskSpace,
         start: true,
@@ -114,72 +115,72 @@ function recreateJobs(tz) {
     // randomized pattern per cloudron every hour
     var randomMinute = Math.floor(60*Math.random());
 
-    if (gBoxUpdateCheckerJob) gBoxUpdateCheckerJob.stop();
-    gBoxUpdateCheckerJob = new CronJob({
+    if (gJobs.boxUpdateCheckerJob) gJobs.boxUpdateCheckerJob.stop();
+    gJobs.boxUpdateCheckerJob = new CronJob({
         cronTime: '00 ' + randomMinute + ' * * * *', // once an hour
         onTick: updateChecker.checkBoxUpdates,
         start: true,
         timeZone: tz
     });
 
-    if (gAppUpdateCheckerJob) gAppUpdateCheckerJob.stop();
-    gAppUpdateCheckerJob = new CronJob({
+    if (gJobs.appUpdateChecker) gJobs.appUpdateChecker.stop();
+    gJobs.appUpdateChecker = new CronJob({
         cronTime: '00 ' + randomMinute + ' * * * *', // once an hour
         onTick: updateChecker.checkAppUpdates,
         start: true,
         timeZone: tz
     });
 
-    if (gCleanupTokensJob) gCleanupTokensJob.stop();
-    gCleanupTokensJob = new CronJob({
+    if (gJobs.cleanupTokens) gJobs.cleanupTokens.stop();
+    gJobs.cleanupTokens = new CronJob({
         cronTime: '00 */30 * * * *', // every 30 minutes
         onTick: janitor.cleanupTokens,
         start: true,
         timeZone: tz
     });
 
-    if (gCleanupBackupsJob) gCleanupBackupsJob.stop();
-    gCleanupBackupsJob = new CronJob({
+    if (gJobs.cleanupBackups) gJobs.cleanupBackups.stop();
+    gJobs.cleanupBackups = new CronJob({
         cronTime: '00 45 */6 * * *', // every 6 hours. try not to overlap with ensureBackup job
         onTick: backups.cleanup.bind(null, AUDIT_SOURCE, NOOP_CALLBACK),
         start: true,
         timeZone: tz
     });
 
-    if (gCleanupEventlogJob) gCleanupEventlogJob.stop();
-    gCleanupEventlogJob = new CronJob({
+    if (gJobs.cleanupEventlog) gJobs.cleanupEventlog.stop();
+    gJobs.cleanupEventlog = new CronJob({
         cronTime: '00 */30 * * * *', // every 30 minutes
         onTick: eventlog.cleanup,
         start: true,
         timeZone: tz
     });
 
-    if (gDockerVolumeCleanerJob) gDockerVolumeCleanerJob.stop();
-    gDockerVolumeCleanerJob = new CronJob({
+    if (gJobs.dockerVolumeCleaner) gJobs.dockerVolumeCleaner.stop();
+    gJobs.dockerVolumeCleaner = new CronJob({
         cronTime: '00 00 */12 * * *', // every 12 hours
         onTick: janitor.cleanupDockerVolumes,
         start: true,
         timeZone: tz
     });
 
-    if (gSchedulerSyncJob) gSchedulerSyncJob.stop();
-    gSchedulerSyncJob = new CronJob({
+    if (gJobs.schedulerSync) gJobs.schedulerSync.stop();
+    gJobs.schedulerSync = new CronJob({
         cronTime: config.TEST ? '*/10 * * * * *' : '00 */1 * * * *', // every minute
         onTick: scheduler.sync,
         start: true,
         timeZone: tz
     });
 
-    if (gCertificateRenewJob) gCertificateRenewJob.stop();
-    gCertificateRenewJob = new CronJob({
+    if (gJobs.certificateRenew) gJobs.certificateRenew.stop();
+    gJobs.certificateRenew = new CronJob({
         cronTime: '00 00 */12 * * *', // every 12 hours
         onTick: certificates.renewAll.bind(null, AUDIT_SOURCE, NOOP_CALLBACK),
         start: true,
         timeZone: tz
     });
 
-    if (gDigestEmailJob) gDigestEmailJob.stop();
-    gDigestEmailJob = new CronJob({
+    if (gJobs.digestEmail) gJobs.digestEmail.stop();
+    gJobs.digestEmail = new CronJob({
         cronTime: '00 00 00 * * 3', // every wednesday
         onTick: digest.maybeSend,
         start: true,
@@ -189,15 +190,15 @@ function recreateJobs(tz) {
 
 function autoupdatePatternChanged(pattern) {
     assert.strictEqual(typeof pattern, 'string');
-    assert(gBoxUpdateCheckerJob);
+    assert(gJobs.boxUpdateCheckerJob);
 
     debug('Auto update pattern changed to %s', pattern);
 
-    if (gAutoupdaterJob) gAutoupdaterJob.stop();
+    if (gJobs.autoUpdater) gJobs.autoUpdater.stop();
 
     if (pattern === constants.AUTOUPDATE_PATTERN_NEVER) return;
 
-    gAutoupdaterJob = new CronJob({
+    gJobs.autoUpdater = new CronJob({
         cronTime: pattern,
         onTick: function() {
             var updateInfo = updateChecker.getUpdateInfo();
@@ -216,26 +217,26 @@ function autoupdatePatternChanged(pattern) {
             }
         },
         start: true,
-        timeZone: gBoxUpdateCheckerJob.cronTime.zone // hack
+        timeZone: gJobs.boxUpdateCheckerJob.cronTime.zone // hack
     });
 }
 
 function dynamicDNSChanged(enabled) {
     assert.strictEqual(typeof enabled, 'boolean');
-    assert(gBoxUpdateCheckerJob);
+    assert(gJobs.boxUpdateCheckerJob);
 
     debug('Dynamic DNS setting changed to %s', enabled);
 
     if (enabled) {
-        gDynamicDNSJob = new CronJob({
+        gJobs.dynamicDNS = new CronJob({
             cronTime: '00 */10 * * * *',
             onTick: cloudron.refreshDNS,
             start: true,
-            timeZone: gBoxUpdateCheckerJob.cronTime.zone // hack
+            timeZone: gJobs.boxUpdateCheckerJob.cronTime.zone // hack
         });
     } else {
-        if (gDynamicDNSJob) gDynamicDNSJob.stop();
-        gDynamicDNSJob = null;
+        if (gJobs.dynamicDNS) gJobs.dynamicDNS.stop();
+        gJobs.dynamicDNS = null;
     }
 }
 
@@ -244,48 +245,13 @@ function uninitialize(callback) {
 
     settings.events.removeListener(settings.TIME_ZONE_KEY, recreateJobs);
     settings.events.removeListener(settings.AUTOUPDATE_PATTERN_KEY, autoupdatePatternChanged);
+    settings.events.removeListener(settings.DYNAMIC_DNS_KEY, dynamicDNSChanged);
 
-    if (gAutoupdaterJob) gAutoupdaterJob.stop();
-    gAutoupdaterJob = null;
-
-    if (gBoxUpdateCheckerJob) gBoxUpdateCheckerJob.stop();
-    gBoxUpdateCheckerJob = null;
-
-    if (gAppUpdateCheckerJob) gAppUpdateCheckerJob.stop();
-    gAppUpdateCheckerJob = null;
-
-    if (gCaasHeartbeatJob) gCaasHeartbeatJob.stop();
-    gCaasHeartbeatJob = null;
-
-    if (gAliveJob) gAliveJob.stop();
-    gAliveJob = null;
-
-    if (gBackupJob) gBackupJob.stop();
-    gBackupJob = null;
-
-    if (gCleanupTokensJob) gCleanupTokensJob.stop();
-    gCleanupTokensJob = null;
-
-    if (gCleanupBackupsJob) gCleanupBackupsJob.stop();
-    gCleanupBackupsJob = null;
-
-    if (gCleanupEventlogJob) gCleanupEventlogJob.stop();
-    gCleanupEventlogJob = null;
-
-    if (gDockerVolumeCleanerJob) gDockerVolumeCleanerJob.stop();
-    gDockerVolumeCleanerJob = null;
-
-    if (gSchedulerSyncJob) gSchedulerSyncJob.stop();
-    gSchedulerSyncJob = null;
-
-    if (gCertificateRenewJob) gCertificateRenewJob.stop();
-    gCertificateRenewJob = null;
-
-    if (gDynamicDNSJob) gDynamicDNSJob.stop();
-    gDynamicDNSJob = null;
-
-    if (gDigestEmailJob) gDigestEmailJob.stop();
-    gDigestEmailJob = null;
+    for (var job in gJobs) {
+        if (!gJobs[job]) continue;
+        gJobs[job].stop();
+        gJobs[job] = null;
+    }
 
     callback();
 }

src/database.js

@@ -10,6 +10,9 @@ exports = module.exports = {
     rollback: rollback,
     commit: commit,
 
+    importFromFile: importFromFile,
+    exportToFile: exportToFile,
+
     _clear: clear
 };
 
@@ -101,6 +104,7 @@ function clear(callback) {
     async.series([
         child_process.exec.bind(null, cmd),
         require('./clientdb.js')._addDefaultClients,
+        require('./domaindb.js')._addDefaultDomain,
         require('./groupdb.js')._addDefaultGroups
     ], callback);
 }
@@ -183,3 +187,27 @@ function transaction(queries, callback) {
     });
 }
 
+function importFromFile(file, callback) {
+    assert.strictEqual(typeof file, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    var password = config.database().password ? '-p' + config.database().password : '--skip-password';
+
+    var cmd = `/usr/bin/mysql -u ${config.database().username} ${password} ${config.database().name} < ${file}`;
+
+    async.series([
+        query.bind(null, 'CREATE DATABASE IF NOT EXISTS box'),
+        child_process.exec.bind(null, cmd)
+    ], callback);
+}
+
+function exportToFile(file, callback) {
+    assert.strictEqual(typeof file, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    var password = config.database().password ? '-p' + config.database().password : '--skip-password';
+    var cmd = `/usr/bin/mysqldump -u root ${password} --single-transaction --routines \
+            --triggers ${config.database().name} > "${file}"`;
+
+    child_process.exec(cmd, callback);
+}

src/developer.js

@@ -5,8 +5,6 @@
 exports = module.exports = {
     DeveloperError: DeveloperError,
 
-    isEnabled: isEnabled,
-    setEnabled: setEnabled,
     issueDeveloperToken: issueDeveloperToken
 };
 
@@ -15,7 +13,6 @@ var assert = require('assert'),
     constants = require('./constants.js'),
     eventlog = require('./eventlog.js'),
     tokendb = require('./tokendb.js'),
-    settings = require('./settings.js'),
     util = require('util');
 
 function DeveloperError(reason, errorOrMessage) {
@@ -40,29 +37,6 @@ util.inherits(DeveloperError, Error);
 DeveloperError.INTERNAL_ERROR = 'Internal Error';
 DeveloperError.EXTERNAL_ERROR = 'External Error';
 
-function isEnabled(callback) {
-    assert.strictEqual(typeof callback, 'function');
-
-    settings.getDeveloperMode(function (error, enabled) {
-        if (error) return callback(new DeveloperError(DeveloperError.INTERNAL_ERROR, error));
-        callback(null, enabled);
-    });
-}
-
-function setEnabled(enabled, auditSource, callback) {
-    assert.strictEqual(typeof enabled, 'boolean');
-    assert.strictEqual(typeof auditSource, 'object');
-    assert.strictEqual(typeof callback, 'function');
-
-    settings.setDeveloperMode(enabled, function (error) {
-        if (error) return callback(new DeveloperError(DeveloperError.INTERNAL_ERROR, error));
-
-        eventlog.add(eventlog.ACTION_CLI_MODE, auditSource, { enabled: enabled });
-
-        callback(null);
-    });
-}
-
 function issueDeveloperToken(user, auditSource, callback) {
     assert.strictEqual(typeof user, 'object');
     assert.strictEqual(typeof auditSource, 'object');

src/dns/caas.js

@@ -11,10 +11,17 @@ exports = module.exports = {
 var assert = require('assert'),
     config = require('../config.js'),
     debug = require('debug')('box:dns/caas'),
-    SubdomainError = require('../subdomains.js').SubdomainError,
+    DomainError = require('../domains.js').DomainError,
     superagent = require('superagent'),
     util = require('util');
 
+function getFqdn(subdomain, domain) {
+    assert.strictEqual(typeof subdomain, 'string');
+    assert.strictEqual(typeof domain, 'string');
+
+    return (subdomain === '') ? domain : subdomain + '-' + domain;
+}
+
 function add(dnsConfig, zoneName, subdomain, type, values, callback) {
     assert.strictEqual(typeof dnsConfig, 'object');
     assert.strictEqual(typeof zoneName, 'string');
@@ -23,9 +30,9 @@ function add(dnsConfig, zoneName, subdomain, type, values, callback) {
     assert(util.isArray(values));
     assert.strictEqual(typeof callback, 'function');
 
-    var fqdn = subdomain !== '' && type === 'TXT' ? subdomain + '.' + config.fqdn() : config.appFqdn(subdomain);
+    var fqdn = subdomain !== '' && type === 'TXT' ? subdomain + '.' + dnsConfig.fqdn : getFqdn(subdomain, dnsConfig.fqdn);
 
-    debug('add: %s for zone %s of type %s with values %j', subdomain, zoneName, type, values);
+    debug('add: %s for zone %s of type %s with values %j', subdomain, dnsConfig.fqdn, type, values);
 
     var data = {
         type: type,
@@ -38,10 +45,10 @@ function add(dnsConfig, zoneName, subdomain, type, values, callback) {
         .send(data)
         .timeout(30 * 1000)
         .end(function (error, result) {
-            if (error && !error.response) return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, util.format('Network error %s', error.message)));
-            if (result.statusCode === 400) return callback(new SubdomainError(SubdomainError.BAD_FIELD, result.body.message));
-            if (result.statusCode === 420) return callback(new SubdomainError(SubdomainError.STILL_BUSY));
-            if (result.statusCode !== 201) return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, util.format('%s %j', result.statusCode, result.body)));
+            if (error && !error.response) return callback(new DomainError(DomainError.EXTERNAL_ERROR, util.format('Network error %s', error.message)));
+            if (result.statusCode === 400) return callback(new DomainError(DomainError.BAD_FIELD, result.body.message));
+            if (result.statusCode === 420) return callback(new DomainError(DomainError.STILL_BUSY));
+            if (result.statusCode !== 201) return callback(new DomainError(DomainError.EXTERNAL_ERROR, util.format('%s %j', result.statusCode, result.body)));
 
             return callback(null, result.body.changeId);
         });
@@ -54,17 +61,17 @@ function get(dnsConfig, zoneName, subdomain, type, callback) {
     assert.strictEqual(typeof type, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    var fqdn = subdomain !== '' && type === 'TXT' ? subdomain + '.' + config.fqdn() : config.appFqdn(subdomain);
+    var fqdn = subdomain !== '' && type === 'TXT' ? subdomain + '.' + dnsConfig.fqdn : getFqdn(subdomain, dnsConfig.fqdn);
 
-    debug('get: zoneName: %s subdomain: %s type: %s fqdn: %s', zoneName, subdomain, type, fqdn);
+    debug('get: zoneName: %s subdomain: %s type: %s fqdn: %s', dnsConfig.fqdn, subdomain, type, fqdn);
 
     superagent
         .get(config.apiServerOrigin() + '/api/v1/domains/' + fqdn)
         .query({ token: dnsConfig.token, type: type })
         .timeout(30 * 1000)
         .end(function (error, result) {
-            if (error && !error.response) return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, util.format('Network error %s', error.message)));
-            if (result.statusCode !== 200) return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, util.format('%s %j', result.statusCode, result.body)));
+            if (error && !error.response) return callback(new DomainError(DomainError.EXTERNAL_ERROR, util.format('Network error %s', error.message)));
+            if (result.statusCode !== 200) return callback(new DomainError(DomainError.EXTERNAL_ERROR, util.format('%s %j', result.statusCode, result.body)));
 
             return callback(null, result.body.values);
         });
@@ -89,7 +96,7 @@ function del(dnsConfig, zoneName, subdomain, type, values, callback) {
     assert(util.isArray(values));
     assert.strictEqual(typeof callback, 'function');
 
-    debug('del: %s for zone %s of type %s with values %j', subdomain, zoneName, type, values);
+    debug('del: %s for zone %s of type %s with values %j', subdomain, dnsConfig.fqdn, type, values);
 
     var data = {
         type: type,
@@ -97,16 +104,16 @@ function del(dnsConfig, zoneName, subdomain, type, values, callback) {
     };
 
     superagent
-        .del(config.apiServerOrigin() + '/api/v1/domains/' + config.appFqdn(subdomain))
+        .del(config.apiServerOrigin() + '/api/v1/domains/' + getFqdn(subdomain, dnsConfig.fqdn))
         .query({ token: dnsConfig.token })
         .send(data)
         .timeout(30 * 1000)
         .end(function (error, result) {
-            if (error && !error.response) return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, util.format('Network error %s', error.message)));
-            if (result.statusCode === 400) return callback(new SubdomainError(SubdomainError.BAD_FIELD, result.body.message));
-            if (result.statusCode === 420) return callback(new SubdomainError(SubdomainError.STILL_BUSY));
-            if (result.statusCode === 404) return callback(new SubdomainError(SubdomainError.NOT_FOUND));
-            if (result.statusCode !== 204) return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, util.format('%s %j', result.statusCode, result.body)));
+            if (error && !error.response) return callback(new DomainError(DomainError.EXTERNAL_ERROR, util.format('Network error %s', error.message)));
+            if (result.statusCode === 400) return callback(new DomainError(DomainError.BAD_FIELD, result.body.message));
+            if (result.statusCode === 420) return callback(new DomainError(DomainError.STILL_BUSY));
+            if (result.statusCode === 404) return callback(new DomainError(DomainError.NOT_FOUND));
+            if (result.statusCode !== 204) return callback(new DomainError(DomainError.EXTERNAL_ERROR, util.format('%s %j', result.statusCode, result.body)));
 
             return callback(null);
         });
@@ -120,7 +127,8 @@ function verifyDnsConfig(dnsConfig, domain, zoneName, ip, callback) {
     assert.strictEqual(typeof callback, 'function');
 
     var credentials = {
-        provider: dnsConfig.provider
+        token: dnsConfig.token,
+        fqdn: domain
     };
 
     return callback(null, credentials);

src/dns/cloudflare.js

@@ -10,12 +10,12 @@ exports = module.exports = {
 
 var assert = require('assert'),
     async = require('async'),
-    dns = require('dns'),
-    _ = require('underscore'),
-    SubdomainError = require('../subdomains.js').SubdomainError,
-    superagent = require('superagent'),
     debug = require('debug')('box:dns/cloudflare'),
-    util = require('util');
+    dns = require('dns'),
+    DomainError = require('../domains.js').DomainError,
+    superagent = require('superagent'),
+    util = require('util'),
+    _ = require('underscore');
 
 // we are using latest v4 stable API https://api.cloudflare.com/#getting-started-endpoints
 var CLOUDFLARE_ENDPOINT = 'https://api.cloudflare.com/client/v4';
@@ -24,8 +24,8 @@ function translateRequestError(result, callback) {
     assert.strictEqual(typeof result, 'object');
     assert.strictEqual(typeof callback, 'function');
 
-    if (result.statusCode === 404) return callback(new SubdomainError(SubdomainError.NOT_FOUND, util.format('%s %j', result.statusCode, 'API does not exist')));
-    if (result.statusCode === 422) return callback(new SubdomainError(SubdomainError.BAD_FIELD, result.body.message));
+    if (result.statusCode === 404) return callback(new DomainError(DomainError.NOT_FOUND, util.format('%s %j', result.statusCode, 'API does not exist')));
+    if (result.statusCode === 422) return callback(new DomainError(DomainError.BAD_FIELD, result.body.message));
     if ((result.statusCode === 400 || result.statusCode === 401 || result.statusCode === 403) && result.body.errors.length > 0) {
         let error = result.body.errors[0];
         let message = error.message;
@@ -34,10 +34,10 @@ function translateRequestError(result, callback) {
             else message = 'Invalid credentials';
         }
 
-        return callback(new SubdomainError(SubdomainError.ACCESS_DENIED, message));
+        return callback(new DomainError(DomainError.ACCESS_DENIED, message));
     }
 
-    callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, util.format('%s %j', result.statusCode, result.body)));
+    callback(new DomainError(DomainError.EXTERNAL_ERROR, util.format('%s %j', result.statusCode, result.body)));
 }
 
 function getZoneByName(dnsConfig, zoneName, callback) {
@@ -52,7 +52,7 @@ function getZoneByName(dnsConfig, zoneName, callback) {
       .end(function (error, result) {
         if (error && !error.response) return callback(error);
         if (result.statusCode !== 200 || result.body.success !== true) return translateRequestError(result, callback);
-        if (!result.body.result.length) return callback(new SubdomainError(SubdomainError.NOT_FOUND, util.format('%s %j', result.statusCode, result.body)));
+        if (!result.body.result.length) return callback(new DomainError(DomainError.NOT_FOUND, util.format('%s %j', result.statusCode, result.body)));
 
         callback(null, result.body.result[0]);
     });
@@ -233,11 +233,10 @@ function verifyDnsConfig(dnsConfig, fqdn, zoneName, ip, callback) {
     assert.strictEqual(typeof ip, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    if (!dnsConfig.token || typeof dnsConfig.token !== 'string') return callback(new SubdomainError(SubdomainError.BAD_FIELD, 'token must be a non-empty string'));
-    if (!dnsConfig.email || typeof dnsConfig.email !== 'string') return callback(new SubdomainError(SubdomainError.BAD_FIELD, 'email must be a non-empty string'));
+    if (!dnsConfig.token || typeof dnsConfig.token !== 'string') return callback(new DomainError(DomainError.BAD_FIELD, 'token must be a non-empty string'));
+    if (!dnsConfig.email || typeof dnsConfig.email !== 'string') return callback(new DomainError(DomainError.BAD_FIELD, 'email must be a non-empty string'));
 
     var credentials = {
-        provider: dnsConfig.provider,
         token: dnsConfig.token,
         email: dnsConfig.email
     };
@@ -245,23 +244,31 @@ function verifyDnsConfig(dnsConfig, fqdn, zoneName, ip, callback) {
     if (process.env.BOX_ENV === 'test') return callback(null, credentials); // this shouldn't be here
 
     dns.resolveNs(zoneName, function (error, nameservers) {
-        if (error && error.code === 'ENOTFOUND') return callback(new SubdomainError(SubdomainError.BAD_FIELD, 'Unable to resolve nameservers for this domain'));
-        if (error || !nameservers) return callback(new SubdomainError(SubdomainError.BAD_FIELD, error ? error.message : 'Unable to get nameservers'));
+        if (error && error.code === 'ENOTFOUND') return callback(new DomainError(DomainError.BAD_FIELD, 'Unable to resolve nameservers for this domain'));
+        if (error || !nameservers) return callback(new DomainError(DomainError.BAD_FIELD, error ? error.message : 'Unable to get nameservers'));
 
         getZoneByName(dnsConfig, zoneName, function(error, result) {
             if (error) return callback(error);
 
             if (!_.isEqual(result.name_servers.sort(), nameservers.sort())) {
                 debug('verifyDnsConfig: %j and %j do not match', nameservers, result.name_servers);
-                return callback(new SubdomainError(SubdomainError.BAD_FIELD, 'Domain nameservers are not set to Cloudflare'));
+                return callback(new DomainError(DomainError.BAD_FIELD, 'Domain nameservers are not set to Cloudflare'));
             }
 
-            upsert(credentials, zoneName, 'my', 'A', [ ip ], function (error, changeId) {
+            const testSubdomain = 'cloudrontestdns';
+
+            upsert(credentials, zoneName, testSubdomain, 'A', [ ip ], function (error, changeId) {
                 if (error) return callback(error);
 
-                debug('verifyDnsConfig: A record added with change id %s', changeId);
+                debug('verifyDnsConfig: Test A record added with change id %s', changeId);
 
-                callback(null, credentials);
+                del(dnsConfig, zoneName, testSubdomain, 'A', [ ip ], function (error) {
+                    if (error) return callback(error);
+
+                    debug('verifyDnsConfig: Test A record removed again');
+
+                    callback(null, credentials);
+                });
             });
         });
     });

src/dns/digitalocean.js

@@ -10,11 +10,10 @@ exports = module.exports = {
 
 var assert = require('assert'),
     async = require('async'),
-    config = require('../config.js'),
     debug = require('debug')('box:dns/digitalocean'),
     dns = require('dns'),
+    DomainError = require('../domains.js').DomainError,
     safe = require('safetydance'),
-    SubdomainError = require('../subdomains.js').SubdomainError,
     superagent = require('superagent'),
     util = require('util');
 
@@ -40,10 +39,10 @@ function getInternal(dnsConfig, zoneName, subdomain, type, callback) {
             .set('Authorization', 'Bearer ' + dnsConfig.token)
             .timeout(30 * 1000)
             .end(function (error, result) {
-                if (error && !error.response) return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, util.format('Network error %s', error.message)));
-                if (result.statusCode === 404) return callback(new SubdomainError(SubdomainError.NOT_FOUND, formatError(result)));
-                if (result.statusCode === 403 || result.statusCode === 401) return callback(new SubdomainError(SubdomainError.ACCESS_DENIED, formatError(result)));
-                if (result.statusCode !== 200) return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, formatError(result)));
+                if (error && !error.response) return callback(new DomainError(DomainError.EXTERNAL_ERROR, util.format('Network error %s', error.message)));
+                if (result.statusCode === 404) return callback(new DomainError(DomainError.NOT_FOUND, formatError(result)));
+                if (result.statusCode === 403 || result.statusCode === 401) return callback(new DomainError(DomainError.ACCESS_DENIED, formatError(result)));
+                if (result.statusCode !== 200) return callback(new DomainError(DomainError.EXTERNAL_ERROR, formatError(result)));
 
                 matchingRecords = matchingRecords.concat(result.body.domain_records.filter(function (record) {
                     return (record.type === type && record.name === subdomain);
@@ -80,7 +79,7 @@ function upsert(dnsConfig, zoneName, subdomain, type, values, callback) {
         // used to track available records to update instead of create
         var i = 0, recordIds = [];
 
-        async.eachSeries(values, function (value, callback) {
+        async.eachSeries(values, function (value, iteratorCallback) {
             var priority = null;
 
             if (type === 'MX') {
@@ -102,14 +101,14 @@ function upsert(dnsConfig, zoneName, subdomain, type, values, callback) {
                     .send(data)
                     .timeout(30 * 1000)
                     .end(function (error, result) {
-                        if (error && !error.response) return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, util.format('Network error %s', error.message)));
-                        if (result.statusCode === 403 || result.statusCode === 401) return callback(new SubdomainError(SubdomainError.ACCESS_DENIED, formatError(result)));
-                        if (result.statusCode === 422) return callback(new SubdomainError(SubdomainError.BAD_FIELD, result.body.message));
-                        if (result.statusCode !== 201) return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, formatError(result)));
+                        if (error && !error.response) return iteratorCallback(new DomainError(DomainError.EXTERNAL_ERROR, util.format('Network error %s', error.message)));
+                        if (result.statusCode === 403 || result.statusCode === 401) return iteratorCallback(new DomainError(DomainError.ACCESS_DENIED, formatError(result)));
+                        if (result.statusCode === 422) return iteratorCallback(new DomainError(DomainError.BAD_FIELD, result.body.message));
+                        if (result.statusCode !== 201) return iteratorCallback(new DomainError(DomainError.EXTERNAL_ERROR, formatError(result)));
 
                         recordIds.push(safe.query(result.body, 'domain_record.id'));
 
-                        return callback(null);
+                        return iteratorCallback(null);
                     });
             } else {
                 superagent.put(DIGITALOCEAN_ENDPOINT + '/v2/domains/' + zoneName + '/records/' + result[i].id)
@@ -120,17 +119,17 @@ function upsert(dnsConfig, zoneName, subdomain, type, values, callback) {
                     // increment, as we have consumed the record
                         ++i;
 
-                        if (error && !error.response) return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, util.format('Network error %s', error.message)));
-                        if (result.statusCode === 403 || result.statusCode === 401) return callback(new SubdomainError(SubdomainError.ACCESS_DENIED, formatError(result)));
-                        if (result.statusCode === 422) return callback(new SubdomainError(SubdomainError.BAD_FIELD, result.body.message));
-                        if (result.statusCode !== 200) return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, formatError(result)));
+                        if (error && !error.response) return iteratorCallback(new DomainError(DomainError.EXTERNAL_ERROR, util.format('Network error %s', error.message)));
+                        if (result.statusCode === 403 || result.statusCode === 401) return iteratorCallback(new DomainError(DomainError.ACCESS_DENIED, formatError(result)));
+                        if (result.statusCode === 422) return iteratorCallback(new DomainError(DomainError.BAD_FIELD, result.body.message));
+                        if (result.statusCode !== 200) return iteratorCallback(new DomainError(DomainError.EXTERNAL_ERROR, formatError(result)));
 
                         recordIds.push(safe.query(result.body, 'domain_record.id'));
 
-                        return callback(null);
+                        return iteratorCallback(null);
                     });
             }
-        }, function (error, id) {
+        }, function (error) {
             if (error) return callback(error);
 
             callback(null, '' + recordIds[0]); // DO ids are integers
@@ -186,10 +185,10 @@ function del(dnsConfig, zoneName, subdomain, type, values, callback) {
             .set('Authorization', 'Bearer ' + dnsConfig.token)
             .timeout(30 * 1000)
             .end(function (error, result) {
-                if (error && !error.response) return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, util.format('Network error %s', error.message)));
+                if (error && !error.response) return callback(new DomainError(DomainError.EXTERNAL_ERROR, util.format('Network error %s', error.message)));
                 if (result.statusCode === 404) return callback(null);
-                if (result.statusCode === 403 || result.statusCode === 401) return callback(new SubdomainError(SubdomainError.ACCESS_DENIED, formatError(result)));
-                if (result.statusCode !== 204) return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, formatError(result)));
+                if (result.statusCode === 403 || result.statusCode === 401) return callback(new DomainError(DomainError.ACCESS_DENIED, formatError(result)));
+                if (result.statusCode !== 204) return callback(new DomainError(DomainError.EXTERNAL_ERROR, formatError(result)));
 
                 debug('del: done');
 
@@ -206,29 +205,34 @@ function verifyDnsConfig(dnsConfig, fqdn, zoneName, ip, callback) {
     assert.strictEqual(typeof callback, 'function');
 
     var credentials = {
-        provider: dnsConfig.provider,
         token: dnsConfig.token
     };
 
     if (process.env.BOX_ENV === 'test') return callback(null, credentials); // this shouldn't be here
 
     dns.resolveNs(zoneName, function (error, nameservers) {
-        if (error && error.code === 'ENOTFOUND') return callback(new SubdomainError(SubdomainError.BAD_FIELD, 'Unable to resolve nameservers for this domain'));
-        if (error || !nameservers) return callback(new SubdomainError(SubdomainError.BAD_FIELD, error ? error.message : 'Unable to get nameservers'));
+        if (error && error.code === 'ENOTFOUND') return callback(new DomainError(DomainError.BAD_FIELD, 'Unable to resolve nameservers for this domain'));
+        if (error || !nameservers) return callback(new DomainError(DomainError.BAD_FIELD, error ? error.message : 'Unable to get nameservers'));
 
         if (nameservers.map(function (n) { return n.toLowerCase(); }).indexOf('ns1.digitalocean.com') === -1) {
             debug('verifyDnsConfig: %j does not contains DO NS', nameservers);
-            return callback(new SubdomainError(SubdomainError.BAD_FIELD, 'Domain nameservers are not set to Digital Ocean'));
+            return callback(new DomainError(DomainError.BAD_FIELD, 'Domain nameservers are not set to Digital Ocean'));
         }
 
-        const name = config.adminLocation() + (fqdn === zoneName ? '' :  '.' + fqdn.slice(0, - zoneName.length - 1));
+        const testSubdomain = 'cloudrontestdns';
 
-        upsert(credentials, zoneName, name, 'A', [ ip ], function (error, changeId) {
+        upsert(credentials, zoneName, testSubdomain, 'A', [ ip ], function (error, changeId) {
             if (error) return callback(error);
 
-            debug('verifyDnsConfig: A record added with change id %s', changeId);
+            debug('verifyDnsConfig: Test A record added with change id %s', changeId);
 
-            callback(null, credentials);
+            del(dnsConfig, zoneName, testSubdomain, 'A', [ ip ], function (error) {
+                if (error) return callback(error);
+
+                debug('verifyDnsConfig: Test A record removed again');
+
+                callback(null, credentials);
+            });
         });
     });
 }

src/dns/gcdns.js

@@ -12,8 +12,8 @@ var assert = require('assert'),
     config = require('../config.js'),
     debug = require('debug')('box:dns/gcdns'),
     dns = require('dns'),
+    DomainError = require('../domains.js').DomainError,
     GCDNS = require('@google-cloud/dns'),
-    SubdomainError = require('../subdomains.js').SubdomainError,
     util = require('util'),
     _ = require('underscore');
 
@@ -21,7 +21,6 @@ function getDnsCredentials(dnsConfig) {
     assert.strictEqual(typeof dnsConfig, 'object');
 
     var config = {
-        provider: dnsConfig.provider,
         projectId: dnsConfig.projectId,
         keyFilename: dnsConfig.keyFilename,
         email: dnsConfig.email
@@ -44,20 +43,20 @@ function getZoneByName(dnsConfig, zoneName, callback) {
     var gcdns = GCDNS(getDnsCredentials(dnsConfig));
 
     gcdns.getZones(function (error, zones) {
-        if (error && error.message === 'invalid_grant') return callback(new SubdomainError(SubdomainError.ACCESS_DENIED, 'The key was probably revoked'));
-        if (error && error.reason === 'No such domain') return callback(new SubdomainError(SubdomainError.NOT_FOUND, error.message));
-        if (error && error.code === 403) return callback(new SubdomainError(SubdomainError.ACCESS_DENIED, error.message));
-        if (error && error.code === 404) return callback(new SubdomainError(SubdomainError.NOT_FOUND, error.message));
+        if (error && error.message === 'invalid_grant') return callback(new DomainError(DomainError.ACCESS_DENIED, 'The key was probably revoked'));
+        if (error && error.reason === 'No such domain') return callback(new DomainError(DomainError.NOT_FOUND, error.message));
+        if (error && error.code === 403) return callback(new DomainError(DomainError.ACCESS_DENIED, error.message));
+        if (error && error.code === 404) return callback(new DomainError(DomainError.NOT_FOUND, error.message));
         if (error) {
             debug('gcdns.getZones', error);
-            return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, error));
+            return callback(new DomainError(DomainError.EXTERNAL_ERROR, error));
         }
 
         var zone = zones.filter(function (zone) {
             return zone.metadata.dnsName.slice(0, -1) === zoneName;     // the zone name contains a '.' at the end
         })[0];
 
-        if (!zone) return callback(new SubdomainError(SubdomainError.NOT_FOUND, 'no such zone'));
+        if (!zone) return callback(new DomainError(DomainError.NOT_FOUND, 'no such zone'));
 
         callback(null, zone); //zone.metadata ~= {name="", dnsName="", nameServers:[]}
     });
@@ -79,10 +78,10 @@ function upsert(dnsConfig, zoneName, subdomain, type, values, callback) {
         var domain = (subdomain ? subdomain + '.' : '') + zoneName + '.';
 
         zone.getRecords({ type: type, name: domain }, function (error, oldRecords) {
-            if (error && error.code === 403) return callback(new SubdomainError(SubdomainError.ACCESS_DENIED, error.message));
+            if (error && error.code === 403) return callback(new DomainError(DomainError.ACCESS_DENIED, error.message));
             if (error) {
                 debug('upsert->zone.getRecords', error);
-                return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, error.message));
+                return callback(new DomainError(DomainError.EXTERNAL_ERROR, error.message));
             }
 
             var newRecord = zone.record(type, {
@@ -92,11 +91,11 @@ function upsert(dnsConfig, zoneName, subdomain, type, values, callback) {
             });
 
             zone.createChange({ delete: oldRecords, add: newRecord }, function(error, change) {
-                if (error && error.code === 403) return callback(new SubdomainError(SubdomainError.ACCESS_DENIED, error.message));
-                if (error && error.code === 412) return callback(new SubdomainError(SubdomainError.STILL_BUSY, error.message));
+                if (error && error.code === 403) return callback(new DomainError(DomainError.ACCESS_DENIED, error.message));
+                if (error && error.code === 412) return callback(new DomainError(DomainError.STILL_BUSY, error.message));
                 if (error) {
                     debug('upsert->zone.createChange', error);
-                    return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, error.message));
+                    return callback(new DomainError(DomainError.EXTERNAL_ERROR, error.message));
                 }
 
                 callback(null, change.id);
@@ -121,8 +120,8 @@ function get(dnsConfig, zoneName, subdomain, type, callback) {
         };
 
         zone.getRecords(params, function (error, records) {
-            if (error && error.code === 403) return callback(new SubdomainError(SubdomainError.ACCESS_DENIED, error.message));
-            if (error) return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, error));
+            if (error && error.code === 403) return callback(new DomainError(DomainError.ACCESS_DENIED, error.message));
+            if (error) return callback(new DomainError(DomainError.EXTERNAL_ERROR, error));
             if (records.length === 0) return callback(null, [ ]);
 
             return callback(null, records[0].data);
@@ -144,18 +143,18 @@ function del(dnsConfig, zoneName, subdomain, type, values, callback) {
         var domain = (subdomain ? subdomain + '.' : '') + zoneName + '.';
 
         zone.getRecords({ type: type, name: domain }, function(error, oldRecords) {
-            if (error && error.code === 403) return callback(new SubdomainError(SubdomainError.ACCESS_DENIED, error.message));
+            if (error && error.code === 403) return callback(new DomainError(DomainError.ACCESS_DENIED, error.message));
             if (error) {
                 debug('del->zone.getRecords', error);
-                return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, error.message));
+                return callback(new DomainError(DomainError.EXTERNAL_ERROR, error.message));
             }
 
             zone.deleteRecords(oldRecords, function (error, change) {
-                if (error && error.code === 403) return callback(new SubdomainError(SubdomainError.ACCESS_DENIED, error.message));
-                if (error && error.code === 412) return callback(new SubdomainError(SubdomainError.STILL_BUSY, error.message));
+                if (error && error.code === 403) return callback(new DomainError(DomainError.ACCESS_DENIED, error.message));
+                if (error && error.code === 412) return callback(new DomainError(DomainError.STILL_BUSY, error.message));
                 if (error) {
                     debug('del->zone.createChange', error);
-                    return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, error.message));
+                    return callback(new DomainError(DomainError.EXTERNAL_ERROR, error.message));
                 }
 
                 callback(null, change.id);
@@ -175,8 +174,8 @@ function verifyDnsConfig(dnsConfig, fqdn, zoneName, ip, callback) {
     if (process.env.BOX_ENV === 'test') return callback(null, credentials); // this shouldn't be here
 
     dns.resolveNs(zoneName, function (error, resolvedNS) {
-        if (error && error.code === 'ENOTFOUND') return callback(new SubdomainError(SubdomainError.BAD_FIELD, 'Unable to resolve nameservers for this domain'));
-        if (error || !resolvedNS) return callback(new SubdomainError(SubdomainError.BAD_FIELD, error ? error.message : 'Unable to get nameservers'));
+        if (error && error.code === 'ENOTFOUND') return callback(new DomainError(DomainError.BAD_FIELD, 'Unable to resolve nameservers for this domain'));
+        if (error || !resolvedNS) return callback(new DomainError(DomainError.BAD_FIELD, error ? error.message : 'Unable to get nameservers'));
 
         getZoneByName(credentials, zoneName, function (error, zone) {
             if (error) return callback(error);
@@ -184,17 +183,23 @@ function verifyDnsConfig(dnsConfig, fqdn, zoneName, ip, callback) {
             var definedNS = zone.metadata.nameServers.sort().map(function(r) { return r.replace(/\.$/, ''); });
             if (!_.isEqual(definedNS, resolvedNS.sort())) {
                 debug('verifyDnsConfig: %j and %j do not match', resolvedNS, definedNS);
-                return callback(new SubdomainError(SubdomainError.BAD_FIELD, 'Domain nameservers are not set to Google Cloud DNS'));
+                return callback(new DomainError(DomainError.BAD_FIELD, 'Domain nameservers are not set to Google Cloud DNS'));
             }
 
-            const name = config.adminLocation() + (fqdn === zoneName ? '' :  '.' + fqdn.slice(0, - zoneName.length - 1));
+            const testSubdomain = 'cloudrontestdns';
 
-            upsert(credentials, zoneName, name, 'A', [ ip ], function (error, changeId) {
+            upsert(credentials, zoneName, testSubdomain, 'A', [ ip ], function (error, changeId) {
                 if (error) return callback(error);
 
-                debug('verifyDnsConfig: A record added with change id %s', changeId);
+                debug('verifyDnsConfig: Test A record added with change id %s', changeId);
 
-                callback(null, credentials);
+                del(dnsConfig, zoneName, testSubdomain, 'A', [ ip ], function (error) {
+                    if (error) return callback(error);
+
+                    debug('verifyDnsConfig: Test A record removed again');
+
+                    callback(null, credentials);
+                });
             });
         });
     });

src/dns/interface.js

@@ -15,7 +15,7 @@ exports = module.exports = {
 };
 
 var assert = require('assert'),
-    SubdomainError = require('../subdomains.js').SubdomainError,
+    DomainError = require('../domains.js').DomainError,
     util = require('util');
 
 function upsert(dnsConfig, zoneName, subdomain, type, values, callback) {

src/dns/manual.js

@@ -9,12 +9,9 @@ exports = module.exports = {
 };
 
 var assert = require('assert'),
-    async = require('async'),
-    config = require('../config.js'),
     debug = require('debug')('box:dns/manual'),
-    dig = require('../dig.js'),
     dns = require('dns'),
-    SubdomainError = require('../subdomains.js').SubdomainError,
+    DomainError = require('../domains.js').DomainError,
     util = require('util');
 
 function upsert(dnsConfig, zoneName, subdomain, type, values, callback) {
@@ -58,50 +55,10 @@ function verifyDnsConfig(dnsConfig, domain, zoneName, ip, callback) {
     assert.strictEqual(typeof ip, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    var adminDomain = config.adminLocation() + '.' + domain;
-
+    // Very basic check if the nameservers can be fetched
     dns.resolveNs(zoneName, function (error, nameservers) {
-        if (error || !nameservers) return callback(new SubdomainError(SubdomainError.BAD_FIELD, 'Unable to get nameservers'));
+        if (error || !nameservers) return callback(new DomainError(DomainError.BAD_FIELD, 'Unable to get nameservers'));
 
-        async.every(nameservers, function (nameserver, everyNsCallback) {
-            // ns records cannot have cname
-            dns.resolve4(nameserver, function (error, nsIps) {
-                if (error || !nsIps || nsIps.length === 0) {
-                    return everyNsCallback(new SubdomainError(SubdomainError.BAD_FIELD, 'Unable to resolve nameservers for this domain'));
-                }
-
-                async.every(nsIps, function (nsIp, everyIpCallback) {
-                    dig.resolve(adminDomain, 'A', { server: nsIp, timeout: 5000 }, function (error, answer) {
-                        if (error && error.code === 'ETIMEDOUT') {
-                            debug('nameserver %s (%s) timed out when trying to resolve %s', nameserver, nsIp, adminDomain);
-                            return everyIpCallback(null, true); // should be ok if dns server is down
-                        }
-
-                        if (error) {
-                            debug('nameserver %s (%s) returned error trying to resolve %s: %s', nameserver, nsIp, adminDomain, error);
-                            return everyIpCallback(null, false);
-                        }
-
-                        if (!answer || answer.length === 0) {
-                            debug('bad answer from nameserver %s (%s) resolving %s (%s): %j', nameserver, nsIp, adminDomain, 'A', answer);
-                            return everyIpCallback(null, false);
-                        }
-
-                        debug('verifyDnsConfig: ns: %s (%s), name:%s Actual:%j Expecting:%s', nameserver, nsIp, adminDomain, answer, ip);
-
-                        var match = answer.some(function (a) { return a === ip; });
-
-                        if (match) return everyIpCallback(null, true); // done!
-
-                        everyIpCallback(null, false);
-                    });
-                }, everyNsCallback);
-            });
-        }, function (error, success) {
-            if (error) return callback(error);
-            if (!success) return callback(new SubdomainError(SubdomainError.BAD_FIELD, 'The domain ' + adminDomain + ' does not resolve to the server\'s IP ' + ip));
-
-            callback(null, { provider: dnsConfig.provider, wildcard: !!dnsConfig.wildcard });
-        });
+        callback(null, { wildcard: !!dnsConfig.wildcard });
     });
 }

src/dns/noop.js

@@ -64,9 +64,5 @@ function verifyDnsConfig(dnsConfig, domain, zoneName, ip, callback) {
     assert.strictEqual(typeof ip, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    var credentials = {
-        provider: dnsConfig.provider
-    };
-
-    return callback(null, credentials);
+    return callback(null, { });
 }

src/dns/route53.js

@@ -16,7 +16,7 @@ var assert = require('assert'),
     config = require('../config.js'),
     debug = require('debug')('box:dns/route53'),
     dns = require('dns'),
-    SubdomainError = require('../subdomains.js').SubdomainError,
+    DomainError = require('../domains.js').DomainError,
     util = require('util'),
     _ = require('underscore');
 
@@ -41,15 +41,15 @@ function getZoneByName(dnsConfig, zoneName, callback) {
 
     var route53 = new AWS.Route53(getDnsCredentials(dnsConfig));
     route53.listHostedZones({}, function (error, result) {
-        if (error && error.code === 'AccessDenied') return callback(new SubdomainError(SubdomainError.ACCESS_DENIED, error.message));
-        if (error && error.code === 'InvalidClientTokenId') return callback(new SubdomainError(SubdomainError.ACCESS_DENIED, error.message));
-        if (error) return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, error.message));
+        if (error && error.code === 'AccessDenied') return callback(new DomainError(DomainError.ACCESS_DENIED, error.message));
+        if (error && error.code === 'InvalidClientTokenId') return callback(new DomainError(DomainError.ACCESS_DENIED, error.message));
+        if (error) return callback(new DomainError(DomainError.EXTERNAL_ERROR, error.message));
 
         var zone = result.HostedZones.filter(function (zone) {
             return zone.Name.slice(0, -1) === zoneName;     // aws zone name contains a '.' at the end
         })[0];
 
-        if (!zone) return callback(new SubdomainError(SubdomainError.NOT_FOUND, 'no such zone'));
+        if (!zone) return callback(new DomainError(DomainError.NOT_FOUND, 'no such zone'));
 
         callback(null, zone);
     });
@@ -65,9 +65,9 @@ function getHostedZone(dnsConfig, zoneName, callback) {
 
         var route53 = new AWS.Route53(getDnsCredentials(dnsConfig));
         route53.getHostedZone({ Id: zone.Id }, function (error, result) {
-            if (error && error.code === 'AccessDenied') return callback(new SubdomainError(SubdomainError.ACCESS_DENIED, error.message));
-            if (error && error.code === 'InvalidClientTokenId') return callback(new SubdomainError(SubdomainError.ACCESS_DENIED, error.message));
-            if (error) return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, error.message));
+            if (error && error.code === 'AccessDenied') return callback(new DomainError(DomainError.ACCESS_DENIED, error.message));
+            if (error && error.code === 'InvalidClientTokenId') return callback(new DomainError(DomainError.ACCESS_DENIED, error.message));
+            if (error) return callback(new DomainError(DomainError.EXTERNAL_ERROR, error.message));
 
             callback(null, result);
         });
@@ -107,11 +107,11 @@ function add(dnsConfig, zoneName, subdomain, type, values, callback) {
 
         var route53 = new AWS.Route53(getDnsCredentials(dnsConfig));
         route53.changeResourceRecordSets(params, function(error, result) {
-            if (error && error.code === 'AccessDenied') return callback(new SubdomainError(SubdomainError.ACCESS_DENIED, error.message));
-            if (error && error.code === 'InvalidClientTokenId') return callback(new SubdomainError(SubdomainError.ACCESS_DENIED, error.message));
-            if (error && error.code === 'PriorRequestNotComplete') return callback(new SubdomainError(SubdomainError.STILL_BUSY, error.message));
-            if (error && error.code === 'InvalidChangeBatch') return callback(new SubdomainError(SubdomainError.BAD_FIELD, error.message));
-            if (error) return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, error.message));
+            if (error && error.code === 'AccessDenied') return callback(new DomainError(DomainError.ACCESS_DENIED, error.message));
+            if (error && error.code === 'InvalidClientTokenId') return callback(new DomainError(DomainError.ACCESS_DENIED, error.message));
+            if (error && error.code === 'PriorRequestNotComplete') return callback(new DomainError(DomainError.STILL_BUSY, error.message));
+            if (error && error.code === 'InvalidChangeBatch') return callback(new DomainError(DomainError.BAD_FIELD, error.message));
+            if (error) return callback(new DomainError(DomainError.EXTERNAL_ERROR, error.message));
 
             callback(null, result.ChangeInfo.Id);
         });
@@ -148,9 +148,9 @@ function get(dnsConfig, zoneName, subdomain, type, callback) {
 
         var route53 = new AWS.Route53(getDnsCredentials(dnsConfig));
         route53.listResourceRecordSets(params, function (error, result) {
-            if (error && error.code === 'AccessDenied') return callback(new SubdomainError(SubdomainError.ACCESS_DENIED, error.message));
-            if (error && error.code === 'InvalidClientTokenId') return callback(new SubdomainError(SubdomainError.ACCESS_DENIED, error.message));
-            if (error) return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, error.message));
+            if (error && error.code === 'AccessDenied') return callback(new DomainError(DomainError.ACCESS_DENIED, error.message));
+            if (error && error.code === 'InvalidClientTokenId') return callback(new DomainError(DomainError.ACCESS_DENIED, error.message));
+            if (error) return callback(new DomainError(DomainError.EXTERNAL_ERROR, error.message));
             if (result.ResourceRecordSets.length === 0) return callback(null, [ ]);
             if (result.ResourceRecordSets[0].Name !== params.StartRecordName || result.ResourceRecordSets[0].Type !== params.StartRecordType) return callback(null, [ ]);
 
@@ -194,23 +194,23 @@ function del(dnsConfig, zoneName, subdomain, type, values, callback) {
 
         var route53 = new AWS.Route53(getDnsCredentials(dnsConfig));
         route53.changeResourceRecordSets(params, function(error, result) {
-            if (error && error.code === 'AccessDenied') return callback(new SubdomainError(SubdomainError.ACCESS_DENIED, error.message));
-            if (error && error.code === 'InvalidClientTokenId') return callback(new SubdomainError(SubdomainError.ACCESS_DENIED, error.message));
+            if (error && error.code === 'AccessDenied') return callback(new DomainError(DomainError.ACCESS_DENIED, error.message));
+            if (error && error.code === 'InvalidClientTokenId') return callback(new DomainError(DomainError.ACCESS_DENIED, error.message));
             if (error && error.message && error.message.indexOf('it was not found') !== -1) {
                 debug('del: resource record set not found.', error);
-                return callback(new SubdomainError(SubdomainError.NOT_FOUND, error.message));
+                return callback(new DomainError(DomainError.NOT_FOUND, error.message));
             } else if (error && error.code === 'NoSuchHostedZone') {
                 debug('del: hosted zone not found.', error);
-                return callback(new SubdomainError(SubdomainError.NOT_FOUND, error.message));
+                return callback(new DomainError(DomainError.NOT_FOUND, error.message));
             } else if (error && error.code === 'PriorRequestNotComplete') {
                 debug('del: resource is still busy', error);
-                return callback(new SubdomainError(SubdomainError.STILL_BUSY, error.message));
+                return callback(new DomainError(DomainError.STILL_BUSY, error.message));
             } else if (error && error.code === 'InvalidChangeBatch') {
                 debug('del: invalid change batch. No such record to be deleted.');
-                return callback(new SubdomainError(SubdomainError.NOT_FOUND, error.message));
+                return callback(new DomainError(DomainError.NOT_FOUND, error.message));
             } else if (error) {
                 debug('del: error', error);
-                return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, error.message));
+                return callback(new DomainError(DomainError.EXTERNAL_ERROR, error.message));
             }
 
             callback(null);
@@ -226,7 +226,6 @@ function verifyDnsConfig(dnsConfig, fqdn, zoneName, ip, callback) {
     assert.strictEqual(typeof callback, 'function');
 
     var credentials = {
-        provider: dnsConfig.provider,
         accessKeyId: dnsConfig.accessKeyId,
         secretAccessKey: dnsConfig.secretAccessKey,
         region: dnsConfig.region || 'us-east-1',
@@ -236,25 +235,31 @@ function verifyDnsConfig(dnsConfig, fqdn, zoneName, ip, callback) {
     if (process.env.BOX_ENV === 'test') return callback(null, credentials); // this shouldn't be here
 
     dns.resolveNs(zoneName, function (error, nameservers) {
-        if (error && error.code === 'ENOTFOUND') return callback(new SubdomainError(SubdomainError.BAD_FIELD, 'Unable to resolve nameservers for this domain'));
-        if (error || !nameservers) return callback(new SubdomainError(SubdomainError.BAD_FIELD, error ? error.message : 'Unable to get nameservers'));
+        if (error && error.code === 'ENOTFOUND') return callback(new DomainError(DomainError.BAD_FIELD, 'Unable to resolve nameservers for this domain'));
+        if (error || !nameservers) return callback(new DomainError(DomainError.BAD_FIELD, error ? error.message : 'Unable to get nameservers'));
 
         getHostedZone(credentials, zoneName, function (error, zone) {
             if (error) return callback(error);
 
             if (!_.isEqual(zone.DelegationSet.NameServers.sort(), nameservers.sort())) {
                 debug('verifyDnsConfig: %j and %j do not match', nameservers, zone.DelegationSet.NameServers);
-                return callback(new SubdomainError(SubdomainError.BAD_FIELD, 'Domain nameservers are not set to Route53'));
+                return callback(new DomainError(DomainError.BAD_FIELD, 'Domain nameservers are not set to Route53'));
             }
 
-            const name = config.adminLocation() + (fqdn === zoneName ? '' :  '.' + fqdn.slice(0, - zoneName.length - 1));
+            const testSubdomain = 'cloudrontestdns';
 
-            upsert(credentials, zoneName, name, 'A', [ ip ], function (error, changeId) {
+            upsert(credentials, zoneName, testSubdomain, 'A', [ ip ], function (error, changeId) {
                 if (error) return callback(error);
 
-                debug('verifyDnsConfig: A record added with change id %s', changeId);
+                debug('verifyDnsConfig: Test A record added with change id %s', changeId);
 
-                callback(null, credentials);
+                del(dnsConfig, zoneName, testSubdomain, 'A', [ ip ], function (error) {
+                    if (error) return callback(error);
+
+                    debug('verifyDnsConfig: Test A record removed again');
+
+                    callback(null, credentials);
+                });
             });
         });
     });

src/dns/waitfordns.js

@@ -7,7 +7,7 @@ var assert = require('assert'),
     debug = require('debug')('box:dns/waitfordns'),
     dig = require('../dig.js'),
     dns = require('dns'),
-    SubdomainError = require('../subdomains.js').SubdomainError,
+    DomainError = require('../domains.js').DomainError,
     util = require('util');
 
 function isChangeSynced(domain, value, type, nameserver, callback) {
@@ -56,7 +56,7 @@ function isChangeSynced(domain, value, type, nameserver, callback) {
         }, callback);
 
     });
- }
+}
 
 // check if IP change has propagated to every nameserver
 function waitForDns(domain, zoneName, value, type, options, callback) {
@@ -76,22 +76,22 @@ function waitForDns(domain, zoneName, value, type, options, callback) {
 
     var attempt = 1;
     async.retry(options, function (retryCallback) {
-        debug('waitForDNS: %s attempt %s.', domain, attempt++);
+        debug('waitForDNS: %s (zone: %s) attempt %s.', domain, zoneName, attempt++);
 
         dns.resolveNs(zoneName, function (error, nameservers) {
-            if (error || !nameservers) return retryCallback(error || new SubdomainError(SubdomainError.EXTERNAL_ERROR, 'Unable to get nameservers'));
+            if (error || !nameservers) return retryCallback(error || new DomainError(DomainError.EXTERNAL_ERROR, 'Unable to get nameservers'));
 
             async.every(nameservers, isChangeSynced.bind(null, domain, value, type), function (error, synced) {
                 debug('waitForIp: %s %s ns: %j', domain, synced ? 'done' : 'not done', nameservers);
 
-                retryCallback(synced ? null : new SubdomainError(SubdomainError.EXTERNAL_ERROR, 'ETRYAGAIN'));
+                retryCallback(synced ? null : new DomainError(DomainError.EXTERNAL_ERROR, 'ETRYAGAIN'));
             });
         });
     }, function retryDone(error) {
-         if (error) return callback(error);
+        if (error) return callback(error);
 
         debug('waitForDNS: %s done.', domain);
 
         callback(null);
-     });
+    });
 }

src/docker.js

@@ -51,7 +51,7 @@ var addons = require('./addons.js'),
 function debugApp(app, args) {
     assert(!app || typeof app === 'object');
 
-    var prefix = app ? (app.location || '(bare)') : '(no app)';
+    var prefix = app ? app.intrinsicFqdn : '(no app)';
     debug(prefix + ' ' + util.format.apply(util, Array.prototype.slice.call(arguments, 1)));
 }
 
@@ -129,7 +129,7 @@ function createSubcontainer(app, name, cmd, options, callback) {
 
     var manifest = app.manifest;
     var exposedPorts = {}, dockerPortBindings = { };
-    var domain = app.altDomain || config.appFqdn(app.location);
+    var domain = app.altDomain || app.intrinsicFqdn;
     var stdEnv = [
         'CLOUDRON=1',
         'WEBADMIN_ORIGIN=' + config.adminOrigin(),
@@ -186,7 +186,7 @@ function createSubcontainer(app, name, cmd, options, callback) {
                 '/run': {}
             },
             Labels: {
-                'location': app.location,
+                'fqdn': app.intrinsicFqdn,
                 'appId': app.id,
                 'isSubcontainer': String(!isAppContainer)
             },

src/domaindb.js

@@ -0,0 +1,125 @@
+/* jslint node:true */
+
+'use strict';
+
+exports = module.exports = {
+    add: add,
+    get: get,
+    getAll: getAll,
+    update: update,
+    upsert: upsert,
+    del: del,
+
+    _clear: clear,
+    _addDefaultDomain: addDefaultDomain
+};
+
+var assert = require('assert'),
+    database = require('./database.js'),
+    DatabaseError = require('./databaseerror'),
+    config = require('./config.js'),
+    safe = require('safetydance');
+
+function postProcess(data) {
+    data.config = safe.JSON.parse(data.configJson);
+    delete data.configJson;
+
+    return data;
+}
+
+function get(domain, callback) {
+    assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    database.query('SELECT * FROM domains WHERE domain=?', [ domain ], function (error, result) {
+        if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
+        if (result.length === 0) return callback(new DatabaseError(DatabaseError.NOT_FOUND));
+
+        postProcess(result[0]);
+
+        callback(null, result[0]);
+    });
+}
+
+function getAll(callback) {
+    database.query('SELECT * FROM domains ORDER BY domain', function (error, results) {
+        if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
+
+        results.forEach(postProcess);
+
+        callback(null, results);
+    });
+}
+
+function add(domain, zoneName, provider, config, callback) {
+    assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof zoneName, 'string');
+    assert.strictEqual(typeof provider, 'string');
+    assert.strictEqual(typeof config, 'object');
+    assert.strictEqual(typeof callback, 'function');
+
+    database.query('INSERT INTO domains (domain, zoneName, provider, configJson) VALUES (?, ?, ?, ?)', [ domain, zoneName, provider, JSON.stringify(config) ], function (error) {
+        if (error && error.code === 'ER_DUP_ENTRY') return callback(new DatabaseError(DatabaseError.ALREADY_EXISTS, error));
+        if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
+
+        callback(null);
+    });
+}
+
+function upsert(domain, zoneName, provider, config, callback) {
+    assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof zoneName, 'string');
+    assert.strictEqual(typeof provider, 'string');
+    assert.strictEqual(typeof config, 'object');
+    assert.strictEqual(typeof callback, 'function');
+
+    database.query('REPLACE INTO domains (domain, zoneName, provider, configJson) VALUES (?, ?, ?, ?)', [ domain, zoneName, provider, JSON.stringify(config) ], function (error) {
+        if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
+
+        callback(null);
+    });
+}
+
+function update(domain, provider, config, callback) {
+    assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof provider, 'string');
+    assert.strictEqual(typeof config, 'object');
+    assert.strictEqual(typeof callback, 'function');
+
+    database.query('UPDATE domains SET provider=?, configJson=? WHERE domain=?', [ provider, JSON.stringify(config), domain ], function (error) {
+        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new DatabaseError(DatabaseError.NOT_FOUND));
+        if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
+
+        callback(null);
+    });
+}
+
+function del(domain, callback) {
+    assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    database.query('DELETE FROM domains WHERE domain=?', [ domain ], function (error, result) {
+        if (error && error.code === 'ER_ROW_IS_REFERENCED_2') return callback(new DatabaseError(DatabaseError.IN_USE));
+        if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
+        if (result.affectedRows !== 1) return callback(new DatabaseError(DatabaseError.NOT_FOUND));
+
+        callback(null);
+    });
+}
+
+function clear(callback) {
+    database.query('DELETE FROM domains', function (error) {
+        if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
+
+        callback(error);
+    });
+}
+
+function addDefaultDomain(callback) {
+    assert(config.fqdn(), 'no fqdn set in config, cannot continue');
+
+    add(config.fqdn(), config.zoneName(), 'manual', { }, function (error) {
+        if (error && error.reason !== DatabaseError.ALREADY_EXISTS) return callback(error);
+        callback();
+    });
+}

src/domains.js

@@ -0,0 +1,335 @@
+'use strict';
+
+module.exports = exports = {
+    add: add,
+    get: get,
+    getAll: getAll,
+    update: update,
+    del: del,
+
+    fqdn: fqdn,
+    setAdmin: setAdmin,
+
+    getDNSRecords: getDNSRecords,
+    upsertDNSRecords: upsertDNSRecords,
+    removeDNSRecords: removeDNSRecords,
+
+    waitForDNSRecord: waitForDNSRecord,
+
+    DomainError: DomainError
+};
+
+var assert = require('assert'),
+    caas = require('./caas.js'),
+    config = require('./config.js'),
+    certificates = require('./certificates.js'),
+    CertificatesError = certificates.CertificatesError,
+    DatabaseError = require('./databaseerror.js'),
+    debug = require('debug')('box:domains'),
+    domaindb = require('./domaindb.js'),
+    path = require('path'),
+    shell = require('./shell.js'),
+    sysinfo = require('./sysinfo.js'),
+    tld = require('tldjs'),
+    util = require('util');
+
+var RESTART_CMD = path.join(__dirname, 'scripts/restart.sh');
+var NOOP_CALLBACK = function (error) { if (error) debug(error); };
+
+function DomainError(reason, errorOrMessage) {
+    assert.strictEqual(typeof reason, 'string');
+    assert(errorOrMessage instanceof Error || typeof errorOrMessage === 'string' || typeof errorOrMessage === 'undefined');
+
+    Error.call(this);
+    Error.captureStackTrace(this, this.constructor);
+
+    this.name = this.constructor.name;
+    this.reason = reason;
+    if (typeof errorOrMessage === 'undefined') {
+        this.message = reason;
+    } else if (typeof errorOrMessage === 'string') {
+        this.message = errorOrMessage;
+    } else {
+        this.message = 'Internal error';
+        this.nestedError = errorOrMessage;
+    }
+}
+util.inherits(DomainError, Error);
+
+DomainError.NOT_FOUND = 'No such domain';
+DomainError.ALREADY_EXISTS = 'Domain already exists';
+DomainError.EXTERNAL_ERROR = 'External error';
+DomainError.BAD_FIELD = 'Bad Field';
+DomainError.STILL_BUSY = 'Still busy';
+DomainError.IN_USE = 'In Use';
+DomainError.INTERNAL_ERROR = 'Internal error';
+DomainError.ACCESS_DENIED = 'Access denied';
+DomainError.INVALID_PROVIDER = 'provider must be route53, gcdns, digitalocean, cloudflare, noop, manual or caas';
+
+// choose which subdomain backend we use for test purpose we use route53
+function api(provider) {
+    assert.strictEqual(typeof provider, 'string');
+
+    switch (provider) {
+    case 'caas': return require('./dns/caas.js');
+    case 'cloudflare': return require('./dns/cloudflare.js');
+    case 'route53': return require('./dns/route53.js');
+    case 'gcdns': return require('./dns/gcdns.js');
+    case 'digitalocean': return require('./dns/digitalocean.js');
+    case 'noop': return require('./dns/noop.js');
+    case 'manual': return require('./dns/manual.js');
+    default: return null;
+    }
+}
+
+// TODO make it return a DomainError instead of DomainError
+function verifyDnsConfig(config, domain, zoneName, provider, ip, callback) {
+    assert(config && typeof config === 'object'); // the dns config to test with
+    assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof zoneName, 'string');
+    assert.strictEqual(typeof provider, 'string');
+    assert.strictEqual(typeof ip, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    var backend = api(provider);
+    if (!backend) return callback(new DomainError(DomainError.INVALID_PROVIDER));
+
+    api(provider).verifyDnsConfig(config, domain, zoneName, ip, callback);
+}
+
+
+function add(domain, zoneName, provider, config, fallbackCertificate, callback) {
+    assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof zoneName, 'string');
+    assert.strictEqual(typeof provider, 'string');
+    assert.strictEqual(typeof config, 'object');
+    assert.strictEqual(typeof fallbackCertificate, 'object');
+    assert.strictEqual(typeof callback, 'function');
+
+    if (!tld.isValid(domain)) return callback(new DomainError(DomainError.BAD_FIELD, 'Invalid domain'));
+    if (!tld.isValid(zoneName)) return callback(new DomainError(DomainError.BAD_FIELD, 'Invalid zoneName'));
+
+    if (fallbackCertificate) {
+        let error = certificates.validateCertificate(fallbackCertificate.cert, fallbackCertificate.key, domain);
+        if (error) return callback(new DomainError(DomainError.BAD_FIELD, error.message));
+    }
+
+    sysinfo.getPublicIp(function (error, ip) {
+        if (error) return callback(new DomainError(DomainError.INTERNAL_ERROR, 'Error getting IP:' + error.message));
+
+        verifyDnsConfig(config, domain, zoneName, provider, ip, function (error, result) {
+            if (error && error.reason === DomainError.ACCESS_DENIED) return callback(new DomainError(DomainError.BAD_FIELD, 'Error adding A record. Access denied'));
+            if (error && error.reason === DomainError.NOT_FOUND) return callback(new DomainError(DomainError.BAD_FIELD, 'Zone not found'));
+            if (error && error.reason === DomainError.EXTERNAL_ERROR) return callback(new DomainError(DomainError.BAD_FIELD, 'Error adding A record:' + error.message));
+            if (error && error.reason === DomainError.BAD_FIELD) return callback(new DomainError(DomainError.BAD_FIELD, error.message));
+            if (error && error.reason === DomainError.INVALID_PROVIDER) return callback(new DomainError(DomainError.BAD_FIELD, error.message));
+            if (error) return callback(new DomainError(DomainError.INTERNAL_ERROR, error));
+
+            domaindb.add(domain, zoneName, provider, result, function (error) {
+                if (error && error.reason === DatabaseError.ALREADY_EXISTS) return callback(new DomainError(DomainError.ALREADY_EXISTS));
+                if (error) return callback(new DomainError(DomainError.INTERNAL_ERROR, error));
+
+                if (!fallbackCertificate) return callback();
+
+                // cert validation already happened above no need to check all errors again
+                certificates.setFallbackCertificate(fallbackCertificate.cert, fallbackCertificate.key, domain, function (error) {
+                    if (error) return callback(new DomainError(DomainError.INTERNAL_ERROR, error));
+                    callback();
+                });
+            });
+        });
+    });
+}
+
+function get(domain, callback) {
+    assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    domaindb.get(domain, function (error, result) {
+        // TODO try to find subdomain entries maybe based on zoneNames or so
+        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new DomainError(DomainError.NOT_FOUND));
+        if (error) return callback(new DomainError(DomainError.INTERNAL_ERROR, error));
+
+        certificates.getFallbackCertificate(domain, function (error, fallbackCertificate) {
+            if (error && error.reason !== CertificatesError.NOT_FOUND) return callback(new DomainError(DomainError.INTERNAL_ERROR, error));
+
+            if (fallbackCertificate) result.fallbackCertificate = fallbackCertificate;
+
+            return callback(null, result);
+        });
+    });
+}
+
+function getAll(callback) {
+    assert.strictEqual(typeof callback, 'function');
+
+    domaindb.getAll(function (error, result) {
+        if (error) return callback(new DomainError(DomainError.INTERNAL_ERROR, error));
+
+        return callback(null, result);
+    });
+}
+
+function update(domain, provider, config, fallbackCertificate, callback) {
+    assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof provider, 'string');
+    assert.strictEqual(typeof config, 'object');
+    assert.strictEqual(typeof fallbackCertificate, 'object');
+    assert.strictEqual(typeof callback, 'function');
+
+    domaindb.get(domain, function (error, result) {
+        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new DomainError(DomainError.NOT_FOUND));
+        if (error) return callback(new DomainError(DomainError.INTERNAL_ERROR, error));
+
+        if (fallbackCertificate) {
+            let error = certificates.validateCertificate(fallbackCertificate.cert, fallbackCertificate.key, domain);
+            if (error) return callback(new DomainError(DomainError.BAD_FIELD, error.message));
+        }
+
+        sysinfo.getPublicIp(function (error, ip) {
+            if (error) return callback(new DomainError(DomainError.INTERNAL_ERROR, 'Error getting IP:' + error.message));
+
+            verifyDnsConfig(config, domain, result.zoneName, provider, ip, function (error, result) {
+                if (error && error.reason === DomainError.ACCESS_DENIED) return callback(new DomainError(DomainError.BAD_FIELD, 'Error adding A record. Access denied'));
+                if (error && error.reason === DomainError.NOT_FOUND) return callback(new DomainError(DomainError.BAD_FIELD, 'Zone not found'));
+                if (error && error.reason === DomainError.EXTERNAL_ERROR) return callback(new DomainError(DomainError.BAD_FIELD, 'Error adding A record:' + error.message));
+                if (error && error.reason === DomainError.BAD_FIELD) return callback(new DomainError(DomainError.BAD_FIELD, error.message));
+                if (error && error.reason === DomainError.INVALID_PROVIDER) return callback(new DomainError(DomainError.BAD_FIELD, error.message));
+                if (error) return callback(new DomainError(DomainError.INTERNAL_ERROR, error));
+
+                domaindb.update(domain, provider, result, function (error) {
+                    if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new DomainError(DomainError.NOT_FOUND));
+                    if (error) return callback(new DomainError(DomainError.INTERNAL_ERROR, error));
+
+                    if (!fallbackCertificate) return callback();
+
+                    // cert validation already happened above no need to check all errors again
+                    certificates.setFallbackCertificate(fallbackCertificate.cert, fallbackCertificate.key, domain, function (error) {
+                        if (error) return callback(new DomainError(DomainError.INTERNAL_ERROR, error));
+                        callback();
+                    });
+                });
+            });
+        });
+    });
+}
+
+function del(domain, callback) {
+    assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    domaindb.del(domain, function (error) {
+        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new DomainError(DomainError.NOT_FOUND));
+        if (error && error.reason === DatabaseError.IN_USE) return callback(new DomainError(DomainError.IN_USE));
+        if (error) return callback(new DomainError(DomainError.INTERNAL_ERROR, error));
+
+        return callback(null);
+    });
+}
+
+function getDNSRecords(subdomain, domain, type, callback) {
+    assert.strictEqual(typeof subdomain, 'string');
+    assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof type, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    get(domain, function (error, result) {
+        if (error) return callback(new DomainError(DomainError.INTERNAL_ERROR, error));
+
+        api(result.provider).get(result.config, result.zoneName, subdomain, type, function (error, values) {
+            if (error) return callback(error);
+
+            callback(null, values);
+        });
+    });
+}
+
+function upsertDNSRecords(subdomain, domain, type, values, callback) {
+    assert.strictEqual(typeof subdomain, 'string');
+    assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof type, 'string');
+    assert(util.isArray(values));
+    assert.strictEqual(typeof callback, 'function');
+
+    debug('upsertDNSRecord: %s on %s type %s values', subdomain, domain, type, values);
+
+    get(domain, function (error, result) {
+        if (error) return callback(new DomainError(DomainError.INTERNAL_ERROR, error));
+
+        api(result.provider).upsert(result.config, result.zoneName, subdomain, type, values, function (error, changeId) {
+            if (error) return callback(error);
+
+            callback(null, changeId);
+        });
+    });
+}
+
+function removeDNSRecords(subdomain, domain, type, values, callback) {
+    assert.strictEqual(typeof subdomain, 'string');
+    assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof type, 'string');
+    assert(util.isArray(values));
+    assert.strictEqual(typeof callback, 'function');
+
+    debug('removeDNSRecord: %s on %s type %s values', subdomain, domain, type, values);
+
+    get(domain, function (error, result) {
+        if (error) return callback(error);
+
+        api(result.provider).del(result.config, result.zoneName, subdomain, type, values, function (error) {
+            if (error && error.reason !== DomainError.NOT_FOUND) return callback(error);
+
+            callback(null);
+        });
+    });
+}
+
+function waitForDNSRecord(fqdn, domain, value, type, options, callback) {
+    assert.strictEqual(typeof fqdn, 'string');
+    assert.strictEqual(typeof domain, 'string');
+    assert(typeof value === 'string' || util.isRegExp(value));
+    assert(type === 'A' || type === 'CNAME' || type === 'TXT');
+    assert(options && typeof options === 'object'); // { interval: 5000, times: 50000 }
+    assert.strictEqual(typeof callback, 'function');
+
+    get(domain, function (error, result) {
+        // domain can be not found when waiting for altDomain. When we migrate altDomain, this can never happen
+        if (error && error.reason !== DomainError.NOT_FOUND) return callback(new DomainError(DomainError.INTERNAL_ERROR, error));
+
+        // hack for lack of provider with altDomain. When we migrate altDomain, this will be automatically "manual"
+        const provider = result ? result.provider : 'manual';
+
+        api(provider).waitForDns(fqdn, result ? result.zoneName : domain, value, type, options, callback);
+    });
+}
+
+function setAdmin(domain, callback) {
+    assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    debug('setAdmin domain:%s', domain);
+
+    get(domain, function (error, result) {
+        if (error) return callback(error);
+
+        var setPtrRecord = config.provider() === 'caas' ? caas.setPtrRecord : function (d, next) { next(); };
+
+        setPtrRecord(domain, function (error) {
+            if (error) return callback(new DomainError(DomainError.EXTERNAL_ERROR, 'Error setting PTR record:' + error.message));
+
+            config.setFqdn(result.domain);
+            config.setAdminLocation('my');
+            config.setAdminFqdn('my' + (result.provider === 'caas' ? '-' : '.') + result.domain);
+            config.setZoneName(result.zoneName);
+
+            callback();
+
+            shell.sudo('restart', [ RESTART_CMD ], NOOP_CALLBACK);
+        });
+    });
+}
+
+function fqdn(location, domain, provider) {
+    return location + (location ? (provider !== 'caas' ? '.' : '-') : '') + domain;
+}
+

src/email.js

@@ -12,10 +12,8 @@ var assert = require('assert'),
     async = require('async'),
     cloudron = require('./cloudron.js'),
     config = require('./config.js'),
-    constants = require('./constants.js'),
     debug = require('debug')('box:email'),
     dig = require('./dig.js'),
-    mailer = require('./mailer.js'),
     net = require('net'),
     nodemailer = require('nodemailer'),
     safe = require('safetydance'),
@@ -25,8 +23,6 @@ var assert = require('assert'),
     util = require('util'),
     _ = require('underscore');
 
-var NOOP_CALLBACK = function (error) { if (error) console.error(error); };
-
 const digOptions = { server: '127.0.0.1', port: 53, timeout: 5000 };
 
 function EmailError(reason, errorOrMessage) {
@@ -113,7 +109,7 @@ function checkSmtpRelay(relay, callback) {
             return callback(error, result);
         }
 
-       callback(null, result);
+        callback(null, result);
     });
 }
 
@@ -266,59 +262,59 @@ function checkPtr(callback) {
 // https://raw.githubusercontent.com/jawsome/node-dnsbl/master/list.json
 const RBL_LIST = [
     {
-        "name": "Barracuda",
-        "dns": "b.barracudacentral.org",
-        "site": "http://www.barracudacentral.org/rbl/removal-request"
+        'name': 'Barracuda',
+        'dns': 'b.barracudacentral.org',
+        'site': 'http://www.barracudacentral.org/rbl/removal-request'
     },
     {
-        "name": "SpamCop",
-        "dns": "bl.spamcop.net",
-        "site": "http://spamcop.net"
+        'name': 'SpamCop',
+        'dns': 'bl.spamcop.net',
+        'site': 'http://spamcop.net'
     },
     {
-        "name": "Sorbs Aggregate Zone",
-        "dns": "dnsbl.sorbs.net",
-        "site": "http://dnsbl.sorbs.net/"
+        'name': 'Sorbs Aggregate Zone',
+        'dns': 'dnsbl.sorbs.net',
+        'site': 'http://dnsbl.sorbs.net/'
     },
     {
-        "name": "Sorbs spam.dnsbl Zone",
-        "dns": "spam.dnsbl.sorbs.net",
-        "site": "http://sorbs.net"
+        'name': 'Sorbs spam.dnsbl Zone',
+        'dns': 'spam.dnsbl.sorbs.net',
+        'site': 'http://sorbs.net'
     },
     {
-        "name": "Composite Blocking List",
-        "dns": "cbl.abuseat.org",
-        "site": "http://www.abuseat.org"
+        'name': 'Composite Blocking List',
+        'dns': 'cbl.abuseat.org',
+        'site': 'http://www.abuseat.org'
     },
     {
-        "name": "SpamHaus Zen",
-        "dns": "zen.spamhaus.org",
-        "site": "http://spamhaus.org"
+        'name': 'SpamHaus Zen',
+        'dns': 'zen.spamhaus.org',
+        'site': 'http://spamhaus.org'
     },
     {
-        "name": "Multi SURBL",
-        "dns": "multi.surbl.org",
-        "site": "http://www.surbl.org"
+        'name': 'Multi SURBL',
+        'dns': 'multi.surbl.org',
+        'site': 'http://www.surbl.org'
     },
     {
-        "name": "Spam Cannibal",
-        "dns": "bl.spamcannibal.org",
-        "site": "http://www.spamcannibal.org/cannibal.cgi"
+        'name': 'Spam Cannibal',
+        'dns': 'bl.spamcannibal.org',
+        'site': 'http://www.spamcannibal.org/cannibal.cgi'
     },
     {
-        "name": "dnsbl.abuse.ch",
-        "dns": "spam.abuse.ch",
-        "site": "http://dnsbl.abuse.ch/"
+        'name': 'dnsbl.abuse.ch',
+        'dns': 'spam.abuse.ch',
+        'site': 'http://dnsbl.abuse.ch/'
     },
     {
-        "name": "The Unsubscribe Blacklist(UBL)",
-        "dns": "ubl.unsubscore.com ",
-        "site": "http://www.lashback.com/blacklist/"
+        'name': 'The Unsubscribe Blacklist(UBL)',
+        'dns': 'ubl.unsubscore.com ',
+        'site': 'http://www.lashback.com/blacklist/'
     },
     {
-        "name": "UCEPROTECT Network",
-        "dns": "dnsbl-1.uceprotect.net",
-        "site": "http://www.uceprotect.net/en"
+        'name': 'UCEPROTECT Network',
+        'dns': 'dnsbl-1.uceprotect.net',
+        'site': 'http://www.uceprotect.net/en'
     }
 ];
 

src/groupdb.js

@@ -24,6 +24,7 @@ exports = module.exports = {
 
 var assert = require('assert'),
     constants = require('./constants.js'),
+    config = require('./config.js'),
     database = require('./database.js'),
     DatabaseError = require('./databaseerror'),
     mailboxdb = require('./mailboxdb.js');
@@ -88,10 +89,8 @@ function add(id, name, callback) {
     assert.strictEqual(typeof name, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    var data = [ id, name ];
-
     var queries = [];
-    queries.push({ query: 'INSERT INTO mailboxes (name, ownerId, ownerType) VALUES (?, ?, ?)', args: [ name, id, mailboxdb.TYPE_GROUP ] });
+    queries.push({ query: 'INSERT INTO mailboxes (name, domain, ownerId, ownerType) VALUES (?, ?, ?, ?)', args: [ name, config.fqdn(), id, mailboxdb.TYPE_GROUP ] });
     queries.push({ query: 'INSERT INTO groups (id, name) VALUES (?, ?)', args: [ id, name ] });
 
     database.transaction(queries, function (error, result) {

src/infra_version.js

@@ -18,7 +18,7 @@ exports = module.exports = {
         'postgresql': { repo: 'cloudron/postgresql', tag: 'cloudron/postgresql:0.17.1' },
         'mongodb': { repo: 'cloudron/mongodb', tag: 'cloudron/mongodb:0.13.0' },
         'redis': { repo: 'cloudron/redis', tag: 'cloudron/redis:0.11.0' },
-        'mail': { repo: 'cloudron/mail', tag: 'cloudron/mail:0.39.0' },
+        'mail': { repo: 'cloudron/mail', tag: 'cloudron/mail:0.40.0' },
         'graphite': { repo: 'cloudron/graphite', tag: 'cloudron/graphite:0.12.0' }
     }
 };

src/ldap.js

@@ -265,7 +265,7 @@ function mailboxSearch(req, res, next) {
         name = parts[0];
     }
 
-    mailboxdb.getMailbox(name, function (error, mailbox) {
+    mailboxdb.getMailbox(name, config.fqdn(), function (error, mailbox) {
         if (error && error.reason === DatabaseError.NOT_FOUND) return next(new ldap.NoSuchObjectError(req.dn.toString()));
         if (error) return next(new ldap.OperationsError(error.toString()));
 
@@ -298,7 +298,7 @@ function mailAliasSearch(req, res, next) {
 
     if (!req.dn.rdns[0].attrs.cn) return next(new ldap.NoSuchObjectError(req.dn.toString()));
 
-    mailboxdb.getAlias(req.dn.rdns[0].attrs.cn.value.toLowerCase(), function (error, alias) {
+    mailboxdb.getAlias(req.dn.rdns[0].attrs.cn.value.toLowerCase(), config.fqdn(), function (error, alias) {
         if (error && error.reason === DatabaseError.NOT_FOUND) return next(new ldap.NoSuchObjectError(req.dn.toString()));
         if (error) return next(new ldap.OperationsError(error.toString()));
 
@@ -331,7 +331,7 @@ function mailingListSearch(req, res, next) {
 
     if (!req.dn.rdns[0].attrs.cn) return next(new ldap.NoSuchObjectError(req.dn.toString()));
 
-    mailboxdb.getGroup(req.dn.rdns[0].attrs.cn.value.toLowerCase(), function (error, group) {
+    mailboxdb.getGroup(req.dn.rdns[0].attrs.cn.value.toLowerCase(), config.fqdn(), function (error, group) {
         if (error && error.reason === DatabaseError.NOT_FOUND) return next(new ldap.NoSuchObjectError(req.dn.toString()));
         if (error) return next(new ldap.OperationsError(error.toString()));
 
@@ -419,7 +419,7 @@ function authenticateMailbox(req, res, next) {
         name = parts[0];
     }
 
-    mailboxdb.getMailbox(name, function (error, mailbox) {
+    mailboxdb.getMailbox(name, config.fqdn(), function (error, mailbox) {
         if (error && error.reason === DatabaseError.NOT_FOUND) return next(new ldap.NoSuchObjectError(req.dn.toString()));
         if (error) return next(new ldap.OperationsError(error.message));
 

src/locker.js

@@ -15,6 +15,7 @@ util.inherits(Locker, EventEmitter);
 
 // these are mutually exclusive operations
 Locker.prototype.OP_BOX_UPDATE = 'box_update';
+Locker.prototype.OP_PLATFORM_START = 'platform_start';
 Locker.prototype.OP_FULL_BACKUP = 'full_backup';
 Locker.prototype.OP_APPTASK = 'apptask';
 Locker.prototype.OP_MIGRATE = 'migrate';

src/mailboxdb.js

@@ -31,15 +31,16 @@ var assert = require('assert'),
     DatabaseError = require('./databaseerror.js'),
     util = require('util');
 
-var MAILBOX_FIELDS = [ 'name', 'ownerId', 'ownerType', 'aliasTarget', 'creationTime' ].join(',');
+var MAILBOX_FIELDS = [ 'name', 'ownerId', 'ownerType', 'aliasTarget', 'creationTime', 'domain' ].join(',');
 
-function add(name, ownerId, ownerType, callback) {
+function add(name, domain, ownerId, ownerType, callback) {
     assert.strictEqual(typeof name, 'string');
+    assert.strictEqual(typeof domain, 'string');
     assert.strictEqual(typeof ownerId, 'string');
     assert.strictEqual(typeof ownerType, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    database.query('INSERT INTO mailboxes (name, ownerId, ownerType) VALUES (?, ?, ?)', [ name, ownerId, ownerType ], function (error) {
+    database.query('INSERT INTO mailboxes (name, domain, ownerId, ownerType) VALUES (?, ?, ?, ?)', [ name, domain, ownerId, ownerType ], function (error) {
         if (error && error.code === 'ER_DUP_ENTRY') return callback(new DatabaseError(DatabaseError.ALREADY_EXISTS, 'mailbox already exists'));
         if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
 
@@ -56,12 +57,13 @@ function clear(callback) {
     });
 }
 
-function del(name, callback) {
+function del(name, domain, callback) {
     assert.strictEqual(typeof name, 'string');
+    assert.strictEqual(typeof domain, 'string');
     assert.strictEqual(typeof callback, 'function');
 
     // deletes aliases as well
-    database.query('DELETE FROM mailboxes WHERE name=? OR aliasTarget = ?', [ name, name ], function (error, result) {
+    database.query('DELETE FROM mailboxes WHERE (name=? OR aliasTarget = ?) AND domain = ?', [ name, name, domain ], function (error, result) {
         if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
         if (result.affectedRows === 0) return callback(new DatabaseError(DatabaseError.NOT_FOUND));
 
@@ -81,15 +83,17 @@ function delByOwnerId(id, callback) {
     });
 }
 
-function updateName(oldName, newName, callback) {
+function updateName(oldName, oldDomain, newName, newDomain, callback) {
     assert.strictEqual(typeof oldName, 'string');
+    assert.strictEqual(typeof oldDomain, 'string');
     assert.strictEqual(typeof newName, 'string');
+    assert.strictEqual(typeof newDomain, 'string');
     assert.strictEqual(typeof callback, 'function');
 
     // skip if no changes
-    if (oldName === newName) return callback(null);
+    if (oldName === newName && oldDomain === newDomain) return callback(null);
 
-    database.query('UPDATE mailboxes SET name=? WHERE name=?', [ newName, oldName ], function (error, result) {
+    database.query('UPDATE mailboxes SET name=?, domain=? WHERE name=? AND domain = ?', [ newName, newDomain, oldName, oldDomain ], function (error, result) {
         if (error && error.code === 'ER_DUP_ENTRY') return callback(new DatabaseError(DatabaseError.ALREADY_EXISTS, 'mailbox already exists'));
         if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
         if (result.affectedRows !== 1) return callback(new DatabaseError(DatabaseError.NOT_FOUND));
@@ -98,11 +102,12 @@ function updateName(oldName, newName, callback) {
     });
 }
 
-function getMailbox(name, callback) {
+function getMailbox(name, domain, callback) {
     assert.strictEqual(typeof name, 'string');
+    assert.strictEqual(typeof domain, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    database.query('SELECT ' + MAILBOX_FIELDS + ' FROM mailboxes WHERE name = ? AND (ownerType = ? OR ownerType = ?) AND aliasTarget IS NULL', [ name, exports.TYPE_APP, exports.TYPE_USER ], function (error, results) {
+    database.query('SELECT ' + MAILBOX_FIELDS + ' FROM mailboxes WHERE name = ? AND domain = ? AND (ownerType = ? OR ownerType = ?) AND aliasTarget IS NULL', [ name, domain, exports.TYPE_APP, exports.TYPE_USER ], function (error, results) {
         if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
         if (results.length === 0) return callback(new DatabaseError(DatabaseError.NOT_FOUND));
 
@@ -110,18 +115,20 @@ function getMailbox(name, callback) {
     });
 }
 
-function listMailboxes(callback) {
+function listMailboxes(domain, callback) {
+    assert.strictEqual(typeof domain, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    database.query('SELECT ' + MAILBOX_FIELDS + ' FROM mailboxes WHERE (ownerType = ? OR ownerType = ?) AND aliasTarget IS NULL ORDER BY name', [ exports.TYPE_APP, exports.TYPE_USER ], function (error, results) {
+    database.query('SELECT ' + MAILBOX_FIELDS + ' FROM mailboxes WHERE domain = ? AND (ownerType = ? OR ownerType = ?) AND aliasTarget IS NULL ORDER BY name', [ domain, exports.TYPE_APP, exports.TYPE_USER ], function (error, results) {
         if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
 
         callback(null, results);
     });
 }
 
-function getGroup(name, callback) {
+function getGroup(name, domain, callback) {
     assert.strictEqual(typeof name, 'string');
+    assert.strictEqual(typeof domain, 'string');
     assert.strictEqual(typeof callback, 'function');
 
     // This can be merged into a single query but cannot get 'not found' information
@@ -130,7 +137,7 @@ function getGroup(name, callback) {
     //    INNER JOIN users ON groupMembers.userId = users.id
     //    WHERE mailboxes.name = <name>
 
-    database.query('SELECT ' + MAILBOX_FIELDS + ' FROM mailboxes WHERE name = ? AND ownerType = ? AND aliasTarget IS NULL', [ name, exports.TYPE_GROUP ], function (error, results) {
+    database.query('SELECT ' + MAILBOX_FIELDS + ' FROM mailboxes WHERE name = ? AND domain = ? AND ownerType = ? AND aliasTarget IS NULL', [ name, domain, exports.TYPE_GROUP ], function (error, results) {
         if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
         if (results.length === 0) return callback(new DatabaseError(DatabaseError.NOT_FOUND));
 
@@ -157,20 +164,21 @@ function getByOwnerId(ownerId, callback) {
     });
 }
 
-function setAliasesForName(name, aliases, callback) {
+function setAliasesForName(name, domain, aliases, callback) {
     assert.strictEqual(typeof name, 'string');
+    assert.strictEqual(typeof domain, 'string');
     assert(util.isArray(aliases));
     assert.strictEqual(typeof callback, 'function');
 
-    database.query('SELECT ' + MAILBOX_FIELDS + ' FROM mailboxes WHERE name = ? ', [ name ], function (error, results) {
+    database.query('SELECT ' + MAILBOX_FIELDS + ' FROM mailboxes WHERE name = ? AND domain = ?', [ name, domain ], function (error, results) {
         if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
         if (results.length === 0) return callback(new DatabaseError(DatabaseError.NOT_FOUND));
 
         var queries = [];
-        queries.push({ query: 'DELETE FROM mailboxes WHERE aliasTarget = ?', args: [ name ] });
+        queries.push({ query: 'DELETE FROM mailboxes WHERE aliasTarget = ? AND domain = ?', args: [ name, domain ] });
         aliases.forEach(function (alias) {
-            queries.push({ query: 'INSERT INTO mailboxes (name, aliasTarget, ownerId, ownerType) VALUES (?, ?, ?, ?)',
-                         args: [ alias, name, results[0].ownerId, results[0].ownerType ] });
+            queries.push({ query: 'INSERT INTO mailboxes (name, domain, aliasTarget, ownerId, ownerType) VALUES (?, ?, ?, ?, ?)',
+                         args: [ alias, domain, name, results[0].ownerId, results[0].ownerType ] });
         });
 
         database.transaction(queries, function (error) {
@@ -182,11 +190,12 @@ function setAliasesForName(name, aliases, callback) {
     });
 }
 
-function getAliasesForName(name, callback) {
+function getAliasesForName(name, domain, callback) {
     assert.strictEqual(typeof name, 'string');
+    assert.strictEqual(typeof domain, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    database.query('SELECT name FROM mailboxes WHERE aliasTarget=? ORDER BY name', [ name ], function (error, results) {
+    database.query('SELECT name FROM mailboxes WHERE aliasTarget = ? AND domain = ? ORDER BY name', [ name, domain ], function (error, results) {
         if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
 
         results = results.map(function (r) { return r.name; });
@@ -194,21 +203,23 @@ function getAliasesForName(name, callback) {
     });
 }
 
-function listAliases(callback) {
+function listAliases(domain, callback) {
+    assert.strictEqual(typeof domain, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    database.query('SELECT ' + MAILBOX_FIELDS + ' FROM mailboxes WHERE aliasTarget IS NOT NULL ORDER BY name', function (error, results) {
+    database.query('SELECT ' + MAILBOX_FIELDS + ' FROM mailboxes WHERE domain = ? AND aliasTarget IS NOT NULL ORDER BY name', [ domain ], function (error, results) {
         if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
 
         callback(null, results);
     });
 }
 
-function getAlias(name, callback) {
+function getAlias(name, domain, callback) {
     assert.strictEqual(typeof name, 'string');
+    assert.strictEqual(typeof domain, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    database.query('SELECT ' + MAILBOX_FIELDS + ' FROM mailboxes WHERE name = ? AND aliasTarget IS NOT NULL', [ name ], function (error, results) {
+    database.query('SELECT ' + MAILBOX_FIELDS + ' FROM mailboxes WHERE name = ? AND domain = ? AND aliasTarget IS NOT NULL', [ name, domain ], function (error, results) {
         if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
         if (results.length === 0) return callback(new DatabaseError(DatabaseError.NOT_FOUND));
 

src/mailer.js

@@ -1,9 +1,6 @@
 'use strict';
 
 exports = module.exports = {
-    start: start,
-    stop: stop,
-
     userAdded: userAdded,
     userRemoved: userRemoved,
     adminChanged: adminChanged,
@@ -49,8 +46,7 @@ var NOOP_CALLBACK = function (error) { if (error) debug(error); };
 
 var MAIL_TEMPLATES_DIR = path.join(__dirname, 'mail_templates');
 
-var gMailQueue = [ ],
-    gPaused = false;
+var gMailQueue = [ ];
 
 function splatchError(error) {
     var result = { };
@@ -63,25 +59,6 @@ function splatchError(error) {
     return util.inspect(result, { depth: null, showHidden: true });
 }
 
-function start(callback) {
-    assert.strictEqual(typeof callback, 'function');
-
-    if (process.env.BOX_ENV === 'test') gPaused = true;
-
-    callback(null);
-}
-
-function stop(callback) {
-    assert.strictEqual(typeof callback, 'function');
-
-    // TODO: interrupt processQueue as well
-
-    debug(gMailQueue.length + ' mail items dropped');
-    gMailQueue = [ ];
-
-    callback(null);
-}
-
 function mailConfig() {
     return {
         from: '"Cloudron" <no-reply@' + config.fqdn() + '>'
@@ -89,8 +66,6 @@ function mailConfig() {
 }
 
 function processQueue() {
-    assert(!gPaused);
-
     sendMails(gMailQueue);
     gMailQueue = [ ];
 }
@@ -137,7 +112,7 @@ function enqueue(mailOptions) {
     debug('Queued mail for ' + mailOptions.from + ' to ' + mailOptions.to);
     gMailQueue.push(mailOptions);
 
-    if (!gPaused) processQueue();
+    if (process.env.BOX_ENV !== 'test') processQueue();
 }
 
 function render(templateFile, params) {

src/nginx.js

@@ -55,7 +55,7 @@ function configureApp(app, certFilePath, keyFilePath, callback) {
 
     var sourceDir = path.resolve(__dirname, '..');
     var endpoint = 'app';
-    var vhost = app.altDomain || config.appFqdn(app.location);
+    var vhost = app.altDomain || app.intrinsicFqdn;
 
     var data = {
         sourceDir: sourceDir,
@@ -86,7 +86,7 @@ function unconfigureApp(app, callback) {
     assert.strictEqual(typeof app, 'object');
     assert.strictEqual(typeof callback, 'function');
 
-    var vhost = app.altDomain || config.appFqdn(app.location);
+    var vhost = app.altDomain || app.intrinsicFqdn;
 
     var nginxConfigFilename = path.join(paths.NGINX_APPCONFIG_DIR, app.id + '.conf');
     if (!safe.fs.unlinkSync(nginxConfigFilename)) {

src/paths.js

@@ -31,5 +31,7 @@ exports = module.exports = {
     ACME_ACCOUNT_KEY_FILE: path.join(config.baseDir(), 'boxdata/acme/acme.key'),
     APP_CERTS_DIR: path.join(config.baseDir(), 'boxdata/certs'),
     CLOUDRON_AVATAR_FILE: path.join(config.baseDir(), 'boxdata/avatar.png'),
-    UPDATE_CHECKER_FILE: path.join(config.baseDir(), 'boxdata/updatechecker.json')
+    UPDATE_CHECKER_FILE: path.join(config.baseDir(), 'boxdata/updatechecker.json'),
+
+    AUTO_PROVISION_FILE: path.join(config.baseDir(), 'configs/autoprovision.json')
 };

src/platform.js

@@ -13,9 +13,11 @@ var apps = require('./apps.js'),
     config = require('./config.js'),
     certificates = require('./certificates.js'),
     debug = require('debug')('box:platform'),
+    domains = require('./domains.js'),
     fs = require('fs'),
     hat = require('hat'),
     infra = require('./infra_version.js'),
+    locker = require('./locker.js'),
     nginx = require('./nginx.js'),
     os = require('os'),
     paths = require('./paths.js'),
@@ -23,7 +25,6 @@ var apps = require('./apps.js'),
     semver = require('semver'),
     settings = require('./settings.js'),
     shell = require('./shell.js'),
-    subdomains = require('./subdomains.js'),
     taskmanager = require('./taskmanager.js'),
     user = require('./user.js'),
     util = require('util'),
@@ -63,6 +64,9 @@ function start(callback) {
 
     debug('Updating infrastructure from %s to %s', existingInfra.version, infra.version);
 
+    var error = locker.lock(locker.OP_PLATFORM_START);
+    if (error) return callback(error);
+
     async.series([
         stopContainers.bind(null, existingInfra),
         startAddons.bind(null, existingInfra),
@@ -72,6 +76,8 @@ function start(callback) {
     ], function (error) {
         if (error) return callback(error);
 
+        locker.unlock(locker.OP_PLATFORM_START);
+
         emitPlatformReady();
 
         callback();
@@ -328,7 +334,7 @@ function startMail(callback) {
                 ];
 
                 async.mapSeries(records, function (record, iteratorCallback) {
-                    subdomains.upsert(record.subdomain, record.type, record.values, iteratorCallback);
+                    domains.upsertDNSRecords(record.subdomain, config.fqdn(), record.type, record.values, iteratorCallback);
                 }, NOOP_CALLBACK); // do not crash if DNS creds do not work in startup sequence
 
                 callback();

src/routes/apps.js

@@ -51,6 +51,7 @@ function removeInternalAppFields(app) {
         runState: app.runState,
         health: app.health,
         location: app.location,
+        domain: app.domain,
         accessRestriction: app.accessRestriction,
         manifest: app.manifest,
         portBindings: app.portBindings,
@@ -63,7 +64,9 @@ function removeInternalAppFields(app) {
         sso: app.sso,
         debugMode: app.debugMode,
         robotsTxt: app.robotsTxt,
-        enableBackup: app.enableBackup
+        enableBackup: app.enableBackup,
+        creationTime: app.creationTime.toISOString(),
+        updateTime: app.updateTime.toISOString()
     };
 }
 
@@ -113,6 +116,7 @@ function installApp(req, res, next) {
 
     // required
     if (typeof data.location !== 'string') return next(new HttpError(400, 'location is required'));
+    if (typeof data.domain !== 'string') return next(new HttpError(400, 'domain is required'));
     if (typeof data.accessRestriction !== 'object') return next(new HttpError(400, 'accessRestriction is required'));
 
     // optional
@@ -165,6 +169,7 @@ function configureApp(req, res, next) {
     var data = req.body;
 
     if ('location' in data && typeof data.location !== 'string') return next(new HttpError(400, 'location must be string'));
+    if ('domain' in data && typeof data.domain !== 'string') return next(new HttpError(400, 'domain must be string'));
     if ('portBindings' in data && typeof data.portBindings !== 'object') return next(new HttpError(400, 'portBindings must be an object'));
     if ('accessRestriction' in data && typeof data.accessRestriction !== 'object') return next(new HttpError(400, 'accessRestriction must be an object'));
 
@@ -232,12 +237,14 @@ function cloneApp(req, res, next) {
 
     if (typeof data.backupId !== 'string') return next(new HttpError(400, 'backupId must be a string'));
     if (typeof data.location !== 'string') return next(new HttpError(400, 'location is required'));
+    if (typeof data.domain !== 'string') return next(new HttpError(400, 'domain is required'));
     if (('portBindings' in data) && typeof data.portBindings !== 'object') return next(new HttpError(400, 'portBindings must be an object'));
 
     apps.clone(req.params.id, data, auditSource(req), function (error, result) {
         if (error && error.reason === AppsError.NOT_FOUND) return next(new HttpError(404, 'No such app'));
         if (error && error.reason === AppsError.BAD_FIELD) return next(new HttpError(400, error.message));
         if (error && error.reason === AppsError.BAD_STATE) return next(new HttpError(409, error.message));
+        if (error && error.reason === AppsError.BILLING_REQUIRED) return next(new HttpError(402, 'Billing required'));
         if (error && error.reason === AppsError.EXTERNAL_ERROR) return next(new HttpError(424, error.message));
         if (error) return next(new HttpError(500, error));
 

src/routes/caas.js

@@ -0,0 +1,42 @@
+'use strict';
+
+exports = module.exports = {
+    changePlan: changePlan
+};
+
+var caas = require('../caas.js'),
+    CaasError = require('../caas.js').CaasError,
+    config = require('../config.js'),
+    debug = require('debug')('box:routes/cloudron'),
+    HttpError = require('connect-lastmile').HttpError,
+    HttpSuccess = require('connect-lastmile').HttpSuccess,
+    _ = require('underscore');
+
+function changePlan(req, res, next) {
+    if (config.provider() !== 'caas') return next(new HttpError(422, 'Cannot use migrate API with this provider'));
+
+    if ('size' in req.body && typeof req.body.size !== 'string') return next(new HttpError(400, 'size must be string'));
+    if ('region' in req.body && typeof req.body.region !== 'string') return next(new HttpError(400, 'region must be string'));
+
+    if ('domain' in req.body) {
+        if (typeof req.body.domain !== 'string') return next(new HttpError(400, 'domain must be string'));
+        if (typeof req.body.provider !== 'string') return next(new HttpError(400, 'provider must be string'));
+    }
+
+    if ('zoneName' in req.body && typeof req.body.zoneName !== 'string') return next(new HttpError(400, 'zoneName must be string'));
+
+    debug('Migration requested domain:%s size:%s region:%s', req.body.domain, req.body.size, req.body.region);
+
+    var options = _.pick(req.body, 'domain', 'size', 'region');
+    if (Object.keys(options).length === 0) return next(new HttpError(400, 'no migrate option provided'));
+
+    if (options.domain) options.domain = options.domain.toLowerCase();
+
+    caas.changePlan(req.body, function (error) { // pass req.body because 'domain' can have arbitrary options
+        if (error && error.reason === CaasError.BAD_STATE) return next(new HttpError(409, error.message));
+        if (error && error.reason === CaasError.BAD_FIELD) return next(new HttpError(400, error.message));
+        if (error) return next(new HttpError(500, error));
+
+        next(new HttpSuccess(202, {}));
+    });
+}

src/routes/cloudron.js

@@ -6,8 +6,8 @@ exports = module.exports = {
     setupTokenAuth: setupTokenAuth,
     providerTokenAuth: providerTokenAuth,
     getStatus: getStatus,
+    restore: restore,
     reboot: reboot,
-    migrate: migrate,
     getProgress: getProgress,
     getConfig: getConfig,
     getDisks: getDisks,
@@ -78,15 +78,42 @@ function activate(req, res, next) {
     });
 }
 
+function restore(req, res, next) {
+    assert.strictEqual(typeof req.body, 'object');
+
+    if (!req.body.backupConfig || typeof req.body.backupConfig !== 'object') return next(new HttpError(400, 'backupConfig is required'));
+
+    var backupConfig = req.body.backupConfig;
+    if (typeof backupConfig.provider !== 'string') return next(new HttpError(400, 'provider is required'));
+    if ('key' in backupConfig && typeof backupConfig.key !== 'string') return next(new HttpError(400, 'key must be a string'));
+    if (typeof backupConfig.format !== 'string') return next(new HttpError(400, 'format must be a string'));
+    if ('acceptSelfSignedCerts' in backupConfig && typeof backupConfig.acceptSelfSignedCerts !== 'boolean') return next(new HttpError(400, 'format must be a boolean'));
+
+    if (typeof req.body.backupId !== 'string') return next(new HttpError(400, 'backupId must be a string or null'));
+    if (typeof req.body.version !== 'string') return next(new HttpError(400, 'version must be a string'));
+
+    cloudron.restore(backupConfig, req.body.backupId, req.body.version, function (error) {
+        if (error && error.reason === CloudronError.ALREADY_SETUP) return next(new HttpError(409, error.message));
+        if (error && error.reason === CloudronError.BAD_FIELD) return next(new HttpError(400, error.message));
+        if (error && error.reason === CloudronError.BAD_STATE) return next(new HttpError(409, error.message));
+        if (error && error.reason === CloudronError.EXTERNAL_ERROR) return next(new HttpError(402, error.message));
+        if (error) return next(new HttpError(500, error));
+
+        next(new HttpSuccess(200));
+    });
+}
+
 function dnsSetup(req, res, next) {
     assert.strictEqual(typeof req.body, 'object');
 
-    if (typeof req.body.provider !== 'string') return next(new HttpError(400, 'provider is required'));
+    if (typeof req.body.provider !== 'string' || !req.body.provider) return next(new HttpError(400, 'provider is required'));
     if (typeof req.body.domain !== 'string' || !req.body.domain) return next(new HttpError(400, 'domain is required'));
+    if (typeof req.body.adminFqdn !== 'string' || !req.body.domain) return next(new HttpError(400, 'adminFqdn is required'));
 
     if ('zoneName' in req.body && typeof req.body.zoneName !== 'string') return next(new HttpError(400, 'zoneName must be a string'));
+    if (!req.body.config || typeof req.body.config !== 'object') return next(new HttpError(400, 'config must be an object'));
 
-    cloudron.dnsSetup(req.body, req.body.domain.toLowerCase(), req.body.zoneName || '', function (error) {
+    cloudron.dnsSetup(req.body.adminFqdn.toLowerCase(), req.body.domain.toLowerCase(), req.body.zoneName || '', req.body.provider, req.body.config, function (error) {
         if (error && error.reason === CloudronError.ALREADY_SETUP) return next(new HttpError(409, error.message));
         if (error && error.reason === CloudronError.BAD_FIELD) return next(new HttpError(400, error.message));
         if (error) return next(new HttpError(500, error));
@@ -154,41 +181,12 @@ function reboot(req, res, next) {
     cloudron.reboot(function () { });
 }
 
-function migrate(req, res, next) {
-    if (config.provider() !== 'caas') return next(new HttpError(422, 'Cannot use migrate API with this provider'));
-
-    if ('size' in req.body && typeof req.body.size !== 'string') return next(new HttpError(400, 'size must be string'));
-    if ('region' in req.body && typeof req.body.region !== 'string') return next(new HttpError(400, 'region must be string'));
-
-    if ('domain' in req.body) {
-        if (typeof req.body.domain !== 'string') return next(new HttpError(400, 'domain must be string'));
-        if (typeof req.body.provider !== 'string') return next(new HttpError(400, 'provider must be string'));
-    }
-
-    if ('zoneName' in req.body && typeof req.body.zoneName !== 'string') return next(new HttpError(400, 'zoneName must be string'));
-
-    debug('Migration requested domain:%s size:%s region:%s', req.body.domain, req.body.size, req.body.region);
-
-    var options = _.pick(req.body, 'domain', 'size', 'region');
-    if (Object.keys(options).length === 0) return next(new HttpError(400, 'no migrate option provided'));
-
-    if (options.domain) options.domain = options.domain.toLowerCase();
-
-    cloudron.migrate(req.body, function (error) { // pass req.body because 'domain' can have arbitrary options
-        if (error && error.reason === CloudronError.BAD_STATE) return next(new HttpError(409, error.message));
-        if (error && error.reason === CloudronError.BAD_FIELD) return next(new HttpError(400, error.message));
-        if (error) return next(new HttpError(500, error));
-
-        next(new HttpSuccess(202, {}));
-    });
-}
-
 function getConfig(req, res, next) {
     cloudron.getConfig(function (error, cloudronConfig) {
         if (error) return next(new HttpError(500, error));
 
         if (!req.user.admin) {
-            cloudronConfig = _.pick(cloudronConfig, 'apiServerOrigin', 'webServerOrigin', 'fqdn', 'version', 'progress', 'isCustomDomain', 'isDemo', 'cloudronName', 'provider');
+            cloudronConfig = _.pick(cloudronConfig, 'apiServerOrigin', 'webServerOrigin', 'fqdn', 'adminFqdn', 'version', 'progress', 'isDemo', 'cloudronName', 'provider');
         }
 
         next(new HttpSuccess(200, cloudronConfig));

src/routes/developer.js

@@ -1,9 +1,6 @@
 'use strict';
 
 exports = module.exports = {
-    enabled: enabled,
-    setEnabled: setEnabled,
-    status: status,
     login: login
 };
 
@@ -17,27 +14,6 @@ function auditSource(req) {
     return { ip: ip, username: req.user ? req.user.username : null, userId: req.user ? req.user.id : null };
 }
 
-function enabled(req, res, next) {
-    developer.isEnabled(function (error, enabled) {
-        if (enabled) return next();
-        next(new HttpError(412, 'Developer mode not enabled'));
-    });
-}
-
-function setEnabled(req, res, next) {
-    if (typeof req.body.enabled !== 'boolean') return next(new HttpError(400, 'enabled must be boolean'));
-
-    developer.setEnabled(req.body.enabled, auditSource(req), function (error) {
-        if (error) return next(new HttpError(500, error));
-
-        next(new HttpSuccess(200, {}));
-    });
-}
-
-function status(req, res, next) {
-    next(new HttpSuccess(200, {}));
-}
-
 function login(req, res, next) {
     passport.authenticate('local', function (error, user) {
         if (error) return next(new HttpError(500, error));

src/routes/domains.js

@@ -0,0 +1,100 @@
+'use strict';
+
+exports = module.exports = {
+    add: add,
+    get: get,
+    getAll: getAll,
+    update: update,
+    del: del,
+
+    setAdmin: setAdmin
+};
+
+var assert = require('assert'),
+    domains = require('../domains.js'),
+    DomainError = domains.DomainError,
+    HttpError = require('connect-lastmile').HttpError,
+    HttpSuccess = require('connect-lastmile').HttpSuccess;
+
+function add(req, res, next) {
+    assert.strictEqual(typeof req.body, 'object');
+
+    if (typeof req.body.domain !== 'string') return next(new HttpError(400, 'domain must be a string'));
+    if (typeof req.body.provider !== 'string') return next(new HttpError(400, 'provider must be a string'));
+    if (typeof req.body.config !== 'object') return next(new HttpError(400, 'config must be an object'));
+    if ('zoneName' in req.body && typeof req.body.zoneName !== 'string') return next(new HttpError(400, 'zoneName must be a string'));
+    if ('fallbackCertificate' in req.body && typeof req.body.fallbackCertificate !== 'object') return next(new HttpError(400, 'fallbackCertificate must be a object with cert and key strings'));
+    if (req.body.fallbackCertificate && (!req.body.cert || typeof req.body.cert !== 'string')) return next(new HttpError(400, 'fallbackCertificate.cert must be a string'));
+    if (req.body.fallbackCertificate && (!req.body.key || typeof req.body.key !== 'string')) return next(new HttpError(400, 'fallbackCertificate.key must be a string'));
+
+    domains.add(req.body.domain, req.body.zoneName || req.body.domain, req.body.provider, req.body.config, req.body.fallbackCertificate || null, function (error) {
+        if (error && error.reason === DomainError.ALREADY_EXISTS) return next(new HttpError(409, error.message));
+        if (error && error.reason === DomainError.BAD_FIELD) return next(new HttpError(400, error.message));
+        if (error && error.reason === DomainError.INVALID_PROVIDER) return next(new HttpError(400, error.message));
+        if (error) return next(new HttpError(500, error));
+
+        next(new HttpSuccess(201, { domain: req.body.domain, config: req.body.config }));
+    });
+}
+
+function get(req, res, next) {
+    assert.strictEqual(typeof req.params.domain, 'string');
+
+    domains.get(req.params.domain, function (error, result) {
+        if (error && error.reason === DomainError.NOT_FOUND) return next(new HttpError(404, error.message));
+        if (error) return next(new HttpError(500, error));
+
+        next(new HttpSuccess(200, result));
+    });
+}
+
+function getAll(req, res, next) {
+    domains.getAll(function (error, result) {
+        if (error) return next(new HttpError(500, error));
+
+        next(new HttpSuccess(200, { domains: result }));
+    });
+}
+
+function update(req, res, next) {
+    assert.strictEqual(typeof req.params.domain, 'string');
+    assert.strictEqual(typeof req.body, 'object');
+
+    if (typeof req.body.provider !== 'string') return next(new HttpError(400, 'provider must be an object'));
+    if (typeof req.body.config !== 'object') return next(new HttpError(400, 'config must be an object'));
+    if ('fallbackCertificate' in req.body && typeof req.body.fallbackCertificate !== 'object') return next(new HttpError(400, 'fallbackCertificate must be a object with cert and key strings'));
+    if (req.body.fallbackCertificate && (!req.body.fallbackCertificate.cert || typeof req.body.fallbackCertificate.cert !== 'string')) return next(new HttpError(400, 'fallbackCertificate.cert must be a string'));
+    if (req.body.fallbackCertificate && (!req.body.fallbackCertificate.key || typeof req.body.fallbackCertificate.key !== 'string')) return next(new HttpError(400, 'fallbackCertificate.key must be a string'));
+
+    domains.update(req.params.domain, req.body.provider, req.body.config, req.body.fallbackCertificate || null, function (error) {
+        if (error && error.reason === DomainError.NOT_FOUND) return next(new HttpError(404, error.message));
+        if (error && error.reason === DomainError.BAD_FIELD) return next(new HttpError(400, error.message));
+        if (error && error.reason === DomainError.INVALID_PROVIDER) return next(new HttpError(400, error.message));
+        if (error) return next(new HttpError(500, error));
+
+        next(new HttpSuccess(204, {}));
+    });
+}
+
+function del(req, res, next) {
+    assert.strictEqual(typeof req.params.domain, 'string');
+
+    domains.del(req.params.domain, function (error) {
+        if (error && error.reason === DomainError.NOT_FOUND) return next(new HttpError(404, error.message));
+        if (error && error.reason === DomainError.IN_USE) return next(new HttpError(409, 'Domain is still in use'));
+        if (error) return next(new HttpError(500, error));
+
+        next(new HttpSuccess(204, {}));
+    });
+}
+
+function setAdmin(req, res, next) {
+    assert.strictEqual(typeof req.params.domain, 'string');
+
+    domains.setAdmin(req.params.domain.toLowerCase(), function (error) {
+        if (error && error.reason === DomainError.NOT_FOUND) return next(new HttpError(404, error.message));
+        if (error) return next(new HttpError(500, error));
+
+        next(new HttpSuccess(202, {}));
+    });
+}

src/routes/index.js

@@ -3,9 +3,11 @@
 exports = module.exports = {
     apps: require('./apps.js'),
     backups: require('./backups.js'),
+    caas: require('./caas.js'),
     clients: require('./clients.js'),
     cloudron: require('./cloudron.js'),
     developer: require('./developer.js'),
+    domains: require('./domains.js'),
     eventlog: require('./eventlog.js'),
     graphs: require('./graphs.js'),
     groups: require('./groups.js'),

src/routes/oauth2.js

@@ -1,7 +1,6 @@
 'use strict';
 
-var appdb = require('../appdb'),
-    apps = require('../apps'),
+var apps = require('../apps'),
     assert = require('assert'),
     auth = require('../auth.js'),
     authcodedb = require('../authcodedb'),
@@ -237,10 +236,10 @@ function loginForm(req, res) {
             default: break;
         }
 
-        appdb.get(result.appId, function (error, result) {
+        apps.get(result.appId, function (error, result) {
             if (error) return sendErrorPageOrRedirect(req, res, 'Unknown Application for those OAuth credentials');
 
-            var applicationName = result.location || config.fqdn();
+            var applicationName = result.altDomain || result.intrinsicFqdn;
             render(applicationName, '/api/v1/apps/' + result.id + '/icon');
         });
     });
@@ -452,7 +451,7 @@ var authorization = [
             return next();
         }
 
-        appdb.get(req.oauth2.client.appId, function (error, appObject) {
+        apps.get(req.oauth2.client.appId, function (error, appObject) {
             if (error) return sendErrorPageOrRedirect(req, res, 'Invalid request. Unknown app for this client_id.');
 
             apps.hasAccessTo(appObject, req.oauth2.user, function (error, access) {

src/routes/settings.js

@@ -12,9 +12,6 @@ exports = module.exports = {
 
     getEmailStatus: getEmailStatus,
 
-    getDnsConfig: getDnsConfig,
-    setDnsConfig: setDnsConfig,
-
     getBackupConfig: getBackupConfig,
     setBackupConfig: setBackupConfig,
 
@@ -36,7 +33,6 @@ exports = module.exports = {
     getAppstoreConfig: getAppstoreConfig,
     setAppstoreConfig: setAppstoreConfig,
 
-    setFallbackCertificate: setFallbackCertificate,
     setAdminCertificate: setAdminCertificate
 };
 
@@ -239,27 +235,6 @@ function getEmailStatus(req, res, next) {
     });
 }
 
-function getDnsConfig(req, res, next) {
-    settings.getDnsConfig(function (error, config) {
-        if (error) return next(new HttpError(500, error));
-
-        next(new HttpSuccess(200, config));
-    });
-}
-
-function setDnsConfig(req, res, next) {
-    assert.strictEqual(typeof req.body, 'object');
-
-    if (typeof req.body.provider !== 'string') return next(new HttpError(400, 'provider is required'));
-
-    settings.setDnsConfig(req.body, config.fqdn(), config.zoneName(), function (error) {
-        if (error && error.reason === SettingsError.BAD_FIELD) return next(new HttpError(400, error.message));
-        if (error) return next(new HttpError(500, error));
-
-        next(new HttpSuccess(200));
-    });
-}
-
 function getBackupConfig(req, res, next) {
     settings.getBackupConfig(function (error, config) {
         if (error) return next(new HttpError(500, error));
@@ -318,21 +293,6 @@ function setAppstoreConfig(req, res, next) {
     });
 }
 
-// default fallback cert
-function setFallbackCertificate(req, res, next) {
-    assert.strictEqual(typeof req.body, 'object');
-
-    if (!req.body.cert || typeof req.body.cert !== 'string') return next(new HttpError(400, 'cert must be a string'));
-    if (!req.body.key || typeof req.body.key !== 'string') return next(new HttpError(400, 'key must be a string'));
-
-    certificates.setFallbackCertificate(req.body.cert, req.body.key, function (error) {
-        if (error && error.reason === CertificatesError.INVALID_CERT) return next(new HttpError(400, error.message));
-        if (error) return next(new HttpError(500, error));
-
-        next(new HttpSuccess(202, {}));
-    });
-}
-
 // only webadmin cert, until it can be treated just like a normal app
 function setAdminCertificate(req, res, next) {
     assert.strictEqual(typeof req.body, 'object');

src/routes/test/apps-test.js

@@ -47,7 +47,9 @@ var TEST_IMAGE = TEST_IMAGE_REPO + ':' + TEST_IMAGE_TAG;
 
 var APP_STORE_ID = 'test', APP_ID;
 var APP_LOCATION = 'appslocation';
+var APP_DOMAIN = 'example-apps-test.com';
 var APP_LOCATION_2 = 'appslocationtwo';
+var APP_DOMAIN_2 = 'example-apps-test.com';
 var APP_LOCATION_NEW = 'appslocationnew';
 
 var APP_MANIFEST = JSON.parse(fs.readFileSync(__dirname + '/../../../../test-app/CloudronManifest.json', 'utf8'));
@@ -149,7 +151,7 @@ function startBox(done) {
     safe.fs.unlinkSync(paths.INFRA_VERSION_FILE);
     child_process.execSync('docker ps -qa | xargs --no-run-if-empty docker rm -f');
 
-    config.setFqdn('foobar.com');
+    config.setFqdn(APP_DOMAIN);
     config.setZoneName('foobar.com');
 
     awsHostedZones = {
@@ -575,29 +577,25 @@ describe('App API', function () {
     });
 
     it('app install succeeds without password but developer token', function (done) {
-        settings.setDeveloperMode(true, function (error) {
-            expect(error).to.be(null);
+        superagent.post(SERVER_URL + '/api/v1/developer/login')
+                .send({ username: USERNAME, password: PASSWORD })
+                .end(function (error, result) {
+            expect(error).to.not.be.ok();
+            expect(result.statusCode).to.equal(200);
+            expect(new Date(result.body.expiresAt).toString()).to.not.be('Invalid Date');
+            expect(result.body.token).to.be.a('string');
 
-            superagent.post(SERVER_URL + '/api/v1/developer/login')
-                   .send({ username: USERNAME, password: PASSWORD })
-                   .end(function (error, result) {
-                expect(error).to.not.be.ok();
-                expect(result.statusCode).to.equal(200);
-                expect(new Date(result.body.expiresAt).toString()).to.not.be('Invalid Date');
-                expect(result.body.token).to.be.a('string');
+            // overwrite non dev token
+            token = result.body.token;
 
-                // overwrite non dev token
-                token = result.body.token;
-
-                superagent.post(SERVER_URL + '/api/v1/apps/install')
-                       .query({ access_token: token })
-                       .send({ manifest: APP_MANIFEST, location: APP_LOCATION+APP_LOCATION, portBindings: null, accessRestriction: null })
-                       .end(function (err, res) {
-                    expect(res.statusCode).to.equal(202);
-                    expect(res.body.id).to.be.a('string');
-                    APP_ID = res.body.id;
-                    done();
-                });
+            superagent.post(SERVER_URL + '/api/v1/apps/install')
+                    .query({ access_token: token })
+                    .send({ manifest: APP_MANIFEST, location: APP_LOCATION+APP_LOCATION, portBindings: null, accessRestriction: null })
+                    .end(function (err, res) {
+                expect(res.statusCode).to.equal(202);
+                expect(res.body.id).to.be.a('string');
+                APP_ID = res.body.id;
+                done();
             });
         });
     });
@@ -726,8 +724,8 @@ describe('App installation', function () {
             expect(data.Config.Env).to.contain('WEBADMIN_ORIGIN=' + config.adminOrigin());
             expect(data.Config.Env).to.contain('API_ORIGIN=' + config.adminOrigin());
             expect(data.Config.Env).to.contain('CLOUDRON=1');
-            expect(data.Config.Env).to.contain('APP_ORIGIN=https://' + config.appFqdn(APP_LOCATION));
-            expect(data.Config.Env).to.contain('APP_DOMAIN=' + config.appFqdn(APP_LOCATION));
+            expect(data.Config.Env).to.contain('APP_ORIGIN=https://' + APP_LOCATION + '.' + APP_DOMAIN);
+            expect(data.Config.Env).to.contain('APP_DOMAIN=' + APP_LOCATION + '.' + APP_DOMAIN);
             // Hostname must not be set of app fqdn or app location!
             expect(data.Config.Hostname).to.not.contain(APP_LOCATION);
             expect(data.Config.Env).to.contain('ECHO_SERVER_PORT=7171');

src/routes/test/backups-test.js

@@ -24,7 +24,7 @@ function setup(done) {
     nock.cleanAll();
     config._reset();
     config.setVersion('1.2.3');
-    config.setFqdn('localhost');
+    config.setFqdn('example-backups-test.com');
 
     async.series([
         server.start.bind(server),
@@ -53,7 +53,7 @@ function setup(done) {
 
         function addApp(callback) {
             var manifest = { version: '0.0.1', manifestVersion: 1, dockerImage: 'foo', healthCheckPath: '/', httpPort: 3, title: 'ok', addons: { } };
-            appdb.add('appid', 'appStoreId', manifest, 'location', [ ] /* portBindings */, { }, callback);
+            appdb.add('appid', 'appStoreId', manifest, 'location', config.fqdn(), [ ] /* portBindings */, { }, callback);
         },
 
         function createSettings(callback) {
@@ -76,9 +76,6 @@ describe('Backups API', function () {
 
     before(setup);
 
-    after(function (done) {
-        done();
-    });
     after(cleanup);
 
     describe('create', function () {

src/routes/test/clients-test.js

@@ -1,6 +1,5 @@
 'use strict';
 
-/* jslint node:true */
 /* global it:false */
 /* global describe:false */
 /* global before:false */
@@ -22,7 +21,38 @@ var async = require('async'),
 var SERVER_URL = 'http://localhost:' + config.get('port');
 
 var USERNAME = 'superadmin', PASSWORD = 'Foobar?1337', EMAIL ='silly@me.com';
-var token = null; // authentication token
+var token = null;
+
+function setup(done) {
+    config._reset();
+    config.setFqdn('example-clients-test.com');
+    config.set('provider', 'caas');
+
+    async.series([
+        server.start,
+        database._clear,
+
+        function (callback) {
+            var scope1 = nock(config.apiServerOrigin()).get('/api/v1/boxes/' + config.fqdn() + '/setup/verify?setupToken=somesetuptoken').reply(200, {});
+            var scope2 = nock(config.apiServerOrigin()).post('/api/v1/boxes/' + config.fqdn() + '/setup/done?setupToken=somesetuptoken').reply(201, {});
+
+            superagent.post(SERVER_URL + '/api/v1/cloudron/activate')
+                   .query({ setupToken: 'somesetuptoken' })
+                   .send({ username: USERNAME, password: PASSWORD, email: EMAIL })
+                   .end(function (error, result) {
+                expect(result).to.be.ok();
+                expect(result.statusCode).to.equal(201);
+                expect(scope1.isDone()).to.be.ok();
+                expect(scope2.isDone()).to.be.ok();
+
+                // stash token for further use
+                token = result.body.token;
+
+                callback();
+            });
+        }
+    ], done);
+}
 
 function cleanup(done) {
     database._clear(function (error) {
@@ -34,170 +64,122 @@ function cleanup(done) {
 
 describe('OAuth Clients API', function () {
     describe('add', function () {
-        before(function (done) {
-            async.series([
-                server.start.bind(null),
-                database._clear.bind(null),
-
-                function (callback) {
-                    var scope1 = nock(config.apiServerOrigin()).get('/api/v1/boxes/' + config.fqdn() + '/setup/verify?setupToken=somesetuptoken').reply(200, {});
-                    var scope2 = nock(config.apiServerOrigin()).post('/api/v1/boxes/' + config.fqdn() + '/setup/done?setupToken=somesetuptoken').reply(201, {});
-
-                    superagent.post(SERVER_URL + '/api/v1/cloudron/activate')
-                           .query({ setupToken: 'somesetuptoken' })
-                           .send({ username: USERNAME, password: PASSWORD, email: EMAIL })
-                           .end(function (error, result) {
-                        expect(result).to.be.ok();
-                        expect(result.statusCode).to.equal(201);
-                        expect(scope1.isDone()).to.be.ok();
-                        expect(scope2.isDone()).to.be.ok();
-
-                        // stash token for further use
-                        token = result.body.token;
-
-                        callback();
-                    });
-                },
-            ], done);
-        });
-
+        before(setup),
         after(cleanup);
 
-        describe('without developer mode', function () {
-            before(function (done) {
-                settings.setDeveloperMode(false, done);
-            });
-
-            it('fails', function (done) {
-                superagent.post(SERVER_URL + '/api/v1/oauth/clients')
-                       .query({ access_token: token })
-                       .send({ appId: 'someApp', redirectURI: 'http://foobar.com', scope: 'profile' })
-                       .end(function (error, result) {
-                    expect(result.statusCode).to.equal(412);
-                    done();
-                });
+        it('fails without token', function (done) {
+            superagent.post(SERVER_URL + '/api/v1/oauth/clients')
+                    .send({ appId: 'someApp', redirectURI: 'http://foobar.com', scope: 'profile' })
+                    .end(function (error, result) {
+                expect(result.statusCode).to.equal(401);
+                done();
             });
         });
 
-        describe('with developer mode', function () {
-            before(function (done) {
-                settings.setDeveloperMode(true, done);
+        it('fails without appId', function (done) {
+            superagent.post(SERVER_URL + '/api/v1/oauth/clients')
+                    .query({ access_token: token })
+                    .send({ redirectURI: 'http://foobar.com', scope: 'profile' })
+                    .end(function (error, result) {
+                expect(result.statusCode).to.equal(400);
+                done();
             });
+        });
 
-            it('fails without token', function (done) {
-                superagent.post(SERVER_URL + '/api/v1/oauth/clients')
-                       .send({ appId: 'someApp', redirectURI: 'http://foobar.com', scope: 'profile' })
-                       .end(function (error, result) {
-                    expect(result.statusCode).to.equal(401);
-                    done();
-                });
+        it('fails with empty appId', function (done) {
+            superagent.post(SERVER_URL + '/api/v1/oauth/clients')
+                    .query({ access_token: token })
+                    .send({ appId: '', redirectURI: 'http://foobar.com', scope: 'profile' })
+                    .end(function (error, result) {
+                expect(result.statusCode).to.equal(400);
+                done();
             });
+        });
 
-            it('fails without appId', function (done) {
-                superagent.post(SERVER_URL + '/api/v1/oauth/clients')
-                       .query({ access_token: token })
-                       .send({ redirectURI: 'http://foobar.com', scope: 'profile' })
-                       .end(function (error, result) {
-                    expect(result.statusCode).to.equal(400);
-                    done();
-                });
+        it('fails without scope', function (done) {
+            superagent.post(SERVER_URL + '/api/v1/oauth/clients')
+                    .query({ access_token: token })
+                    .send({ appId: 'someApp', redirectURI: 'http://foobar.com' })
+                    .end(function (error, result) {
+                expect(result.statusCode).to.equal(400);
+                done();
             });
+        });
 
-            it('fails with empty appId', function (done) {
-                superagent.post(SERVER_URL + '/api/v1/oauth/clients')
-                       .query({ access_token: token })
-                       .send({ appId: '', redirectURI: 'http://foobar.com', scope: 'profile' })
-                       .end(function (error, result) {
-                    expect(result.statusCode).to.equal(400);
-                    done();
-                });
+        it('fails with empty scope', function (done) {
+            superagent.post(SERVER_URL + '/api/v1/oauth/clients')
+                    .query({ access_token: token })
+                    .send({ appId: 'someApp', redirectURI: 'http://foobar.com', scope: '' })
+                    .end(function (error, result) {
+                expect(result.statusCode).to.equal(400);
+                done();
             });
+        });
 
-            it('fails without scope', function (done) {
-                superagent.post(SERVER_URL + '/api/v1/oauth/clients')
-                       .query({ access_token: token })
-                       .send({ appId: 'someApp', redirectURI: 'http://foobar.com' })
-                       .end(function (error, result) {
-                    expect(result.statusCode).to.equal(400);
-                    done();
-                });
+        it('fails without redirectURI', function (done) {
+            superagent.post(SERVER_URL + '/api/v1/oauth/clients')
+                    .query({ access_token: token })
+                    .send({ appId: 'someApp', scope: 'profile' })
+                    .end(function (error, result) {
+                expect(result.statusCode).to.equal(400);
+                done();
             });
+        });
 
-            it('fails with empty scope', function (done) {
-                superagent.post(SERVER_URL + '/api/v1/oauth/clients')
-                       .query({ access_token: token })
-                       .send({ appId: 'someApp', redirectURI: 'http://foobar.com', scope: '' })
-                       .end(function (error, result) {
-                    expect(result.statusCode).to.equal(400);
-                    done();
-                });
+        it('fails with empty redirectURI', function (done) {
+            superagent.post(SERVER_URL + '/api/v1/oauth/clients')
+                    .query({ access_token: token })
+                    .send({ appId: 'someApp', redirectURI: '', scope: 'profile' })
+                    .end(function (error, result) {
+                expect(result.statusCode).to.equal(400);
+                done();
             });
+        });
 
-            it('fails without redirectURI', function (done) {
-                superagent.post(SERVER_URL + '/api/v1/oauth/clients')
-                       .query({ access_token: token })
-                       .send({ appId: 'someApp', scope: 'profile' })
-                       .end(function (error, result) {
-                    expect(result.statusCode).to.equal(400);
-                    done();
-                });
+        it('fails with malformed redirectURI', function (done) {
+            superagent.post(SERVER_URL + '/api/v1/oauth/clients')
+                    .query({ access_token: token })
+                    .send({ appId: 'someApp', redirectURI: 'foobar', scope: 'profile' })
+                    .end(function (error, result) {
+                expect(result.statusCode).to.equal(400);
+                done();
             });
+        });
 
-            it('fails with empty redirectURI', function (done) {
-                superagent.post(SERVER_URL + '/api/v1/oauth/clients')
-                       .query({ access_token: token })
-                       .send({ appId: 'someApp', redirectURI: '', scope: 'profile' })
-                       .end(function (error, result) {
-                    expect(result.statusCode).to.equal(400);
-                    done();
-                });
+        it('fails with invalid name', function (done) {
+            superagent.post(SERVER_URL + '/api/v1/oauth/clients')
+                    .query({ access_token: token })
+                    .send({ appId: '$"$%^45asdfasdfadf.adf.', redirectURI: 'http://foobar.com', scope: 'profile' })
+                    .end(function (error, result) {
+                expect(result.statusCode).to.equal(400);
+                done();
             });
+        });
 
-            it('fails with malformed redirectURI', function (done) {
-                superagent.post(SERVER_URL + '/api/v1/oauth/clients')
-                       .query({ access_token: token })
-                       .send({ appId: 'someApp', redirectURI: 'foobar', scope: 'profile' })
-                       .end(function (error, result) {
-                    expect(result.statusCode).to.equal(400);
-                    done();
-                });
+        it('succeeds with dash', function (done) {
+            superagent.post(SERVER_URL + '/api/v1/oauth/clients')
+                    .query({ access_token: token })
+                    .send({ appId: 'fo-1234-bar', redirectURI: 'http://foobar.com', scope: 'profile' })
+                    .end(function (error, result) {
+                expect(result.statusCode).to.equal(201);
+                done();
             });
+        });
 
-            it('fails with invalid name', function (done) {
-                superagent.post(SERVER_URL + '/api/v1/oauth/clients')
-                       .query({ access_token: token })
-                       .send({ appId: '$"$%^45asdfasdfadf.adf.', redirectURI: 'http://foobar.com', scope: 'profile' })
-                       .end(function (error, result) {
-                    expect(result.statusCode).to.equal(400);
-                    done();
-                });
-            });
+        it('succeeds', function (done) {
+            superagent.post(SERVER_URL + '/api/v1/oauth/clients')
+                    .query({ access_token: token })
+                    .send({ appId: 'someApp', redirectURI: 'http://foobar.com', scope: 'profile' })
+                    .end(function (error, result) {
+                expect(result.statusCode).to.equal(201);
+                expect(result.body.id).to.be.a('string');
+                expect(result.body.appId).to.be.a('string');
+                expect(result.body.redirectURI).to.be.a('string');
+                expect(result.body.clientSecret).to.be.a('string');
+                expect(result.body.scope).to.be.a('string');
+                expect(result.body.type).to.equal(clients.TYPE_EXTERNAL);
 
-            it('succeeds with dash', function (done) {
-                superagent.post(SERVER_URL + '/api/v1/oauth/clients')
-                       .query({ access_token: token })
-                       .send({ appId: 'fo-1234-bar', redirectURI: 'http://foobar.com', scope: 'profile' })
-                       .end(function (error, result) {
-                    expect(result.statusCode).to.equal(201);
-                    done();
-                });
-            });
-
-            it('succeeds', function (done) {
-                superagent.post(SERVER_URL + '/api/v1/oauth/clients')
-                       .query({ access_token: token })
-                       .send({ appId: 'someApp', redirectURI: 'http://foobar.com', scope: 'profile' })
-                       .end(function (error, result) {
-                    expect(result.statusCode).to.equal(201);
-                    expect(result.body.id).to.be.a('string');
-                    expect(result.body.appId).to.be.a('string');
-                    expect(result.body.redirectURI).to.be.a('string');
-                    expect(result.body.clientSecret).to.be.a('string');
-                    expect(result.body.scope).to.be.a('string');
-                    expect(result.body.type).to.equal(clients.TYPE_EXTERNAL);
-
-                    done();
-                });
+                done();
             });
         });
     });
@@ -212,29 +194,7 @@ describe('OAuth Clients API', function () {
 
         before(function (done) {
             async.series([
-                server.start.bind(null),
-                database._clear.bind(null),
-
-                function (callback) {
-                    var scope1 = nock(config.apiServerOrigin()).get('/api/v1/boxes/' + config.fqdn() + '/setup/verify?setupToken=somesetuptoken').reply(200, {});
-                    var scope2 = nock(config.apiServerOrigin()).post('/api/v1/boxes/' + config.fqdn() + '/setup/done?setupToken=somesetuptoken').reply(201, {});
-
-                    superagent.post(SERVER_URL + '/api/v1/cloudron/activate')
-                           .query({ setupToken: 'somesetuptoken' })
-                           .send({ username: USERNAME, password: PASSWORD, email: EMAIL })
-                           .end(function (error, result) {
-                        expect(result).to.be.ok();
-                        expect(scope1.isDone()).to.be.ok();
-                        expect(scope2.isDone()).to.be.ok();
-
-                        // stash token for further use
-                        token = result.body.token;
-
-                        callback();
-                    });
-                },
-
-                settings.setDeveloperMode.bind(null, true),
+                setup,
 
                 function (callback) {
                     superagent.post(SERVER_URL + '/api/v1/oauth/clients')
@@ -253,52 +213,31 @@ describe('OAuth Clients API', function () {
 
         after(cleanup);
 
-        describe('without developer mode', function () {
-            before(function (done) {
-                settings.setDeveloperMode(false, done);
-            });
-
-            it('fails', function (done) {
-                superagent.get(SERVER_URL + '/api/v1/oauth/clients/' + CLIENT_0.id)
-                       .query({ access_token: token })
-                       .end(function (error, result) {
-                    expect(result.statusCode).to.equal(412);
-                    done();
-                });
+        it('fails without token', function (done) {
+            superagent.get(SERVER_URL + '/api/v1/oauth/clients/' + CLIENT_0.id)
+                    .end(function (error, result) {
+                expect(result.statusCode).to.equal(401);
+                done();
             });
         });
 
-        describe('with developer mode', function () {
-            before(function (done) {
-                settings.setDeveloperMode(true, done);
+
+        it('fails with unknown id', function (done) {
+            superagent.get(SERVER_URL + '/api/v1/oauth/clients/' + CLIENT_0.id.toUpperCase())
+                    .query({ access_token: token })
+                    .end(function (error, result) {
+                expect(result.statusCode).to.equal(404);
+                done();
             });
+        });
 
-            it('fails without token', function (done) {
-                superagent.get(SERVER_URL + '/api/v1/oauth/clients/' + CLIENT_0.id)
-                       .end(function (error, result) {
-                    expect(result.statusCode).to.equal(401);
-                    done();
-                });
-            });
-
-
-            it('fails with unknown id', function (done) {
-                superagent.get(SERVER_URL + '/api/v1/oauth/clients/' + CLIENT_0.id.toUpperCase())
-                       .query({ access_token: token })
-                       .end(function (error, result) {
-                    expect(result.statusCode).to.equal(404);
-                    done();
-                });
-            });
-
-            it('succeeds', function (done) {
-                superagent.get(SERVER_URL + '/api/v1/oauth/clients/' + CLIENT_0.id)
-                       .query({ access_token: token })
-                       .end(function (error, result) {
-                    expect(result.statusCode).to.equal(200);
-                    expect(result.body).to.eql(CLIENT_0);
-                    done();
-                });
+        it('succeeds', function (done) {
+            superagent.get(SERVER_URL + '/api/v1/oauth/clients/' + CLIENT_0.id)
+                    .query({ access_token: token })
+                    .end(function (error, result) {
+                expect(result.statusCode).to.equal(200);
+                expect(result.body).to.eql(CLIENT_0);
+                done();
             });
         });
     });
@@ -321,29 +260,7 @@ describe('OAuth Clients API', function () {
 
         before(function (done) {
             async.series([
-                server.start.bind(null),
-                database._clear.bind(null),
-
-                function (callback) {
-                    var scope1 = nock(config.apiServerOrigin()).get('/api/v1/boxes/' + config.fqdn() + '/setup/verify?setupToken=somesetuptoken').reply(200, {});
-                    var scope2 = nock(config.apiServerOrigin()).post('/api/v1/boxes/' + config.fqdn() + '/setup/done?setupToken=somesetuptoken').reply(201, {});
-
-                    superagent.post(SERVER_URL + '/api/v1/cloudron/activate')
-                           .query({ setupToken: 'somesetuptoken' })
-                           .send({ username: USERNAME, password: PASSWORD, email: EMAIL })
-                           .end(function (error, result) {
-                        expect(result).to.be.ok();
-                        expect(scope1.isDone()).to.be.ok();
-                        expect(scope2.isDone()).to.be.ok();
-
-                        // stash token for further use
-                        token = result.body.token;
-
-                        callback();
-                    });
-                },
-
-                settings.setDeveloperMode.bind(null, true),
+                setup,
 
                 function (callback) {
                     superagent.post(SERVER_URL + '/api/v1/oauth/clients')
@@ -362,94 +279,73 @@ describe('OAuth Clients API', function () {
 
         after(cleanup);
 
-        describe('without developer mode', function () {
-            before(function (done) {
-                settings.setDeveloperMode(false, done);
+        it('fails without token', function (done) {
+            superagent.del(SERVER_URL + '/api/v1/oauth/clients/' + CLIENT_0.id)
+                    .end(function (error, result) {
+                expect(result.statusCode).to.equal(401);
+                done();
             });
+        });
+
+
+        it('fails with unknown id', function (done) {
+            superagent.del(SERVER_URL + '/api/v1/oauth/clients/' + CLIENT_0.id.toUpperCase())
+                    .query({ access_token: token })
+                    .end(function (error, result) {
+                expect(result.statusCode).to.equal(404);
+                done();
+            });
+        });
+
+        it('succeeds', function (done) {
+            superagent.del(SERVER_URL + '/api/v1/oauth/clients/' + CLIENT_0.id)
+                    .query({ access_token: token })
+                    .end(function (error, result) {
+                expect(result.statusCode).to.equal(204);
+
+                superagent.get(SERVER_URL + '/api/v1/oauth/clients/' + CLIENT_0.id)
+                        .query({ access_token: token })
+                        .end(function (error, result) {
+                    expect(result.statusCode).to.equal(404);
 
-            it('fails', function (done) {
-                superagent.del(SERVER_URL + '/api/v1/oauth/clients/' + CLIENT_0.id)
-                       .query({ access_token: token })
-                       .end(function (error, result) {
-                    expect(result.statusCode).to.equal(412);
                     done();
                 });
             });
         });
 
-        describe('with developer mode', function () {
-            before(function (done) {
-                settings.setDeveloperMode(true, done);
-            });
+        it('fails for cid-webadmin', function (done) {
+            superagent.del(SERVER_URL + '/api/v1/oauth/clients/cid-webadmin')
+                    .query({ access_token: token })
+                    .end(function (error, result) {
+                expect(result.statusCode).to.equal(405);
+
+                superagent.get(SERVER_URL + '/api/v1/oauth/clients/cid-webadmin')
+                        .query({ access_token: token })
+                        .end(function (error, result) {
+                    expect(result.statusCode).to.equal(200);
 
-            it('fails without token', function (done) {
-                superagent.del(SERVER_URL + '/api/v1/oauth/clients/' + CLIENT_0.id)
-                       .end(function (error, result) {
-                    expect(result.statusCode).to.equal(401);
                     done();
                 });
             });
+        });
 
+        it('fails for addon auth client', function (done) {
+            clients.add(CLIENT_1.appId, CLIENT_1.type, CLIENT_1.redirectURI, CLIENT_1.scope, function (error, result) {
+                expect(error).to.equal(null);
 
-            it('fails with unknown id', function (done) {
-                superagent.del(SERVER_URL + '/api/v1/oauth/clients/' + CLIENT_0.id.toUpperCase())
-                       .query({ access_token: token })
-                       .end(function (error, result) {
-                    expect(result.statusCode).to.equal(404);
-                    done();
-                });
-            });
+                CLIENT_1.id = result.id;
 
-            it('succeeds', function (done) {
-                superagent.del(SERVER_URL + '/api/v1/oauth/clients/' + CLIENT_0.id)
-                       .query({ access_token: token })
-                       .end(function (error, result) {
-                    expect(result.statusCode).to.equal(204);
-
-                    superagent.get(SERVER_URL + '/api/v1/oauth/clients/' + CLIENT_0.id)
-                           .query({ access_token: token })
-                           .end(function (error, result) {
-                        expect(result.statusCode).to.equal(404);
-
-                        done();
-                   });
-                });
-            });
-
-            it('fails for cid-webadmin', function (done) {
-                superagent.del(SERVER_URL + '/api/v1/oauth/clients/cid-webadmin')
-                       .query({ access_token: token })
-                       .end(function (error, result) {
+                superagent.del(SERVER_URL + '/api/v1/oauth/clients/' + CLIENT_1.id)
+                        .query({ access_token: token })
+                        .end(function (error, result) {
                     expect(result.statusCode).to.equal(405);
 
-                    superagent.get(SERVER_URL + '/api/v1/oauth/clients/cid-webadmin')
-                           .query({ access_token: token })
-                           .end(function (error, result) {
+                    superagent.get(SERVER_URL + '/api/v1/oauth/clients/' + CLIENT_1.id)
+                            .query({ access_token: token })
+                            .end(function (error, result) {
                         expect(result.statusCode).to.equal(200);
 
                         done();
-                   });
-                });
-            });
-
-            it('fails for addon auth client', function (done) {
-                clients.add(CLIENT_1.appId, CLIENT_1.type, CLIENT_1.redirectURI, CLIENT_1.scope, function (error, result) {
-                    expect(error).to.equal(null);
-
-                    CLIENT_1.id = result.id;
-
-                    superagent.del(SERVER_URL + '/api/v1/oauth/clients/' + CLIENT_1.id)
-                           .query({ access_token: token })
-                           .end(function (error, result) {
-                        expect(result.statusCode).to.equal(405);
-
-                        superagent.get(SERVER_URL + '/api/v1/oauth/clients/' + CLIENT_1.id)
-                               .query({ access_token: token })
-                               .end(function (error, result) {
-                            expect(result.statusCode).to.equal(200);
-
-                            done();
-                       });
                     });
                 });
             });
@@ -476,51 +372,27 @@ describe('Clients', function () {
         next();
     };
 
-    function setup(done) {
+    function setup2(done) {
         async.series([
-            server.start.bind(server),
-            database._clear.bind(null),
+            setup,
+
             function (callback) {
-                var scope1 = nock(config.apiServerOrigin()).get('/api/v1/boxes/' + config.fqdn() + '/setup/verify?setupToken=somesetuptoken').reply(200, {});
-                var scope2 = nock(config.apiServerOrigin()).post('/api/v1/boxes/' + config.fqdn() + '/setup/done?setupToken=somesetuptoken').reply(201, {});
-
-                superagent.post(SERVER_URL + '/api/v1/cloudron/activate')
-                       .query({ setupToken: 'somesetuptoken' })
-                       .send({ username: USER_0.username, password: USER_0.password, email: USER_0.email })
-                       .end(function (error, result) {
+                superagent.get(SERVER_URL + '/api/v1/profile')
+                        .query({ access_token: token })
+                        .end(function (error, result) {
                     expect(result).to.be.ok();
-                    expect(result.statusCode).to.eql(201);
-                    expect(scope1.isDone()).to.be.ok();
-                    expect(scope2.isDone()).to.be.ok();
+                    expect(result.statusCode).to.eql(200);
 
-                    // stash for further use
-                    token = result.body.token;
+                    USER_0.id = result.body.id;
 
-                    superagent.get(SERVER_URL + '/api/v1/profile')
-                            .query({ access_token: token })
-                            .end(function (error, result) {
-                        expect(result).to.be.ok();
-                        expect(result.statusCode).to.eql(200);
-
-                        USER_0.id = result.body.id;
-
-                        callback();
-                    });
+                    callback();
                 });
             }
         ], done);
     }
 
-    function cleanup(done) {
-        database._clear(function (error) {
-            expect(error).to.not.be.ok();
-
-            server.stop(done);
-        });
-    }
-
     describe('get', function () {
-        before(setup);
+        before(setup2);
         after(cleanup);
 
         it('fails due to missing token', function (done) {
@@ -563,7 +435,7 @@ describe('Clients', function () {
     });
 
     describe('get tokens by client', function () {
-        before(setup);
+        before(setup2);
         after(cleanup);
 
         it('fails due to missing token', function (done) {
@@ -616,7 +488,7 @@ describe('Clients', function () {
     });
 
     describe('delete tokens by client', function () {
-        before(setup);
+        before(setup2);
         after(cleanup);
 
         it('fails due to missing token', function (done) {

src/routes/test/cloudron-test.js

@@ -28,13 +28,14 @@ var USERNAME_1 = 'userTheFirst', EMAIL_1 = 'taO@zen.mac', userId_1, token_1;
 function setup(done) {
     nock.cleanAll();
     config._reset();
-    config.set('version', '0.5.0');
-    config.setFqdn('localhost');
+    config.setFqdn('example-cloudron-test.com');
+    config.setAdminFqdn('my.example-cloudron-test.com');
 
-    server.start(function (error) {
-        if (error) return done(error);
-        settings.setBackupConfig({ provider: 'filesystem', backupFolder: '/tmp', format: 'tgz' }, done);
-    });
+    async.series([
+        server.start.bind(server),
+        database._clear,
+        settings.setBackupConfig.bind(null, { provider: 'filesystem', backupFolder: '/tmp', format: 'tgz' })
+    ], done);
 }
 
 function cleanup(done) {
@@ -240,11 +241,10 @@ describe('Cloudron', function () {
                     expect(result.body.apiServerOrigin).to.eql('http://localhost:6060');
                     expect(result.body.webServerOrigin).to.eql(null);
                     expect(result.body.fqdn).to.eql(config.fqdn());
-                    expect(result.body.isCustomDomain).to.eql(true);
+                    expect(result.body.adminFqdn).to.eql(config.adminFqdn());
                     expect(result.body.progress).to.be.an('object');
                     expect(result.body.update).to.be.an('object');
                     expect(result.body.version).to.eql(config.version());
-                    expect(result.body.developerMode).to.be.a('boolean');
                     expect(result.body.size).to.eql(null);
                     expect(result.body.region).to.eql(null);
                     expect(result.body.memory).to.eql(os.totalmem());
@@ -256,7 +256,7 @@ describe('Cloudron', function () {
 
         it('succeeds (admin)', function (done) {
             var scope = nock(config.apiServerOrigin())
-                .get('/api/v1/boxes/localhost?token=' + config.token())
+                .get(`/api/v1/boxes/${config.fqdn()}?token=${config.token()}`)
                 .reply(200, { box: { region: 'sfo', size: '1gb' }, user: { }});
 
             superagent.get(SERVER_URL + '/api/v1/cloudron/config')
@@ -266,11 +266,10 @@ describe('Cloudron', function () {
                     expect(result.body.apiServerOrigin).to.eql('http://localhost:6060');
                     expect(result.body.webServerOrigin).to.eql(null);
                     expect(result.body.fqdn).to.eql(config.fqdn());
-                    expect(result.body.isCustomDomain).to.eql(true);
+                    expect(result.body.adminFqdn).to.eql(config.adminFqdn());
                     expect(result.body.progress).to.be.an('object');
                     expect(result.body.update).to.be.an('object');
                     expect(result.body.version).to.eql(config.version());
-                    expect(result.body.developerMode).to.be.a('boolean');
                     expect(result.body.size).to.eql('1gb');
                     expect(result.body.region).to.eql('sfo');
                     expect(result.body.memory).to.eql(os.totalmem());
@@ -292,7 +291,7 @@ describe('Cloudron', function () {
                     expect(result.body.apiServerOrigin).to.eql('http://localhost:6060');
                     expect(result.body.webServerOrigin).to.eql(null);
                     expect(result.body.fqdn).to.eql(config.fqdn());
-                    expect(result.body.isCustomDomain).to.eql(true);
+                    expect(result.body.adminFqdn).to.eql(config.adminFqdn());
                     expect(result.body.progress).to.be.an('object');
                     expect(result.body.version).to.eql(config.version());
                     expect(result.body.cloudronName).to.be.a('string');

src/routes/test/developer-test.js

@@ -22,7 +22,13 @@ var token = null; // authentication token
 
 var server;
 function setup(done) {
-    server.start(done);
+    config._reset();
+    config.setFqdn('example-developer-test.com');
+
+    async.series([
+        server.start.bind(server),
+        database._clear
+    ], done);
 }
 
 function cleanup(done) {
@@ -34,200 +40,10 @@ function cleanup(done) {
 }
 
 describe('Developer API', function () {
-    describe('isEnabled', function () {
-        before(function (done) {
-            async.series([
-                setup,
-
-                function (callback) {
-                    var scope1 = nock(config.apiServerOrigin()).get('/api/v1/boxes/' + config.fqdn() + '/setup/verify?setupToken=somesetuptoken').reply(200, {});
-                    var scope2 = nock(config.apiServerOrigin()).post('/api/v1/boxes/' + config.fqdn() + '/setup/done?setupToken=somesetuptoken').reply(201, {});
-
-                    superagent.post(SERVER_URL + '/api/v1/cloudron/activate')
-                           .query({ setupToken: 'somesetuptoken' })
-                           .send({ username: USERNAME, password: PASSWORD, email: EMAIL })
-                           .end(function (error, result) {
-                        expect(result).to.be.ok();
-                        expect(scope1.isDone()).to.be.ok();
-                        expect(scope2.isDone()).to.be.ok();
-
-                        // stash token for further use
-                        token = result.body.token;
-
-                        callback();
-                    });
-                },
-            ], done);
-        });
-
-        after(cleanup);
-
-        it('fails without token', function (done) {
-            settings.setDeveloperMode(true, function (error) {
-                expect(error).to.be(null);
-
-                superagent.get(SERVER_URL + '/api/v1/developer')
-                       .end(function (error, result) {
-                    expect(result.statusCode).to.equal(401);
-                    done();
-                });
-            });
-        });
-
-        it('succeeds (enabled)', function (done) {
-            settings.setDeveloperMode(true, function (error) {
-                expect(error).to.be(null);
-
-                superagent.get(SERVER_URL + '/api/v1/developer')
-                       .query({ access_token: token })
-                       .end(function (error, result) {
-                    expect(result.statusCode).to.equal(200);
-                    done();
-                });
-            });
-        });
-
-        it('succeeds (not enabled)', function (done) {
-            settings.setDeveloperMode(false, function (error) {
-                expect(error).to.be(null);
-
-                superagent.get(SERVER_URL + '/api/v1/developer')
-                       .query({ access_token: token })
-                       .end(function (error, result) {
-                    expect(result.statusCode).to.equal(412);
-                    done();
-                });
-            });
-        });
-    });
-
-    describe('setEnabled', function () {
-        before(function (done) {
-            async.series([
-                setup,
-
-                function (callback) {
-                    var scope1 = nock(config.apiServerOrigin()).get('/api/v1/boxes/' + config.fqdn() + '/setup/verify?setupToken=somesetuptoken').reply(200, {});
-                    var scope2 = nock(config.apiServerOrigin()).post('/api/v1/boxes/' + config.fqdn() + '/setup/done?setupToken=somesetuptoken').reply(201, {});
-
-                    superagent.post(SERVER_URL + '/api/v1/cloudron/activate')
-                           .query({ setupToken: 'somesetuptoken' })
-                           .send({ username: USERNAME, password: PASSWORD, email: EMAIL })
-                           .end(function (error, result) {
-                        expect(result).to.be.ok();
-                        expect(scope1.isDone()).to.be.ok();
-                        expect(scope2.isDone()).to.be.ok();
-
-                        // stash token for further use
-                        token = result.body.token;
-
-                        callback();
-                    });
-                },
-            ], done);
-        });
-
-        after(cleanup);
-
-        it('fails without token', function (done) {
-            superagent.post(SERVER_URL + '/api/v1/developer')
-                   .send({ enabled: true })
-                   .end(function (error, result) {
-                expect(result.statusCode).to.equal(401);
-                done();
-            });
-        });
-
-        it('fails due to missing password', function (done) {
-            superagent.post(SERVER_URL + '/api/v1/developer')
-                   .query({ access_token: token })
-                   .send({ enabled: true })
-                   .end(function (error, result) {
-                expect(result.statusCode).to.equal(400);
-                done();
-            });
-        });
-
-        it('fails due to empty password', function (done) {
-            superagent.post(SERVER_URL + '/api/v1/developer')
-                   .query({ access_token: token })
-                   .send({ password: '', enabled: true })
-                   .end(function (error, result) {
-                expect(result.statusCode).to.equal(403);
-                done();
-            });
-        });
-
-        it('fails due to wrong password', function (done) {
-            superagent.post(SERVER_URL + '/api/v1/developer')
-                   .query({ access_token: token })
-                   .send({ password: PASSWORD.toUpperCase(), enabled: true })
-                   .end(function (error, result) {
-                expect(result.statusCode).to.equal(403);
-                done();
-            });
-        });
-
-        it('fails due to missing enabled property', function (done) {
-            superagent.post(SERVER_URL + '/api/v1/developer')
-                   .query({ access_token: token })
-                   .send({ password: PASSWORD })
-                   .end(function (error, result) {
-                expect(result.statusCode).to.equal(400);
-                done();
-            });
-        });
-
-        it('fails due to wrong enabled property type', function (done) {
-            superagent.post(SERVER_URL + '/api/v1/developer')
-                   .query({ access_token: token })
-                   .send({ password: PASSWORD, enabled: 'true' })
-                   .end(function (error, result) {
-                expect(result.statusCode).to.equal(400);
-                done();
-            });
-        });
-
-        it('succeeds enabling', function (done) {
-            superagent.post(SERVER_URL + '/api/v1/developer')
-                   .query({ access_token: token })
-                   .send({ password: PASSWORD, enabled: true })
-                   .end(function (error, result) {
-                expect(result.statusCode).to.equal(200);
-
-                superagent.get(SERVER_URL + '/api/v1/developer')
-                       .query({ access_token: token })
-                       .end(function (error, result) {
-                    expect(result.statusCode).to.equal(200);
-                    done();
-                });
-            });
-        });
-
-        it('succeeds disabling', function (done) {
-            superagent.post(SERVER_URL + '/api/v1/developer')
-                   .query({ access_token: token })
-                   .send({ password: PASSWORD, enabled: false })
-                   .end(function (error, result) {
-                expect(result.statusCode).to.equal(200);
-
-                superagent.get(SERVER_URL + '/api/v1/developer')
-                       .query({ access_token: token })
-                       .end(function (error, result) {
-                    expect(result.statusCode).to.equal(412);
-                    done();
-                });
-            });
-        });
-    });
-
     describe('login', function () {
         before(function (done) {
             async.series([
                 setup,
-
-                settings.setDeveloperMode.bind(null, true),
-
                 function (callback) {
                     var scope1 = nock(config.apiServerOrigin()).get('/api/v1/boxes/' + config.fqdn() + '/setup/verify?setupToken=somesetuptoken').reply(200, {});
                     var scope2 = nock(config.apiServerOrigin()).post('/api/v1/boxes/' + config.fqdn() + '/setup/done?setupToken=somesetuptoken').reply(201, {});
@@ -373,9 +189,6 @@ describe('Developer API', function () {
         before(function (done) {
             async.series([
                 setup,
-
-                settings.setDeveloperMode.bind(null, true),
-
                 function (callback) {
                     var scope1 = nock(config.apiServerOrigin()).get('/api/v1/boxes/' + config.fqdn() + '/setup/verify?setupToken=somesetuptoken').reply(200, {});
                     var scope2 = nock(config.apiServerOrigin()).post('/api/v1/boxes/' + config.fqdn() + '/setup/done?setupToken=somesetuptoken').reply(201, {});

src/routes/test/domains-test.js

@@ -0,0 +1,242 @@
+'use strict';
+
+/* global it:false */
+/* global describe:false */
+/* global before:false */
+/* global after:false */
+
+var async = require('async'),
+    config = require('../../config.js'),
+    database = require('../../database.js'),
+    expect = require('expect.js'),
+    nock = require('nock'),
+    superagent = require('superagent'),
+    server = require('../../server.js');
+
+var SERVER_URL = 'http://localhost:' + config.get('port');
+
+var USERNAME = 'superadmin', PASSWORD = 'Foobar?1337', EMAIL ='silly@me.com';
+var token = null;
+
+var DOMAIN_0 = {
+    domain: 'cloudron.com',
+    zoneName: 'cloudron.com',
+    provider: 'noop',
+    config: { }
+};
+
+var DOMAIN_1 = {
+    domain: 'foobar.com',
+    provider: 'noop',
+    config: { }
+};
+
+describe('Domains API', function () {
+    this.timeout(10000);
+
+    before(function (done) {
+        config._reset();
+        config.set('provider', 'digitalocean');
+        config.setFqdn('example-domains-test.com');
+
+        async.series([
+            server.start.bind(null),
+            database._clear.bind(null),
+
+            function (callback) {
+                superagent.post(SERVER_URL + '/api/v1/cloudron/activate')
+                        .query({ setupToken: 'somesetuptoken' })
+                        .send({ username: USERNAME, password: PASSWORD, email: EMAIL })
+                        .end(function (error, result) {
+                    expect(result).to.be.ok();
+                    expect(result.statusCode).to.equal(201);
+
+                    // stash token for further use
+                    token = result.body.token;
+
+                    callback();
+                });
+            },
+        ], done);
+    });
+
+    after(function (done) {
+        async.series([
+            database._clear.bind(null),
+            server.stop.bind(null)
+        ], done);
+    });
+
+    describe('add', function () {
+        it('fails with missing domain', function (done) {
+            superagent.post(SERVER_URL + '/api/v1/domains')
+                    .query({ access_token: token })
+                    .send({})
+                    .end(function (error, result) {
+                expect(result.statusCode).to.equal(400);
+
+                done();
+            });
+        });
+
+        it('fails with invalid domain', function (done) {
+            superagent.post(SERVER_URL + '/api/v1/domains')
+                    .query({ access_token: token })
+                    .send({ domain: 'abc' })
+                    .end(function (error, result) {
+                expect(result.statusCode).to.equal(400);
+
+                done();
+            });
+        });
+
+        it('fails with unknown provider', function (done) {
+            var scope = nock(config.apiServerOrigin()).get('/api/v1/helper/public_ip').reply(200, { ip: '127.0.0.1' });
+
+            superagent.post(SERVER_URL + '/api/v1/domains')
+                    .query({ access_token: token })
+                    .send({ domain: 'cloudron.com', provider: 'doesnotexist', config: { }})
+                    .end(function (error, result) {
+                expect(result.statusCode).to.equal(400);
+                expect(scope.isDone()).to.be.ok();
+
+                done();
+            });
+        });
+
+        it('succeeds', function (done) {
+            var scope = nock(config.apiServerOrigin()).get('/api/v1/helper/public_ip').reply(200, { ip: '127.0.0.1' });
+
+            superagent.post(SERVER_URL + '/api/v1/domains')
+                    .query({ access_token: token })
+                    .send(DOMAIN_0)
+                    .end(function (error, result) {
+                expect(result.statusCode).to.equal(201);
+                expect(scope.isDone()).to.be.ok();
+
+                done();
+            });
+        });
+
+        it('succeeds for second domain without zoneName', function (done) {
+            var scope = nock(config.apiServerOrigin()).get('/api/v1/helper/public_ip').reply(200, { ip: '127.0.0.1' });
+
+            superagent.post(SERVER_URL + '/api/v1/domains')
+                    .query({ access_token: token })
+                    .send(DOMAIN_1)
+                    .end(function (error, result) {
+                expect(result.statusCode).to.equal(201);
+                expect(scope.isDone()).to.be.ok();
+
+                done();
+            });
+        });
+
+        it('fails for already added domain', function (done) {
+            var scope = nock(config.apiServerOrigin()).get('/api/v1/helper/public_ip').reply(200, { ip: '127.0.0.1' });
+
+            superagent.post(SERVER_URL + '/api/v1/domains')
+                    .query({ access_token: token })
+                    .send(DOMAIN_0)
+                    .end(function (error, result) {
+                expect(result.statusCode).to.equal(409);
+                expect(scope.isDone()).to.be.ok();
+
+                done();
+            });
+        });
+    });
+
+    describe('list', function () {
+        it('succeeds', function (done) {
+            superagent.get(SERVER_URL + '/api/v1/domains')
+                    .query({ access_token: token })
+                    .end(function (error, result) {
+                expect(result.statusCode).to.equal(200);
+                expect(result.body.domains).to.be.an(Array);
+                // includes currently the implicitly added config.fqdn()
+                expect(result.body.domains.length).to.equal(3);
+
+                expect(result.body.domains[0].domain).to.equal(DOMAIN_0.domain);
+                expect(result.body.domains[1].domain).to.equal(config.fqdn());
+                expect(result.body.domains[2].domain).to.equal(DOMAIN_1.domain);
+
+                done();
+            });
+        });
+    });
+
+    describe('get', function () {
+        it('fails for non-existing domain', function (done) {
+            superagent.get(SERVER_URL + '/api/v1/domains/' + DOMAIN_0.domain + DOMAIN_0.domain)
+                    .query({ access_token: token })
+                    .end(function (error, result) {
+                expect(result.statusCode).to.equal(404);
+
+                done();
+            });
+        });
+
+        it('succeeds', function (done) {
+            superagent.get(SERVER_URL + '/api/v1/domains/' + DOMAIN_0.domain)
+                    .query({ access_token: token })
+                    .end(function (error, result) {
+                expect(result.statusCode).to.equal(200);
+                expect(result.body.domain).to.equal(DOMAIN_0.domain);
+
+                done();
+            });
+        });
+    });
+
+    describe('delete', function () {
+        it('fails without password', function (done) {
+            superagent.delete(SERVER_URL + '/api/v1/domains/' + DOMAIN_0.domain + DOMAIN_0.domain)
+                    .query({ access_token: token })
+                    .end(function (error, result) {
+                expect(result.statusCode).to.equal(400);
+
+                done();
+            });
+        });
+
+        it('fails with wrong password', function (done) {
+            superagent.delete(SERVER_URL + '/api/v1/domains/' + DOMAIN_0.domain + DOMAIN_0.domain)
+                    .query({ access_token: token })
+                    .send({ password: PASSWORD + PASSWORD })
+                    .end(function (error, result) {
+                expect(result.statusCode).to.equal(403);
+
+                done();
+            });
+        });
+
+        it('fails for non-existing domain', function (done) {
+            superagent.delete(SERVER_URL + '/api/v1/domains/' + DOMAIN_0.domain + DOMAIN_0.domain)
+                    .query({ access_token: token })
+                    .send({ password: PASSWORD })
+                    .end(function (error, result) {
+                expect(result.statusCode).to.equal(404);
+
+                done();
+            });
+        });
+
+        it('succeeds', function (done) {
+            superagent.delete(SERVER_URL + '/api/v1/domains/' + DOMAIN_0.domain)
+                    .query({ access_token: token })
+                    .send({ password: PASSWORD })
+                    .end(function (error, result) {
+                expect(result.statusCode).to.equal(204);
+
+                superagent.get(SERVER_URL + '/api/v1/domains/' + DOMAIN_0.domain)
+                        .query({ access_token: token })
+                        .end(function (error, result) {
+                    expect(result.statusCode).to.equal(404);
+
+                    done();
+                });
+            });
+        });
+    });
+});

src/routes/test/eventlog-test.js

@@ -10,7 +10,6 @@ var async = require('async'),
     config = require('../../config.js'),
     database = require('../../database.js'),
     expect = require('expect.js'),
-    nock = require('nock'),
     superagent = require('superagent'),
     server = require('../../server.js'),
     tokendb = require('../../tokendb.js');
@@ -23,7 +22,9 @@ var token = null;
 var USER_1_ID = null, token_1;
 
 function setup(done) {
-    config.setVersion('1.2.3');
+    config._reset();
+    config.set('provider', 'notcaas');
+    config.setFqdn('example-eventlog-test.com');
 
     async.series([
         server.start.bind(server),
@@ -31,17 +32,12 @@ function setup(done) {
         database._clear,
 
         function createAdmin(callback) {
-            var scope1 = nock(config.apiServerOrigin()).get('/api/v1/boxes/' + config.fqdn() + '/setup/verify?setupToken=somesetuptoken').reply(200, {});
-            var scope2 = nock(config.apiServerOrigin()).post('/api/v1/boxes/' + config.fqdn() + '/setup/done?setupToken=somesetuptoken').reply(201, {});
-
             superagent.post(SERVER_URL + '/api/v1/cloudron/activate')
                    .query({ setupToken: 'somesetuptoken' })
                    .send({ username: USERNAME, password: PASSWORD, email: EMAIL })
                    .end(function (error, result) {
                 expect(result).to.be.ok();
                 expect(result.statusCode).to.eql(201);
-                expect(scope1.isDone()).to.be.ok();
-                expect(scope2.isDone()).to.be.ok();
 
                 // stash token for further use
                 token = result.body.token;

src/routes/test/groups-test.js

@@ -28,6 +28,10 @@ var groupObject;
 
 var server;
 function setup(done) {
+    config._reset();
+    config.set('provider', 'caas');
+    config.setFqdn('example-groups-test.com');
+
     async.series([
         server.start.bind(server),
 
@@ -223,7 +227,7 @@ describe('Groups API', function () {
       var group0Object, group1Object;
         before(function (done) {
             groups.create('group0', function (e, r) {
-                group0Object = r; 
+                group0Object = r;
                 groups.create('group1', function (e, r) {
                   group1Object = r;
                   done();

src/routes/test/oauth2-test.js

@@ -154,6 +154,7 @@ describe('OAuth2', function () {
             appStoreId: '',
             manifest: { version: '0.1.0', addons: { } },
             location: 'test',
+            domain: 'example.com',
             portBindings: {},
             accessRestriction: null,
             memoryLimit: 0,
@@ -165,6 +166,7 @@ describe('OAuth2', function () {
             appStoreId: '',
             manifest: { version: '0.1.0', addons: { } },
             location: 'test1',
+            domain: 'example.com',
             portBindings: {},
             accessRestriction: { users: [ 'foobar' ] },
             memoryLimit: 0,
@@ -176,6 +178,7 @@ describe('OAuth2', function () {
             appStoreId: '',
             manifest: { version: '0.1.0', addons: { } },
             location: 'test2',
+            domain: 'example.com',
             portBindings: {},
             accessRestriction: { users: [ USER_0.id ] },
             memoryLimit: 0,
@@ -187,6 +190,7 @@ describe('OAuth2', function () {
             appStoreId: '',
             manifest: { version: '0.1.0', addons: { } },
             location: 'test3',
+            domain: 'example.com',
             portBindings: {},
             accessRestriction: { groups: [ 'someothergroup', 'admin', 'anothergroup' ] },
             memoryLimit: 0,
@@ -290,6 +294,10 @@ describe('OAuth2', function () {
         };
 
         function setup(done) {
+            config._reset();
+            config.setFqdn(APP_0.domain);
+            config.setAdminFqdn('my.' + APP_0.domain);
+
             async.series([
                 server.start,
                 database._clear,
@@ -302,10 +310,10 @@ describe('OAuth2', function () {
                 clientdb.add.bind(null, CLIENT_6.id, CLIENT_6.appId, CLIENT_6.type, CLIENT_6.clientSecret, CLIENT_6.redirectURI, CLIENT_6.scope),
                 clientdb.add.bind(null, CLIENT_7.id, CLIENT_7.appId, CLIENT_7.type, CLIENT_7.clientSecret, CLIENT_7.redirectURI, CLIENT_7.scope),
                 clientdb.add.bind(null, CLIENT_9.id, CLIENT_9.appId, CLIENT_9.type, CLIENT_9.clientSecret, CLIENT_9.redirectURI, CLIENT_9.scope),
-                appdb.add.bind(null, APP_0.id, APP_0.appStoreId, APP_0.manifest, APP_0.location, APP_0.portBindings, APP_0),
-                appdb.add.bind(null, APP_1.id, APP_1.appStoreId, APP_1.manifest, APP_1.location, APP_1.portBindings, APP_1),
-                appdb.add.bind(null, APP_2.id, APP_2.appStoreId, APP_2.manifest, APP_2.location, APP_2.portBindings, APP_2),
-                appdb.add.bind(null, APP_3.id, APP_3.appStoreId, APP_3.manifest, APP_3.location, APP_3.portBindings, APP_3),
+                appdb.add.bind(null, APP_0.id, APP_0.appStoreId, APP_0.manifest, APP_0.location, APP_0.domain, APP_0.portBindings, APP_0),
+                appdb.add.bind(null, APP_1.id, APP_1.appStoreId, APP_1.manifest, APP_1.location, APP_1.domain, APP_1.portBindings, APP_1),
+                appdb.add.bind(null, APP_2.id, APP_2.appStoreId, APP_2.manifest, APP_2.location, APP_2.domain, APP_2.portBindings, APP_2),
+                appdb.add.bind(null, APP_3.id, APP_3.appStoreId, APP_3.manifest, APP_3.location, APP_3.domain, APP_3.portBindings, APP_3),
                 function (callback) {
                     user.create(USER_0.username, USER_0.password, USER_0.email, USER_0.displayName, null /* source */, function (error, userObject) {
                         expect(error).to.not.be.ok();

src/routes/test/profile-test.js

@@ -26,6 +26,9 @@ describe('Profile API', function () {
     var token_0;
 
     function setup(done) {
+        config._reset();
+        config.setFqdn('example-profile-test.com');
+
         server.start(function (error) {
             expect(!error).to.be.ok();
 

src/routes/test/server-test.js

@@ -22,6 +22,9 @@ var token = null;
 
 var server;
 function setup(done) {
+    config._reset();
+    config.setFqdn('example-server-test.com');
+    config.set('provider', 'caas');
     config.setVersion('1.2.3');
 
     async.series([
@@ -34,19 +37,19 @@ function setup(done) {
             var scope2 = nock(config.apiServerOrigin()).post('/api/v1/boxes/' + config.fqdn() + '/setup/done?setupToken=somesetuptoken').reply(201, {});
 
             superagent.post(SERVER_URL + '/api/v1/cloudron/activate')
-                   .query({ setupToken: 'somesetuptoken' })
-                   .send({ username: USERNAME, password: PASSWORD, email: EMAIL })
-                   .end(function (error, result) {
-                expect(result).to.be.ok();
-                expect(result.statusCode).to.eql(201);
-                expect(scope1.isDone()).to.be.ok();
-                expect(scope2.isDone()).to.be.ok();
+                .query({ setupToken: 'somesetuptoken' })
+                .send({ username: USERNAME, password: PASSWORD, email: EMAIL })
+                .end(function (error, result) {
+                    expect(result).to.be.ok();
+                    expect(result.statusCode).to.eql(201);
+                    expect(scope1.isDone()).to.be.ok();
+                    expect(scope2.isDone()).to.be.ok();
 
-                // stash token for further use
-                token = result.body.token;
+                    // stash token for further use
+                    token = result.body.token;
 
-                callback();
-            });
+                    callback();
+                });
         }
     ], done);
 }
@@ -67,22 +70,24 @@ describe('REST API', function () {
         superagent.post(SERVER_URL + '/api/v1/users')
             .query({ access_token: token })
             .set('content-type', 'application/json')
-            .send("some invalid non-strict json")
-           .end(function (error, result) {
-            expect(result.statusCode).to.equal(400);
-            expect(result.body.message).to.be('Failed to parse body');
-            done();
-        });
+            .send('some invalid non-strict json')
+            .end(function (error, result) {
+                expect(result.statusCode).to.equal(400);
+                expect(result.body.message).to.be('Failed to parse body');
+
+                done();
+            });
     });
 
     it('does not crash with invalid string', function (done) {
         superagent.post(SERVER_URL + '/api/v1/users')
             .query({ access_token: token })
             .set('content-type', 'application/x-www-form-urlencoded')
-            .send("some string")
-           .end(function (error, result) {
-            expect(result.statusCode).to.equal(400);
-            done();
-        });
+            .send('some string')
+            .end(function (error, result) {
+                expect(result.statusCode).to.equal(400);
+
+                done();
+            });
     });
 });

src/routes/test/settings-test.js

@@ -1,40 +1,40 @@
+'use strict';
+
 /* global it:false */
 /* global describe:false */
 /* global before:false */
 /* global after:false */
 
-'use strict';
-
-var appdb = require('../../appdb.js'),
-    async = require('async'),
+var async = require('async'),
     child_process = require('child_process'),
     cloudron = require('../../cloudron.js'),
     config = require('../../config.js'),
     constants = require('../../constants.js'),
     database = require('../../database.js'),
     expect = require('expect.js'),
+    fs = require('fs'),
+    nock = require('nock'),
     path = require('path'),
     paths = require('../../paths.js'),
     server = require('../../server.js'),
     settings = require('../../settings.js'),
     settingsdb = require('../../settingsdb.js'),
-    superagent = require('superagent'),
-    fs = require('fs'),
-    nock = require('nock');
+    superagent = require('superagent');
 
 var SERVER_URL = 'http://localhost:' + config.get('port');
 
 var USERNAME = 'superadmin', PASSWORD = 'Foobar?1337', EMAIL ='silly@me.com';
 var token = null;
 
-var server;
 function setup(done) {
-    config.setFqdn('foobar.com');
+    config._reset();
+    config.setFqdn('example-settings-test.com');
+    config.setAdminFqdn('my.example-settings-test.com');
+    config.set('provider', 'caas');
 
     async.series([
-        server.start.bind(server),
-
-        database._clear,
+        server.start.bind(null),
+        database._clear.bind(null),
 
         function createAdmin(callback) {
             var scope1 = nock(config.apiServerOrigin()).get('/api/v1/boxes/' + config.fqdn() + '/setup/verify?setupToken=somesetuptoken').reply(200, {});
@@ -54,11 +54,6 @@ function setup(done) {
 
                 callback();
             });
-        },
-
-        function addApp(callback) {
-            var manifest = { version: '0.0.1', manifestVersion: 1, dockerImage: 'foo', healthCheckPath: '/', httpPort: 3, title: 'ok' };
-            appdb.add('appid', 'appStoreId', manifest, 'location', [ ] /* portBindings */, { }, callback);
         }
     ], done);
 }
@@ -72,8 +67,6 @@ function cleanup(done) {
 }
 
 describe('Settings API', function () {
-    this.timeout(10000);
-
     before(setup);
     after(cleanup);
 
@@ -234,47 +227,6 @@ describe('Settings API', function () {
         });
     });
 
-    describe('dns_config', function () {
-        it('get dns_config fails', function (done) {
-            superagent.get(SERVER_URL + '/api/v1/settings/dns_config')
-                   .query({ access_token: token })
-                   .end(function (err, res) {
-                expect(res.statusCode).to.equal(200);
-                expect(res.body).to.eql({ provider: 'manual' });
-                done();
-            });
-        });
-
-        it('cannot set without data', function (done) {
-            superagent.post(SERVER_URL + '/api/v1/settings/dns_config')
-                   .query({ access_token: token })
-                   .end(function (err, res) {
-                expect(res.statusCode).to.equal(400);
-                done();
-            });
-        });
-
-        it('set succeeds', function (done) {
-            superagent.post(SERVER_URL + '/api/v1/settings/dns_config')
-                   .query({ access_token: token })
-                   .send({ provider: 'route53', accessKeyId: 'accessKey', secretAccessKey: 'secretAccessKey' })
-                   .end(function (err, res) {
-                expect(res.statusCode).to.equal(200);
-                done();
-            });
-        });
-
-        it('get succeeds', function (done) {
-            superagent.get(SERVER_URL + '/api/v1/settings/dns_config')
-                   .query({ access_token: token })
-                   .end(function (err, res) {
-                expect(res.statusCode).to.equal(200);
-                expect(res.body).to.eql({ provider: 'route53', accessKeyId: 'accessKey', secretAccessKey: 'secretAccessKey', region: 'us-east-1', endpoint: null });
-                done();
-            });
-        });
-    });
-
     describe('mail_config', function () {
         it('get mail_config succeeds', function (done) {
             superagent.get(SERVER_URL + '/api/v1/settings/mail_config')
@@ -367,16 +319,16 @@ describe('Settings API', function () {
         });
     });
 
-    describe('Certificates API', function () {
-        var validCert0, validKey0, // foobar.com
-            validCert1, validKey1; // *.foobar.com
+    xdescribe('Certificates API', function () {
+        var validCert0, validKey0, // example.com
+            validCert1, validKey1; // *.example.com
 
         before(function () {
-            child_process.execSync('openssl req -subj "/CN=foobar.com/O=My Company Name LTD./C=US" -new -newkey rsa:2048 -days 365 -nodes -x509 -keyout /tmp/server.key -out /tmp/server.crt');
+            child_process.execSync('openssl req -subj "/CN=example.com/O=My Company Name LTD./C=US" -new -newkey rsa:2048 -days 365 -nodes -x509 -keyout /tmp/server.key -out /tmp/server.crt');
             validKey0 = fs.readFileSync('/tmp/server.key', 'utf8');
             validCert0 = fs.readFileSync('/tmp/server.crt', 'utf8');
 
-            child_process.execSync('openssl req -subj "/CN=*.foobar.com/O=My Company Name LTD./C=US" -new -newkey rsa:2048 -days 365 -nodes -x509 -keyout /tmp/server.key -out /tmp/server.crt');
+            child_process.execSync('openssl req -subj "/CN=*.example.com/O=My Company Name LTD./C=US" -new -newkey rsa:2048 -days 365 -nodes -x509 -keyout /tmp/server.key -out /tmp/server.crt');
             validKey1 = fs.readFileSync('/tmp/server.key', 'utf8');
             validCert1 = fs.readFileSync('/tmp/server.crt', 'utf8');
         });

src/routes/test/ssh-test.js

@@ -28,7 +28,8 @@ var token = null;
 
 var server;
 function setup(done) {
-    config.setFqdn('foobar.com');
+    config._reset();
+    config.setFqdn('example-ssh-test.com');
 
     async.series([
         server.start.bind(server),

src/routes/test/sysadmin-test.js

@@ -30,6 +30,9 @@ var SERVER_URL = 'http://localhost:' + config.get('port');
 var USERNAME = 'superadmin', PASSWORD = 'Foobar?1337', EMAIL ='silly@me.com';
 
 function setup(done) {
+    config._reset();
+    config.setFqdn('example-sysadmin-test.com');
+    config.set('provider', 'caas');
     config.setVersion('1.2.3');
 
     async.series([
@@ -56,7 +59,7 @@ function setup(done) {
 
         function addApp(callback) {
             var manifest = { version: '0.0.1', manifestVersion: 1, dockerImage: 'foo', healthCheckPath: '/', httpPort: 3, title: 'ok', addons: { } };
-            appdb.add('appid', 'appStoreId', manifest, 'location', [ ] /* portBindings */, { }, callback);
+            appdb.add('appid', 'appStoreId', manifest, 'location', config.fqdn(), [ ] /* portBindings */, { }, callback);
         },
 
         function createSettings(callback) {
@@ -65,7 +68,7 @@ function setup(done) {
             s3._mockInject(MockS3);
 
             safe.fs.mkdirSync('/tmp/box-sysadmin-test');
-            settingsdb.set(settings.BACKUP_CONFIG_KEY, JSON.stringify({ provider: 'caas', token: 'BACKUP_TOKEN', key: 'key', prefix: 'boxid', format: 'tgz'}), callback);
+            settingsdb.set(settings.BACKUP_CONFIG_KEY, JSON.stringify({ provider: 'caas', token: 'BACKUP_TOKEN', fqdn: config.fqdn(), key: 'key', prefix: 'boxid', format: 'tgz'}), callback);
         }
     ], done);
 }

src/routes/test/user-test.js

@@ -26,6 +26,9 @@ var USERNAME_3 = 'ut', EMAIL_3 = 'user3@FOO.bar';
 var groupObject;
 
 function setup(done) {
+    config._reset();
+    config.setFqdn('example-user-test.com');
+
     server.start(function (error) {
         expect(!error).to.be.ok();
 

src/scripts/restart.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+set -eu -o pipefail
+
+readonly INFRA_VERSION_FILE=/home/yellowtent/platformdata/INFRA_VERSION
+
+if [[ ${EUID} -ne 0 ]]; then
+    echo "This script should be run as root." > /dev/stderr
+    exit 1
+fi
+
+if [[ $# == 1 && "$1" == "--check" ]]; then
+    echo "OK"
+    exit 0
+fi
+
+if [[ "${BOX_ENV}" == "cloudron" ]]; then
+    systemctl restart box
+fi
+

src/server.js

@@ -91,30 +91,28 @@ function initializeExpressSync() {
     var profileScope = routes.oauth2.scope(clients.SCOPE_PROFILE);
     var usersScope = routes.oauth2.scope(clients.SCOPE_USERS);
     var appsScope = routes.oauth2.scope(clients.SCOPE_APPS);
-    var developerScope = routes.oauth2.scope(clients.SCOPE_DEVELOPER);
     var settingsScope = routes.oauth2.scope(clients.SCOPE_SETTINGS);
 
     // csrf protection
     var csrf = routes.oauth2.csrf;
 
     // public routes
-    router.post('/api/v1/cloudron/activate', routes.cloudron.setupTokenAuth, routes.cloudron.activate);
     router.post('/api/v1/cloudron/dns_setup', routes.cloudron.providerTokenAuth, routes.cloudron.dnsSetup);    // only available until no-domain
+    router.post('/api/v1/cloudron/activate', routes.cloudron.setupTokenAuth, routes.cloudron.activate);
+    router.post('/api/v1/cloudron/restore', routes.cloudron.restore);    // only available until activated
+
     router.get ('/api/v1/cloudron/progress', routes.cloudron.getProgress);
     router.get ('/api/v1/cloudron/status', routes.cloudron.getStatus);
     router.get ('/api/v1/cloudron/avatar', routes.settings.getCloudronAvatar); // this is a public alias for /api/v1/settings/cloudron_avatar
 
     // developer routes
-    router.post('/api/v1/developer', developerScope, routes.user.requireAdmin, routes.user.verifyPassword, routes.developer.setEnabled);
-    router.get ('/api/v1/developer', developerScope, routes.developer.enabled, routes.developer.status);
-    router.post('/api/v1/developer/login', routes.developer.enabled, routes.developer.login);
+    router.post('/api/v1/developer/login', routes.developer.login);
 
     // cloudron routes
     router.get ('/api/v1/cloudron/config', cloudronScope, routes.cloudron.getConfig);
     router.post('/api/v1/cloudron/update', cloudronScope, routes.user.requireAdmin, routes.cloudron.update);
     router.post('/api/v1/cloudron/check_for_updates', cloudronScope, routes.user.requireAdmin, routes.cloudron.checkForUpdates);
     router.post('/api/v1/cloudron/reboot', cloudronScope, routes.user.requireAdmin, routes.cloudron.reboot);
-    router.post('/api/v1/cloudron/migrate', cloudronScope, routes.user.requireAdmin, routes.user.verifyPassword, routes.cloudron.migrate);
     router.get ('/api/v1/cloudron/graphs', cloudronScope, routes.user.requireAdmin, routes.graphs.getGraphs);
     router.get ('/api/v1/cloudron/disks', cloudronScope, routes.user.requireAdmin, routes.cloudron.getDisks);
     router.get ('/api/v1/cloudron/logs', cloudronScope, routes.user.requireAdmin, routes.cloudron.getLogs);
@@ -166,12 +164,12 @@ function initializeExpressSync() {
     router.get ('/api/v1/oauth/dialog/authorize', routes.oauth2.authorization);
     router.post('/api/v1/oauth/token', routes.oauth2.token);
     router.get ('/api/v1/oauth/clients', settingsScope, routes.clients.getAll);
-    router.post('/api/v1/oauth/clients', routes.developer.enabled, settingsScope, routes.clients.add);
-    router.get ('/api/v1/oauth/clients/:clientId', routes.developer.enabled, settingsScope, routes.clients.get);
-    router.post('/api/v1/oauth/clients/:clientId', routes.developer.enabled, settingsScope, routes.clients.add);
-    router.del ('/api/v1/oauth/clients/:clientId', routes.developer.enabled, settingsScope, routes.clients.del);
+    router.post('/api/v1/oauth/clients', settingsScope, routes.clients.add);
+    router.get ('/api/v1/oauth/clients/:clientId', settingsScope, routes.clients.get);
+    router.post('/api/v1/oauth/clients/:clientId', settingsScope, routes.clients.add);
+    router.del ('/api/v1/oauth/clients/:clientId', settingsScope, routes.clients.del);
     router.get ('/api/v1/oauth/clients/:clientId/tokens', settingsScope, routes.clients.getClientTokens);
-    router.post('/api/v1/oauth/clients/:clientId/tokens', routes.developer.enabled, settingsScope, routes.clients.addClientToken);
+    router.post('/api/v1/oauth/clients/:clientId/tokens', settingsScope, routes.clients.addClientToken);
     router.del ('/api/v1/oauth/clients/:clientId/tokens', settingsScope, routes.clients.delClientTokens);
     router.del ('/api/v1/oauth/clients/:clientId/tokens/:tokenId', settingsScope, routes.clients.delToken);
 
@@ -191,7 +189,7 @@ function initializeExpressSync() {
     router.post('/api/v1/apps/:id/start',     appsScope, routes.user.requireAdmin, routes.apps.startApp);
     router.get ('/api/v1/apps/:id/logstream', appsScope, routes.user.requireAdmin, routes.apps.getLogStream);
     router.get ('/api/v1/apps/:id/logs',      appsScope, routes.user.requireAdmin, routes.apps.getLogs);
-    router.get ('/api/v1/apps/:id/exec',      routes.developer.enabled, appsScope, routes.user.requireAdmin, routes.apps.exec);
+    router.get ('/api/v1/apps/:id/exec',      appsScope, routes.user.requireAdmin, routes.apps.exec);
     // websocket cannot do bearer authentication
     router.get ('/api/v1/apps/:id/execws',    routes.oauth2.websocketAuth.bind(null, [ clients.SCOPE_APPS ]), routes.user.requireAdmin, routes.apps.execWebSocket);
     router.post('/api/v1/apps/:id/clone',     appsScope, routes.user.requireAdmin, routes.apps.cloneApp);
@@ -206,11 +204,8 @@ function initializeExpressSync() {
     router.get ('/api/v1/settings/cloudron_avatar',    settingsScope, routes.user.requireAdmin, routes.settings.getCloudronAvatar);
     router.post('/api/v1/settings/cloudron_avatar',    settingsScope, routes.user.requireAdmin, multipart, routes.settings.setCloudronAvatar);
     router.get ('/api/v1/settings/email_status',       settingsScope, routes.user.requireAdmin, routes.settings.getEmailStatus);
-    router.get ('/api/v1/settings/dns_config',         settingsScope, routes.user.requireAdmin, routes.settings.getDnsConfig);
-    router.post('/api/v1/settings/dns_config',         settingsScope, routes.user.requireAdmin, routes.settings.setDnsConfig);
     router.get ('/api/v1/settings/backup_config',      settingsScope, routes.user.requireAdmin, routes.settings.getBackupConfig);
     router.post('/api/v1/settings/backup_config',      settingsScope, routes.user.requireAdmin, routes.settings.setBackupConfig);
-    router.post('/api/v1/settings/certificate',        settingsScope, routes.user.requireAdmin, routes.settings.setFallbackCertificate);
 
     router.post('/api/v1/settings/admin_certificate',  settingsScope, routes.user.requireAdmin, routes.settings.setAdminCertificate);
     router.get ('/api/v1/settings/time_zone',          settingsScope, routes.user.requireAdmin, routes.settings.getTimeZone);
@@ -235,6 +230,17 @@ function initializeExpressSync() {
     router.get ('/api/v1/backups', settingsScope, routes.user.requireAdmin, routes.backups.get);
     router.post('/api/v1/backups', settingsScope, routes.user.requireAdmin, routes.backups.create);
 
+    // domain routes
+    router.post('/api/v1/domains', settingsScope, routes.user.requireAdmin, routes.domains.add);
+    router.get ('/api/v1/domains', settingsScope, routes.user.requireAdmin, routes.domains.getAll);
+    router.get ('/api/v1/domains/:domain', settingsScope, routes.user.requireAdmin, routes.domains.get);
+    router.put ('/api/v1/domains/:domain', settingsScope, routes.user.requireAdmin, routes.domains.update);
+    router.post('/api/v1/domains/:domain/set_admin', settingsScope, routes.user.requireAdmin, routes.domains.setAdmin);
+    router.del ('/api/v1/domains/:domain', settingsScope, routes.user.requireAdmin, routes.user.verifyPassword, routes.domains.del);
+
+    // caas routes
+    router.post('/api/v1/caas/change_plan', cloudronScope, routes.user.requireAdmin, routes.user.verifyPassword, routes.caas.changePlan);
+
     // disable server socket "idle" timeout. we use the timeout middleware to handle timeouts on a route level
     // we rely on nginx for timeouts on the TCP level (see client_header_timeout)
     httpServer.setTimeout(0);

src/settings.js

@@ -18,12 +18,6 @@ exports = module.exports = {
     getCloudronAvatar: getCloudronAvatar,
     setCloudronAvatar: setCloudronAvatar,
 
-    getDeveloperMode: getDeveloperMode,
-    setDeveloperMode: setDeveloperMode,
-
-    getDnsConfig: getDnsConfig,
-    setDnsConfig: setDnsConfig,
-
     getDynamicDnsConfig: getDynamicDnsConfig,
     setDynamicDnsConfig: setDynamicDnsConfig,
 
@@ -54,13 +48,11 @@ exports = module.exports = {
     getAll: getAll,
 
     // booleans. if you add an entry here, be sure to fix getAll
-    DEVELOPER_MODE_KEY: 'developer_mode',
     DYNAMIC_DNS_KEY: 'dynamic_dns',
     MAIL_FROM_VALIDATION_KEY: 'mail_from_validation',
     EMAIL_DIGEST: 'email_digest',
 
     // json. if you add an entry here, be sure to fix getAll
-    DNS_CONFIG_KEY: 'dns_config',
     BACKUP_CONFIG_KEY: 'backup_config',
     TLS_CONFIG_KEY: 'tls_config',
     UPDATE_CONFIG_KEY: 'update_config',
@@ -85,7 +77,6 @@ var assert = require('assert'),
     CronJob = require('cron').CronJob,
     DatabaseError = require('./databaseerror.js'),
     debug = require('debug')('box:settings'),
-    cloudron = require('./cloudron.js'),
     moment = require('moment-timezone'),
     paths = require('./paths.js'),
     platform = require('./platform.js'),
@@ -93,10 +84,7 @@ var assert = require('assert'),
     EmailError = email.EmailError,
     safe = require('safetydance'),
     settingsdb = require('./settingsdb.js'),
-    subdomains = require('./subdomains.js'),
-    SubdomainError = subdomains.SubdomainError,
     superagent = require('superagent'),
-    sysinfo = require('./sysinfo.js'),
     util = require('util'),
     _ = require('underscore');
 
@@ -105,9 +93,7 @@ var gDefaults = (function () {
     result[exports.AUTOUPDATE_PATTERN_KEY] = '00 00 1,3,5,23 * * *';
     result[exports.TIME_ZONE_KEY] = 'America/Los_Angeles';
     result[exports.CLOUDRON_NAME_KEY] = 'Cloudron';
-    result[exports.DEVELOPER_MODE_KEY] = true;
     result[exports.DYNAMIC_DNS_KEY] = false;
-    result[exports.DNS_CONFIG_KEY] = { provider: 'manual' };
     result[exports.BACKUP_CONFIG_KEY] = {
         provider: 'filesystem',
         key: '',
@@ -273,72 +259,6 @@ function setCloudronAvatar(avatar, callback) {
     return callback(null);
 }
 
-function getDeveloperMode(callback) {
-    assert.strictEqual(typeof callback, 'function');
-
-    settingsdb.get(exports.DEVELOPER_MODE_KEY, function (error, enabled) {
-        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(null, gDefaults[exports.DEVELOPER_MODE_KEY]);
-        if (error) return callback(new SettingsError(SettingsError.INTERNAL_ERROR, error));
-
-        callback(null, !!enabled); // settingsdb holds string values only
-    });
-}
-
-function setDeveloperMode(enabled, callback) {
-    assert.strictEqual(typeof enabled, 'boolean');
-    assert.strictEqual(typeof callback, 'function');
-
-    // settingsdb takes string values only
-    settingsdb.set(exports.DEVELOPER_MODE_KEY, enabled ? 'enabled' : '', function (error) {
-        if (error) return callback(new SettingsError(SettingsError.INTERNAL_ERROR, error));
-
-        exports.events.emit(exports.DEVELOPER_MODE_KEY, enabled);
-
-        return callback(null);
-    });
-}
-
-function getDnsConfig(callback) {
-    assert.strictEqual(typeof callback, 'function');
-
-    settingsdb.get(exports.DNS_CONFIG_KEY, function (error, value) {
-        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(null, gDefaults[exports.DNS_CONFIG_KEY]);
-        if (error) return callback(new SettingsError(SettingsError.INTERNAL_ERROR, error));
-
-        callback(null, JSON.parse(value));
-    });
-}
-
-function setDnsConfig(dnsConfig, domain, zoneName, callback) {
-    assert.strictEqual(typeof dnsConfig, 'object');
-    assert.strictEqual(typeof domain, 'string');
-    assert.strictEqual(typeof zoneName, 'string');
-    assert.strictEqual(typeof callback, 'function');
-
-    sysinfo.getPublicIp(function (error, ip) {
-        if (error) return callback(new SettingsError(SettingsError.INTERNAL_ERROR, 'Error getting IP:' + error.message));
-
-        subdomains.verifyDnsConfig(dnsConfig, domain, zoneName, ip, function (error, result) {
-            if (error && error.reason === SubdomainError.ACCESS_DENIED) return callback(new SettingsError(SettingsError.BAD_FIELD, 'Error adding A record. Access denied'));
-            if (error && error.reason === SubdomainError.NOT_FOUND) return callback(new SettingsError(SettingsError.BAD_FIELD, 'Zone not found'));
-            if (error && error.reason === SubdomainError.EXTERNAL_ERROR) return callback(new SettingsError(SettingsError.BAD_FIELD, 'Error adding A record:' + error.message));
-            if (error && error.reason === SubdomainError.BAD_FIELD) return callback(new SettingsError(SettingsError.BAD_FIELD, error.message));
-            if (error && error.reason === SubdomainError.INVALID_PROVIDER) return callback(new SettingsError(SettingsError.BAD_FIELD, error.message));
-            if (error) return callback(new SettingsError(SettingsError.INTERNAL_ERROR, error));
-
-            settingsdb.set(exports.DNS_CONFIG_KEY, JSON.stringify(result), function (error) {
-                if (error) return callback(new SettingsError(SettingsError.INTERNAL_ERROR, error));
-
-                exports.events.emit(exports.DNS_CONFIG_KEY, dnsConfig);
-
-                cloudron.configureWebadmin(NOOP_CALLBACK); // do not block
-
-                callback(null);
-            });
-        });
-    });
-}
-
 function getDynamicDnsConfig(callback) {
     assert.strictEqual(typeof callback, 'function');
 
@@ -635,12 +555,11 @@ function getAll(callback) {
         settings.forEach(function (setting) { result[setting.name] = setting.value; });
 
         // convert booleans
-        result[exports.DEVELOPER_MODE_KEY] = !!result[exports.DEVELOPER_MODE_KEY];
         result[exports.DYNAMIC_DNS_KEY] = !!result[exports.DYNAMIC_DNS_KEY];
         result[exports.MAIL_FROM_VALIDATION_KEY] = !!result[exports.MAIL_FROM_VALIDATION_KEY];
 
         // convert JSON objects
-        [exports.DNS_CONFIG_KEY, exports.TLS_CONFIG_KEY, exports.BACKUP_CONFIG_KEY, exports.MAIL_CONFIG_KEY,
+        [exports.TLS_CONFIG_KEY, exports.BACKUP_CONFIG_KEY, exports.MAIL_CONFIG_KEY,
             exports.UPDATE_CONFIG_KEY, exports.APPSTORE_CONFIG_KEY, exports.MAIL_RELAY_KEY, exports.CATCH_ALL_ADDRESS_KEY].forEach(function (key) {
             result[key] = typeof result[key] === 'object' ? result[key] : safe.JSON.parse(result[key]);
         });

src/storage/gcs.js

@@ -0,0 +1,325 @@
+'use strict';
+
+exports = module.exports = {
+    upload: upload,
+    download: download,
+    downloadDir: downloadDir,
+    copy: copy,
+
+    remove: remove,
+    removeDir: removeDir,
+
+    backupDone: backupDone,
+
+    testConfig: testConfig,
+
+    // Used to mock GCS
+    _mockInject: mockInject,
+    _mockRestore: mockRestore
+};
+
+var assert = require('assert'),
+    async = require('async'),
+    BackupsError = require('../backups.js').BackupsError,
+    debug = require('debug')('box:storage/gcs'),
+    EventEmitter = require('events'),
+    fs = require('fs'),
+    GCS = require('@google-cloud/storage'),
+    mkdirp = require('mkdirp'),
+    PassThrough = require('stream').PassThrough,
+    path = require('path');
+
+// test only
+var originalGCS;
+function mockInject(mock) {
+    originalGCS = GCS;
+    GCS = mock;
+}
+
+function mockRestore() {
+    GCS = originalGCS;
+}
+
+// internal only
+function getBucket(apiConfig) {
+    assert.strictEqual(typeof apiConfig, 'object');
+
+    var gcsConfig = {
+        projectId: apiConfig.projectId,
+
+        credentials: {
+            client_email: apiConfig.credentials.client_email,
+            private_key: apiConfig.credentials.private_key
+        }
+    };
+
+    return GCS(gcsConfig).bucket(apiConfig.bucket);
+}
+
+// storage api
+function upload(apiConfig, backupFilePath, sourceStream, callback) {
+    assert.strictEqual(typeof apiConfig, 'object');
+    assert.strictEqual(typeof backupFilePath, 'string');
+    assert.strictEqual(typeof sourceStream, 'object');
+    assert.strictEqual(typeof callback, 'function');
+
+    debug(`Uploading to ${backupFilePath}`);
+
+    function done(error) {
+        if (error) {
+            debug('[%s] upload: gcp upload error.', backupFilePath, error);
+            return callback(new BackupsError(BackupsError.EXTERNAL_ERROR, `Error uploading ${backupFilePath}. Message: ${error.message} HTTP Code: ${error.code}`));
+        }
+
+        callback(null);
+    }
+
+    var uploadStream = getBucket(apiConfig).file(backupFilePath)
+        .createWriteStream({resumable: false})
+        .on('finish', done)
+        .on('error', done);
+
+    sourceStream.pipe(uploadStream);
+}
+
+function download(apiConfig, backupFilePath, callback) {
+    assert.strictEqual(typeof apiConfig, 'object');
+    assert.strictEqual(typeof backupFilePath, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    debug(`Download ${backupFilePath} starting`);
+
+    var file = getBucket(apiConfig).file(backupFilePath);
+
+    var ps = new PassThrough();
+    var readStream = file.createReadStream()
+        .on('error', function(error) {
+            if (error && error.code == 404){
+                ps.emit('error', new BackupsError(BackupsError.NOT_FOUND));
+            } else {
+                debug('[%s] download: gcp stream error.', backupFilePath, error);
+                ps.emit('error', new BackupsError(BackupsError.EXTERNAL_ERROR, error));
+            }
+        })
+    ;
+    readStream.pipe(ps);
+
+    callback(null, ps);
+}
+
+function listDir(apiConfig, backupFilePath, batchSize, iteratorCallback, callback) {
+    var bucket = getBucket(apiConfig);
+
+    var query = { prefix: backupFilePath, autoPaginate: batchSize === -1 };
+    if (batchSize > 0) {
+        query.maxResults = batchSize;
+    }
+
+    async.forever(function listAndDownload(foreverCallback) {
+        bucket.getFiles(query, function (error, files, nextQuery) {
+            if (error) {
+                debug('remove: Failed to list %s. Not fatal.', error);
+                return foreverCallback(error);
+            }
+
+            if (files.length === 0) return foreverCallback(new Error('Done'));
+
+            debug('emitting ' + files.length + ' files found: ' + files.map(function(f) { return f.name; }).join(','));
+            iteratorCallback(files, function (error) {
+                if (error) {
+                    debug(`listDir page handled unsuccessfully ${error}`);
+                    return foreverCallback(error);
+                }
+
+                if (!nextQuery) return foreverCallback(new Error('Done'));
+
+                query = nextQuery;
+                debug(`listDir next page token ${query.pageToken}`);
+                foreverCallback();
+            });
+        });
+    }, function (error) {
+        if (error.message === 'Done') return callback(null);
+
+        callback(error);
+    });
+}
+
+function downloadDir(apiConfig, backupFilePath, destDir) {
+    assert.strictEqual(typeof apiConfig, 'object');
+    assert.strictEqual(typeof backupFilePath, 'string');
+    assert.strictEqual(typeof destDir, 'string');
+
+    var events = new EventEmitter();
+    var total = 0;
+
+    function downloadFile(file, iteratorCallback) {
+        var relativePath = path.relative(backupFilePath, file.name);
+
+        events.emit('progress', `Downloading ${relativePath}`);
+
+        mkdirp(path.dirname(path.join(destDir, relativePath)), function (error) {
+            if (error) return iteratorCallback(new BackupsError(BackupsError.EXTERNAL_ERROR, error.message));
+
+            download(apiConfig, file.name, function (error, sourceStream) {
+                if (error) return iteratorCallback(error);
+
+                var destStream = fs.createWriteStream(path.join(destDir, relativePath));
+
+                destStream.on('open', function () {
+                    sourceStream.pipe(destStream);
+                });
+
+                destStream.on('error', function (error) {
+                    iteratorCallback(new BackupsError(BackupsError.EXTERNAL_ERROR, error.message));
+                });
+
+                destStream.on('finish', iteratorCallback);
+            });
+        });
+    }
+
+    const concurrency = 10, batchSize = -1;
+
+    listDir(apiConfig, backupFilePath, batchSize, function (files, done) {
+        total += files.length;
+        async.eachLimit(files, concurrency, downloadFile, done);
+    }, function (error) {
+        events.emit('progress', `Downloaded ${total} files`);
+        events.emit('done', error);
+    });
+
+    return events;
+}
+
+function copy(apiConfig, oldFilePath, newFilePath) {
+    assert.strictEqual(typeof apiConfig, 'object');
+    assert.strictEqual(typeof oldFilePath, 'string');
+    assert.strictEqual(typeof newFilePath, 'string');
+
+    var events = new EventEmitter(), retryCount = 0;
+
+    function copyFile(file, iteratorCallback) {
+
+        var relativePath = path.relative(oldFilePath, file.name);
+
+        file.copy(path.join(newFilePath, relativePath), function(error) {
+            if (error && error.code == 404) return iteratorCallback(new BackupsError(BackupsError.NOT_FOUND, 'Old backup not found'));
+            if (error) {
+                debug('copyBackup: gcs copy error', error);
+                return iteratorCallback(new BackupsError(BackupsError.EXTERNAL_ERROR, error.message));
+            }
+            iteratorCallback(null);
+        });
+
+        events.emit('progress', `Copying ${relativePath}...`);
+    }
+
+    const batchSize = -1;
+    var total = 0, concurrency = 4;
+
+    listDir(apiConfig, oldFilePath, batchSize, function (files, done) {
+        total += files.length;
+
+        if (retryCount === 0) concurrency = Math.min(concurrency + 1, 10); else concurrency = Math.max(concurrency - 1, 5);
+        events.emit('progress', `${retryCount} errors. concurrency set to ${concurrency}`);
+        retryCount = 0;
+
+        async.eachLimit(files, concurrency, copyFile, done);
+    }, function (error) {
+        events.emit('progress', `Copied ${total} files`);
+
+        events.emit('done', error);
+    });
+
+    return events;
+}
+
+function remove(apiConfig, filename, callback) {
+    assert.strictEqual(typeof apiConfig, 'object');
+    assert.strictEqual(typeof filename, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    getBucket(apiConfig)
+        .file(filename)
+        .delete(function(e) {
+            if (e) debug('removeBackups: Unable to remove %s (%s). Not fatal.', filename, e.message);
+            else debug('removeBackups: Deleted: %s', filename);
+            callback(null);
+        });
+}
+
+function removeDir(apiConfig, pathPrefix) {
+    assert.strictEqual(typeof apiConfig, 'object');
+    assert.strictEqual(typeof pathPrefix, 'string');
+
+    var events = new EventEmitter(), retryCount = 0;
+
+    const batchSize = 1;
+    var total = 0, concurrency = 4;
+
+    listDir(apiConfig, pathPrefix, batchSize, function (files, done) {
+        total += files.length;
+
+        if (retryCount === 0) concurrency = Math.min(concurrency + 1, 10); else concurrency = Math.max(concurrency - 1, 5);
+        events.emit('progress', `${retryCount} errors. concurrency set to ${concurrency}`);
+        retryCount = 0;
+
+        async.eachLimit(files, concurrency, remove.bind(null, apiConfig), done);
+    }, function (error) {
+        events.emit('progress', `Deleted ${total} files`);
+
+        events.emit('done', error);
+    });
+
+    return events;
+}
+
+function testConfig(apiConfig, callback) {
+    assert.strictEqual(typeof apiConfig, 'object');
+    assert.strictEqual(typeof callback, 'function');
+
+    if (typeof apiConfig.projectId !== 'string') return callback(new BackupsError(BackupsError.BAD_FIELD, 'projectId must be a string'));
+    if (!apiConfig.credentials || typeof apiConfig.credentials !== 'object') return callback(new BackupsError(BackupsError.BAD_FIELD, 'credentials must be an object'));
+    if (typeof apiConfig.credentials.client_email !== 'string') return callback(new BackupsError(BackupsError.BAD_FIELD, 'credentials.client_email must be a string'));
+    if (typeof apiConfig.credentials.private_key !== 'string') return callback(new BackupsError(BackupsError.BAD_FIELD, 'credentials.private_key must be a string'));
+
+    if (typeof apiConfig.bucket !== 'string') return callback(new BackupsError(BackupsError.BAD_FIELD, 'bucket must be a string'));
+    if (typeof apiConfig.prefix !== 'string') return callback(new BackupsError(BackupsError.BAD_FIELD, 'prefix must be a string'));
+
+    // attempt to upload and delete a file with new credentials
+    var bucket = getBucket(apiConfig);
+
+    var testFile = bucket.file(path.join(apiConfig.prefix, 'cloudron-testfile'));
+
+    var uploadStream = testFile.createWriteStream({ resumable: false });
+    uploadStream.write('testfilecontents');
+    uploadStream.end();
+
+    uploadStream.on('error', function(error) {
+        debug('testConfig: failed uploading cloudron-testfile', error);
+        if (error && error.code && (error.code == 403 || error.code == 404)) {
+            return callback(new BackupsError(BackupsError.BAD_FIELD, error.message));
+        }
+
+        return callback(new BackupsError(BackupsError.EXTERNAL_ERROR, error.message));
+    });
+
+    uploadStream.on('finish', function() {
+        debug('testConfig: uploaded cloudron-testfile ' + JSON.stringify(arguments));
+        bucket.file(path.join(apiConfig.prefix, 'cloudron-testfile')).delete(function(error) {
+            if (error) return callback(new BackupsError(BackupsError.EXTERNAL_ERROR, error.message));
+            debug('testConfig: deleted cloudron-testfile');
+            callback();
+        });
+    });
+}
+
+function backupDone(apiConfig, backupId, appBackupIds, callback) {
+    assert.strictEqual(typeof apiConfig, 'object');
+    assert.strictEqual(typeof backupId, 'string');
+    assert(Array.isArray(appBackupIds));
+    assert.strictEqual(typeof callback, 'function');
+
+    callback();
+}

src/storage/s3.js

@@ -59,7 +59,7 @@ function getCaasConfig(apiConfig, callback) {
 
     debug('getCaasCredentials: getting new credentials');
 
-    var url = config.apiServerOrigin() + '/api/v1/boxes/' + config.fqdn() + '/awscredentials';
+    var url = config.apiServerOrigin() + '/api/v1/boxes/' + apiConfig.fqdn + '/awscredentials';
     superagent.post(url).query({ token: apiConfig.token }).timeout(30 * 1000).end(function (error, result) {
         if (error && !error.response) return callback(error);
         if (result.statusCode !== 201) return callback(new Error(result.text));
@@ -179,8 +179,8 @@ function download(apiConfig, backupFilePath, callback) {
             if (error.code === 'NoSuchKey' || error.code === 'ENOENT') {
                 ps.emit('error', new BackupsError(BackupsError.NOT_FOUND));
             } else {
-                debug('[%s] download: s3 stream error.', backupFilePath, error);
-                ps.emit('error', new BackupsError(BackupsError.EXTERNAL_ERROR, error.message));
+                debug(`download: ${apiConfig.bucket}:${backupFilePath} s3 stream error.`, error);
+                ps.emit('error', new BackupsError(BackupsError.EXTERNAL_ERROR, error.message || error.code)); // DO sets 'code'
             }
         });
 
@@ -484,7 +484,7 @@ function testConfig(apiConfig, callback) {
 
         var s3 = new AWS.S3(credentials);
         s3.putObject(params, function (error) {
-            if (error) return callback(new BackupsError(BackupsError.EXTERNAL_ERROR, error.message));
+            if (error) return callback(new BackupsError(BackupsError.EXTERNAL_ERROR, error.message || error.code)); // DO sets 'code'
 
             var params = {
                 Bucket: apiConfig.bucket,
@@ -492,7 +492,7 @@ function testConfig(apiConfig, callback) {
             };
 
             s3.deleteObject(params, function (error) {
-                if (error) return callback(new BackupsError(BackupsError.EXTERNAL_ERROR, error.message));
+                if (error) return callback(new BackupsError(BackupsError.EXTERNAL_ERROR, error.message || error.code)); // DO sets 'code'
 
                 callback();
             });
@@ -508,23 +508,18 @@ function backupDone(apiConfig, backupId, appBackupIds, callback) {
 
     if (apiConfig.provider !== 'caas') return callback();
 
-    // CaaS expects filenames instead of backupIds, this means no prefix but a file type extension
-    var FILE_TYPE = '.tar.gz.enc';
-    var boxBackupFilename = backupId + FILE_TYPE;
-    var appBackupFilenames = appBackupIds.map(function (id) { return id + FILE_TYPE; });
+    debug('[%s] backupDone: %s apps %j', backupId, backupId, appBackupIds);
 
-    debug('[%s] backupDone: %s apps %j', backupId, boxBackupFilename, appBackupFilenames);
-
-    var url = config.apiServerOrigin() + '/api/v1/boxes/' + config.fqdn() + '/backupDone';
+    var url = config.apiServerOrigin() + '/api/v1/boxes/' + apiConfig.fqdn + '/backupDone';
     var data = {
         boxVersion: config.version(),
-        restoreKey: boxBackupFilename,
+        backupId: backupId,
         appId: null,        // now unused
         appVersion: null,   // now unused
-        appBackupIds: appBackupFilenames
+        appBackupIds: appBackupIds
     };
 
-    superagent.post(url).send(data).query({ token: config.token() }).timeout(30 * 1000).end(function (error, result) {
+    superagent.post(url).send(data).query({ token: apiConfig.token }).timeout(30 * 1000).end(function (error, result) {
         if (error && !error.response) return callback(new BackupsError(BackupsError.EXTERNAL_ERROR, error));
         if (result.statusCode !== 200) return callback(new BackupsError(BackupsError.EXTERNAL_ERROR, result.text));
 

src/subdomains.js

@@ -1,155 +0,0 @@
-'use strict';
-
-module.exports = exports = {
-    remove: remove,
-    upsert: upsert,
-    get: get,
-    waitForDns: waitForDns,
-    verifyDnsConfig: verifyDnsConfig,
-
-    SubdomainError: SubdomainError
-};
-
-var assert = require('assert'),
-    config = require('./config.js'),
-    settings = require('./settings.js'),
-    tld = require('tldjs'),
-    util = require('util');
-
-function SubdomainError(reason, errorOrMessage) {
-    assert.strictEqual(typeof reason, 'string');
-    assert(errorOrMessage instanceof Error || typeof errorOrMessage === 'string' || typeof errorOrMessage === 'undefined');
-
-    Error.call(this);
-    Error.captureStackTrace(this, this.constructor);
-
-    this.name = this.constructor.name;
-    this.reason = reason;
-    if (typeof errorOrMessage === 'undefined') {
-        this.message = reason;
-    } else if (typeof errorOrMessage === 'string') {
-        this.message = errorOrMessage;
-    } else {
-        this.message = 'Internal error';
-        this.nestedError = errorOrMessage;
-    }
-}
-util.inherits(SubdomainError, Error);
-
-SubdomainError.NOT_FOUND = 'No such domain';
-SubdomainError.EXTERNAL_ERROR = 'External error';
-SubdomainError.BAD_FIELD = 'Bad Field';
-SubdomainError.STILL_BUSY = 'Still busy';
-SubdomainError.INTERNAL_ERROR = 'Internal error';
-SubdomainError.ACCESS_DENIED = 'Access denied';
-SubdomainError.INVALID_PROVIDER = 'provider must be route53, gcdns, digitalocean, cloudflare, noop, manual or caas';
-
-// choose which subdomain backend we use for test purpose we use route53
-function api(provider) {
-    assert.strictEqual(typeof provider, 'string');
-
-    switch (provider) {
-        case 'caas': return require('./dns/caas.js');
-        case 'cloudflare': return require('./dns/cloudflare.js');
-        case 'route53': return require('./dns/route53.js');
-        case 'gcdns': return require('./dns/gcdns.js');
-        case 'digitalocean': return require('./dns/digitalocean.js');
-        case 'noop': return require('./dns/noop.js');
-        case 'manual': return require('./dns/manual.js');
-        default: return null;
-    }
-}
-
-function getName(subdomain) {
-    // support special caas domains
-    if (!config.isCustomDomain()) return subdomain;
-
-    if (config.fqdn() === config.zoneName()) return subdomain;
-
-    var part = config.fqdn().slice(0, -config.zoneName().length - 1);
-
-    return subdomain === '' ? part : subdomain + '.' + part;
-}
-
-function get(subdomain, type, callback) {
-    assert.strictEqual(typeof subdomain, 'string');
-    assert.strictEqual(typeof type, 'string');
-    assert.strictEqual(typeof callback, 'function');
-
-    settings.getDnsConfig(function (error, dnsConfig) {
-        if (error) return callback(new SubdomainError(SubdomainError.INTERNAL_ERROR, error));
-
-        api(dnsConfig.provider).get(dnsConfig, config.zoneName(), getName(subdomain), type, function (error, values) {
-            if (error) return callback(error);
-
-            callback(null, values);
-        });
-    });
-}
-
-function upsert(subdomain, type, values, callback) {
-    assert.strictEqual(typeof subdomain, 'string');
-    assert.strictEqual(typeof type, 'string');
-    assert(util.isArray(values));
-    assert.strictEqual(typeof callback, 'function');
-
-    settings.getDnsConfig(function (error, dnsConfig) {
-        if (error) return callback(new SubdomainError(SubdomainError.INTERNAL_ERROR, error));
-
-        api(dnsConfig.provider).upsert(dnsConfig, config.zoneName(), getName(subdomain), type, values, function (error, changeId) {
-            if (error) return callback(error);
-
-            callback(null, changeId);
-        });
-    });
-}
-
-function remove(subdomain, type, values, callback) {
-    assert.strictEqual(typeof subdomain, 'string');
-    assert.strictEqual(typeof type, 'string');
-    assert(util.isArray(values));
-    assert.strictEqual(typeof callback, 'function');
-
-    settings.getDnsConfig(function (error, dnsConfig) {
-        if (error) return callback(new SubdomainError(SubdomainError.INTERNAL_ERROR, error));
-
-        api(dnsConfig.provider).del(dnsConfig, config.zoneName(), getName(subdomain), type, values, function (error) {
-            if (error && error.reason !== SubdomainError.NOT_FOUND) return callback(error);
-
-            callback(null);
-        });
-    });
-}
-
-function waitForDns(domain, value, type, options, callback) {
-    assert.strictEqual(typeof domain, 'string');
-    assert(typeof value === 'string' || util.isRegExp(value));
-    assert(type === 'A' || type === 'CNAME' || type === 'TXT');
-    assert(options && typeof options === 'object'); // { interval: 5000, times: 50000 }
-    assert.strictEqual(typeof callback, 'function');
-
-    settings.getDnsConfig(function (error, dnsConfig) {
-        if (error) return callback(new SubdomainError(SubdomainError.INTERNAL_ERROR, error));
-
-        var zoneName = config.zoneName();
-
-        // if the domain is on another zone in case of external domain, use the correct zone
-        if (!domain.endsWith(zoneName)) zoneName = tld.getDomain(domain);
-
-        api(dnsConfig.provider).waitForDns(domain, zoneName, value, type, options, callback);
-    });
-}
-
-function verifyDnsConfig(dnsConfig, domain, zoneName, ip, callback) {
-    assert(dnsConfig && typeof dnsConfig === 'object'); // the dns config to test with
-    assert(typeof dnsConfig.provider === 'string');
-    assert.strictEqual(typeof domain, 'string');
-    assert.strictEqual(typeof zoneName, 'string');
-    assert.strictEqual(typeof ip, 'string');
-    assert.strictEqual(typeof callback, 'function');
-
-    var backend = api(dnsConfig.provider);
-    if (!backend) return callback(new SubdomainError(SubdomainError.INVALID_PROVIDER));
-
-    api(dnsConfig.provider).verifyDnsConfig(dnsConfig, domain, zoneName, ip, callback);
-}

src/taskmanager.js

@@ -16,6 +16,7 @@ var appdb = require('./appdb.js'),
     assert = require('assert'),
     async = require('async'),
     child_process = require('child_process'),
+    config = require('./config.js'),
     debug = require('debug')('box:taskmanager'),
     locker = require('./locker.js'),
     sendFailureLogs = require('./logcollector.js').sendFailureLogs,
@@ -47,7 +48,7 @@ function resumeTasks(callback) {
 
             if (app.installationState === appdb.ISTATE_ERROR) return;
 
-            debug('Creating process for %s (%s) with state %s', app.location, app.id, app.installationState);
+            debug('Creating process for %s (%s) with state %s', app.intrinsicFqdn, app.id, app.installationState);
             restartAppTask(app.id, NOOP_CALLBACK); // restart because the auto-installer could have queued up tasks already
         });
 

src/test/apps-test.js

@@ -12,6 +12,7 @@ var appdb = require('../appdb.js'),
     config = require('../config.js'),
     constants = require('../constants.js'),
     database = require('../database.js'),
+    domaindb = require('../domaindb.js'),
     expect = require('expect.js'),
     groupdb = require('../groupdb.js'),
     groups = require('../groups.js'),
@@ -66,10 +67,25 @@ describe('Apps', function () {
         name: 'group1'
     };
 
+    const DOMAIN_0 = {
+        domain: 'example.com',
+        zoneName: 'example.com',
+        provider: 'manual',
+        config: { }
+    };
+
+    const DOMAIN_1 = {
+        domain: 'example2.com',
+        zoneName: 'example2.com',
+        provider: 'manual',
+        config: { }
+    };
+
     var APP_0 = {
         id: 'appid-0',
         appStoreId: 'appStoreId-0',
         location: 'some-location-0',
+        domain: DOMAIN_0.domain,
         manifest: {
             version: '0.1', dockerImage: 'docker/app0', healthCheckPath: '/', httpPort: 80, title: 'app0',
             tcpPorts: {
@@ -88,6 +104,7 @@ describe('Apps', function () {
         id: 'appid-1',
         appStoreId: 'appStoreId-1',
         location: 'some-location-1',
+        domain: DOMAIN_0.domain,
         manifest: {
             version: '0.1', dockerImage: 'docker/app1', healthCheckPath: '/', httpPort: 80, title: 'app1',
             tcpPorts: {}
@@ -101,6 +118,7 @@ describe('Apps', function () {
         id: 'appid-2',
         appStoreId: 'appStoreId-2',
         location: 'some-location-2',
+        domain: DOMAIN_1.domain,
         manifest: {
             version: '0.1', dockerImage: 'docker/app2', healthCheckPath: '/', httpPort: 80, title: 'app2',
             tcpPorts: {}
@@ -111,10 +129,16 @@ describe('Apps', function () {
     };
 
     before(function (done) {
+        config._reset();
+
+        config.setFqdn(DOMAIN_0.domain);
+        config.setAdminFqdn('my.' + DOMAIN_0.domain);
 
         async.series([
             database.initialize,
             database._clear,
+            // DOMAIN_0 already added for test through domaindb.addDefaultDomain()
+            domaindb.add.bind(null, DOMAIN_1.domain, DOMAIN_1.zoneName, DOMAIN_1.provider, DOMAIN_1.config),
             userdb.add.bind(null, ADMIN_0.id, ADMIN_0),
             userdb.add.bind(null, USER_0.id, USER_0),
             userdb.add.bind(null, USER_1.id, USER_1),
@@ -122,48 +146,51 @@ describe('Apps', function () {
             groupdb.add.bind(null, GROUP_1.id, GROUP_1.name),
             groups.addMember.bind(null, constants.ADMIN_GROUP_ID, ADMIN_0.id),
             groups.addMember.bind(null, GROUP_0.id, USER_1.id),
-            appdb.add.bind(null, APP_0.id, APP_0.appStoreId, APP_0.manifest, APP_0.location, APP_0.portBindings, APP_0),
-            appdb.add.bind(null, APP_1.id, APP_1.appStoreId, APP_1.manifest, APP_1.location, APP_1.portBindings, APP_1),
-            appdb.add.bind(null, APP_2.id, APP_2.appStoreId, APP_2.manifest, APP_2.location, APP_2.portBindings, APP_2),
+            appdb.add.bind(null, APP_0.id, APP_0.appStoreId, APP_0.manifest, APP_0.location, APP_0.domain, APP_0.portBindings, APP_0),
+            appdb.add.bind(null, APP_1.id, APP_1.appStoreId, APP_1.manifest, APP_1.location, APP_1.domain, APP_1.portBindings, APP_1),
+            appdb.add.bind(null, APP_2.id, APP_2.appStoreId, APP_2.manifest, APP_2.location, APP_2.domain, APP_2.portBindings, APP_2),
             settingsdb.set.bind(null, settings.BACKUP_CONFIG_KEY, JSON.stringify({ provider: 'caas', token: 'BACKUP_TOKEN', bucket: 'Bucket', prefix: 'Prefix' }))
         ], done);
     });
 
     after(function (done) {
-        database._clear(done);
+        async.series([
+            database._clear,
+            database.uninitialize
+        ], done);
     });
 
     describe('validateHostname', function () {
         it('does not allow admin subdomain', function () {
-            expect(apps._validateHostname('my', 'cloudron.us')).to.be.an(Error);
+            expect(apps._validateHostname('my', DOMAIN_0.domain, 'my.' + DOMAIN_0.domain)).to.be.an(Error);
         });
 
         it('cannot have >63 length subdomains', function () {
             var s = '';
             for (var i = 0; i < 64; i++) s += 's';
-            expect(apps._validateHostname(s, 'cloudron.us')).to.be.an(Error);
+            expect(apps._validateHostname(s, 'example.com', s + '.example.com')).to.be.an(Error);
         });
 
         it('allows only alphanumerics and hypen', function () {
-            expect(apps._validateHostname('#2r', 'cloudron.us')).to.be.an(Error);
-            expect(apps._validateHostname('a%b', 'cloudron.us')).to.be.an(Error);
-            expect(apps._validateHostname('ab_', 'cloudron.us')).to.be.an(Error);
-            expect(apps._validateHostname('a.b', 'cloudron.us')).to.be.an(Error);
-            expect(apps._validateHostname('-ab', 'cloudron.us')).to.be.an(Error);
-            expect(apps._validateHostname('ab-', 'cloudron.us')).to.be.an(Error);
+            expect(apps._validateHostname('#2r', 'example.com', '#2r.example.com')).to.be.an(Error);
+            expect(apps._validateHostname('a%b', 'example.com', 'a%b.example.com')).to.be.an(Error);
+            expect(apps._validateHostname('ab_', 'example.com', 'ab_.example.com')).to.be.an(Error);
+            expect(apps._validateHostname('a.b', 'example.com', 'a.b.example.com')).to.be.an(Error);
+            expect(apps._validateHostname('-ab', 'example.com', '-ab.example.com')).to.be.an(Error);
+            expect(apps._validateHostname('ab-', 'example.com', 'ab-.example.com')).to.be.an(Error);
         });
 
         it('total length cannot exceed 255', function () {
             var s = '';
-            for (var i = 0; i < (255 - 'cloudron.us'.length); i++) s += 's';
+            for (var i = 0; i < (255 - 'example.com'.length); i++) s += 's';
 
-            expect(apps._validateHostname(s, 'cloudron.us')).to.be.an(Error);
+            expect(apps._validateHostname(s, 'example.com', s + '.example.com')).to.be.an(Error);
         });
 
         it('allow valid domains', function () {
-            expect(apps._validateHostname('a', 'cloudron.us')).to.be(null);
-            expect(apps._validateHostname('a0-x', 'cloudron.us')).to.be(null);
-            expect(apps._validateHostname('01', 'cloudron.us')).to.be(null);
+            expect(apps._validateHostname('a', 'example.com', 'a.example.com')).to.be(null);
+            expect(apps._validateHostname('a0-x', 'example.com', 'a0-x.example.com')).to.be(null);
+            expect(apps._validateHostname('01', 'example.com', '01.example.com')).to.be(null);
         });
     });
 

src/test/apptask-test.js

@@ -11,6 +11,7 @@ var addons = require('../addons.js'),
     async = require('async'),
     config = require('../config.js'),
     database = require('../database.js'),
+    domains = require('../domains.js'),
     expect = require('expect.js'),
     fs = require('fs'),
     js2xml = require('js2xmlparser').parse,
@@ -48,12 +49,26 @@ var MANIFEST = {
   }
 };
 
+const DOMAIN_0 = {
+    domain: 'example.com',
+    zoneName: 'example.com',
+    provider: 'route53',
+    config: {
+        accessKeyId: 'accessKeyId',
+        secretAccessKey: 'secretAccessKey',
+        endpoint: 'http://localhost:5353'
+    }
+};
+
 var APP = {
     id: 'appid',
     appStoreId: 'appStoreId',
     installationState: appdb.ISTATE_PENDING_INSTALL,
     runState: null,
     location: 'applocation',
+    domain: DOMAIN_0.domain,
+    intrinsicFqdn: DOMAIN_0.domain + '.' + 'applocation',
+    fqdn: DOMAIN_0.domain + '.' + 'applocation',
     manifest: MANIFEST,
     containerId: null,
     httpPort: 4567,
@@ -63,13 +78,12 @@ var APP = {
     memoryLimit: 0
 };
 
- var awsHostedZones;
+var awsHostedZones;
 
 describe('apptask', function () {
     before(function (done) {
-        config.set('version', '0.5.0');
-        config.setFqdn('foobar.com');
-        config.setZoneName('foobar.com');
+        config._reset();
+        config.setFqdn(DOMAIN_0.domain);
         config.set('provider', 'caas');
 
         awsHostedZones = {
@@ -89,15 +103,19 @@ describe('apptask', function () {
 
         async.series([
             database.initialize,
-            appdb.add.bind(null, APP.id, APP.appStoreId, APP.manifest, APP.location, APP.portBindings, APP),
+            database._clear,
+            domains.update.bind(null, DOMAIN_0.domain, DOMAIN_0.provider, DOMAIN_0.config, null),
+            appdb.add.bind(null, APP.id, APP.appStoreId, APP.manifest, APP.location, APP.domain, APP.portBindings, APP),
             settings.initialize,
-            settings.setDnsConfig.bind(null, { provider: 'route53', accessKeyId: 'accessKeyId', secretAccessKey: 'secretAccessKey', endpoint: 'http://localhost:5353' }, config.fqdn(), config.zoneName()),
             settings.setTlsConfig.bind(null, { provider: 'caas' })
         ], done);
     });
 
     after(function (done) {
-        database._clear(done);
+        async.series([
+            database._clear,
+            database.uninitialize
+        ], done);
     });
 
     it('initializes succesfully', function (done) {
@@ -246,7 +264,7 @@ describe('apptask', function () {
             .post('/2013-04-01/hostedzone/ZONEID/rrset/')
             .reply(200, js2xml('ChangeResourceRecordSetsResponse', { ChangeInfo: { Id: 'RRID', Status: 'INSYNC' } }));
 
-        apptask._unregisterSubdomain(APP, APP.location, function (error) {
+        apptask._unregisterSubdomain(APP, APP.location, APP.domain, function (error) {
             expect(error).to.be(null);
             expect(awsScope.isDone()).to.be.ok();
             done();