Add 1.10.2 changes

In the e2e, we did not check the webadminStatus after a dnsSetup
and immediately rushed into restore. This ended up mangling the
cert/key files of the admin domain.

.gitattributes

@@ -1,7 +1,6 @@
 # following files are skipped when exporting using git archive
 test export-ignore
-.jshintrc export-ignore
-.gitlab export-ignore
+docs export-ignore
 .gitattributes export-ignore
 .gitignore export-ignore
 

.gitlab/issue_templates/Bug.md

@@ -1,6 +0,0 @@
-Please do not use this issue tracker for support requests and bug reports.
-This issue tracker is used by the Cloudron development team to track actual
-bugs in the code.
-
-Please use the forum at https://forum.cloudron.io to report bugs. For
-confidential issues, please email us at support@cloudron.io.

.gitlab/issue_templates/Feature.md

@@ -1,7 +0,0 @@
-Please do not use this issue tracker for support requests and feature reports.
-This issue tracker is used by the Cloudron development team to track issues in
-the code.
-
-Please use the forum at https://forum.cloudron.io to report bugs. For
-confidential issues, please email us at support@cloudron.io.
-

.jshintrc

@@ -2,7 +2,6 @@
     "node": true,
     "browser": true,
     "unused": true,
-    "multistr": true,
     "globalstrict": true,
     "predef": [ "angular", "$" ],
     "esnext": true

CHANGES

@@ -1205,71 +1205,3 @@
 * Configure Exoscale SOS to use new SOS NG endpoint
 * Fix S3 storage backend CopySource encoding rules
 
-[1.11.0]
-* Update Haraka to 2.8.17 to fix various crashes
-* Report dependency error for clone if backup or domain was not found
-* Enable auto-updates for major versions
-
-[2.0.0]
-* Multi-domain support
-* Update Haraka to 2.8.18
-* Split box and app autoupdate pattern settings
-* Stop and disable any pre-installed postfix server
-* Migrate altDomain as a manual DNS provider
-* Use node's native dns resolve instead of dig
-* DNS records can now be a A record or a CNAME record
-* Fix generation of fallback certificates to include naked domain
-* Merge multi-string DKIM records
-* scheduler: do not start cron jobs all at once
-* scheduler: give cron jobs a grace period of 30 minutes to complete
-
-[2.0.1]
-* Multi-domain support
-* Update Haraka to 2.8.18
-* Split box and app autoupdate pattern settings
-* Stop and disable any pre-installed postfix server
-* Migrate altDomain as a manual DNS provider
-* Use node's native dns resolve instead of dig
-* DNS records can now be a A record or a CNAME record
-* Fix generation of fallback certificates to include naked domain
-* Merge multi-string DKIM records
-* scheduler: do not start cron jobs all at once
-* scheduler: give cron jobs a grace period of 30 minutes to complete
-* Rework the eventlog view
-* App clone now clones the robotsTxt and backup settings
-
-[2.1.0]
-* Make S3 backend work reliably with slow internet connections
-* Update docker to 18.03.0-ce
-* Finalize the Email and Mailbox API
-* Move mailbox settings from users to email view
-* mail: fix issue where hosts with valid SPF for a Cloudron domain are unable to send mail to Cloudron
-* mail: fix crash when bounce emails have a null sender
-* Add CSP header for dashboard
-* Add support for installing private docker images
-
-[2.1.1]
-* Make S3 backend work reliably with slow internet connections
-* Update docker to 18.03.0-ce
-* Finalize the Email and Mailbox API
-* Move mailbox settings from users to email view
-* mail: fix issue where hosts with valid SPF for a Cloudron domain are unable to send mail to Cloudron
-* mail: fix crash when bounce emails have a null sender
-* Add CSP header for dashboard
-* Add support for installing private docker images
-
-[2.2.0]
-* Add 2FA support for the admin dashboard
-* Cleanup scope management in REST API
-* Enhance user creation API to take a password
-* Relax restriction on mailbox names now that it is decoupled from user management
-
-[2.2.1]
-* Add 2FA support for the admin dashboard
-* Add Gandi & GoDaddy DNS providers
-* Fix zone detection logic on Route53 accounts with more than 100 zones
-* Warn using when disabling email
-* Cleanup scope management in REST API
-* Enhance user creation API to take a password
-* Relax restriction on mailbox names now that it is decoupled from user management
-* Fix issue where mail container incorrectly advertised CRAM-MD5 support

README.md

@@ -48,11 +48,6 @@ apps up-to-date and secure.
 * [Selfhosting](https://cloudron.io/documentation/installation/) - [Pricing](https://cloudron.io/pricing.html)
 * [Managed Hosting](https://cloudron.io/managed.html)
 
-**Note:** This repo is a small part of what gets installed on your server - there is
-the dashboard, database addons, graph container, base image etc. Cloudron also relies
-on external services such as the App Store for apps to be installed. As such, don't
-clone this repo and npm install and expect something to work.
-
 ## Documentation
 
 * [Documentation](https://cloudron.io/documentation/)
@@ -64,6 +59,6 @@ the containers in the Cloudron.
 
 ## Community
 
-* [Forum](https://forum.cloudron.io/)
+* [Chat](https://chat.cloudron.io/)
 * [Support](mailto:support@cloudron.io)
 

baseimage/initializeBaseUbuntuImage.sh

@@ -105,7 +105,3 @@ systemctl disable bind9 || true
 systemctl stop dnsmasq || true
 systemctl disable dnsmasq || true
 
-# on ssdnodes postfix seems to run by default
-systemctl stop postfix || true
-systemctl disable postfix || true
-

migrations/20180207000000-split-autoupdate-pattern-setting.js

@@ -1,24 +0,0 @@
-'use strict';
-
-var async = require('async');
-
-exports.up = function(db, callback) {
-    db.runSql('SELECT * FROM settings WHERE name=?', ['autoupdate_pattern'], function (error, results) {
-        if (error || results.length === 0) return callback(error); // will use defaults from box code
-
-        // migrate the 'daily' update pattern
-        var appUpdatePattern = results[0].value;
-        if (appUpdatePattern === '00 00 1,3,5,23 * * *') appUpdatePattern = '00 30 1,3,5,23 * * *';
-
-        async.series([
-            db.runSql.bind(db, 'START TRANSACTION;'),
-            db.runSql.bind(db, 'DELETE FROM settings WHERE name=?', ['autoupdate_pattern']),
-            db.runSql.bind(db, 'INSERT settings (name, value) VALUES(?, ?)', ['app_autoupdate_pattern', appUpdatePattern]),
-            db.runSql.bind(db, 'COMMIT')
-        ], callback);
-    });
-};
-
-exports.down = function(db, callback) {
-    callback();
-};

migrations/20180207000001-migrate-altDomain-to-manual-domain.js

@@ -1,121 +0,0 @@
-'use strict';
-
-var async = require('async'),
-    crypto = require('crypto'),
-    fs = require('fs'),
-    os = require('os'),
-    path = require('path'),
-    safe = require('safetydance'),
-    tldjs = require('tldjs');
-
-exports.up = function(db, callback) {
-    db.all('SELECT * FROM apps', function (error, apps) {
-        if (error) return callback(error);
-
-        async.eachSeries(apps, function (app, callback) {
-            if (!app.altDomain) {
-                console.log('App %s does not use altDomain, skip', app.id);
-                return callback();
-            }
-
-            const domain = tldjs.getDomain(app.altDomain);
-            const subdomain = tldjs.getSubdomain(app.altDomain);
-            const mailboxName = (subdomain ? subdomain : JSON.parse(app.manifestJson).title.toLowerCase().replace(/[^a-zA-Z0-9]/g, '')) + '.app';
-
-            console.log('App %s is on domain %s and subdomain %s with mailbox', app.id, domain, subdomain, mailboxName);
-
-            async.series([
-                // Add domain if not exists
-                function (callback) {
-                    const query = 'INSERT INTO domains (domain, zoneName, provider, configJson, tlsConfigJson) VALUES (?, ?, ?, ?, ?)';
-                    const args = [ domain, domain, 'manual', JSON.stringify({}), JSON.stringify({ provider: 'letsencrypt-prod' }) ];
-
-                    db.runSql(query, args, function (error) {
-                        if (error && error.code !== 'ER_DUP_ENTRY') return callback(error);
-
-                        console.log('Added domain %s', domain);
-
-                        // ensure we have a fallback cert for the newly added domain. This is the same as in reverseproxy.js
-                        // WARNING this will only work on the cloudron itself not during local testing!
-                        const certFilePath = `/home/yellowtent/boxdata/certs/${domain}.host.cert`;
-                        const keyFilePath = `/home/yellowtent/boxdata/certs/${domain}.host.key`;
-
-                        if (!fs.existsSync(certFilePath) || !fs.existsSync(keyFilePath)) { // generate it
-                            let opensslConf = safe.fs.readFileSync('/etc/ssl/openssl.cnf', 'utf8');
-                            let opensslConfWithSan = `${opensslConf}\n[SAN]\nsubjectAltName=DNS:${domain}\n`;
-                            let configFile = path.join(os.tmpdir(), 'openssl-' + crypto.randomBytes(4).readUInt32LE(0) + '.conf');
-                            let certCommand = `openssl req -x509 -newkey rsa:2048 -keyout ${keyFilePath} -out ${certFilePath} -days 3650 -subj /CN=*.${domain} -extensions SAN -config ${configFile} -nodes`;
-
-                            safe.fs.writeFileSync(configFile, opensslConfWithSan, 'utf8');
-                            if (!safe.child_process.execSync(certCommand)) return callback(safe.error.message);
-                            safe.fs.unlinkSync(configFile);
-                        }
-
-                        callback();
-                    });
-                },
-                // Add domain to mail table if not exists
-                function (callback) {
-                    const query = 'INSERT INTO mail (domain, enabled, mailFromValidation, catchAllJson, relayJson) VALUES (?, ?, ?, ?, ?)';
-                    const args = [ domain, 0, 1, '[]', JSON.stringify({ provider: 'cloudron-smtp' }) ];
-
-                    db.runSql(query, args, function (error) {
-                        if (error && error.code !== 'ER_DUP_ENTRY') return callback(error);
-
-                        console.log('Added domain %s to mail table', domain);
-
-                        callback();
-                    });
-                },
-                // Remove old mailbox record if any
-                function (callback) {
-                    const query = 'DELETE FROM mailboxes WHERE ownerId=?';
-                    const args = [ app.id ];
-
-                    db.runSql(query, args, function (error) {
-                        if (error) return callback(error);
-
-                        console.log('Cleaned up mailbox record for app %s', app.id);
-
-                        callback();
-                    });
-                },
-                // Add new mailbox record
-                function (callback) {
-                    const query = 'INSERT INTO mailboxes (name, domain, ownerId, ownerType) VALUES (?, ?, ?, ?)';
-                    const args = [ mailboxName, domain, app.id, 'app' /* mailboxdb.TYPE_APP */ ];
-
-                    db.runSql(query, args, function (error) {
-                        if (error) return callback(error);
-
-                        console.log('Added mailbox record for app %s', app.id);
-
-                        callback();
-                    });
-                },
-                // Update app record
-                function (callback) {
-                    const query = 'UPDATE apps SET location=?, domain=?, altDomain=? WHERE id=?';
-                    const args = [ subdomain, domain, '', app.id ];
-
-                    db.runSql(query, args, function (error) {
-                        if (error) return error;
-
-                        console.log('Updated app %s with new domain', app.id);
-
-                        callback();
-                    });
-                }
-            ], callback);
-        }, function (error) {
-            if (error) return callback(error);
-
-            // finally drop the altDomain db field
-            db.runSql('ALTER TABLE apps DROP COLUMN altDomain', [], callback);
-        });
-    });
-};
-
-exports.down = function(db, callback) {
-    db.runSql('ALTER TABLE apps ADD COLUMN altDomain VARCHAR(256)', [], callback);
-};

migrations/20180211052642-mailboxes-alter-domains-constraint.js

@@ -1,19 +0,0 @@
-'use strict';
-
-var async = require('async');
-
-exports.up = function(db, callback) {
-    async.series([
-        db.runSql.bind(db, 'START TRANSACTION;'),
-        db.runSql.bind(db, 'ALTER TABLE mailboxes DROP FOREIGN KEY mailboxes_domain_constraint'),
-        db.runSql.bind(db, 'ALTER TABLE mailboxes ADD CONSTRAINT mailboxes_domain_constraint FOREIGN KEY(domain) REFERENCES mail(domain)'),
-        db.runSql.bind(db, 'COMMIT')
-    ], callback);
-};
-
-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/20180405222626-mailboxes-add-members.js

@@ -1,51 +0,0 @@
-'use strict';
-
-var async = require('async');
-
-exports.up = function(db, callback) {
-    var users = { }, groupMembers = { };
-
-    async.series([
-        db.runSql.bind(db, 'START TRANSACTION;'),
-        db.runSql.bind(db, 'ALTER TABLE mailboxes ADD COLUMN membersJson TEXT'),
-        function getUsers(done) {
-            db.all('SELECT * from users', [ ], function (error, results) {
-                if (error) return done(error);
-
-                results.forEach(function (result) { users[result.id] = result; });
-
-                done();
-            });
-        },
-        function getGroups(done) {
-            db.all('SELECT id, name, GROUP_CONCAT(groupMembers.userId) AS userIds ' +
-                ' FROM groups LEFT OUTER JOIN groupMembers ON groups.id = groupMembers.groupId ' +
-                ' GROUP BY groups.id', [ ], function (error, results) {
-                if (error) return done(error);
-
-                results.forEach(function (result) {
-                    var userIds = result.userIds ? result.userIds.split(',') : [];
-                    var members = userIds.map(function (id) { return users[id].username; });
-                    groupMembers[result.id] = members;
-                });
-
-                done();
-            });
-        },
-        function removeGroupIdAndSetMembers(done) {
-            async.eachSeries(Object.keys(groupMembers), function (gid, iteratorDone) {
-                console.log(`Migrating group id ${gid} to ${JSON.stringify(groupMembers[gid])}`);
-
-                db.runSql('UPDATE mailboxes SET membersJson = ?, ownerId = ? WHERE ownerId = ?', [ JSON.stringify(groupMembers[gid]), 'admin', gid ], iteratorDone);
-            }, done);
-        },
-        db.runSql.bind(db, 'COMMIT')
-    ], callback);
-};
-
-exports.down = function(db, callback) {
-    db.runSql('ALTER TABLE mailboxes DROP COLUMN membersJson', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};

migrations/20180408014539-mailboxes-add-type.js

@@ -1,34 +0,0 @@
-'use strict';
-
-var async = require('async');
-
-exports.up = function(db, callback) {
-    async.series([
-        db.runSql.bind(db, 'START TRANSACTION;'),
-        db.runSql.bind(db, 'ALTER TABLE mailboxes ADD COLUMN type VARCHAR(16)'),
-        function addMailboxType(done) {
-            db.all('SELECT * from mailboxes', [ ], function (error, results) {
-                if (error) return done(error);
-
-                async.eachSeries(results, function (mailbox, iteratorCallback) {
-                    let type = 'mailbox';
-                    if (mailbox.aliasTarget) {
-                        type = 'alias';
-                    } else if (mailbox.membersJson) {
-                        type = 'list';
-                    }
-                    db.runSql('UPDATE mailboxes SET type = ? WHERE name = ? AND domain = ?', [ type, mailbox.name, mailbox.domain ], iteratorCallback);
-                }, done);
-            });
-        },
-        db.runSql.bind(db, 'ALTER TABLE mailboxes MODIFY type VARCHAR(16) NOT NULL'),
-        db.runSql.bind(db, 'COMMIT')
-    ], callback);
-};
-
-exports.down = function(db, callback) {
-    db.runSql('ALTER TABLE mailboxes DROP COLUMN membersJson', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};

migrations/20180425142932-user-add-twoFactorAuthenticationSecret.js

@@ -1,15 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-    db.runSql('ALTER TABLE users ADD COLUMN twoFactorAuthenticationSecret VARCHAR(128) DEFAULT "", ADD COLUMN twoFactorAuthenticationEnabled BOOLEAN DEFAULT false', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
-
-exports.down = function(db, callback) {
-    db.runSql('ALTER TABLE users DROP twoFactorAuthenticationSecret, DROP twoFactorAuthenticationEnabled', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};

migrations/20180429235008-fixes-scopes.js

@@ -1,21 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-    db.runSql('UPDATE clients SET scope=? WHERE id=? OR id=? OR id=?', ['*', 'cid-webadmin', 'cid-sdk', 'cid-cli'], function (error) {
-        if (error) console.error(error);
-
-        db.runSql('UPDATE tokens SET scope=? WHERE scope LIKE ?', ['*', '%*%'], function (error) { // remove the roleSdk
-            if (error) console.error(error);
-
-            db.runSql('UPDATE tokens SET expires=? WHERE clientId=?', [ 1525636734905, 'cid-webadmin' ], function (error) { // force webadmin to get a new token
-                if (error) console.error(error);
-
-                callback(error);
-            });
-        });
-    });
-};
-
-exports.down = function(db, callback) {
-    callback();
-};

migrations/schema.sql

@@ -21,10 +21,9 @@ CREATE TABLE IF NOT EXISTS users(
     salt VARCHAR(512) NOT NULL,
     createdAt VARCHAR(512) NOT NULL,
     modifiedAt VARCHAR(512) NOT NULL,
-    displayName VARCHAR(512) DEFAULT "",
-    fallbackEmail VARCHAR(512) DEFAULT "",
-    twoFactorAuthenticationSecret VARCHAR(128) DEFAULT "",
-    twoFactorAuthenticationEnabled BOOLEAN DEFAULT false,
+    admin INTEGER NOT NULL,
+    displayName VARCHAR(512) DEFAULT '',
+    fallbackEmail VARCHAR(512) DEFAULT ""
 
     PRIMARY KEY(id));
 
@@ -73,6 +72,7 @@ CREATE TABLE IF NOT EXISTS apps(
     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
@@ -81,8 +81,8 @@ CREATE TABLE IF NOT EXISTS apps(
 
     // 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 to apptask (configure, restore)
-    updateConfigJson TEXT, // used to pass new config to apptask (update)
+    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));
@@ -130,10 +130,25 @@ CREATE TABLE IF NOT EXISTS eventlog(
     action VARCHAR(128) NOT NULL,
     source TEXT, /* { userId, username, ip }. userId can be null for cron,sysadmin */
     data TEXT, /* free flowing json based on action */
-    createdAt TIMESTAMP(2) NOT NULL,
+    creationTime TIMESTAMP, /* FIXME: precision must be TIMESTAMP(2) */
 
     PRIMARY KEY (id));
 
+/* Future fields:
+   * accessRestriction - to determine who can access it. So this has foreign keys
+   * quota - per mailbox quota
+*/
+CREATE TABLE IF NOT EXISTS mailboxes(
+    name VARCHAR(128) NOT NULL,
+    ownerId VARCHAR(128) NOT NULL, /* app id or user id or group id */
+    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),
+    UNIQUE (name, domain));
+
 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 */
@@ -159,20 +174,4 @@ CREATE TABLE IF NOT EXISTS mail(
 
     CHARACTER SET utf8 COLLATE utf8_bin;
 
-/* Future fields:
-   * accessRestriction - to determine who can access it. So this has foreign keys
-   * quota - per mailbox quota
-*/
-CREATE TABLE IF NOT EXISTS mailboxes(
-    name VARCHAR(128) NOT NULL,
-    type VARCHAR(16) NOT NULL, /* 'mailbox', 'alias', 'list' */
-    ownerId VARCHAR(128) NOT NULL, /* app id or user id or group id */
-    ownerType VARCHAR(16) NOT NULL, /* 'app' or 'user' or 'group' */
-    aliasTarget VARCHAR(128), /* the target name type is an alias */
-    membersJson TEXT, /* members of a group */
-    creationTime TIMESTAMP,
-    domain VARCHAR(128),
-
-    FOREIGN KEY(domain) REFERENCES mail(domain),
-    UNIQUE (name, domain));
 

package.json

@@ -14,11 +14,11 @@
     "node": ">=4.0.0 <=4.1.1"
   },
   "dependencies": {
-    "@google-cloud/dns": "^0.7.1",
-    "@google-cloud/storage": "^1.6.0",
+    "@google-cloud/dns": "^0.7.0",
+    "@google-cloud/storage": "^1.2.1",
     "@sindresorhus/df": "^2.1.0",
     "async": "^2.6.0",
-    "aws-sdk": "^2.201.0",
+    "aws-sdk": "^2.151.0",
     "body-parser": "^1.18.2",
     "cloudron-manifestformat": "^2.11.0",
     "connect-ensure-login": "^0.1.1",
@@ -28,24 +28,24 @@
     "cookie-session": "^1.3.2",
     "cron": "^1.3.0",
     "csurf": "^1.6.6",
-    "db-migrate": "^0.10.5",
+    "db-migrate": "^0.10.0-beta.24",
     "db-migrate-mysql": "^1.1.10",
     "debug": "^3.1.0",
-    "dockerode": "^2.5.4",
+    "dockerode": "^2.5.3",
     "ejs": "^2.5.7",
     "ejs-cli": "^2.0.0",
     "express": "^4.16.2",
     "express-session": "^1.15.6",
     "hat": "0.0.3",
     "json": "^9.0.3",
-    "ldapjs": "^1.0.2",
+    "ldapjs": "^1.0.0",
     "lodash.chunk": "^4.2.0",
-    "mime": "^2.2.0",
+    "mime": "^2.0.3",
     "moment-timezone": "^0.5.14",
     "morgan": "^1.9.0",
     "multiparty": "^4.1.2",
     "mysql": "^2.15.0",
-    "nodemailer": "^4.6.0",
+    "nodemailer": "^4.4.0",
     "nodemailer-smtp-transport": "^2.7.4",
     "oauth2orize": "^1.11.0",
     "once": "^1.3.2",
@@ -58,37 +58,45 @@
     "password-generator": "^2.2.0",
     "progress-stream": "^2.0.0",
     "proxy-middleware": "^0.15.0",
-    "qrcode": "^1.2.0",
     "recursive-readdir": "^2.2.1",
     "request": "^2.83.0",
     "s3-block-read-stream": "^0.2.0",
     "safetydance": "^0.7.1",
-    "semver": "^5.5.0",
+    "semver": "^5.4.1",
     "showdown": "^1.8.2",
-    "speakeasy": "^2.0.0",
     "split": "^1.0.0",
     "superagent": "^3.8.1",
     "supererror": "^0.7.1",
     "tar-fs": "^1.16.0",
     "tar-stream": "^1.5.5",
-    "tldjs": "^2.3.1",
+    "tldjs": "^2.2.0",
     "underscore": "^1.7.0",
-    "uuid": "^3.2.1",
+    "uuid": "^3.1.0",
     "valid-url": "^1.0.9",
-    "validator": "^9.4.1",
-    "ws": "^3.3.3"
+    "validator": "^9.1.1",
+    "ws": "^3.3.1"
   },
   "devDependencies": {
+    "bootstrap-sass": "^3.3.3",
     "expect.js": "*",
+    "gulp": "^3.9.1",
+    "gulp-autoprefixer": "^4.0.0",
+    "gulp-concat": "^2.4.3",
+    "gulp-cssnano": "^2.1.0",
+    "gulp-ejs": "^3.1.0",
+    "gulp-sass": "^3.1.0",
+    "gulp-serve": "^1.0.0",
+    "gulp-sourcemaps": "^2.6.1",
+    "gulp-uglify": "^3.0.0",
     "hock": "^1.3.2",
     "istanbul": "*",
     "js2xmlparser": "^3.0.0",
-    "mocha": "^5.0.1",
+    "mocha": "*",
     "mock-aws-s3": "git+https://github.com/cloudron-io/mock-aws-s3.git",
     "nock": "^9.0.14",
     "node-sass": "^4.6.1",
     "readdirp": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz",
-    "rimraf": "^2.6.2"
+    "yargs": "^10.0.3"
   },
   "scripts": {
     "migrate_local": "DATABASE_URL=mysql://root:@localhost/box node_modules/.bin/db-migrate up",
@@ -98,6 +106,6 @@
     "postmerge": "/bin/true",
     "precommit": "/bin/true",
     "prepush": "npm test",
-    "dashboard": "node_modules/.bin/gulp"
+    "webadmin": "node_modules/.bin/gulp"
   }
 }

scripts/cloudron-setup

@@ -2,6 +2,16 @@
 
 set -eu -o pipefail
 
+if [[ ${EUID} -ne 0 ]]; then
+    echo "This script should be run as root." > /dev/stderr
+    exit 1
+fi
+
+if [[ $(lsb_release -rs) != "16.04" ]]; then
+    echo "Cloudron requires Ubuntu 16.04" > /dev/stderr
+    exit 1
+fi
+
 # change this to a hash when we make a upgrade release
 readonly LOG_FILE="/var/log/cloudron-setup.log"
 readonly DATA_FILE="/root/cloudron-install-data.json"
@@ -16,10 +26,6 @@ readonly physical_memory=$(LC_ALL=C free -m | awk '/Mem:/ { print $2 }')
 readonly disk_size_bytes=$(LC_ALL=C df --output=size / | tail -n1)
 readonly disk_size_gb=$((${disk_size_bytes}/1024/1024))
 
-readonly RED='\033[31m'
-readonly GREEN='\033[32m'
-readonly DONE='\033[m'
-
 # verify the system has minimum requirements met
 if [[ "${rootfs_type}" != "ext4" ]]; then
     echo "Error: Cloudron requires '/' to be ext4" # see #364
@@ -75,18 +81,6 @@ while true; do
     esac
 done
 
-# Only --help works as non-root
-if [[ ${EUID} -ne 0 ]]; then
-    echo "This script should be run as root." > /dev/stderr
-    exit 1
-fi
-
-# Only --help works with mismatched ubuntu
-if [[ $(lsb_release -rs) != "16.04" ]]; then
-    echo "Cloudron requires Ubuntu 16.04" > /dev/stderr
-    exit 1
-fi
-
 # validate arguments in the absence of data
 if [[ -z "${provider}" ]]; then
     echo "--provider is required (azure, cloudscale, digitalocean, ec2, exoscale, hetzner, lightsail, linode, ovh, rosehosting, scaleway, vultr or generic)"
@@ -94,7 +88,6 @@ if [[ -z "${provider}" ]]; then
 elif [[  \
             "${provider}" != "ami" && \
             "${provider}" != "azure" && \
-            "${provider}" != "caas" && \
             "${provider}" != "cloudscale" && \
             "${provider}" != "digitalocean" && \
             "${provider}" != "ec2" && \
@@ -126,7 +119,7 @@ echo ""
 echo " Follow setup logs in a second terminal with:"
 echo " $ tail -f ${LOG_FILE}"
 echo ""
-echo " Join us at https://forum.cloudron.io for any questions."
+echo " Join us at https://chat.cloudron.io for any questions."
 echo ""
 
 if [[ "${initBaseImage}" == "true" ]]; then
@@ -205,10 +198,10 @@ while true; do
     sleep 10
 done
 
-echo -e "\n\n${GREEN}Visit https://<IP> and accept the self-signed certificate to finish setup.${DONE}"
+echo -e "\n\nVisit https://<IP> to finish setup once the server has rebooted.\n"
 
 if [[ "${rebootServer}" == "true" ]]; then
-    echo -e "\n${RED}Rebooting this server now to let changes take effect.${DONE}\n"
+    echo -e "\n\nRebooting this server now to let bootloader changes take effect.\n"
     systemctl stop mysql # sometimes mysql ends up having corrupt privilege tables
     systemctl reboot
 fi

scripts/createReleaseTarball

@@ -29,8 +29,8 @@ if ! $(cd "${SOURCE_DIR}" && git diff --exit-code >/dev/null); then
     exit 1
 fi
 
-if ! $(cd "${SOURCE_DIR}/../dashboard" && git diff --exit-code >/dev/null); then
-    echo "You have local changes in dashboard, stash or commit them to proceed"
+if ! $(cd "${SOURCE_DIR}/../webadmin" && git diff --exit-code >/dev/null); then
+    echo "You have local changes in webadmin, stash or commit them to proceed"
     exit 1
 fi
 
@@ -41,40 +41,53 @@ fi
 
 box_version=$(cd "${SOURCE_DIR}" && git rev-parse "HEAD")
 branch=$(git rev-parse --abbrev-ref HEAD)
-if [[ "${branch}" == "master" ]]; then
-    dashboard_version=$(cd "${SOURCE_DIR}/../dashboard" && git rev-parse "${branch}")
-else
-    dashboard_version=$(cd "${SOURCE_DIR}/../dashboard" && git fetch && git rev-parse "origin/${branch}")
-fi
+webadmin_version=$(cd "${SOURCE_DIR}/../webadmin" && git fetch && git rev-parse "origin/${branch}")
 bundle_dir=$(mktemp -d -t box 2>/dev/null || mktemp -d box-XXXXXXXXXX --tmpdir=$TMPDIR)
-[[ -z "$bundle_file" ]] && bundle_file="${TMPDIR}/box-${box_version:0:10}-${dashboard_version:0:10}.tar.gz"
+[[ -z "$bundle_file" ]] && bundle_file="${TMPDIR}/box-${box_version:0:10}-${webadmin_version:0:10}.tar.gz"
 
 chmod "o+rx,g+rx" "${bundle_dir}" # otherwise extracted tarball director won't be readable by others/group
-echo "==> Checking out code box version [${box_version}] and dashboard version [${dashboard_version}] into ${bundle_dir}"
+echo "Checking out code box version [${box_version}] and webadmin version [${webadmin_version}] into ${bundle_dir}"
 (cd "${SOURCE_DIR}" && git archive --format=tar ${box_version} | (cd "${bundle_dir}" && tar xf -))
-(cd "${SOURCE_DIR}/../dashboard" && git archive --format=tar ${dashboard_version} | (mkdir -p "${bundle_dir}/dashboard.build" && cd "${bundle_dir}/dashboard.build" && tar xf -))
-(cp "${SOURCE_DIR}/../dashboard/LICENSE" "${bundle_dir}")
+(cd "${SOURCE_DIR}/../webadmin" && git archive --format=tar ${webadmin_version} | (cd "${bundle_dir}" && tar xf -))
+(cp "${SOURCE_DIR}/../webadmin/LICENSE" "${bundle_dir}")
 
-echo "==> Installing modules for dashboard asset generation"
-(cd "${bundle_dir}/dashboard.build" && npm install --production)
+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
+    echo "Installing modules with dev dependencies"
+    (cd "${bundle_dir}" && npm install)
 
-echo "==> Building dashboard assets"
-(cd "${bundle_dir}/dashboard.build" && ./node_modules/.bin/gulp --revision ${dashboard_version})
+    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}/package-lock.json" "${TMPDIR}/boxtarball.cache/package-lock.json.all"
+fi
 
-echo "==> Move built dashboard assets into destination"
-mkdir -p "${bundle_dir}/dashboard"
-mv "${bundle_dir}/dashboard.build/dist" "${bundle_dir}/dashboard/"
+echo "Building webadmin assets"
+(cd "${bundle_dir}" && ./node_modules/.bin/gulp)
 
-echo "==> Cleanup dashboard build artifacts"
-rm -rf "${bundle_dir}/dashboard.build"
+echo "Remove intermediate files required at build-time only"
+rm -rf "${bundle_dir}/node_modules/"
+rm -rf "${bundle_dir}/webadmin/src"
+rm -rf "${bundle_dir}/gulpfile.js"
 
-echo "==> Installing toplevel node modules"
-(cd "${bundle_dir}" && npm install --production --no-optional)
+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
+    echo "Installing modules for production"
+    (cd "${bundle_dir}" && npm install --production --no-optional)
 
-echo "==> Create final tarball"
+    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}/package-lock.json" "${TMPDIR}/boxtarball.cache/package-lock.json.prod"
+fi
+
+echo "Create final tarball"
 (cd "${bundle_dir}" && tar czf "${bundle_file}" .)
-
-echo "==> Cleaning up ${bundle_dir}"
+echo "Cleaning up ${bundle_dir}"
 rm -rf "${bundle_dir}"
 
-echo "==> Tarball saved at ${bundle_file}"
+echo "Tarball saved at ${bundle_file}"

scripts/installer.sh

@@ -35,11 +35,11 @@ while true; do
 done
 
 echo "==> installer: updating docker"
-if [[ $(docker version --format {{.Client.Version}}) != "18.03.0-ce" ]]; then
-    $curl -sL https://download.docker.com/linux/ubuntu/dists/xenial/pool/stable/amd64/docker-ce_18.03.0~ce-0~ubuntu_amd64.deb -o /tmp/docker.deb
+if [[ $(docker version --format {{.Client.Version}}) != "17.09.0-ce" ]]; then
+    $curl -sL https://download.docker.com/linux/ubuntu/dists/xenial/pool/stable/amd64/docker-ce_17.09.0~ce-0~ubuntu_amd64.deb -o /tmp/docker.deb
 
     # https://download.docker.com/linux/ubuntu/dists/xenial/stable/binary-amd64/Packages
-    if [[ $(sha256sum /tmp/docker.deb | cut -d' ' -f1) != "1f7315b5723b849fe542fe973b0edb4164a0200e926d386ac14363a968f9e4fc" ]]; then
+    if [[ $(sha256sum /tmp/docker.deb | cut -d' ' -f1) != "d33f6eb134f0ab0876148bd96de95ea47d583d7f2cddfdc6757979453f9bd9bf" ]]; then
         echo "==> installer: docker binary download is corrupt"
         exit 5
     fi
@@ -54,12 +54,6 @@ if [[ $(docker version --format {{.Client.Version}}) != "18.03.0-ce" ]]; then
         sleep 1
     done
 
-    # the latest docker might need newer packages
-    while ! apt update -y; do
-        echo "==> installer: Failed to update packages. Retry"
-        sleep 1
-    done
-
     while ! apt install -y /tmp/docker.deb; do
         echo "==> installer: Failed to install docker. Retry"
         sleep 1

setup/start.sh

@@ -214,8 +214,8 @@ cat > "${CONFIG_DIR}/cloudron.conf" <<CONF_END
 }
 CONF_END
 
-echo "==> Creating config.json for dashboard"
-cat > "${BOX_SRC_DIR}/dashboard/dist/config.json" <<CONF_END
+echo "==> Creating config.json for webadmin"
+cat > "${BOX_SRC_DIR}/webadmin/dist/config.json" <<CONF_END
 {
     "webServerOrigin": "${arg_web_server_origin}"
 }

setup/start/nginx/appconfig.ejs

@@ -66,9 +66,8 @@ server {
     # https://raymii.org/s/tutorials/Strong_SSL_Security_On_nginx.html
     ssl_prefer_server_ciphers on;
     ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # don't use SSLv3 ref: POODLE
-
-    # ciphers according to https://mozilla.github.io/server-side-tls/ssl-config-generator/?server=nginx-1.10.3&openssl=1.0.2g&hsts=yes&profile=modern
-    ssl_ciphers 'ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256';
+    # ciphers according to https://weakdh.org/sysadmin.html
+    ssl_ciphers 'ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA';
     ssl_dhparam /home/yellowtent/boxdata/dhparams.pem;
     add_header Strict-Transport-Security "max-age=15768000";
 
@@ -90,11 +89,6 @@ server {
     add_header Referrer-Policy "no-referrer-when-downgrade";
     proxy_hide_header Referrer-Policy;
 
-    # CSP headers for the admin/dashboard resources
-<% if ( endpoint === 'admin' ) { -%>
-    add_header Content-Security-Policy "default-src 'none'; connect-src wss: https: 'self' *.cloudron.io; script-src https: 'self' 'unsafe-inline' 'unsafe-eval'; img-src * data:; style-src https: 'unsafe-inline'; object-src 'none'; font-src https: 'self'; frame-ancestors 'none'; base-uri 'none'; form-action 'self';";
-<% } -%>
-
     proxy_http_version 1.1;
     proxy_intercept_errors on;
     proxy_read_timeout       3500;
@@ -112,7 +106,7 @@ server {
     proxy_set_header Connection $connection_upgrade;
 
     # only serve up the status page if we get proxy gateway errors
-    root <%= sourceDir %>/dashboard/dist;
+    root <%= sourceDir %>/webadmin/dist;
     error_page 502 503 504 /appstatus.html;
     location /appstatus.html {
         internal;
@@ -166,7 +160,7 @@ server {
         # }
 
         location / {
-            root   <%= sourceDir %>/dashboard/dist;
+            root   <%= sourceDir %>/webadmin/dist;
             index  index.html index.htm;
         }
 <% } else if ( endpoint === 'app' ) { %>

src/accesscontrol.js

@@ -1,190 +0,0 @@
-'use strict';
-
-exports = module.exports = {
-    SCOPE_APPS: 'apps',
-    SCOPE_CLIENTS: 'clients',
-    SCOPE_CLOUDRON: 'cloudron',
-    SCOPE_DOMAINS: 'domains',
-    SCOPE_MAIL: 'mail',
-    SCOPE_PROFILE: 'profile',
-    SCOPE_SETTINGS: 'settings',
-    SCOPE_USERS: 'users',
-    VALID_SCOPES: [ 'apps', 'clients', 'cloudron', 'domains', 'mail', 'profile', 'settings', 'users' ],
-
-    SCOPE_ANY: '*',
-
-    initialize: initialize,
-    uninitialize: uninitialize,
-
-    accessTokenAuth: accessTokenAuth,
-
-    validateScope: validateScope,
-    validateRequestedScopes: validateRequestedScopes,
-    normalizeScope: normalizeScope,
-    canonicalScope: canonicalScope
-};
-
-var assert = require('assert'),
-    BasicStrategy = require('passport-http').BasicStrategy,
-    BearerStrategy = require('passport-http-bearer').Strategy,
-    clients = require('./clients'),
-    ClientPasswordStrategy = require('passport-oauth2-client-password').Strategy,
-    ClientsError = clients.ClientsError,
-    DatabaseError = require('./databaseerror'),
-    debug = require('debug')('box:accesscontrol'),
-    LocalStrategy = require('passport-local').Strategy,
-    passport = require('passport'),
-    tokendb = require('./tokendb'),
-    users = require('./users.js'),
-    UsersError = users.UsersError,
-    _ = require('underscore');
-
-function initialize(callback) {
-    assert.strictEqual(typeof callback, 'function');
-
-    passport.serializeUser(function (user, callback) {
-        callback(null, user.id);
-    });
-
-    passport.deserializeUser(function(userId, callback) {
-        users.get(userId, function (error, result) {
-            if (error) return callback(error);
-
-            callback(null, result);
-        });
-    });
-
-    passport.use(new LocalStrategy(function (username, password, callback) {
-        if (username.indexOf('@') === -1) {
-            users.verifyWithUsername(username, password, function (error, result) {
-                if (error && error.reason === UsersError.NOT_FOUND) return callback(null, false);
-                if (error && error.reason === UsersError.WRONG_PASSWORD) return callback(null, false);
-                if (error) return callback(error);
-                if (!result) return callback(null, false);
-                callback(null, result);
-            });
-        } else {
-            users.verifyWithEmail(username, password, function (error, result) {
-                if (error && error.reason === UsersError.NOT_FOUND) return callback(null, false);
-                if (error && error.reason === UsersError.WRONG_PASSWORD) return callback(null, false);
-                if (error) return callback(error);
-                if (!result) return callback(null, false);
-                callback(null, result);
-            });
-        }
-    }));
-
-    passport.use(new BasicStrategy(function (username, password, callback) {
-        if (username.indexOf('cid-') === 0) {
-            debug('BasicStrategy: detected client id %s instead of username:password', username);
-            // username is actually client id here
-            // password is client secret
-            clients.get(username, function (error, client) {
-                if (error && error.reason === ClientsError.NOT_FOUND) return callback(null, false);
-                if (error) return callback(error);
-                if (client.clientSecret != password) return callback(null, false);
-                return callback(null, client);
-            });
-        } else {
-            users.verifyWithUsername(username, password, function (error, result) {
-                if (error && error.reason === UsersError.NOT_FOUND) return callback(null, false);
-                if (error && error.reason === UsersError.WRONG_PASSWORD) return callback(null, false);
-                if (error) return callback(error);
-                if (!result) return callback(null, false);
-                callback(null, result);
-            });
-        }
-    }));
-
-    passport.use(new ClientPasswordStrategy(function (clientId, clientSecret, callback) {
-        clients.get(clientId, function(error, client) {
-            if (error && error.reason === ClientsError.NOT_FOUND) return callback(null, false);
-            if (error) { return callback(error); }
-            if (client.clientSecret != clientSecret) { return callback(null, false); }
-            return callback(null, client);
-        });
-    }));
-
-    passport.use(new BearerStrategy(accessTokenAuth));
-
-    callback(null);
-}
-
-function uninitialize(callback) {
-    assert.strictEqual(typeof callback, 'function');
-
-    callback(null);
-}
-
-function canonicalScope(scope) {
-    return scope.replace(exports.SCOPE_ANY, exports.VALID_SCOPES.join(','));
-}
-
-function normalizeScope(allowedScope, wantedScope) {
-    assert.strictEqual(typeof allowedScope, 'string');
-    assert.strictEqual(typeof wantedScope, 'string');
-
-    const allowedScopes = allowedScope.split(',');
-    const wantedScopes = wantedScope.split(',');
-
-    if (allowedScopes.indexOf(exports.SCOPE_ANY) !== -1) return canonicalScope(wantedScope);
-    if (wantedScopes.indexOf(exports.SCOPE_ANY) !== -1) return canonicalScope(allowedScope);
-
-    return _.intersection(allowedScopes, wantedScopes).join(',');
-}
-
-function accessTokenAuth(accessToken, callback) {
-    assert.strictEqual(typeof accessToken, 'string');
-    assert.strictEqual(typeof callback, 'function');
-
-    tokendb.get(accessToken, function (error, token) {
-        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(null, false);
-        if (error) return callback(error);
-
-        users.get(token.identifier, function (error, user) {
-            if (error && error.reason === UsersError.NOT_FOUND) return callback(null, false);
-            if (error) return callback(error);
-
-            // scopes here can define what capabilities that token carries
-            // passport put the 'info' object into req.authInfo, where we can further validate the scopes
-            var scope = normalizeScope(user.scope, token.scope);
-            var info = { scope: scope, clientId: token.clientId };
-
-            callback(null, user, info);
-        });
-    });
-}
-
-function validateScope(scope) {
-    assert.strictEqual(typeof scope, 'string');
-
-    if (scope === '') return new Error('Empty scope not allowed');
-
-    // NOTE: this function intentionally does not allow '*'. This is only allowed in the db to allow
-    // us not write a migration script every time we add a new scope
-    var allValid = scope.split(',').every(function (s) { return exports.VALID_SCOPES.indexOf(s) !== -1; });
-    if (!allValid) return new Error('Invalid scope. Available scopes are ' + exports.VALID_SCOPES.join(', '));
-
-    return null;
-}
-
-// tests if all requestedScopes are attached to the request
-function validateRequestedScopes(authInfo, requestedScopes) {
-    assert.strictEqual(typeof authInfo, 'object');
-    assert(Array.isArray(requestedScopes));
-
-    if (!authInfo || !authInfo.scope) return new Error('No scope found');
-
-    var scopes = authInfo.scope.split(',');
-
-    if (scopes.indexOf(exports.SCOPE_ANY) !== -1) return null;
-
-    for (var i = 0; i < requestedScopes.length; ++i) {
-        if (scopes.indexOf(requestedScopes[i]) === -1) {
-            debug('scope: missing scope "%s".', requestedScopes[i]);
-            return new Error('Missing required scope "' + requestedScopes[i] + '"');
-        }
-    }
-
-    return null;
-}

src/addons.js

@@ -15,8 +15,7 @@ exports = module.exports = {
     _teardownOauth: teardownOauth
 };
 
-var accesscontrol = require('./accesscontrol.js'),
-    appdb = require('./appdb.js'),
+var appdb = require('./appdb.js'),
     assert = require('assert'),
     async = require('async'),
     clients = require('./clients.js'),
@@ -29,7 +28,6 @@ var accesscontrol = require('./accesscontrol.js'),
     generatePassword = require('password-generator'),
     hat = require('hat'),
     infra = require('./infra_version.js'),
-    mail = require('./mail.js'),
     mailboxdb = require('./mailboxdb.js'),
     once = require('once'),
     path = require('path'),
@@ -114,9 +112,10 @@ var KNOWN_ADDONS = {
 var RMAPPDIR_CMD = path.join(__dirname, 'scripts/rmappdir.sh');
 
 function debugApp(app, args) {
-    assert(typeof app === 'object');
+    assert(!app || typeof app === 'object');
 
-    debug(app.fqdn + ' ' + util.format.apply(util, Array.prototype.slice.call(arguments, 1)));
+    var prefix = app ? app.intrinsicFqdn : '(no app)';
+    debug(prefix + ' ' + util.format.apply(util, Array.prototype.slice.call(arguments, 1)));
 }
 
 function setupAddons(app, addons, callback) {
@@ -251,8 +250,8 @@ function setupOauth(app, options, callback) {
     if (!app.sso) return callback(null);
 
     var appId = app.id;
-    var redirectURI = 'https://' + app.fqdn;
-    var scope = accesscontrol.SCOPE_PROFILE;
+    var redirectURI = 'https://' + (app.altDomain || app.intrinsicFqdn);
+    var scope = 'profile';
 
     clients.delByAppIdAndType(appId, clients.TYPE_OAUTH, function (error) { // remove existing creds
         if (error && error.reason !== ClientsError.NOT_FOUND) return callback(error);
@@ -292,27 +291,20 @@ function setupEmail(app, options, callback) {
     assert.strictEqual(typeof options, 'object');
     assert.strictEqual(typeof callback, 'function');
 
-    mail.getDomains(function (error, mailDomains) {
-        if (error) return callback(error);
+    // note that "external" access info can be derived from MAIL_DOMAIN (since it's part of user documentation)
+    var env = [
+        { name: 'MAIL_SMTP_SERVER', value: 'mail' },
+        { name: 'MAIL_SMTP_PORT', value: '2525' },
+        { name: 'MAIL_IMAP_SERVER', value: 'mail' },
+        { name: 'MAIL_IMAP_PORT', value: '9993' },
+        { name: 'MAIL_SIEVE_SERVER', value: 'mail' },
+        { name: 'MAIL_SIEVE_PORT', value: '4190' },
+        { name: 'MAIL_DOMAIN', value: app.domain }
+    ];
 
-        const mailInDomains = mailDomains.filter(function (d) { return d.enabled; }).map(function (d) { return d.domain; }).join(',');
+    debugApp(app, 'Setting up Email');
 
-        // note that "external" access info can be derived from MAIL_DOMAIN (since it's part of user documentation)
-        var env = [
-            { name: 'MAIL_SMTP_SERVER', value: 'mail' },
-            { name: 'MAIL_SMTP_PORT', value: '2525' },
-            { name: 'MAIL_IMAP_SERVER', value: 'mail' },
-            { name: 'MAIL_IMAP_PORT', value: '9993' },
-            { name: 'MAIL_SIEVE_SERVER', value: 'mail' },
-            { name: 'MAIL_SIEVE_PORT', value: '4190' },
-            { name: 'MAIL_DOMAIN', value: app.domain },
-            { name: 'MAIL_DOMAINS', value: mailInDomains }
-        ];
-
-        debugApp(app, 'Setting up Email');
-
-        appdb.setAddonConfig(app.id, 'email', env, callback);
-    });
+    appdb.setAddonConfig(app.id, 'email', env, callback);
 }
 
 function teardownEmail(app, options, callback) {
@@ -468,10 +460,6 @@ function teardownMySql(app, options, callback) {
 }
 
 function backupMySql(app, options, callback) {
-    assert.strictEqual(typeof app, 'object');
-    assert.strictEqual(typeof options, 'object');
-    assert.strictEqual(typeof callback, 'function');
-
     debugApp(app, 'Backing up mysql');
 
     callback = once(callback); // ChildProcess exit may or may not be called after error
@@ -485,10 +473,6 @@ function backupMySql(app, options, callback) {
 }
 
 function restoreMySql(app, options, callback) {
-    assert.strictEqual(typeof app, 'object');
-    assert.strictEqual(typeof options, 'object');
-    assert.strictEqual(typeof callback, 'function');
-
     callback = once(callback); // ChildProcess exit may or may not be called after error
 
     setupMySql(app, options, function (error) {
@@ -541,10 +525,6 @@ function teardownPostgreSql(app, options, callback) {
 }
 
 function backupPostgreSql(app, options, callback) {
-    assert.strictEqual(typeof app, 'object');
-    assert.strictEqual(typeof options, 'object');
-    assert.strictEqual(typeof callback, 'function');
-
     debugApp(app, 'Backing up postgresql');
 
     callback = once(callback); // ChildProcess exit may or may not be called after error
@@ -558,10 +538,6 @@ function backupPostgreSql(app, options, callback) {
 }
 
 function restorePostgreSql(app, options, callback) {
-    assert.strictEqual(typeof app, 'object');
-    assert.strictEqual(typeof options, 'object');
-    assert.strictEqual(typeof callback, 'function');
-
     callback = once(callback);
 
     setupPostgreSql(app, options, function (error) {
@@ -615,10 +591,6 @@ function teardownMongoDb(app, options, callback) {
 }
 
 function backupMongoDb(app, options, callback) {
-    assert.strictEqual(typeof app, 'object');
-    assert.strictEqual(typeof options, 'object');
-    assert.strictEqual(typeof callback, 'function');
-
     debugApp(app, 'Backing up mongodb');
 
     callback = once(callback); // ChildProcess exit may or may not be called after error
@@ -632,10 +604,6 @@ function backupMongoDb(app, options, callback) {
 }
 
 function restoreMongoDb(app, options, callback) {
-    assert.strictEqual(typeof app, 'object');
-    assert.strictEqual(typeof options, 'object');
-    assert.strictEqual(typeof callback, 'function');
-
     callback = once(callback); // ChildProcess exit may or may not be called after error
 
     setupMongoDb(app, options, function (error) {
@@ -679,7 +647,7 @@ function setupRedis(app, options, callback) {
     }
 
     const tag = infra.images.redis.tag, redisName = 'redis-' + app.id;
-    const label = app.fqdn;
+    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=${label} \
@@ -729,7 +697,7 @@ function teardownRedis(app, options, callback) {
 
         safe.fs.unlinkSync(paths.ADDON_CONFIG_DIR, 'redis-' + app.id + '_vars.sh');
 
-        shell.sudo('teardownRedis', [ RMAPPDIR_CMD, app.id + '/redis', true /* delete directory */ ], function (error /* ,stdout , stderr*/) {
+        shell.sudo('teardownRedis', [ RMAPPDIR_CMD, app.id + '/redis', true /* delete directory */ ], function (error, stdout, stderr) {
             if (error) return callback(new Error('Error removing redis data:' + error));
 
             appdb.unsetAddonConfig(app.id, 'redis', callback);
@@ -738,10 +706,6 @@ function teardownRedis(app, options, callback) {
 }
 
 function backupRedis(app, options, callback) {
-    assert.strictEqual(typeof app, 'object');
-    assert.strictEqual(typeof options, 'object');
-    assert.strictEqual(typeof callback, 'function');
-
     debugApp(app, 'Backing up redis');
 
     var cmd = [ '/addons/redis/service.sh', 'backup' ]; // the redis dir is volume mounted

src/appdb.js

@@ -61,7 +61,7 @@ var assert = require('assert'),
 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.domain', 'apps.dnsRecordId',
     'apps.accessRestrictionJson', 'apps.restoreConfigJson', 'apps.oldConfigJson', 'apps.updateConfigJson', 'apps.memoryLimit',
-    'apps.xFrameOptions', 'apps.sso', 'apps.debugModeJson', 'apps.robotsTxt', 'apps.enableBackup',
+    '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(',');
@@ -196,18 +196,17 @@ function add(id, appStoreId, manifest, location, domain, portBindings, data, cal
     var accessRestriction = data.accessRestriction || null;
     var accessRestrictionJson = JSON.stringify(accessRestriction);
     var memoryLimit = data.memoryLimit || 0;
+    var altDomain = data.altDomain || null;
     var xFrameOptions = data.xFrameOptions || '';
     var installationState = data.installationState || exports.ISTATE_PENDING_INSTALL;
     var restoreConfigJson = data.restoreConfig ? JSON.stringify(data.restoreConfig) : null; // used when cloning
     var sso = 'sso' in data ? data.sso : null;
-    var robotsTxt = 'robotsTxt' in data ? data.robotsTxt : null;
     var debugModeJson = data.debugMode ? JSON.stringify(data.debugMode) : null;
 
     var queries = [];
     queries.push({
-        query: 'INSERT INTO apps (id, appStoreId, manifestJson, installationState, location, domain, accessRestrictionJson, memoryLimit, xFrameOptions, restoreConfigJson, sso, debugModeJson, robotsTxt) ' +
-            ' VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)',
-        args: [ id, appStoreId, manifestJson, installationState, location, domain, accessRestrictionJson, memoryLimit, xFrameOptions, restoreConfigJson, sso, debugModeJson, robotsTxt ]
+        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) {
@@ -220,8 +219,8 @@ function add(id, appStoreId, manifest, location, domain, portBindings, data, cal
     // only allocate a mailbox if mailboxName is set
     if (data.mailboxName) {
         queries.push({
-            query: 'INSERT INTO mailboxes (name, type, domain, ownerId, ownerType) VALUES (?, ?, ?, ?, ?)',
-            args: [ data.mailboxName, mailboxdb.TYPE_MAILBOX, domain, id, mailboxdb.OWNER_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'),
@@ -23,9 +24,13 @@ var gRunTimeout = null;
 var gDockerEventStream = null;
 
 function debugApp(app) {
-    assert(typeof app === 'object');
+    assert(!app || typeof app === 'object');
 
-    debug(app.fqdn + ' ' + app.manifest.id + ' ' + util.format.apply(util, Array.prototype.slice.call(arguments, 1)) + ' - ' + app.id);
+    var prefix = app ? app.intrinsicFqdn : '(no app)';
+    var manifestAppId = app ? app.manifest.id : '';
+    var id = app ? app.id : '';
+
+    debug(prefix + ' ' + manifestAppId + ' ' + util.format.apply(util, Array.prototype.slice.call(arguments, 1)) + ' - ' + id);
 }
 
 function setHealth(app, health, callback) {
@@ -66,9 +71,6 @@ function setHealth(app, health, callback) {
 
 // callback is called with error for fatal errors and not if health check failed
 function checkAppHealth(app, callback) {
-    assert.strictEqual(typeof app, 'object');
-    assert.strictEqual(typeof callback, 'function');
-
     if (app.installationState !== appdb.ISTATE_INSTALLED || app.runState !== appdb.RSTATE_RUNNING) {
         debugApp(app, 'skipped. istate:%s rstate:%s', app.installationState, app.runState);
         return callback(null);

src/apps.js

@@ -4,7 +4,6 @@ exports = module.exports = {
     AppsError: AppsError,
 
     hasAccessTo: hasAccessTo,
-    removeInternalAppFields: removeInternalAppFields,
 
     get: get,
     getByIpAddress: getByIpAddress,
@@ -62,7 +61,7 @@ var addons = require('./addons.js'),
     docker = require('./docker.js'),
     domaindb = require('./domaindb.js'),
     domains = require('./domains.js'),
-    DomainsError = require('./domains.js').DomainsError,
+    DomainError = require('./domains.js').DomainError,
     eventlog = require('./eventlog.js'),
     fs = require('fs'),
     groups = require('./groups.js'),
@@ -84,8 +83,7 @@ var addons = require('./addons.js'),
     url = require('url'),
     util = require('util'),
     uuid = require('uuid'),
-    validator = require('validator'),
-    _ = require('underscore');
+    validator = require('validator');
 
 // http://dustinsenos.com/articles/customErrorsInNode
 // http://code.google.com/p/v8/wiki/JavaScriptStackTraceApi
@@ -174,14 +172,14 @@ function validatePortBindings(portBindings, tcpPorts) {
         993, /* imaps */
         2003, /* graphite (lo) */
         2004, /* graphite (lo) */
-        2020, /* mail server */
+        2020, /* install server */
         config.get('port'), /* app server (lo) */
         config.get('sysadminPort'), /* sysadmin app server (lo) */
         config.get('smtpPort'), /* internal smtp port (lo) */
         config.get('ldapPort'), /* ldap server (lo) */
         3306, /* mysql (lo) */
         4190, /* managesieve */
-        8000, /* graphite (lo) */
+        8000 /* graphite (lo) */
     ];
 
     if (!portBindings) return null;
@@ -308,29 +306,20 @@ function getDuplicateErrorDetails(location, portBindings, error) {
     return new AppsError(AppsError.ALREADY_EXISTS);
 }
 
-// app configs that is useful for 'archival' into the app backup config.json
 function getAppConfig(app) {
     return {
         manifest: app.manifest,
         location: app.location,
         domain: app.domain,
-        fqdn: app.fqdn,
+        intrinsicFqdn: app.intrinsicFqdn,
         accessRestriction: app.accessRestriction,
         portBindings: app.portBindings,
         memoryLimit: app.memoryLimit,
         xFrameOptions: app.xFrameOptions || 'SAMEORIGIN',
-        robotsTxt: app.robotsTxt,
-        sso: app.sso
+        altDomain: app.altDomain
     };
 }
 
-function removeInternalAppFields(app) {
-    return _.pick(app, 'id', 'appStoreId', 'installationState', 'installationProgress', 'runState', 'health',
-        'location', 'domain', 'fqdn',
-        'accessRestriction', 'manifest', 'portBindings', 'iconUrl', 'memoryLimit', 'xFrameOptions',
-        'sso', 'debugMode', 'robotsTxt', 'enableBackup', 'creationTime', 'updateTime');
-}
-
 function getIconUrlSync(app) {
     var iconPath = paths.APP_ICONS_DIR + '/' + app.id + '.png';
     return fs.existsSync(iconPath) ? '/api/v1/apps/' + app.id + '/icon' : null;
@@ -373,8 +362,10 @@ function get(appId, callback) {
         domaindb.get(app.domain, function (error, result) {
             if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
 
+            app.intrinsicFqdn = domains.fqdn(app.location, app.domain, result.provider);
             app.iconUrl = getIconUrlSync(app);
-            app.fqdn = domains.fqdn(app.location, app.domain, result.provider);
+            app.fqdn = app.altDomain || app.intrinsicFqdn;
+            app.cnameTarget = app.altDomain ? app.intrinsicFqdn : null;
 
             callback(null, app);
         });
@@ -395,8 +386,10 @@ function getByIpAddress(ip, callback) {
             domaindb.get(app.domain, function (error, result) {
                 if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
 
+                app.intrinsicFqdn = domains.fqdn(app.location, app.domain, result.provider);
                 app.iconUrl = getIconUrlSync(app);
-                app.fqdn = domains.fqdn(app.location, app.domain, result.provider);
+                app.fqdn = app.altDomain || app.intrinsicFqdn;
+                app.cnameTarget = app.altDomain ? app.intrinsicFqdn : null;
 
                 callback(null, app);
             });
@@ -414,8 +407,10 @@ function getAll(callback) {
             domaindb.get(app.domain, function (error, result) {
                 if (error) return iteratorDone(new AppsError(AppsError.INTERNAL_ERROR, error));
 
+                app.intrinsicFqdn = domains.fqdn(app.location, app.domain, result.provider);
                 app.iconUrl = getIconUrlSync(app);
-                app.fqdn = domains.fqdn(app.location, app.domain, result.provider);
+                app.fqdn = app.altDomain || app.intrinsicFqdn;
+                app.cnameTarget = app.altDomain ? app.intrinsicFqdn : null;
 
                 iteratorDone();
             });
@@ -473,6 +468,7 @@ function install(data, auditSource, callback) {
         cert = data.cert || null,
         key = data.key || null,
         memoryLimit = data.memoryLimit || 0,
+        altDomain = data.altDomain || null,
         xFrameOptions = data.xFrameOptions || 'SAMEORIGIN',
         sso = 'sso' in data ? data.sso : null,
         debugMode = data.debugMode || null,
@@ -517,6 +513,8 @@ function install(data, auditSource, callback) {
         // if sso was unspecified, enable it by default if possible
         if (sso === null) sso = !!manifest.addons['ldap'] || !!manifest.addons['oauth'];
 
+        if (altDomain !== null && !validator.isFQDN(altDomain)) return callback(new AppsError(AppsError.BAD_FIELD, 'Invalid external domain'));
+
         var appId = uuid.v4();
 
         if (icon) {
@@ -528,70 +526,56 @@ function install(data, auditSource, callback) {
         }
 
         domains.get(domain, function (error, domainObject) {
-            if (error && error.reason === DomainsError.NOT_FOUND) return callback(new AppsError(AppsError.NOT_FOUND, 'No such domain'));
+            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));
 
-            var fqdn = domains.fqdn(location, domain, domainObject.provider);
+            var intrinsicFqdn = domains.fqdn(location, domain, domainObject.provider);
 
-            error = validateHostname(location, domain, fqdn);
+            error = validateHostname(location, domain, intrinsicFqdn);
             if (error) return callback(error);
 
             if (cert && key) {
-                error = reverseProxy.validateCertificate(fqdn, cert, key);
+                error = reverseProxy.validateCertificate(intrinsicFqdn, cert, key);
                 if (error) return callback(new AppsError(AppsError.BAD_CERTIFICATE, error.message));
             }
 
             debug('Will install app with id : ' + appId);
 
-            var data = {
-                accessRestriction: accessRestriction,
-                memoryLimit: memoryLimit,
-                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
-            };
-
-            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 && error.reason === DatabaseError.NOT_FOUND) return callback(new AppsError(AppsError.NOT_FOUND, error.message));
+            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));
 
-                appstore.purchase(appId, appStoreId, function (appstoreError) {
-                    // if purchase failed, rollback the appdb record
-                    if (appstoreError) {
-                        appdb.del(appId, function (error) {
-                            if (error) console.error('Failed to rollback app installation.', 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,
+                    intrinsicFqdn: intrinsicFqdn
+                };
 
-                            if (appstoreError.reason === AppstoreError.NOT_FOUND) return callback(new AppsError(AppsError.NOT_FOUND, appstoreError.message));
-                            if (appstoreError && appstoreError.reason === AppstoreError.BILLING_REQUIRED) return callback(new AppsError(AppsError.BILLING_REQUIRED, appstoreError.message));
-                            if (appstoreError && appstoreError.reason === AppstoreError.EXTERNAL_ERROR) return callback(new AppsError(AppsError.EXTERNAL_ERROR, appstoreError.message));
-
-                            callback(new AppsError(AppsError.INTERNAL_ERROR, appstoreError));
-                        });
-
-                        return;
-                    }
+                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));
 
                     // save cert to boxdata/certs
                     if (cert && key) {
-                        if (!safe.fs.writeFileSync(path.join(paths.APP_CERTS_DIR, fqdn + '.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, fqdn + '.user.key'), key)) return callback(new AppsError(AppsError.INTERNAL_ERROR, 'Error saving key: ' + safe.error.message));
+                        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));
                     }
 
                     taskmanager.restartAppTask(appId);
 
-                    // fetch fresh app object for eventlog
-                    get(appId, function (error, result) {
-                        if (error) return callback(error);
+                    eventlog.add(eventlog.ACTION_APP_INSTALL, auditSource, { appId: appId, location: location, domain: domain, manifest: manifest, backupId: backupId });
 
-                        eventlog.add(eventlog.ACTION_APP_INSTALL, auditSource, { appId: appId, app: result });
-
-                        callback(null, { id : appId });
-                    });
+                    callback(null, { id : appId });
                 });
             });
         });
@@ -604,8 +588,9 @@ function configure(appId, data, auditSource, callback) {
     assert.strictEqual(typeof auditSource, 'object');
     assert.strictEqual(typeof callback, 'function');
 
-    get(appId, function (error, app) {
-        if (error) return callback(error);
+    appdb.get(appId, function (error, app) {
+        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 domain, location, portBindings, values = { };
         if ('location' in data) location = values.location = data.location.toLowerCase();
@@ -620,6 +605,11 @@ function configure(appId, data, auditSource, callback) {
             if (error) return callback(error);
         }
 
+        if ('altDomain' in data) {
+            values.altDomain = data.altDomain;
+            if (values.altDomain !== null && !validator.isFQDN(values.altDomain)) return callback(new AppsError(AppsError.BAD_FIELD, 'Invalid external domain'));
+        }
+
         if ('portBindings' in data) {
             portBindings = values.portBindings = data.portBindings;
             error = validatePortBindings(values.portBindings, app.manifest.tcpPorts);
@@ -653,25 +643,27 @@ function configure(appId, data, auditSource, callback) {
         }
 
         domains.get(domain, function (error, domainObject) {
-            if (error && error.reason === DomainsError.NOT_FOUND) return callback(new AppsError(AppsError.NOT_FOUND, 'No such domain'));
+            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));
 
-            var fqdn = domains.fqdn(location, domain, domainObject.provider);
+            var intrinsicFqdn = domains.fqdn(location, domain, domainObject.provider);
 
-            error = validateHostname(location, domain, fqdn);
+            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 = reverseProxy.validateCertificate(fqdn, data.cert, data.key);
+                    var vhost = values.altDomain || intrinsicFqdn;
+
+                    error = reverseProxy.validateCertificate(vhost, data.cert, data.key);
                     if (error) return callback(new AppsError(AppsError.BAD_CERTIFICATE, error.message));
 
-                    if (!safe.fs.writeFileSync(path.join(paths.APP_CERTS_DIR, `${fqdn}.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, `${fqdn}.user.key`), data.key)) return callback(new AppsError(AppsError.INTERNAL_ERROR, 'Error saving key: ' + safe.error.message));
+                    if (!safe.fs.writeFileSync(path.join(paths.APP_CERTS_DIR, `${vhost}.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, `${vhost}.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, `${fqdn}.user.cert`))) debug('Error removing cert: ' + safe.error.message);
-                    if (!safe.fs.unlinkSync(path.join(paths.APP_CERTS_DIR, `${fqdn}..user.key`))) debug('Error removing key: ' + safe.error.message);
+                    if (!safe.fs.unlinkSync(path.join(paths.APP_CERTS_DIR, `${vhost}.user.cert`))) debug('Error removing cert: ' + safe.error.message);
+                    if (!safe.fs.unlinkSync(path.join(paths.APP_CERTS_DIR, `${vhost}..user.key`))) debug('Error removing key: ' + safe.error.message);
                 }
             }
 
@@ -695,14 +687,9 @@ function configure(appId, data, auditSource, callback) {
 
                     taskmanager.restartAppTask(appId);
 
-                    // fetch fresh app object for eventlog
-                    get(appId, function (error, result) {
-                        if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
+                    eventlog.add(eventlog.ACTION_APP_CONFIGURE, auditSource, { appId: appId });
 
-                        eventlog.add(eventlog.ACTION_APP_CONFIGURE, auditSource, { appId: appId, app: result });
-
-                        callback(null);
-                    });
+                    callback(null);
                 });
             });
         });
@@ -742,8 +729,9 @@ function update(appId, data, auditSource, callback) {
             }
         }
 
-        get(appId, function (error, app) {
-            if (error) return callback(error);
+        appdb.get(appId, function (error, app) {
+            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));
 
             // prevent user from installing a app with different manifest id over an existing app
             // this allows cloudron install -f --app <appid> for an app installed from the appStore
@@ -768,7 +756,7 @@ function update(appId, data, auditSource, callback) {
 
                 taskmanager.restartAppTask(appId);
 
-                eventlog.add(eventlog.ACTION_APP_UPDATE, auditSource, { appId: appId, toManifest: manifest, fromManifest: app.manifest, force: data.force, app: app });
+                eventlog.add(eventlog.ACTION_APP_UPDATE, auditSource, { appId: appId, toManifest: manifest, fromManifest: app.manifest, force: data.force });
 
                 // clear update indicator, if update fails, it will come back through the update checker
                 updateChecker.resetAppUpdateInfo(appId);
@@ -792,8 +780,10 @@ function getLogs(appId, options, callback) {
 
     debug('Getting logs for %s', appId);
 
-    get(appId, function (error, app) {
-        if (error) return callback(error);
+    appdb.get(appId, function (error, app) {
+        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new AppsError(AppsError.NOT_FOUND));
+        if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
+
 
         var lines = options.lines || 100,
             follow = !!options.follow,
@@ -837,8 +827,9 @@ function restore(appId, data, auditSource, callback) {
 
     debug('Will restore app with id:%s', appId);
 
-    get(appId, function (error, app) {
-        if (error) return callback(error);
+    appdb.get(appId, function (error, app) {
+        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new AppsError(AppsError.NOT_FOUND));
+        if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
 
         // for empty or null backupId, use existing manifest to mimic a reinstall
         var func = data.backupId ? backups.get.bind(null, data.backupId) : function (next) { return next(null, { manifest: app.manifest }); };
@@ -867,7 +858,7 @@ function restore(appId, data, auditSource, callback) {
 
                 taskmanager.restartAppTask(appId);
 
-                eventlog.add(eventlog.ACTION_APP_RESTORE, auditSource, { appId: appId, app: app });
+                eventlog.add(eventlog.ACTION_APP_RESTORE, auditSource, { appId: appId });
 
                 callback(null);
             });
@@ -893,12 +884,13 @@ function clone(appId, data, auditSource, callback) {
     assert.strictEqual(typeof domain, 'string');
     assert.strictEqual(typeof portBindings, 'object');
 
-    get(appId, function (error, app) {
-        if (error) return callback(error);
+    appdb.get(appId, function (error, app) {
+        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new AppsError(AppsError.NOT_FOUND));
+        if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
 
         backups.get(backupId, function (error, backupInfo) {
             if (error && error.reason === BackupsError.EXTERNAL_ERROR) return callback(new AppsError(AppsError.EXTERNAL_ERROR, error.message));
-            if (error && error.reason === BackupsError.NOT_FOUND) return callback(new AppsError(AppsError.EXTERNAL_ERROR, 'Backup not found'));
+            if (error && error.reason === BackupsError.NOT_FOUND) return callback(new AppsError(AppsError.EXTERNAL_ERROR, error.message));
             if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
 
             if (!backupInfo.manifest) callback(new AppsError(AppsError.EXTERNAL_ERROR, 'Could not get restore config'));
@@ -911,56 +903,41 @@ function clone(appId, data, auditSource, callback) {
             if (error) return callback(error);
 
             domains.get(domain, function (error, domainObject) {
-                if (error && error.reason === DomainsError.NOT_FOUND) return callback(new AppsError(AppsError.EXTERNAL_ERROR, 'No such domain'));
+                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));
 
-                error = validateHostname(location, domain, domains.fqdn(location, domain, domainObject.provider));
+                var intrinsicFqdn = domains.fqdn(location, domain, domainObject.provider);
+
+                error = validateHostname(location, domain, intrinsicFqdn);
                 if (error) return callback(error);
 
                 var newAppId = uuid.v4(), manifest = backupInfo.manifest;
 
-                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',
-                    enableBackup: app.enableBackup,
-                    robotsTxt: app.robotsTxt
-                };
-
-                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));
+                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));
 
-                    appstore.purchase(newAppId, app.appStoreId, function (appstoreError) {
-                        // if purchase failed, rollback the appdb record
-                        if (appstoreError) {
-                            appdb.del(newAppId, function (error) {
-                                if (error) console.error('Failed to rollback app installation.', error);
+                    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'
+                    };
 
-                                if (appstoreError.reason === AppstoreError.NOT_FOUND) return callback(new AppsError(AppsError.NOT_FOUND, appstoreError.message));
-                                if (appstoreError && appstoreError.reason === AppstoreError.BILLING_REQUIRED) return callback(new AppsError(AppsError.BILLING_REQUIRED, appstoreError.message));
-                                if (appstoreError && appstoreError.reason === AppstoreError.EXTERNAL_ERROR) return callback(new AppsError(AppsError.EXTERNAL_ERROR, appstoreError.message));
-
-                                callback(new AppsError(AppsError.INTERNAL_ERROR, appstoreError));
-                            });
-
-                            return;
-                        }
+                    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));
 
                         taskmanager.restartAppTask(newAppId);
 
-                        // fetch fresh app object for eventlog
-                        get(appId, function (error, result) {
-                            if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
+                        eventlog.add(eventlog.ACTION_APP_CLONE, auditSource, { appId: newAppId, oldAppId: appId, backupId: backupId, location: location, manifest: manifest });
 
-                            eventlog.add(eventlog.ACTION_APP_CLONE, auditSource, { appId: newAppId, oldAppId: appId, backupId: backupId, oldApp: app, newApp: result });
-
-                            callback(null, { id : newAppId });
-                        });
+                        callback(null, { id : newAppId });
                     });
                 });
             });
@@ -975,10 +952,10 @@ function uninstall(appId, auditSource, callback) {
 
     debug('Will uninstall app with id:%s', appId);
 
-    get(appId, function (error, app) {
+    get(appId, function (error, result) {
         if (error) return callback(error);
 
-        appstore.unpurchase(appId, app.appStoreId, function (error) {
+        appstore.unpurchase(appId, result.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));
@@ -989,7 +966,7 @@ function uninstall(appId, 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));
 
-                    eventlog.add(eventlog.ACTION_APP_UNINSTALL, auditSource, { appId: appId, app: app });
+                    eventlog.add(eventlog.ACTION_APP_UNINSTALL, auditSource, { appId: appId });
 
                     taskmanager.startAppTask(appId, callback);
                 });
@@ -1040,7 +1017,7 @@ function checkManifestConstraints(manifest) {
     }
 
     if (semver.valid(manifest.minBoxVersion) && semver.gt(manifest.minBoxVersion, config.version())) {
-        return new AppsError(AppsError.BAD_FIELD, 'App version requires a new platform version');
+        return new AppsError(AppsError.BAD_FIELD, 'minBoxVersion exceeds Box version');
     }
 
     return null;
@@ -1054,8 +1031,9 @@ function exec(appId, options, callback) {
     var cmd = options.cmd || [ '/bin/bash' ];
     assert(util.isArray(cmd) && cmd.length > 0);
 
-    get(appId, function (error, app) {
-        if (error) return callback(error);
+    appdb.get(appId, function (error, app) {
+        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));
 
         if (app.installationState !== appdb.ISTATE_INSTALLED || app.runState !== appdb.RSTATE_RUNNING) {
             return callback(new AppsError(AppsError.BAD_STATE, 'App not installed or running'));
@@ -1194,17 +1172,17 @@ function listBackups(page, perPage, appId, callback) {
 function restoreInstalledApps(callback) {
     assert.strictEqual(typeof callback, 'function');
 
-    getAll(function (error, apps) {
+    appdb.getAll(function (error, apps) {
         if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
 
         async.map(apps, function (app, iteratorDone) {
+            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;
 
-                debug(`marking ${app.fqdn} for restore using restore config ${JSON.stringify(restoreConfig)}`);
-
                 appdb.setInstallationCommand(app.id, appdb.ISTATE_PENDING_RESTORE, { restoreConfig: restoreConfig, oldConfig: null }, function (error) {
-                    if (error) debug(`Error marking ${app.fqdn} for restore: ${JSON.stringify(error)}`);
+                    if (error) debug('did not mark %s for restore', app.intrinsicFqdn, error);
 
                     iteratorDone(); // always succeed
                 });
@@ -1216,14 +1194,14 @@ function restoreInstalledApps(callback) {
 function configureInstalledApps(callback) {
     assert.strictEqual(typeof callback, 'function');
 
-    getAll(function (error, apps) {
+    appdb.getAll(function (error, apps) {
         if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
 
         async.map(apps, function (app, iteratorDone) {
-            debug(`marking ${app.fqdn} for reconfigure`);
+            debug('marking %s for reconfigure', app.intrinsicFqdn);
 
             appdb.setInstallationCommand(app.id, appdb.ISTATE_PENDING_CONFIGURE, { oldConfig: null }, function (error) {
-                if (error) debug(`Error marking ${app.fqdn} for reconfigure: ${JSON.stringify(error)}`);
+                if (error) debug('did not mark %s for reconfigure', app.intrinsicFqdn, error);
 
                 iteratorDone(); // always succeed
             });

src/appstore.js

@@ -18,12 +18,9 @@ exports = module.exports = {
     AppstoreError: AppstoreError
 };
 
-var apps = require('./apps.js'),
-    assert = require('assert'),
-    async = require('async'),
+var assert = require('assert'),
     config = require('./config.js'),
     debug = require('debug')('box:appstore'),
-    domains = require('./domains.js'),
     eventlog = require('./eventlog.js'),
     mail = require('./mail.js'),
     os = require('os'),
@@ -130,7 +127,7 @@ function unpurchase(appId, appstoreId, callback) {
             if (error && !error.response) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, error));
             if (result.statusCode === 403 || result.statusCode === 401) return callback(new AppstoreError(AppstoreError.BILLING_REQUIRED));
             if (result.statusCode === 404) return callback(null);   // was never purchased
-            if (result.statusCode !== 201 && result.statusCode !== 200) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, util.format('App unpurchase failed. %s %j', result.status, result.body)));
+            if (result.statusCode !== 201 && result.statusCode !== 200) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, util.format('App purchase failed. %s %j', result.status, result.body)));
 
             superagent.del(url).query({ accessToken: appstoreConfig.token }).timeout(30 * 1000).end(function (error, result) {
                 if (error && !error.response) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, error));
@@ -143,87 +140,62 @@ function unpurchase(appId, appstoreId, callback) {
     });
 }
 
-function sendAliveStatus(callback) {
+function sendAliveStatus(data, callback) {
     callback = callback || NOOP_CALLBACK;
 
-    var allSettings, allDomains, mailDomains, loginEvents;
+    settings.getAll(function (error, result) {
+        if (error) return callback(new AppstoreError(AppstoreError.INTERNAL_ERROR, error));
 
-    async.series([
-        function (callback) {
-            settings.getAll(function (error, result) {
+        mail.getAll(function (error, mailDomains) {
+            if (error) return callback(new AppstoreError(AppstoreError.INTERNAL_ERROR, error));
+
+            eventlog.getAllPaged(eventlog.ACTION_USER_LOGIN, null, 1, 1, function (error, loginEvents) {
                 if (error) return callback(new AppstoreError(AppstoreError.INTERNAL_ERROR, error));
-                allSettings = result;
-                callback();
-            });
-        },
-        function (callback) {
-            domains.getAll(function (error, result) {
-                if (error) return callback(new AppstoreError(AppstoreError.INTERNAL_ERROR, error));
-                allDomains = result;
-                callback();
-            });
-        },
-        function (callback) {
-            mail.getDomains(function (error, result) {
-                if (error) return callback(new AppstoreError(AppstoreError.INTERNAL_ERROR, error));
-                mailDomains = result;
-                callback();
-            });
-        },
-        function (callback) {
-            eventlog.getAllPaged([ eventlog.ACTION_USER_LOGIN ], null, 1, 1, function (error, result) {
-                if (error) return callback(new AppstoreError(AppstoreError.INTERNAL_ERROR, error));
-                loginEvents = result;
-                callback();
-            });
-        }
-    ], function (error) {
-        if (error) return callback(error);
 
-        var backendSettings = {
-            backupConfig: {
-                provider: allSettings[settings.BACKUP_CONFIG_KEY].provider,
-                hardlinks: !allSettings[settings.BACKUP_CONFIG_KEY].noHardlinks
-            },
-            domainConfig: {
-                count: allDomains.length,
-                domains: Array.from(new Set(allDomains.map(function (d) { return { domain: d.domain, provider: d.provider }; })))
-            },
-            mailConfig: {
-                outboundCount: mailDomains.length,
-                inboundCount: mailDomains.filter(function (d) { return d.enabled; }).length,
-                catchAllCount: mailDomains.filter(function (d) { return d.catchAll.length !== 0; }).length,
-                relayProviders: Array.from(new Set(mailDomains.map(function (d) { return d.relay.provider; })))
-            },
-            appAutoupdatePattern: allSettings[settings.APP_AUTOUPDATE_PATTERN_KEY],
-            boxAutoupdatePattern: allSettings[settings.BOX_AUTOUPDATE_PATTERN_KEY],
-            timeZone: allSettings[settings.TIME_ZONE_KEY],
-        };
+                var backendSettings = {
+                    backupConfig: {
+                        provider: result[settings.BACKUP_CONFIG_KEY].provider,
+                        hardlinks: !result[settings.BACKUP_CONFIG_KEY].noHardlinks
+                    },
+                    domainConfig: {
+                        count: mailDomains.length
+                    },
+                    mailConfig: {
+                        outboundCount: mailDomains.length,
+                        inboundCount: mailDomains.filter(function (d) { return d.enabled; }).length,
+                        catchAllCount: mailDomains.filter(function (d) { return d.catchAll.length !== 0; }).length,
+                        relayProviders: Array.from(new Set(mailDomains.map(function (d) { return d.relay.provider; })))
+                    },
+                    autoupdatePattern: result[settings.AUTOUPDATE_PATTERN_KEY],
+                    timeZone: result[settings.TIME_ZONE_KEY],
+                };
 
-        var data = {
-            version: config.version(),
-            adminFqdn: config.adminFqdn(),
-            provider: config.provider(),
-            backendSettings: backendSettings,
-            machine: {
-                cpus: os.cpus(),
-                totalmem: os.totalmem()
-            },
-            events: {
-                lastLogin: loginEvents[0] ? (new Date(loginEvents[0].creationTime).getTime()) : 0
-            }
-        };
+                var data = {
+                    version: config.version(),
+                    adminFqdn: config.adminFqdn(),
+                    provider: config.provider(),
+                    backendSettings: backendSettings,
+                    machine: {
+                        cpus: os.cpus(),
+                        totalmem: os.totalmem()
+                    },
+                    events: {
+                        lastLogin: loginEvents[0] ? (new Date(loginEvents[0].creationTime).getTime()) : 0
+                    }
+                };
 
-        getAppstoreConfig(function (error, appstoreConfig) {
-            if (error) return callback(error);
+                getAppstoreConfig(function (error, appstoreConfig) {
+                    if (error) return callback(error);
 
-            var url = config.apiServerOrigin() + '/api/v1/users/' + appstoreConfig.userId + '/cloudrons/' + appstoreConfig.cloudronId + '/alive';
-            superagent.post(url).send(data).query({ accessToken: appstoreConfig.token }).timeout(30 * 1000).end(function (error, result) {
-                if (error && !error.response) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, error));
-                if (result.statusCode === 404) return callback(new AppstoreError(AppstoreError.NOT_FOUND));
-                if (result.statusCode !== 201) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, util.format('Sending alive status failed. %s %j', result.status, result.body)));
+                    var url = config.apiServerOrigin() + '/api/v1/users/' + appstoreConfig.userId + '/cloudrons/' + appstoreConfig.cloudronId + '/alive';
+                    superagent.post(url).send(data).query({ accessToken: appstoreConfig.token }).timeout(30 * 1000).end(function (error, result) {
+                        if (error && !error.response) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, error));
+                        if (result.statusCode === 404) return callback(new AppstoreError(AppstoreError.NOT_FOUND));
+                        if (result.statusCode !== 201) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, util.format('Sending alive status failed. %s %j', result.status, result.body)));
 
-                callback(null);
+                        callback(null);
+                    });
+                });
             });
         });
     });
@@ -270,12 +242,9 @@ function getAppUpdate(app, callback) {
 
             const updateInfo = result.body;
 
-            // for the appstore, x.y.z is the same as x.y.z-0 but in semver, x.y.z > x.y.z-0
-            const curAppVersion = semver.prerelease(app.manifest.version) ? app.manifest.version : `${app.manifest.version}-0`;
-
             // do some sanity checks
-            if (!safe.query(updateInfo, 'manifest.version') || semver.gt(curAppVersion, safe.query(updateInfo, 'manifest.version'))) {
-                debug('Skipping malformed update of app %s version: %s. got %j', app.id, curAppVersion, updateInfo);
+            if (!safe.query(updateInfo, 'manifest.version') || semver.gt(app.manifest.version, safe.query(updateInfo, 'manifest.version'))) {
+                debug('Skipping malformed update of app %s version: %s. got %j', app.id, app.manifest.version, updateInfo);
                 return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, util.format('Malformed update: %s %s', result.statusCode, result.text)));
             }
 
@@ -312,26 +281,16 @@ function sendFeedback(info, callback) {
     assert.strictEqual(typeof info.description, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    function collectAppInfoIfNeeded(callback) {
-        if (!info.appId) return callback();
-        apps.get(info.appId, callback);
-    }
-
     getAppstoreConfig(function (error, appstoreConfig) {
         if (error) return callback(error);
 
-        collectAppInfoIfNeeded(function (error, result) {
-            if (error) console.error('Unable to get app info', error);
-            if (result) info.app = result;
+        var url = config.apiServerOrigin() + '/api/v1/users/' + appstoreConfig.userId + '/cloudrons/' + appstoreConfig.cloudronId + '/feedback';
 
-            var url = config.apiServerOrigin() + '/api/v1/users/' + appstoreConfig.userId + '/cloudrons/' + appstoreConfig.cloudronId + '/feedback';
+        superagent.post(url).query({ accessToken: appstoreConfig.token }).send(info).timeout(10 * 1000).end(function (error, result) {
+            if (error && !error.response) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, error));
+            if (result.statusCode !== 201) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, util.format('Bad response: %s %s', result.statusCode, result.text)));
 
-            superagent.post(url).query({ accessToken: appstoreConfig.token }).send(info).timeout(10 * 1000).end(function (error, result) {
-                if (error && !error.response) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, error));
-                if (result.statusCode !== 201) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, util.format('Bad response: %s %s', result.statusCode, result.text)));
-
-                callback(null);
-            });
+            callback(null);
         });
     });
 }

src/apptask.js

@@ -15,7 +15,8 @@ exports = module.exports = {
     _verifyManifest: verifyManifest,
     _registerSubdomain: registerSubdomain,
     _unregisterSubdomain: unregisterSubdomain,
-    _waitForDnsPropagation: waitForDnsPropagation
+    _waitForDnsPropagation: waitForDnsPropagation,
+    _waitForAltDomainDnsPropagation: waitForAltDomainDnsPropagation
 };
 
 require('supererror')({ splatchError: true });
@@ -37,7 +38,7 @@ var addons = require('./addons.js'),
     debug = require('debug')('box:apptask'),
     docker = require('./docker.js'),
     domains = require('./domains.js'),
-    DomainsError = domains.DomainsError,
+    DomainError = domains.DomainError,
     ejs = require('ejs'),
     fs = require('fs'),
     manifestFormat = require('cloudron-manifestformat'),
@@ -70,7 +71,8 @@ function initialize(callback) {
 function debugApp(app) {
     assert.strictEqual(typeof app, 'object');
 
-    debug(app.fqdn + ' ' + util.format.apply(util, Array.prototype.slice.call(arguments, 1)));
+    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
@@ -264,17 +266,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.fqdn, overwrite);
+            debugApp(app, 'Registering subdomain location [%s] overwrite: %s', app.intrinsicFqdn, overwrite);
 
             // get the current record before updating it
-            domains.getDnsRecords(app.location, app.domain, '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
                 if (values.length !== 0 && !overwrite) return retryCallback(null, new Error('DNS Record already exists'));
 
-                domains.upsertDnsRecords(app.location, app.domain, 'A', [ ip ], function (error, changeId) {
-                    if (error && (error.reason === DomainsError.STILL_BUSY || error.reason === DomainsError.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);
                 });
@@ -303,11 +305,11 @@ function unregisterSubdomain(app, location, domain, callback) {
         if (error) return callback(error);
 
         async.retry({ times: 30, interval: 5000 }, function (retryCallback) {
-            debugApp(app, 'Unregistering subdomain: %s', app.fqdn);
+            debugApp(app, 'Unregistering subdomain: %s', app.intrinsicFqdn);
 
-            domains.removeDnsRecords(location, domain, 'A', [ ip ], function (error) {
-                if (error && error.reason === DomainsError.NOT_FOUND) return retryCallback(null, null); // domain can be not found if oldConfig.domain or restoreConfig.domain was removed
-                if (error && (error.reason === DomainsError.STILL_BUSY || error.reason === DomainsError.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);
             });
@@ -341,10 +343,27 @@ function waitForDnsPropagation(app, callback) {
     sysinfo.getPublicIp(function (error, ip) {
         if (error) return callback(error);
 
-        domains.waitForDnsRecord(app.fqdn, app.domain, ip, { interval: 5000, times: 120 }, callback);
+        domains.waitForDNSRecord(app.intrinsicFqdn, app.domain, ip, 'A', { interval: 5000, times: 120 }, callback);
     });
 }
 
+function waitForAltDomainDnsPropagation(app, callback) {
+    if (!app.altDomain) return callback(null);
+
+    // try for 10 minutes before giving up. this allows the user to "reconfigure" the app in the case where
+    // an app has an external domain and cloudron is migrated to custom domain.
+    var isNakedDomain = tld.getDomain(app.altDomain) === app.altDomain;
+    if (isNakedDomain) { // check naked domains with A record since CNAME records don't work there
+        sysinfo.getPublicIp(function (error, ip) {
+            if (error) return callback(error);
+
+            domains.waitForDNSRecord(app.altDomain, tld.getDomain(app.altDomain), ip, 'A', { interval: 10000, times: 60 }, callback);
+        });
+    } else {
+        domains.waitForDNSRecord(app.altDomain, tld.getDomain(app.altDomain), app.intrinsicFqdn + '.', 'CNAME', { interval: 10000, times: 60 }, callback);
+    }
+}
+
 // Ordering is based on the following rationale:
 //   - configure nginx, icon, oauth
 //   - register subdomain.
@@ -427,6 +446,9 @@ function install(app, callback) {
         updateApp.bind(null, app, { installationProgress: '85, Waiting for DNS propagation' }),
         exports._waitForDnsPropagation.bind(null, app),
 
+        updateApp.bind(null, app, { installationProgress: '90, Waiting for External Domain setup' }),
+        exports._waitForAltDomainDnsPropagation.bind(null, app), // required when restoring and !restoreConfig
+
         updateApp.bind(null, app, { installationProgress: '95, Configuring reverse proxy' }),
         configureReverseProxy.bind(null, app),
 
@@ -472,7 +494,7 @@ function configure(app, callback) {
     assert.strictEqual(typeof callback, 'function');
 
     // oldConfig can be null during an infra update
-    var locationChanged = app.oldConfig && (app.oldConfig.fqdn !== app.fqdn);
+    var locationChanged = app.oldConfig && (app.oldConfig.intrinsicFqdn !== app.intrinsicFqdn);
 
     async.series([
         updateApp.bind(null, app, { installationProgress: '10, Cleaning up old install' }),
@@ -519,6 +541,9 @@ function configure(app, callback) {
         updateApp.bind(null, app, { installationProgress: '80, Waiting for DNS propagation' }),
         exports._waitForDnsPropagation.bind(null, app),
 
+        updateApp.bind(null, app, { installationProgress: '85, Waiting for External Domain setup' }),
+        exports._waitForAltDomainDnsPropagation.bind(null, app),
+
         updateApp.bind(null, app, { installationProgress: '90, Configuring reverse proxy' }),
         configureReverseProxy.bind(null, app),
 

src/auth.js

@@ -0,0 +1,125 @@
+'use strict';
+
+exports = module.exports = {
+    initialize: initialize,
+    uninitialize: uninitialize,
+
+    accessTokenAuth: accessTokenAuth
+};
+
+var assert = require('assert'),
+    BasicStrategy = require('passport-http').BasicStrategy,
+    BearerStrategy = require('passport-http-bearer').Strategy,
+    clients = require('./clients'),
+    ClientPasswordStrategy = require('passport-oauth2-client-password').Strategy,
+    ClientsError = clients.ClientsError,
+    DatabaseError = require('./databaseerror'),
+    debug = require('debug')('box:auth'),
+    LocalStrategy = require('passport-local').Strategy,
+    crypto = require('crypto'),
+    passport = require('passport'),
+    tokendb = require('./tokendb'),
+    user = require('./user'),
+    UserError = user.UserError,
+    _ = require('underscore');
+
+function initialize(callback) {
+    assert.strictEqual(typeof callback, 'function');
+
+    passport.serializeUser(function (user, callback) {
+        callback(null, user.id);
+    });
+
+    passport.deserializeUser(function(userId, callback) {
+        user.get(userId, function (error, result) {
+            if (error) return callback(error);
+
+            var md5 = crypto.createHash('md5').update(result.email).digest('hex');
+            result.gravatar = 'https://www.gravatar.com/avatar/' + md5 + '.jpg?s=24&d=mm';
+
+            callback(null, result);
+        });
+    });
+
+    passport.use(new LocalStrategy(function (username, password, callback) {
+        if (username.indexOf('@') === -1) {
+            user.verifyWithUsername(username, password, function (error, result) {
+                if (error && error.reason === UserError.NOT_FOUND) return callback(null, false);
+                if (error && error.reason === UserError.WRONG_PASSWORD) return callback(null, false);
+                if (error) return callback(error);
+                if (!result) return callback(null, false);
+                callback(null, _.pick(result, 'id', 'username', 'email', 'admin'));
+            });
+        } else {
+            user.verifyWithEmail(username, password, function (error, result) {
+                if (error && error.reason === UserError.NOT_FOUND) return callback(null, false);
+                if (error && error.reason === UserError.WRONG_PASSWORD) return callback(null, false);
+                if (error) return callback(error);
+                if (!result) return callback(null, false);
+                callback(null, _.pick(result, 'id', 'username', 'email', 'admin'));
+            });
+        }
+    }));
+
+    passport.use(new BasicStrategy(function (username, password, callback) {
+        if (username.indexOf('cid-') === 0) {
+            debug('BasicStrategy: detected client id %s instead of username:password', username);
+            // username is actually client id here
+            // password is client secret
+            clients.get(username, function (error, client) {
+                if (error && error.reason === ClientsError.NOT_FOUND) return callback(null, false);
+                if (error) return callback(error);
+                if (client.clientSecret != password) return callback(null, false);
+                return callback(null, client);
+            });
+        } else {
+            user.verifyWithUsername(username, password, function (error, result) {
+                if (error && error.reason === UserError.NOT_FOUND) return callback(null, false);
+                if (error && error.reason === UserError.WRONG_PASSWORD) return callback(null, false);
+                if (error) return callback(error);
+                if (!result) return callback(null, false);
+                callback(null, result);
+            });
+        }
+    }));
+
+    passport.use(new ClientPasswordStrategy(function (clientId, clientSecret, callback) {
+        clients.get(clientId, function(error, client) {
+            if (error && error.reason === ClientsError.NOT_FOUND) return callback(null, false);
+            if (error) { return callback(error); }
+            if (client.clientSecret != clientSecret) { return callback(null, false); }
+            return callback(null, client);
+        });
+    }));
+
+    passport.use(new BearerStrategy(accessTokenAuth));
+
+    callback(null);
+}
+
+function uninitialize(callback) {
+    assert.strictEqual(typeof callback, 'function');
+
+    callback(null);
+}
+
+function accessTokenAuth(accessToken, callback) {
+    assert.strictEqual(typeof accessToken, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    tokendb.get(accessToken, function (error, token) {
+        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(null, false);
+        if (error) return callback(error);
+
+        // scopes here can define what capabilities that token carries
+        // passport put the 'info' object into req.authInfo, where we can further validate the scopes
+        var info = { scope: token.scope };
+
+        user.get(token.identifier, function (error, user) {
+            if (error && error.reason === UserError.NOT_FOUND) return callback(null, false);
+            if (error) return callback(error);
+
+            callback(null, user, info);
+        });
+    });
+}

src/backups.js

@@ -68,9 +68,10 @@ var NOOP_CALLBACK = function (error) { if (error) debug(error); };
 var BACKUPTASK_CMD = path.join(__dirname, 'backuptask.js');
 
 function debugApp(app) {
-    assert(typeof app === 'object');
+    assert(!app || typeof app === 'object');
 
-    debug(app.fqdn + ' ' + util.format.apply(util, Array.prototype.slice.call(arguments, 1)));
+    var prefix = app ? app.intrinsicFqdn : '(no app)';
+    debug(prefix + ' ' + util.format.apply(util, Array.prototype.slice.call(arguments, 1)));
 }
 
 function BackupsError(reason, errorOrMessage) {
@@ -231,11 +232,6 @@ function sync(backupConfig, backupId, dataDir, callback) {
     assert.strictEqual(typeof dataDir, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    function setBackupProgress(message) {
-        debug('%s: %s', (new Date()).toISOString(), message);
-        safe.fs.writeFileSync(paths.BACKUP_RESULT_FILE, message);
-    }
-
     syncer.sync(dataDir, function processTask(task, iteratorCallback) {
         debug('sync: processing task: %j', task);
         var backupFilePath = path.join(getBackupFilePath(backupConfig, backupId, backupConfig.format), task.path);
@@ -243,33 +239,28 @@ function sync(backupConfig, backupId, dataDir, callback) {
         if (task.operation === 'removedir') {
             safe.fs.writeFileSync(paths.BACKUP_RESULT_FILE, `Removing directory ${task.path}`);
             return api(backupConfig.provider).removeDir(backupConfig, backupFilePath)
-                .on('progress', setBackupProgress)
+                .on('progress', function (detail) {
+                    debug(`sync: ${detail}`);
+                    safe.fs.writeFileSync(paths.BACKUP_RESULT_FILE, detail);
+                })
                 .on('done', iteratorCallback);
         } else if (task.operation === 'remove') {
-            setBackupProgress(`Removing ${task.path}`);
+            safe.fs.writeFileSync(paths.BACKUP_RESULT_FILE, `Removing ${task.path}`);
             return api(backupConfig.provider).remove(backupConfig, backupFilePath, iteratorCallback);
         }
 
         var retryCount = 0;
         async.retry({ times: 5, interval: 20000 }, function (retryCallback) {
-            retryCallback = once(retryCallback); // protect again upload() erroring much later after read stream error
-
             ++retryCount;
             debug(`${task.operation} ${task.path} try ${retryCount}`);
             if (task.operation === 'add') {
-                setBackupProgress(`Adding ${task.path} position ${task.position} try ${retryCount}`);
+                safe.fs.writeFileSync(paths.BACKUP_RESULT_FILE, `Adding ${task.path}`);
                 var stream = fs.createReadStream(path.join(dataDir, task.path));
-                stream.on('error', function (error) {
-                    setBackupProgress(`read stream error for ${task.path}: ${error.message}`);
-                    retryCallback();
-                }); // ignore error if file disappears
-                api(backupConfig.provider).upload(backupConfig, backupFilePath, stream, function (error) {
-                    setBackupProgress(error ? `Error uploading ${task.path} try ${retryCount}: ${error.message}` : `Uploaded ${task.path}`);
-                    retryCallback(error);
-                });
+                stream.on('error', function () { return retryCallback(); }); // ignore error if file disappears
+                api(backupConfig.provider).upload(backupConfig, backupFilePath, stream, retryCallback);
             }
         }, iteratorCallback);
-    }, backupConfig.syncConcurrency || 10 /* concurrency */, function (error) {
+    }, 10 /* concurrency */, function (error) {
         if (error) return callback(new BackupsError(BackupsError.EXTERNAL_ERROR, error.message));
 
         callback();
@@ -303,6 +294,8 @@ function upload(backupId, format, dataDir, callback) {
     assert.strictEqual(typeof dataDir, 'string');
     assert.strictEqual(typeof callback, 'function');
 
+    callback = once(callback);
+
     debug('upload: id %s format %s dataDir %s', backupId, format, dataDir);
 
     settings.getBackupConfig(function (error, backupConfig) {
@@ -310,8 +303,6 @@ function upload(backupId, format, dataDir, callback) {
 
         if (format === 'tgz') {
             async.retry({ times: 5, interval: 20000 }, function (retryCallback) {
-                retryCallback = once(retryCallback); // protect again upload() erroring much later after tar stream error
-
                 var tarStream = createTarPackStream(dataDir, backupConfig.key || null);
                 tarStream.on('error', retryCallback); // already returns BackupsError
 
@@ -729,7 +720,7 @@ function backupApp(app, callback) {
     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.fqdn);
+    progress.set(progress.BACKUP, 10,  'Backing up ' + (app.altDomain || app.intrinsicFqdn));
 
     backupAppWithTimestamp(app, timestamp, function (error) {
         progress.set(progress.BACKUP, 100, error ? error.message : '');
@@ -756,12 +747,12 @@ 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.fqdn);
+            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.fqdn);
+                progress.set(progress.BACKUP, step * processed, 'Skipped backup ' + (app.altDomain || app.intrinsicFqdn));
                 return iteratorCallback(null, null); // nothing to backup
             }
 
@@ -771,7 +762,7 @@ function backupBoxAndApps(auditSource, callback) {
                     return iteratorCallback(error);
                 }
 
-                progress.set(progress.BACKUP, step * processed, 'Backed up ' + app.fqdn);
+                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
             });

src/backuptask.js

@@ -44,9 +44,9 @@ initialize(function (error) {
     safe.fs.writeFileSync(paths.BACKUP_RESULT_FILE, '');
 
     backups.upload(backupId, format, dataDir, function resultHandler(error) {
-        if (error) debug('upload completed with error', error);
+        if (error) debug('completed with error', error);
 
-        debug('upload completed');
+        debug('completed');
 
         safe.fs.writeFileSync(paths.BACKUP_RESULT_FILE, error ? error.message : '');
 

src/clientdb.js

@@ -182,8 +182,8 @@ function clear(callback) {
 
 function addDefaultClients(callback) {
     async.series([
-        add.bind(null, 'cid-webadmin', 'Settings', 'built-in', 'secret-webadmin', 'https://admin-localhost', '*'),
-        add.bind(null, 'cid-sdk', 'SDK', 'built-in', 'secret-sdk', 'https://admin-localhost', '*'),
-        add.bind(null, 'cid-cli', 'Cloudron Tool', 'built-in', 'secret-cli', 'https://admin-localhost', '*')
+        add.bind(null, 'cid-webadmin', 'Settings', 'built-in', 'secret-webadmin', 'https://admin-localhost', 'cloudron,profile,users,apps,settings'),
+        add.bind(null, 'cid-sdk', 'SDK', 'built-in', 'secret-sdk', 'https://admin-localhost', '*,roleSdk'),
+        add.bind(null, 'cid-cli', 'Cloudron Tool', 'built-in', 'secret-cli', 'https://admin-localhost', '*,roleSdk')
     ], callback);
 }

src/clients.js

@@ -8,16 +8,26 @@ exports = module.exports = {
     del: del,
     getAll: getAll,
     getByAppIdAndType: getByAppIdAndType,
-    getTokensByUserId: getTokensByUserId,
-    delTokensByUserId: delTokensByUserId,
+    getClientTokensByUserId: getClientTokensByUserId,
+    delClientTokensByUserId: delClientTokensByUserId,
     delByAppIdAndType: delByAppIdAndType,
-    addTokenByUserId: addTokenByUserId,
+    addClientTokenByUserId: addClientTokenByUserId,
     delToken: delToken,
 
-    issueDeveloperToken: issueDeveloperToken,
-
     addDefaultClients: addDefaultClients,
 
+    // keep this in sync with start.sh ADMIN_SCOPES that generates the cid-webadmin
+    SCOPE_APPS: 'apps',
+    SCOPE_DEVELOPER: 'developer', // obsolete
+    SCOPE_PROFILE: 'profile',
+    SCOPE_CLOUDRON: 'cloudron',
+    SCOPE_SETTINGS: 'settings',
+    SCOPE_USERS: 'users',
+
+    // roles are handled just like the above scopes, they are parallel to scopes
+    // scopes enclose API groups, roles specify the usage role
+    SCOPE_ROLE_SDK: 'roleSdk',
+
     // client type enums
     TYPE_EXTERNAL: 'external',
     TYPE_BUILT_IN: 'built-in',
@@ -29,14 +39,10 @@ var apps = require('./apps.js'),
     assert = require('assert'),
     async = require('async'),
     clientdb = require('./clientdb.js'),
-    constants = require('./constants.js'),
     DatabaseError = require('./databaseerror.js'),
     debug = require('debug')('box:clients'),
-    eventlog = require('./eventlog.js'),
     hat = require('hat'),
-    accesscontrol = require('./accesscontrol.js'),
     tokendb = require('./tokendb.js'),
-    users = require('./users.js'),
     util = require('util'),
     uuid = require('uuid');
 
@@ -78,6 +84,28 @@ function validateName(name) {
     return null;
 }
 
+function validateScope(scope) {
+    assert.strictEqual(typeof scope, 'string');
+
+    var VALID_SCOPES = [
+        exports.SCOPE_APPS,
+        exports.SCOPE_DEVELOPER,
+        exports.SCOPE_PROFILE,
+        exports.SCOPE_CLOUDRON,
+        exports.SCOPE_SETTINGS,
+        exports.SCOPE_USERS,
+        '*',    // includes all scopes, but not roles
+        exports.SCOPE_ROLE_SDK
+    ];
+
+    if (scope === '') return new ClientsError(ClientsError.INVALID_SCOPE, 'Empty scope not allowed');
+
+    var allValid = scope.split(',').every(function (s) { return VALID_SCOPES.indexOf(s) !== -1; });
+    if (!allValid) return new ClientsError(ClientsError.INVALID_SCOPE, 'Invalid scope. Available scopes are ' + VALID_SCOPES.join(', '));
+
+    return null;
+}
+
 function add(appId, type, redirectURI, scope, callback) {
     assert.strictEqual(typeof appId, 'string');
     assert.strictEqual(typeof type, 'string');
@@ -85,9 +113,13 @@ function add(appId, type, redirectURI, scope, callback) {
     assert.strictEqual(typeof scope, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    var error = accesscontrol.validateScope(scope);
-    if (error) return callback(new ClientsError(ClientsError.INVALID_SCOPE, error.message));
+    // allow whitespace
+    scope = scope.split(',').map(function (s) { return s.trim(); }).join(',');
 
+    var error = validateScope(scope);
+    if (error) return callback(error);
+
+    // appId is also client name
     error = validateName(appId);
     if (error) return callback(error);
 
@@ -159,7 +191,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.domain = result.fqdn;
+                record.domain = result.altDomain || result.intrinsicFqdn;
 
                 tmp.push(record);
 
@@ -184,7 +216,7 @@ function getByAppIdAndType(appId, type, callback) {
     });
 }
 
-function getTokensByUserId(clientId, userId, callback) {
+function getClientTokensByUserId(clientId, userId, callback) {
     assert.strictEqual(typeof clientId, 'string');
     assert.strictEqual(typeof userId, 'string');
     assert.strictEqual(typeof callback, 'function');
@@ -203,7 +235,7 @@ function getTokensByUserId(clientId, userId, callback) {
     });
 }
 
-function delTokensByUserId(clientId, userId, callback) {
+function delClientTokensByUserId(clientId, userId, callback) {
     assert.strictEqual(typeof clientId, 'string');
     assert.strictEqual(typeof userId, 'string');
     assert.strictEqual(typeof callback, 'function');
@@ -243,7 +275,7 @@ function delByAppIdAndType(appId, type, callback) {
     });
 }
 
-function addTokenByUserId(clientId, userId, expiresAt, callback) {
+function addClientTokenByUserId(clientId, userId, expiresAt, callback) {
     assert.strictEqual(typeof clientId, 'string');
     assert.strictEqual(typeof userId, 'string');
     assert.strictEqual(typeof expiresAt, 'number');
@@ -253,39 +285,21 @@ function addTokenByUserId(clientId, userId, expiresAt, callback) {
         if (error) return callback(error);
 
         var token = tokendb.generateToken();
-        var scope = accesscontrol.canonicalScope(result.scope);
 
-        tokendb.add(token, userId, result.id, expiresAt, scope, function (error) {
+        tokendb.add(token, userId, result.id, expiresAt, result.scope, function (error) {
             if (error) return callback(new ClientsError(ClientsError.INTERNAL_ERROR, error));
 
             callback(null, {
                 accessToken: token,
                 identifier: userId,
                 clientId: result.id,
-                scope: result.scope,
+                scope: result.id,
                 expires: expiresAt
             });
         });
     });
 }
 
-// this issues a cid-cli token that does not require a password in various routes
-function issueDeveloperToken(userObject, ip, callback) {
-    assert.strictEqual(typeof userObject, 'object');
-    assert.strictEqual(typeof ip, 'string');
-    assert.strictEqual(typeof callback, 'function');
-
-    const expiresAt = Date.now() + constants.DEFAULT_TOKEN_EXPIRATION;
-
-    addTokenByUserId('cid-cli', userObject.id, expiresAt, function (error, result) {
-        if (error) return callback(error);
-
-        eventlog.add(eventlog.ACTION_USER_LOGIN, { authType: 'cli', ip: ip }, { userId: userObject.id, user: users.removePrivateFields(userObject) });
-
-        callback(null, result);
-    });
-}
-
 function delToken(clientId, tokenId, callback) {
     assert.strictEqual(typeof clientId, 'string');
     assert.strictEqual(typeof tokenId, 'string');
@@ -310,10 +324,13 @@ function addDefaultClients(origin, callback) {
     debug('Adding default clients');
 
     // 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';
+
     // id, appId, type, clientSecret, redirectURI, scope
     async.series([
-        clientdb.upsert.bind(null, 'cid-webadmin', 'Settings', 'built-in', 'secret-webadmin', origin, '*'),
-        clientdb.upsert.bind(null, 'cid-sdk', 'SDK', 'built-in', 'secret-sdk', origin, '*'),
-        clientdb.upsert.bind(null, 'cid-cli', 'Cloudron Tool', 'built-in', 'secret-cli', origin, '*')
+        clientdb.upsert.bind(null, 'cid-webadmin', 'Settings', 'built-in', 'secret-webadmin', origin, ADMIN_SCOPES),
+        clientdb.upsert.bind(null, 'cid-sdk', 'SDK', 'built-in', 'secret-sdk', origin, '*,roleSdk'),
+        clientdb.upsert.bind(null, 'cid-cli', 'Cloudron Tool', 'built-in', 'secret-cli', origin, '*, roleSdk')
     ], callback);
 }

src/cloudron.js

@@ -40,7 +40,7 @@ var assert = require('assert'),
     spawn = require('child_process').spawn,
     split = require('split'),
     updateChecker = require('./updatechecker.js'),
-    users = require('./users.js'),
+    user = require('./user.js'),
     util = require('util'),
     _ = require('underscore');
 
@@ -103,7 +103,7 @@ function onActivated(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)
-    users.count(function (error, count) {
+    user.count(function (error, count) {
         if (error) return callback(new CloudronError(CloudronError.INTERNAL_ERROR, error));
         if (!count) return callback(); // not activated
 
@@ -234,11 +234,30 @@ function updateToLatest(auditSource, callback) {
     if (!boxUpdateInfo) return callback(new CloudronError(CloudronError.ALREADY_UPTODATE, 'No update available'));
     if (!boxUpdateInfo.sourceTarballUrl) return callback(new CloudronError(CloudronError.BAD_STATE, 'No automatic update available'));
 
+    // check if this is just a version number change
+    if (config.version().match(/[-+]/) !== null && config.version().replace(/[-+].*/, '') === boxUpdateInfo.version) {
+        doShortCircuitUpdate(boxUpdateInfo, function (error) {
+            if (error) debug('Short-circuit update failed', error);
+        });
+
+        return callback(null);
+    }
+
     if (boxUpdateInfo.upgrade && config.provider() !== 'caas') return callback(new CloudronError(CloudronError.SELF_UPGRADE_NOT_SUPPORTED));
 
     update(boxUpdateInfo, auditSource, callback);
 }
 
+function doShortCircuitUpdate(boxUpdateInfo, callback) {
+    assert(boxUpdateInfo !== null && typeof boxUpdateInfo === 'object');
+
+    debug('Starting short-circuit from prerelease version %s to release version %s', config.version(), boxUpdateInfo.version);
+    config.setVersion(boxUpdateInfo.version);
+    progress.clear(progress.UPDATE);
+    updateChecker.resetUpdateInfo();
+    callback();
+}
+
 function doUpdate(boxUpdateInfo, callback) {
     assert(boxUpdateInfo && typeof boxUpdateInfo === 'object');
 
@@ -275,7 +294,7 @@ function doUpdate(boxUpdateInfo, callback) {
 
         debug('updating box %s %j', boxUpdateInfo.sourceTarballUrl, _.omit(data, 'tlsCert', 'tlsKey', 'token', 'appstore', 'caas'));
 
-        progress.set(progress.UPDATE, 5, 'Downloading and installing new version');
+        progress.set(progress.UPDATE, 5, 'Downloading and extracting new version');
 
         shell.sudo('update', [ UPDATE_CMD, boxUpdateInfo.sourceTarballUrl, JSON.stringify(data) ], function (error) {
             if (error) return updateError(error);

src/cron.js

@@ -22,12 +22,12 @@ var apps = require('./apps.js'),
     reverseProxy = require('./reverseproxy.js'),
     scheduler = require('./scheduler.js'),
     settings = require('./settings.js'),
+    semver = require('semver'),
     updateChecker = require('./updatechecker.js');
 
 var gJobs = {
     alive: null, // send periodic stats
-    appAutoUpdater: null,
-    boxAutoUpdater: null,
+    autoUpdater: null,
     appUpdateChecker: null,
     backup: null,
     boxUpdateChecker: null,
@@ -78,16 +78,14 @@ function initialize(callback) {
     });
 
     settings.events.on(settings.TIME_ZONE_KEY, recreateJobs);
-    settings.events.on(settings.APP_AUTOUPDATE_PATTERN_KEY, appAutoupdatePatternChanged);
-    settings.events.on(settings.BOX_AUTOUPDATE_PATTERN_KEY, boxAutoupdatePatternChanged);
+    settings.events.on(settings.AUTOUPDATE_PATTERN_KEY, autoupdatePatternChanged);
     settings.events.on(settings.DYNAMIC_DNS_KEY, dynamicDnsChanged);
 
     settings.getAll(function (error, allSettings) {
         if (error) return callback(error);
 
         recreateJobs(allSettings[settings.TIME_ZONE_KEY]);
-        appAutoupdatePatternChanged(allSettings[settings.APP_AUTOUPDATE_PATTERN_KEY]);
-        boxAutoupdatePatternChanged(allSettings[settings.BOX_AUTOUPDATE_PATTERN_KEY]);
+        autoupdatePatternChanged(allSettings[settings.AUTOUPDATE_PATTERN_KEY]);
         dynamicDnsChanged(allSettings[settings.DYNAMIC_DNS_KEY]);
 
         callback();
@@ -191,51 +189,32 @@ function recreateJobs(tz) {
     });
 }
 
-function boxAutoupdatePatternChanged(pattern) {
+function autoupdatePatternChanged(pattern) {
     assert.strictEqual(typeof pattern, 'string');
     assert(gJobs.boxUpdateCheckerJob);
 
-    debug('Box auto update pattern changed to %s', pattern);
+    debug('Auto update pattern changed to %s', pattern);
 
-    if (gJobs.boxAutoUpdater) gJobs.boxAutoUpdater.stop();
+    if (gJobs.autoUpdater) gJobs.autoUpdater.stop();
 
     if (pattern === constants.AUTOUPDATE_PATTERN_NEVER) return;
 
-    gJobs.boxAutoUpdater = new CronJob({
+    gJobs.autoUpdater = new CronJob({
         cronTime: pattern,
         onTick: function() {
             var updateInfo = updateChecker.getUpdateInfo();
             if (updateInfo.box) {
-                debug('Starting autoupdate to %j', updateInfo.box);
-                cloudron.updateToLatest(AUDIT_SOURCE, NOOP_CALLBACK);
-            } else {
-                debug('No box auto updates available');
-            }
-        },
-        start: true,
-        timeZone: gJobs.boxUpdateCheckerJob.cronTime.zone // hack
-    });
-}
-
-function appAutoupdatePatternChanged(pattern) {
-    assert.strictEqual(typeof pattern, 'string');
-    assert(gJobs.boxUpdateCheckerJob);
-
-    debug('Apps auto update pattern changed to %s', pattern);
-
-    if (gJobs.appAutoUpdater) gJobs.appAutoUpdater.stop();
-
-    if (pattern === constants.AUTOUPDATE_PATTERN_NEVER) return;
-
-    gJobs.appAutoUpdater = new CronJob({
-        cronTime: pattern,
-        onTick: function() {
-            var updateInfo = updateChecker.getUpdateInfo();
-            if (updateInfo.apps) {
+                if (semver.major(updateInfo.box.version) === semver.major(config.version())) {
+                    debug('Starting autoupdate to %j', updateInfo.box);
+                    cloudron.updateToLatest(AUDIT_SOURCE, NOOP_CALLBACK);
+                } else {
+                    debug('Block automatic update for major version');
+                }
+            } else if (updateInfo.apps) {
                 debug('Starting app update to %j', updateInfo.apps);
                 apps.autoupdateApps(updateInfo.apps, AUDIT_SOURCE, NOOP_CALLBACK);
             } else {
-                debug('No app auto updates available');
+                debug('No auto updates available');
             }
         },
         start: true,
@@ -266,8 +245,7 @@ function uninitialize(callback) {
     assert.strictEqual(typeof callback, 'function');
 
     settings.events.removeListener(settings.TIME_ZONE_KEY, recreateJobs);
-    settings.events.removeListener(settings.APP_AUTOUPDATE_PATTERN_KEY, appAutoupdatePatternChanged);
-    settings.events.removeListener(settings.BOX_AUTOUPDATE_PATTERN_KEY, boxAutoupdatePatternChanged);
+    settings.events.removeListener(settings.AUTOUPDATE_PATTERN_KEY, autoupdatePatternChanged);
     settings.events.removeListener(settings.DYNAMIC_DNS_KEY, dynamicDnsChanged);
 
     for (var job in gJobs) {

src/database.js

@@ -6,6 +6,10 @@ exports = module.exports = {
     query: query,
     transaction: transaction,
 
+    beginTransaction: beginTransaction,
+    rollback: rollback,
+    commit: commit,
+
     importFromFile: importFromFile,
     exportToFile: exportToFile,
 
@@ -23,13 +27,21 @@ var assert = require('assert'),
 var gConnectionPool = null,
     gDefaultConnection = null;
 
-function initialize(callback) {
+function initialize(options, callback) {
+    if (typeof options === 'function') {
+        callback = options;
+        options = {
+            connectionLimit: 5
+        };
+    }
+
+    assert.strictEqual(typeof options.connectionLimit, 'number');
     assert.strictEqual(typeof callback, 'function');
 
     if (gConnectionPool !== null) return callback(null);
 
     gConnectionPool  = mysql.createPool({
-        connectionLimit: 5, // this has to be > 1 since we store one connection as 'default'. the rest for transactions
+        connectionLimit: options.connectionLimit,
         host: config.database().hostname,
         user: config.database().username,
         password: config.database().password,

src/developer.js

@@ -0,0 +1,56 @@
+/* jslint node: true */
+
+'use strict';
+
+exports = module.exports = {
+    DeveloperError: DeveloperError,
+
+    issueDeveloperToken: issueDeveloperToken
+};
+
+var assert = require('assert'),
+    clients = require('./clients.js'),
+    constants = require('./constants.js'),
+    eventlog = require('./eventlog.js'),
+    tokendb = require('./tokendb.js'),
+    util = require('util');
+
+function DeveloperError(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(DeveloperError, Error);
+DeveloperError.INTERNAL_ERROR = 'Internal Error';
+DeveloperError.EXTERNAL_ERROR = 'External Error';
+
+function issueDeveloperToken(user, auditSource, callback) {
+    assert.strictEqual(typeof user, 'object');
+    assert.strictEqual(typeof auditSource, 'object');
+    assert.strictEqual(typeof callback, 'function');
+
+    var token = tokendb.generateToken();
+    var expiresAt = Date.now() + constants.DEFAULT_TOKEN_EXPIRATION;
+    var scopes = '*,' + clients.SCOPE_ROLE_SDK;
+
+    tokendb.add(token, user.id, 'cid-cli', expiresAt, scopes, function (error) {
+        if (error) return callback(new DeveloperError(DeveloperError.INTERNAL_ERROR, error));
+
+        eventlog.add(eventlog.ACTION_USER_LOGIN, auditSource, { authType: 'cli', userId: user.id, username: user.username });
+
+        callback(null, { token: token, expiresAt: new Date(expiresAt).toISOString() });
+    });
+}

src/dig.js

@@ -0,0 +1,46 @@
+'use strict';
+
+exports = module.exports = {
+    resolve: resolve
+};
+
+var assert = require('assert'),
+    child_process = require('child_process'),
+    debug = require('debug')('box:dig');
+
+function resolve(domain, type, options, callback) {
+    assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof type, 'string');
+    assert.strictEqual(typeof options, 'object');
+    assert.strictEqual(typeof callback, 'function');
+
+    // dig @server cloudron.io TXT +short
+    var args = [ ];
+    if (options.server) args.push('@' + options.server);
+    if (type === 'PTR') {
+        args.push('-x', domain);
+    } else {
+        args.push(domain, type);
+    }
+    args.push('+short');
+
+    child_process.execFile('/usr/bin/dig', args, { encoding: 'utf8', killSignal: 'SIGKILL', timeout: options.timeout || 0 }, function (error, stdout, stderr) {
+        if (error && error.killed) error.code = 'ETIMEDOUT';
+
+        if (error || stderr) debug('resolve error (%j): %j %s %s', args, error, stdout, stderr);
+        if (error) return callback(error);
+
+        debug('resolve (%j): %s', args, stdout);
+
+        if (!stdout) return callback(); // timeout or no result
+
+        var lines = stdout.trim().split('\n');
+        if (type === 'MX') {
+            lines = lines.map(function (line) {
+                var parts = line.split(' ');
+                return { priority: parts[0], exchange: parts[1] };
+            });
+        }
+        return callback(null, lines);
+    });
+}

src/dns/caas.js

@@ -11,7 +11,7 @@ exports = module.exports = {
 var assert = require('assert'),
     config = require('../config.js'),
     debug = require('debug')('box:dns/caas'),
-    DomainsError = require('../domains.js').DomainsError,
+    DomainError = require('../domains.js').DomainError,
     superagent = require('superagent'),
     util = require('util');
 
@@ -45,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 DomainsError(DomainsError.EXTERNAL_ERROR, util.format('Network error %s', error.message)));
-            if (result.statusCode === 400) return callback(new DomainsError(DomainsError.BAD_FIELD, result.body.message));
-            if (result.statusCode === 420) return callback(new DomainsError(DomainsError.STILL_BUSY));
-            if (result.statusCode !== 201) return callback(new DomainsError(DomainsError.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);
         });
@@ -70,8 +70,8 @@ function get(dnsConfig, zoneName, subdomain, type, callback) {
         .query({ token: dnsConfig.token, type: type })
         .timeout(30 * 1000)
         .end(function (error, result) {
-            if (error && !error.response) return callback(new DomainsError(DomainsError.EXTERNAL_ERROR, util.format('Network error %s', error.message)));
-            if (result.statusCode !== 200) return callback(new DomainsError(DomainsError.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);
         });
@@ -109,11 +109,11 @@ function del(dnsConfig, zoneName, subdomain, type, values, callback) {
         .send(data)
         .timeout(30 * 1000)
         .end(function (error, result) {
-            if (error && !error.response) return callback(new DomainsError(DomainsError.EXTERNAL_ERROR, util.format('Network error %s', error.message)));
-            if (result.statusCode === 400) return callback(new DomainsError(DomainsError.BAD_FIELD, result.body.message));
-            if (result.statusCode === 420) return callback(new DomainsError(DomainsError.STILL_BUSY));
-            if (result.statusCode === 404) return callback(new DomainsError(DomainsError.NOT_FOUND));
-            if (result.statusCode !== 204) return callback(new DomainsError(DomainsError.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);
         });

src/dns/cloudflare.js

@@ -11,8 +11,8 @@ exports = module.exports = {
 var assert = require('assert'),
     async = require('async'),
     debug = require('debug')('box:dns/cloudflare'),
-    dns = require('../native-dns.js'),
-    DomainsError = require('../domains.js').DomainsError,
+    dns = require('dns'),
+    DomainError = require('../domains.js').DomainError,
     superagent = require('superagent'),
     util = require('util'),
     _ = require('underscore');
@@ -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 DomainsError(DomainsError.NOT_FOUND, util.format('%s %j', result.statusCode, 'API does not exist')));
-    if (result.statusCode === 422) return callback(new DomainsError(DomainsError.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 DomainsError(DomainsError.ACCESS_DENIED, message));
+        return callback(new DomainError(DomainError.ACCESS_DENIED, message));
     }
 
-    callback(new DomainsError(DomainsError.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,13 +52,13 @@ 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 DomainsError(DomainsError.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]);
         });
 }
 
-function getDnsRecordsByZoneId(dnsConfig, zoneId, zoneName, subdomain, type, callback) {
+function getDNSRecordsByZoneId(dnsConfig, zoneId, zoneName, subdomain, type, callback) {
     assert.strictEqual(typeof dnsConfig, 'object');
     assert.strictEqual(typeof zoneId, 'string');
     assert.strictEqual(typeof zoneName, 'string');
@@ -100,7 +100,7 @@ function upsert(dnsConfig, zoneName, subdomain, type, values, callback) {
 
         var zoneId = result.id;
 
-        getDnsRecordsByZoneId(dnsConfig, zoneId, zoneName, subdomain, type, function (error, result) {
+        getDNSRecordsByZoneId(dnsConfig, zoneId, zoneName, subdomain, type, function (error, result) {
             if (error) return callback(error);
 
             var dnsRecords = result;
@@ -171,7 +171,7 @@ function get(dnsConfig, zoneName, subdomain, type, callback) {
     getZoneByName(dnsConfig, zoneName, function(error, result){
         if (error) return callback(error);
 
-        getDnsRecordsByZoneId(dnsConfig, result.id, zoneName, subdomain, type, function(error, result) {
+        getDNSRecordsByZoneId(dnsConfig, result.id, zoneName, subdomain, type, function(error, result) {
             if (error) return callback(error);
 
             var tmp = result.map(function (record) { return record.content; });
@@ -193,7 +193,7 @@ function del(dnsConfig, zoneName, subdomain, type, values, callback) {
     getZoneByName(dnsConfig, zoneName, function(error, result){
         if (error) return callback(error);
 
-        getDnsRecordsByZoneId(dnsConfig, result.id, zoneName, subdomain, type, function(error, result) {
+        getDNSRecordsByZoneId(dnsConfig, result.id, zoneName, subdomain, type, function(error, result) {
             if (error) return callback(error);
             if (result.length === 0) return callback(null);
 
@@ -233,8 +233,8 @@ 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 DomainsError(DomainsError.BAD_FIELD, 'token must be a non-empty string'));
-    if (!dnsConfig.email || typeof dnsConfig.email !== 'string') return callback(new DomainsError(DomainsError.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 = {
         token: dnsConfig.token,
@@ -243,16 +243,16 @@ function verifyDnsConfig(dnsConfig, fqdn, zoneName, ip, callback) {
 
     if (process.env.BOX_ENV === 'test') return callback(null, credentials); // this shouldn't be here
 
-    dns.resolve(zoneName, 'NS', { timeout: 5000 }, function (error, nameservers) {
-        if (error && error.code === 'ENOTFOUND') return callback(new DomainsError(DomainsError.BAD_FIELD, 'Unable to resolve nameservers for this domain'));
-        if (error || !nameservers) return callback(new DomainsError(DomainsError.BAD_FIELD, error ? error.message : 'Unable to get nameservers'));
+    dns.resolveNs(zoneName, function (error, 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 DomainsError(DomainsError.BAD_FIELD, 'Domain nameservers are not set to Cloudflare'));
+                return callback(new DomainError(DomainError.BAD_FIELD, 'Domain nameservers are not set to Cloudflare'));
             }
 
             const testSubdomain = 'cloudrontestdns';

src/dns/digitalocean.js

@@ -11,8 +11,8 @@ exports = module.exports = {
 var assert = require('assert'),
     async = require('async'),
     debug = require('debug')('box:dns/digitalocean'),
-    dns = require('../native-dns.js'),
-    DomainsError = require('../domains.js').DomainsError,
+    dns = require('dns'),
+    DomainError = require('../domains.js').DomainError,
     safe = require('safetydance'),
     superagent = require('superagent'),
     util = require('util');
@@ -39,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 DomainsError(DomainsError.EXTERNAL_ERROR, util.format('Network error %s', error.message)));
-                if (result.statusCode === 404) return callback(new DomainsError(DomainsError.NOT_FOUND, formatError(result)));
-                if (result.statusCode === 403 || result.statusCode === 401) return callback(new DomainsError(DomainsError.ACCESS_DENIED, formatError(result)));
-                if (result.statusCode !== 200) return callback(new DomainsError(DomainsError.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);
@@ -101,10 +101,10 @@ function upsert(dnsConfig, zoneName, subdomain, type, values, callback) {
                     .send(data)
                     .timeout(30 * 1000)
                     .end(function (error, result) {
-                        if (error && !error.response) return iteratorCallback(new DomainsError(DomainsError.EXTERNAL_ERROR, util.format('Network error %s', error.message)));
-                        if (result.statusCode === 403 || result.statusCode === 401) return iteratorCallback(new DomainsError(DomainsError.ACCESS_DENIED, formatError(result)));
-                        if (result.statusCode === 422) return iteratorCallback(new DomainsError(DomainsError.BAD_FIELD, result.body.message));
-                        if (result.statusCode !== 201) return iteratorCallback(new DomainsError(DomainsError.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'));
 
@@ -119,10 +119,10 @@ function upsert(dnsConfig, zoneName, subdomain, type, values, callback) {
                     // increment, as we have consumed the record
                         ++i;
 
-                        if (error && !error.response) return iteratorCallback(new DomainsError(DomainsError.EXTERNAL_ERROR, util.format('Network error %s', error.message)));
-                        if (result.statusCode === 403 || result.statusCode === 401) return iteratorCallback(new DomainsError(DomainsError.ACCESS_DENIED, formatError(result)));
-                        if (result.statusCode === 422) return iteratorCallback(new DomainsError(DomainsError.BAD_FIELD, result.body.message));
-                        if (result.statusCode !== 200) return iteratorCallback(new DomainsError(DomainsError.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'));
 
@@ -185,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 DomainsError(DomainsError.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 DomainsError(DomainsError.ACCESS_DENIED, formatError(result)));
-                if (result.statusCode !== 204) return callback(new DomainsError(DomainsError.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');
 
@@ -210,13 +210,13 @@ function verifyDnsConfig(dnsConfig, fqdn, zoneName, ip, callback) {
 
     if (process.env.BOX_ENV === 'test') return callback(null, credentials); // this shouldn't be here
 
-    dns.resolve(zoneName, 'NS', { timeout: 5000 }, function (error, nameservers) {
-        if (error && error.code === 'ENOTFOUND') return callback(new DomainsError(DomainsError.BAD_FIELD, 'Unable to resolve nameservers for this domain'));
-        if (error || !nameservers) return callback(new DomainsError(DomainsError.BAD_FIELD, error ? error.message : 'Unable to get nameservers'));
+    dns.resolveNs(zoneName, function (error, 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 DomainsError(DomainsError.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 testSubdomain = 'cloudrontestdns';

src/dns/gandi.js

@@ -1,146 +0,0 @@
-'use strict';
-
-exports = module.exports = {
-    upsert: upsert,
-    get: get,
-    del: del,
-    waitForDns: require('./waitfordns.js'),
-    verifyDnsConfig: verifyDnsConfig
-};
-
-var assert = require('assert'),
-    debug = require('debug')('box:dns/gandi'),
-    dns = require('../native-dns.js'),
-    DomainsError = require('../domains.js').DomainsError,
-    superagent = require('superagent'),
-    util = require('util');
-
-var GANDI_API = 'https://dns.api.gandi.net/api/v5';
-
-function formatError(response) {
-    return util.format(`Gandi DNS error [${response.statusCode}] ${response.body.message}`);
-}
-
-function upsert(dnsConfig, zoneName, subdomain, type, values, callback) {
-    assert.strictEqual(typeof dnsConfig, 'object');
-    assert.strictEqual(typeof zoneName, 'string');
-    assert.strictEqual(typeof subdomain, 'string');
-    assert.strictEqual(typeof type, 'string');
-    assert(util.isArray(values));
-    assert.strictEqual(typeof callback, 'function');
-
-    subdomain = subdomain || '@';
-
-    debug(`upsert: ${subdomain} in zone ${zoneName} of type ${type} with values ${JSON.stringify(values)}`);
-
-    var data = {
-        'rrset_ttl': 300, // this is the minimum allowed
-        'rrset_values': values // for mx records, value is already of the '<priority> <server>' format
-    };
-
-    superagent.put(`${GANDI_API}/domains/${zoneName}/records/${subdomain}/${type}`)
-        .set('X-Api-Key', dnsConfig.token)
-        .timeout(30 * 1000)
-        .send(data)
-        .end(function (error, result) {
-            if (error && !error.response) return callback(new DomainsError(DomainsError.EXTERNAL_ERROR, util.format('Network error %s', error.message)));
-            if (result.statusCode === 403 || result.statusCode === 401) return callback(new DomainsError(DomainsError.ACCESS_DENIED, formatError(result)));
-            if (result.statusCode === 400) return callback(new DomainsError(DomainsError.BAD_FIELD, formatError(result)));
-            if (result.statusCode !== 201) return callback(new DomainsError(DomainsError.EXTERNAL_ERROR, formatError(result)));
-
-            return callback(null, 'unused-id');
-        });
-}
-
-function get(dnsConfig, zoneName, subdomain, type, callback) {
-    assert.strictEqual(typeof dnsConfig, 'object');
-    assert.strictEqual(typeof zoneName, 'string');
-    assert.strictEqual(typeof subdomain, 'string');
-    assert.strictEqual(typeof type, 'string');
-    assert.strictEqual(typeof callback, 'function');
-
-    subdomain = subdomain || '@';
-
-    debug(`get: ${subdomain} in zone ${zoneName} of type ${type}`);
-
-    superagent.get(`${GANDI_API}/domains/${zoneName}/records/${subdomain}/${type}`)
-        .set('X-Api-Key', dnsConfig.token)
-        .timeout(30 * 1000)
-        .end(function (error, result) {
-            if (error && !error.response) return callback(new DomainsError(DomainsError.EXTERNAL_ERROR, util.format('Network error %s', error.message)));
-            if (result.statusCode === 403 || result.statusCode === 401) return callback(new DomainsError(DomainsError.ACCESS_DENIED, formatError(result)));
-            if (result.statusCode === 404) return callback(null, [ ]);
-            if (result.statusCode !== 200) return callback(new DomainsError(DomainsError.EXTERNAL_ERROR, formatError(result)));
-
-            debug('get: %j', result.body);
-
-            return callback(null, result.body.rrset_values);
-        });
-}
-
-function del(dnsConfig, zoneName, subdomain, type, values, callback) {
-    assert.strictEqual(typeof dnsConfig, 'object');
-    assert.strictEqual(typeof zoneName, 'string');
-    assert.strictEqual(typeof subdomain, 'string');
-    assert.strictEqual(typeof type, 'string');
-    assert(util.isArray(values));
-    assert.strictEqual(typeof callback, 'function');
-
-    subdomain = subdomain || '@';
-
-    debug(`del: ${subdomain} in zone ${zoneName} of type ${type} with values ${JSON.stringify(values)}`);
-
-    superagent.del(`${GANDI_API}/domains/${zoneName}/records/${subdomain}/${type}`)
-        .set('X-Api-Key', dnsConfig.token)
-        .timeout(30 * 1000)
-        .end(function (error, result) {
-            if (error && !error.response) return callback(new DomainsError(DomainsError.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 DomainsError(DomainsError.ACCESS_DENIED, formatError(result)));
-            if (result.statusCode !== 204) return callback(new DomainsError(DomainsError.EXTERNAL_ERROR, formatError(result)));
-
-            debug('del: done');
-
-            return callback(null);
-        });
-}
-
-function verifyDnsConfig(dnsConfig, fqdn, zoneName, ip, callback) {
-    assert.strictEqual(typeof dnsConfig, 'object');
-    assert.strictEqual(typeof fqdn, 'string');
-    assert.strictEqual(typeof zoneName, 'string');
-    assert.strictEqual(typeof ip, 'string');
-    assert.strictEqual(typeof callback, 'function');
-
-    var credentials = {
-        token: dnsConfig.token
-    };
-
-    if (process.env.BOX_ENV === 'test') return callback(null, credentials); // this shouldn't be here
-
-    dns.resolve(zoneName, 'NS', { timeout: 5000 }, function (error, nameservers) {
-        if (error && error.code === 'ENOTFOUND') return callback(new DomainsError(DomainsError.BAD_FIELD, 'Unable to resolve nameservers for this domain'));
-        if (error || !nameservers) return callback(new DomainsError(DomainsError.BAD_FIELD, error ? error.message : 'Unable to get nameservers'));
-
-        if (!nameservers.every(function (n) { return n.toLowerCase().indexOf('.gandi.net') !== -1; })) {
-            debug('verifyDnsConfig: %j does not contain Gandi NS', nameservers);
-            return callback(new DomainsError(DomainsError.BAD_FIELD, 'Domain nameservers are not set to Gandi'));
-        }
-
-        const testSubdomain = 'cloudrontestdns';
-
-        upsert(credentials, zoneName, testSubdomain, 'A', [ ip ], function (error, changeId) {
-            if (error) return callback(error);
-
-            debug('verifyDnsConfig: Test A record added with change id %s', changeId);
-
-            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

@@ -10,8 +10,8 @@ exports = module.exports = {
 
 var assert = require('assert'),
     debug = require('debug')('box:dns/gcdns'),
-    dns = require('../native-dns.js'),
-    DomainsError = require('../domains.js').DomainsError,
+    dns = require('dns'),
+    DomainError = require('../domains.js').DomainError,
     GCDNS = require('@google-cloud/dns'),
     util = require('util'),
     _ = require('underscore');
@@ -42,20 +42,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 DomainsError(DomainsError.ACCESS_DENIED, 'The key was probably revoked'));
-        if (error && error.reason === 'No such domain') return callback(new DomainsError(DomainsError.NOT_FOUND, error.message));
-        if (error && error.code === 403) return callback(new DomainsError(DomainsError.ACCESS_DENIED, error.message));
-        if (error && error.code === 404) return callback(new DomainsError(DomainsError.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 DomainsError(DomainsError.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 DomainsError(DomainsError.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:[]}
     });
@@ -77,10 +77,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 DomainsError(DomainsError.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 DomainsError(DomainsError.EXTERNAL_ERROR, error.message));
+                return callback(new DomainError(DomainError.EXTERNAL_ERROR, error.message));
             }
 
             var newRecord = zone.record(type, {
@@ -90,11 +90,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 DomainsError(DomainsError.ACCESS_DENIED, error.message));
-                if (error && error.code === 412) return callback(new DomainsError(DomainsError.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 DomainsError(DomainsError.EXTERNAL_ERROR, error.message));
+                    return callback(new DomainError(DomainError.EXTERNAL_ERROR, error.message));
                 }
 
                 callback(null, change.id);
@@ -119,8 +119,8 @@ function get(dnsConfig, zoneName, subdomain, type, callback) {
         };
 
         zone.getRecords(params, function (error, records) {
-            if (error && error.code === 403) return callback(new DomainsError(DomainsError.ACCESS_DENIED, error.message));
-            if (error) return callback(new DomainsError(DomainsError.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);
@@ -142,18 +142,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 DomainsError(DomainsError.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 DomainsError(DomainsError.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 DomainsError(DomainsError.ACCESS_DENIED, error.message));
-                if (error && error.code === 412) return callback(new DomainsError(DomainsError.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 DomainsError(DomainsError.EXTERNAL_ERROR, error.message));
+                    return callback(new DomainError(DomainError.EXTERNAL_ERROR, error.message));
                 }
 
                 callback(null, change.id);
@@ -172,9 +172,9 @@ function verifyDnsConfig(dnsConfig, fqdn, zoneName, ip, callback) {
     var credentials = getDnsCredentials(dnsConfig);
     if (process.env.BOX_ENV === 'test') return callback(null, credentials); // this shouldn't be here
 
-    dns.resolve(zoneName, 'NS', { timeout: 5000 }, function (error, nameservers) {
-        if (error && error.code === 'ENOTFOUND') return callback(new DomainsError(DomainsError.BAD_FIELD, 'Unable to resolve nameservers for this domain'));
-        if (error || !resolvedNS) return callback(new DomainsError(DomainsError.BAD_FIELD, error ? error.message : 'Unable to get nameservers'));
+    dns.resolveNs(zoneName, function (error, resolvedNS) {
+        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);
@@ -182,7 +182,7 @@ 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 DomainsError(DomainsError.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 testSubdomain = 'cloudrontestdns';

src/dns/godaddy.js

@@ -1,181 +0,0 @@
-'use strict';
-
-exports = module.exports = {
-    upsert: upsert,
-    get: get,
-    del: del,
-    waitForDns: require('./waitfordns.js'),
-    verifyDnsConfig: verifyDnsConfig
-};
-
-var assert = require('assert'),
-    debug = require('debug')('box:dns/godaddy'),
-    dns = require('../native-dns.js'),
-    DomainsError = require('../domains.js').DomainsError,
-    superagent = require('superagent'),
-    util = require('util');
-
-// const GODADDY_API_OTE = 'https://api.ote-godaddy.com/v1/domains';
-const GODADDY_API = 'https://api.godaddy.com/v1/domains';
-
-// this is a workaround for godaddy not having a delete API
-// https://stackoverflow.com/questions/39347464/delete-record-libcloud-godaddy-api
-const GODADDY_INVALID_IP = '0.0.0.0';
-
-function formatError(response) {
-    return util.format(`GoDaddy DNS error [${response.statusCode}] ${response.body.message}`);
-}
-
-function upsert(dnsConfig, zoneName, subdomain, type, values, callback) {
-    assert.strictEqual(typeof dnsConfig, 'object');
-    assert.strictEqual(typeof zoneName, 'string');
-    assert.strictEqual(typeof subdomain, 'string');
-    assert.strictEqual(typeof type, 'string');
-    assert(util.isArray(values));
-    assert.strictEqual(typeof callback, 'function');
-
-    subdomain = subdomain || '@';
-
-    debug(`upsert: ${subdomain} in zone ${zoneName} of type ${type} with values ${JSON.stringify(values)}`);
-
-    var records = [ ];
-    values.forEach(function (value) {
-        var record = { ttl: 600 }; // 600 is the min ttl
-
-        if (type === 'MX') {
-            record.priority = parseInt(value.split(' ')[0], 10);
-            record.data = value.split(' ')[1];
-        } else {
-            record.data = value;
-        }
-
-        records.push(record);
-    });
-
-    superagent.put(`${GODADDY_API}/${zoneName}/records/${type}/${subdomain}`)
-        .set('Authorization', `sso-key ${dnsConfig.apiKey}:${dnsConfig.apiSecret}`)
-        .timeout(30 * 1000)
-        .send(records)
-        .end(function (error, result) {
-            if (error && !error.response) return callback(new DomainsError(DomainsError.EXTERNAL_ERROR, util.format('Network error %s', error.message)));
-            if (result.statusCode === 403 || result.statusCode === 401) return callback(new DomainsError(DomainsError.ACCESS_DENIED, formatError(result)));
-            if (result.statusCode === 400) return callback(new DomainsError(DomainsError.BAD_FIELD, formatError(result))); // no such zone
-            if (result.statusCode === 422) return callback(new DomainsError(DomainsError.BAD_FIELD, formatError(result))); // conflict
-            if (result.statusCode !== 200) return callback(new DomainsError(DomainsError.EXTERNAL_ERROR, formatError(result)));
-
-            return callback(null, 'unused-id');
-        });
-}
-
-function get(dnsConfig, zoneName, subdomain, type, callback) {
-    assert.strictEqual(typeof dnsConfig, 'object');
-    assert.strictEqual(typeof zoneName, 'string');
-    assert.strictEqual(typeof subdomain, 'string');
-    assert.strictEqual(typeof type, 'string');
-    assert.strictEqual(typeof callback, 'function');
-
-    subdomain = subdomain || '@';
-
-    debug(`get: ${subdomain} in zone ${zoneName} of type ${type}`);
-
-    superagent.get(`${GODADDY_API}/${zoneName}/records/${type}/${subdomain}`)
-        .set('Authorization', `sso-key ${dnsConfig.apiKey}:${dnsConfig.apiSecret}`)
-        .timeout(30 * 1000)
-        .end(function (error, result) {
-            if (error && !error.response) return callback(new DomainsError(DomainsError.EXTERNAL_ERROR, util.format('Network error %s', error.message)));
-            if (result.statusCode === 403 || result.statusCode === 401) return callback(new DomainsError(DomainsError.ACCESS_DENIED, formatError(result)));
-            if (result.statusCode === 404) return callback(null, [ ]);
-            if (result.statusCode !== 200) return callback(new DomainsError(DomainsError.EXTERNAL_ERROR, formatError(result)));
-
-            debug('get: %j', result.body);
-
-            var values = result.body.map(function (record) { return record.data; });
-
-            if (values.length === 1 && values[0] === GODADDY_INVALID_IP) return callback(null, [ ]); // pretend this record doesn't exist
-
-            return callback(null, values);
-        });
-}
-
-function del(dnsConfig, zoneName, subdomain, type, values, callback) {
-    assert.strictEqual(typeof dnsConfig, 'object');
-    assert.strictEqual(typeof zoneName, 'string');
-    assert.strictEqual(typeof subdomain, 'string');
-    assert.strictEqual(typeof type, 'string');
-    assert(util.isArray(values));
-    assert.strictEqual(typeof callback, 'function');
-
-    subdomain = subdomain || '@';
-
-    debug(`get: ${subdomain} in zone ${zoneName} of type ${type} with values ${JSON.stringify(values)}`);
-
-    if (type !== 'A') return callback(new DomainsError(DomainsError.EXTERNAL_ERROR, new Error('Not supported by GoDaddy API'))); // can never happen
-
-    // check if the record exists at all so that we don't insert the "Dead" record for no reason
-    get(dnsConfig, zoneName, subdomain, type, function (error, values) {
-        if (error) return callback(error);
-        if (values.length === 0) return callback();
-
-        // godaddy does not have a delete API. so fill it up with an invalid IP that we can ignore in future get()
-        var records = [{
-            ttl: 600,
-            data: GODADDY_INVALID_IP
-        }];
-
-        superagent.put(`${GODADDY_API}/${zoneName}/records/${type}/${subdomain}`)
-            .set('Authorization', `sso-key ${dnsConfig.apiKey}:${dnsConfig.apiSecret}`)
-            .send(records)
-            .timeout(30 * 1000)
-            .end(function (error, result) {
-                if (error && !error.response) return callback(new DomainsError(DomainsError.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 DomainsError(DomainsError.ACCESS_DENIED, formatError(result)));
-                if (result.statusCode !== 200) return callback(new DomainsError(DomainsError.EXTERNAL_ERROR, formatError(result)));
-
-                debug('del: done');
-
-                return callback(null);
-            });
-    });
-}
-
-function verifyDnsConfig(dnsConfig, fqdn, zoneName, ip, callback) {
-    assert.strictEqual(typeof dnsConfig, 'object');
-    assert.strictEqual(typeof fqdn, 'string');
-    assert.strictEqual(typeof zoneName, 'string');
-    assert.strictEqual(typeof ip, 'string');
-    assert.strictEqual(typeof callback, 'function');
-
-    var credentials = {
-        apiKey: dnsConfig.apiKey,
-        apiSecret: dnsConfig.apiSecret
-    };
-
-    if (process.env.BOX_ENV === 'test') return callback(null, credentials); // this shouldn't be here
-
-    dns.resolve(zoneName, 'NS', { timeout: 5000 }, function (error, nameservers) {
-        if (error && error.code === 'ENOTFOUND') return callback(new DomainsError(DomainsError.BAD_FIELD, 'Unable to resolve nameservers for this domain'));
-        if (error || !nameservers) return callback(new DomainsError(DomainsError.BAD_FIELD, error ? error.message : 'Unable to get nameservers'));
-
-        if (!nameservers.every(function (n) { return n.toLowerCase().indexOf('.domaincontrol.com') !== -1; })) {
-            debug('verifyDnsConfig: %j does not contain GoDaddy NS', nameservers);
-            return callback(new DomainsError(DomainsError.BAD_FIELD, 'Domain nameservers are not set to GoDaddy'));
-        }
-
-        const testSubdomain = 'cloudrontestdns';
-
-        upsert(credentials, zoneName, testSubdomain, 'A', [ ip ], function (error, changeId) {
-            if (error) return callback(error);
-
-            debug('verifyDnsConfig: Test A record added with change id %s', changeId);
-
-            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'),
-    DomainsError = require('../domains.js').DomainsError,
+    DomainError = require('../domains.js').DomainError,
     util = require('util');
 
 function upsert(dnsConfig, zoneName, subdomain, type, values, callback) {

src/dns/manual.js

@@ -10,8 +10,8 @@ exports = module.exports = {
 
 var assert = require('assert'),
     debug = require('debug')('box:dns/manual'),
-    dns = require('../native-dns.js'),
-    DomainsError = require('../domains.js').DomainsError,
+    dns = require('dns'),
+    DomainError = require('../domains.js').DomainError,
     util = require('util');
 
 function upsert(dnsConfig, zoneName, subdomain, type, values, callback) {
@@ -56,8 +56,8 @@ function verifyDnsConfig(dnsConfig, domain, zoneName, ip, callback) {
     assert.strictEqual(typeof callback, 'function');
 
     // Very basic check if the nameservers can be fetched
-    dns.resolve(zoneName, 'NS', { timeout: 5000 }, function (error, nameservers) {
-        if (error || !nameservers) return callback(new DomainsError(DomainsError.BAD_FIELD, 'Unable to get nameservers'));
+    dns.resolveNs(zoneName, function (error, nameservers) {
+        if (error || !nameservers) return callback(new DomainError(DomainError.BAD_FIELD, 'Unable to get nameservers'));
 
         callback(null, { wildcard: !!dnsConfig.wildcard });
     });

src/dns/noop.js

@@ -46,10 +46,11 @@ function del(dnsConfig, zoneName, subdomain, type, values, callback) {
     return callback();
 }
 
-function waitForDns(domain, zoneName, value, options, callback) {
+function waitForDns(domain, zoneName, value, type, options, callback) {
     assert.strictEqual(typeof domain, 'string');
     assert.strictEqual(typeof zoneName, 'string');
-    assert.strictEqual(typeof value, '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');
 

src/dns/route53.js

@@ -13,9 +13,10 @@ exports = module.exports = {
 
 var assert = require('assert'),
     AWS = require('aws-sdk'),
+    config = require('../config.js'),
     debug = require('debug')('box:dns/route53'),
-    dns = require('../native-dns.js'),
-    DomainsError = require('../domains.js').DomainsError,
+    dns = require('dns'),
+    DomainError = require('../domains.js').DomainError,
     util = require('util'),
     _ = require('underscore');
 
@@ -39,25 +40,16 @@ function getZoneByName(dnsConfig, zoneName, callback) {
     assert.strictEqual(typeof callback, 'function');
 
     var route53 = new AWS.Route53(getDnsCredentials(dnsConfig));
-
-    // backward compat for 2.2, where we only required access to "listHostedZones"
-    let listHostedZones;
-    if (dnsConfig.listHostedZonesByName) {
-        listHostedZones = route53.listHostedZonesByName.bind(route53, { MaxItems: '1', DNSName: zoneName + '.' });
-    } else {
-        listHostedZones = route53.listHostedZones.bind(route53, {}); // currently, this route does not support > 100 zones
-    }
-
-    listHostedZones(function (error, result) {
-        if (error && error.code === 'AccessDenied') return callback(new DomainsError(DomainsError.ACCESS_DENIED, error.message));
-        if (error && error.code === 'InvalidClientTokenId') return callback(new DomainsError(DomainsError.ACCESS_DENIED, error.message));
-        if (error) return callback(new DomainsError(DomainsError.EXTERNAL_ERROR, error.message));
+    route53.listHostedZones({}, function (error, result) {
+        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 DomainsError(DomainsError.NOT_FOUND, 'no such zone'));
+        if (!zone) return callback(new DomainError(DomainError.NOT_FOUND, 'no such zone'));
 
         callback(null, zone);
     });
@@ -73,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 DomainsError(DomainsError.ACCESS_DENIED, error.message));
-            if (error && error.code === 'InvalidClientTokenId') return callback(new DomainsError(DomainsError.ACCESS_DENIED, error.message));
-            if (error) return callback(new DomainsError(DomainsError.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);
         });
@@ -96,7 +88,7 @@ function add(dnsConfig, zoneName, subdomain, type, values, callback) {
         if (error) return callback(error);
 
         var fqdn = subdomain === '' ? zoneName : subdomain + '.' + zoneName;
-        var records = values.map(function (v) { return { Value: v }; });  // for mx records, value is already of the '<priority> <server>' format
+        var records = values.map(function (v) { return { Value: v }; });
 
         var params = {
             ChangeBatch: {
@@ -115,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 DomainsError(DomainsError.ACCESS_DENIED, error.message));
-            if (error && error.code === 'InvalidClientTokenId') return callback(new DomainsError(DomainsError.ACCESS_DENIED, error.message));
-            if (error && error.code === 'PriorRequestNotComplete') return callback(new DomainsError(DomainsError.STILL_BUSY, error.message));
-            if (error && error.code === 'InvalidChangeBatch') return callback(new DomainsError(DomainsError.BAD_FIELD, error.message));
-            if (error) return callback(new DomainsError(DomainsError.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);
         });
@@ -156,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 DomainsError(DomainsError.ACCESS_DENIED, error.message));
-            if (error && error.code === 'InvalidClientTokenId') return callback(new DomainsError(DomainsError.ACCESS_DENIED, error.message));
-            if (error) return callback(new DomainsError(DomainsError.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, [ ]);
 
@@ -201,24 +193,24 @@ function del(dnsConfig, zoneName, subdomain, type, values, callback) {
         };
 
         var route53 = new AWS.Route53(getDnsCredentials(dnsConfig));
-        route53.changeResourceRecordSets(params, function(error) {
-            if (error && error.code === 'AccessDenied') return callback(new DomainsError(DomainsError.ACCESS_DENIED, error.message));
-            if (error && error.code === 'InvalidClientTokenId') return callback(new DomainsError(DomainsError.ACCESS_DENIED, error.message));
+        route53.changeResourceRecordSets(params, function(error, result) {
+            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 DomainsError(DomainsError.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 DomainsError(DomainsError.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 DomainsError(DomainsError.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 DomainsError(DomainsError.NOT_FOUND, error.message));
+                return callback(new DomainError(DomainError.NOT_FOUND, error.message));
             } else if (error) {
                 debug('del: error', error);
-                return callback(new DomainsError(DomainsError.EXTERNAL_ERROR, error.message));
+                return callback(new DomainError(DomainError.EXTERNAL_ERROR, error.message));
             }
 
             callback(null);
@@ -237,22 +229,21 @@ function verifyDnsConfig(dnsConfig, fqdn, zoneName, ip, callback) {
         accessKeyId: dnsConfig.accessKeyId,
         secretAccessKey: dnsConfig.secretAccessKey,
         region: dnsConfig.region || 'us-east-1',
-        endpoint: dnsConfig.endpoint || null,
-        listHostedZonesByName: true // new/updated creds require this perm
+        endpoint: dnsConfig.endpoint || null
     };
 
     if (process.env.BOX_ENV === 'test') return callback(null, credentials); // this shouldn't be here
 
-    dns.resolve(zoneName, 'NS', { timeout: 5000 }, function (error, nameservers) {
-        if (error && error.code === 'ENOTFOUND') return callback(new DomainsError(DomainsError.BAD_FIELD, 'Unable to resolve nameservers for this domain'));
-        if (error || !nameservers) return callback(new DomainsError(DomainsError.BAD_FIELD, error ? error.message : 'Unable to get nameservers'));
+    dns.resolveNs(zoneName, function (error, 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 DomainsError(DomainsError.BAD_FIELD, 'Domain nameservers are not set to Route53'));
+                return callback(new DomainError(DomainError.BAD_FIELD, 'Domain nameservers are not set to Route53'));
             }
 
             const testSubdomain = 'cloudrontestdns';

src/dns/waitfordns.js

@@ -5,59 +5,53 @@ exports = module.exports = waitForDns;
 var assert = require('assert'),
     async = require('async'),
     debug = require('debug')('box:dns/waitfordns'),
-    dns = require('../native-dns.js'),
-    DomainsError = require('../domains.js').DomainsError;
+    dig = require('../dig.js'),
+    dns = require('dns'),
+    DomainError = require('../domains.js').DomainError,
+    util = require('util');
 
-function resolveIp(hostname, options, callback) {
-    assert.strictEqual(typeof hostname, 'string');
-    assert.strictEqual(typeof options, 'object');
-    assert.strictEqual(typeof callback, 'function');
-
-    // try A record at authoritative server
-    debug(`resolveIp: Checking if ${hostname} has A record at ${options.server}`);
-    dns.resolve(hostname, 'A', options, function (error, results) {
-        if (!error && results.length !== 0) return callback(null, results);
-
-        // try CNAME record at authoritative server
-        debug(`resolveIp: Checking if ${hostname} has CNAME record at ${options.server}`);
-        dns.resolve(hostname, 'CNAME', options, function (error, results) {
-            if (error || results.length === 0) return callback(error, results);
-
-            // recurse lookup the CNAME record
-            debug(`resolveIp: Resolving ${hostname}'s CNAME record ${results[0]}`);
-            dns.resolve(results[0], 'A', { server: '127.0.0.1', timeout: options.timeout }, callback);
-        });
-    });
-}
-
-function isChangeSynced(domain, value, nameserver, callback) {
+function isChangeSynced(domain, value, type, nameserver, callback) {
     assert.strictEqual(typeof domain, 'string');
-    assert.strictEqual(typeof value, 'string');
+    assert(util.isRegExp(value));
+    assert.strictEqual(typeof type, 'string');
     assert.strictEqual(typeof nameserver, 'string');
     assert.strictEqual(typeof callback, 'function');
 
     // ns records cannot have cname
-    dns.resolve(nameserver, 'A', { timeout: 5000 }, function (error, nsIps) {
+    dns.resolve4(nameserver, function (error, nsIps) {
         if (error || !nsIps || nsIps.length === 0) {
-            debug(`isChangeSynced: cannot resolve NS ${nameserver}`); // it's fine if one or more ns are dead
-            return callback(null, true);
+            debug('nameserver %s does not resolve. assuming it stays bad.', nameserver); // it's fine if one or more ns are dead
+            return callback(true);
         }
 
         async.every(nsIps, function (nsIp, iteratorCallback) {
-            resolveIp(domain, { server: nsIp, timeout: 5000 }, function (error, answer) {
-                if (error && error.code === 'TIMEOUT') {
-                    debug(`isChangeSynced: NS ${nameserver} (${nsIp}) timed out when resolving ${domain}`);
+            dig.resolve(domain, type, { 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, domain);
                     return iteratorCallback(null, true); // should be ok if dns server is down
                 }
 
                 if (error) {
-                    debug(`isChangeSynced: NS ${nameserver} (${nsIp}) errored when resolve ${domain}: ${error}`);
+                    debug('nameserver %s (%s) returned error trying to resolve %s: %s', nameserver, nsIp, domain, error);
                     return iteratorCallback(null, false);
                 }
 
-                debug(`isChangeSynced: ${domain} was resolved to ${answer} at NS ${nameserver} (${nsIp}). Expecting ${value}`);
+                if (!answer || answer.length === 0) {
+                    debug('bad answer from nameserver %s (%s) resolving %s (%s)', nameserver, nsIp, domain, type);
+                    return iteratorCallback(null, false);
+                }
 
-                iteratorCallback(null, answer.length === 1 && answer[0] === value);
+                debug('isChangeSynced: ns: %s (%s), name:%s Actual:%j Expecting:%s', nameserver, nsIp, domain, answer, value);
+
+                var match = answer.some(function (a) {
+                    return ((type === 'A' && value.test(a)) ||
+                            (type === 'CNAME' && value.test(a)) ||
+                            (type === 'TXT' && value.test(a)));
+                });
+
+                if (match) return iteratorCallback(null, true); // done!
+
+                iteratorCallback(null, false);
             });
         }, callback);
 
@@ -65,33 +59,38 @@ function isChangeSynced(domain, value, nameserver, callback) {
 }
 
 // check if IP change has propagated to every nameserver
-function waitForDns(domain, zoneName, value, options, callback) {
+function waitForDns(domain, zoneName, value, type, options, callback) {
     assert.strictEqual(typeof domain, 'string');
     assert.strictEqual(typeof zoneName, 'string');
-    assert.strictEqual(typeof value, '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');
 
-    debug('waitForDns: domain %s to be %s in zone %s.', domain, value, zoneName);
+    if (typeof value === 'string') {
+        // http://stackoverflow.com/questions/3561493/is-there-a-regexp-escape-function-in-javascript
+        value = new RegExp('^' + value.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&') + '$');
+    }
 
-    var attempt = 0;
+    debug('waitForIp: domain %s to be %s in zone %s.', domain, value, zoneName);
+
+    var attempt = 1;
     async.retry(options, function (retryCallback) {
-        ++attempt;
-        debug(`waitForDns (try ${attempt}): ${domain} to be ${value} in zone ${zoneName}`);
+        debug('waitForDNS: %s (zone: %s) attempt %s.', domain, zoneName, attempt++);
 
-        dns.resolve(zoneName, 'NS', { timeout: 5000 }, function (error, nameservers) {
-            if (error || !nameservers) return retryCallback(error || new DomainsError(DomainsError.EXTERNAL_ERROR, 'Unable to get nameservers'));
+        dns.resolveNs(zoneName, function (error, nameservers) {
+            if (error || !nameservers) return retryCallback(error || new DomainError(DomainError.EXTERNAL_ERROR, 'Unable to get nameservers'));
 
-            async.every(nameservers, isChangeSynced.bind(null, domain, value), function (error, synced) {
-                debug('waitForDns: %s %s ns: %j', domain, synced ? 'done' : 'not done', 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 DomainsError(DomainsError.EXTERNAL_ERROR, 'ETRYAGAIN'));
+                retryCallback(synced ? null : new DomainError(DomainError.EXTERNAL_ERROR, 'ETRYAGAIN'));
             });
         });
     }, function retryDone(error) {
         if (error) return callback(error);
 
-        debug(`waitForDns: ${domain} has propagated`);
+        debug('waitForDNS: %s done.', domain);
 
         callback(null);
     });

src/docker.js

@@ -15,7 +15,6 @@ exports = module.exports = {
     createSubcontainer: createSubcontainer,
     getContainerIdByIp: getContainerIdByIp,
     inspect: inspect,
-    inspectByName: inspect,
     execContainer: execContainer
 };
 
@@ -45,38 +44,56 @@ var addons = require('./addons.js'),
     debug = require('debug')('box:docker.js'),
     once = require('once'),
     safe = require('safetydance'),
-    shell = require('./shell.js'),
     spawn = child_process.spawn,
     util = require('util'),
     _ = require('underscore');
 
 function debugApp(app, args) {
-    assert(typeof app === 'object');
+    assert(!app || typeof app === 'object');
 
-    debug(app.fqdn + ' ' + util.format.apply(util, Array.prototype.slice.call(arguments, 1)));
+    var prefix = app ? app.intrinsicFqdn : '(no app)';
+    debug(prefix + ' ' + util.format.apply(util, Array.prototype.slice.call(arguments, 1)));
 }
 
 function pullImage(manifest, callback) {
     var docker = exports.connection;
 
-    // Use docker CLI here to support downloading of private repos. for dockerode, we have to use
-    // https://github.com/apocas/dockerode#pull-from-private-repos
-    shell.exec('pullImage', '/usr/bin/docker', [ 'pull', manifest.dockerImage ], { }, function (error) {
-        if (error) {
-            debug(`pullImage: Error pulling image ${manifest.dockerImage} of ${manifest.id}: ${error.message}`);
-            return callback(new Error('Failed to pull image'));
-        }
+    docker.pull(manifest.dockerImage, function (err, stream) {
+        if (err) return callback(new Error('Error connecting to docker. statusCode: ' + err.statusCode));
 
-        var image = docker.getImage(manifest.dockerImage);
+        // https://github.com/dotcloud/docker/issues/1074 says each status message
+        // is emitted as a chunk
+        stream.on('data', function (chunk) {
+            var data = safe.JSON.parse(chunk) || { };
+            debug('pullImage %s: %j', manifest.id, data);
 
-        image.inspect(function (err, data) {
-            if (err) return callback(new Error('Error inspecting image:' + err.message));
-            if (!data || !data.Config) return callback(new Error('Missing Config in image:' + JSON.stringify(data, null, 4)));
-            if (!data.Config.Entrypoint && !data.Config.Cmd) return callback(new Error('Only images with entry point are allowed'));
+            // The information here is useless because this is per layer as opposed to per image
+            if (data.status) {
+            } else if (data.error) {
+                debug('pullImage error %s: %s', manifest.id, data.errorDetail.message);
+            }
+        });
 
-            if (data.Config.ExposedPorts) debug('This image of %s exposes ports: %j', manifest.id, data.Config.ExposedPorts);
+        stream.on('end', function () {
+            debug('downloaded image %s of %s successfully', manifest.dockerImage, manifest.id);
 
-            callback(null);
+            var image = docker.getImage(manifest.dockerImage);
+
+            image.inspect(function (err, data) {
+                if (err) return callback(new Error('Error inspecting image:' + err.message));
+                if (!data || !data.Config) return callback(new Error('Missing Config in image:' + JSON.stringify(data, null, 4)));
+                if (!data.Config.Entrypoint && !data.Config.Cmd) return callback(new Error('Only images with entry point are allowed'));
+
+                if (data.Config.ExposedPorts) debug('This image of %s exposes ports: %j', manifest.id, data.Config.ExposedPorts);
+
+                callback(null);
+            });
+        });
+
+        stream.on('error', function (error) {
+            debug('error pulling image %s of %s: %j', manifest.dockerImage, manifest.id, error);
+
+            callback(error);
         });
     });
 }
@@ -112,7 +129,7 @@ function createSubcontainer(app, name, cmd, options, callback) {
 
     var manifest = app.manifest;
     var exposedPorts = {}, dockerPortBindings = { };
-    var domain = app.fqdn;
+    var domain = app.altDomain || app.intrinsicFqdn;
     var stdEnv = [
         'CLOUDRON=1',
         'WEBADMIN_ORIGIN=' + config.adminOrigin(),
@@ -146,10 +163,6 @@ function createSubcontainer(app, name, cmd, options, callback) {
         memoryLimit = constants.DEFAULT_MEMORY_LIMIT;
     }
 
-    // give scheduler tasks twice the memory limit since background jobs take more memory
-    // if required, we can make this a manifest and runtime argument later
-    if (!isAppContainer) memoryLimit *= 2;
-
     // apparmor is disabled on few servers
     var enableSecurityOpt = config.CLOUDRON && safe(function () { return child_process.spawnSync('aa-enabled').status === 0; }, false);
 
@@ -173,7 +186,7 @@ function createSubcontainer(app, name, cmd, options, callback) {
                 '/run': {}
             },
             Labels: {
-                'fqdn': app.fqdn,
+                'fqdn': app.intrinsicFqdn,
                 'appId': app.id,
                 'isSubcontainer': String(!isAppContainer)
             },

src/domains.js

@@ -10,15 +10,13 @@ module.exports = exports = {
     fqdn: fqdn,
     setAdmin: setAdmin,
 
-    getDnsRecords: getDnsRecords,
-    upsertDnsRecords: upsertDnsRecords,
-    removeDnsRecords: removeDnsRecords,
+    getDNSRecords: getDNSRecords,
+    upsertDNSRecords: upsertDNSRecords,
+    removeDNSRecords: removeDNSRecords,
 
-    waitForDnsRecord: waitForDnsRecord,
+    waitForDNSRecord: waitForDNSRecord,
 
-    removePrivateFields: removePrivateFields,
-
-    DomainsError: DomainsError
+    DomainError: DomainError
 };
 
 var assert = require('assert'),
@@ -34,13 +32,12 @@ var assert = require('assert'),
     shell = require('./shell.js'),
     sysinfo = require('./sysinfo.js'),
     tld = require('tldjs'),
-    util = require('util'),
-    _ = require('underscore');
+    util = require('util');
 
 var RESTART_CMD = path.join(__dirname, 'scripts/restart.sh');
 var NOOP_CALLBACK = function (error) { if (error) debug(error); };
 
-function DomainsError(reason, errorOrMessage) {
+function DomainError(reason, errorOrMessage) {
     assert.strictEqual(typeof reason, 'string');
     assert(errorOrMessage instanceof Error || typeof errorOrMessage === 'string' || typeof errorOrMessage === 'undefined');
 
@@ -58,17 +55,17 @@ function DomainsError(reason, errorOrMessage) {
         this.nestedError = errorOrMessage;
     }
 }
-util.inherits(DomainsError, Error);
+util.inherits(DomainError, Error);
 
-DomainsError.NOT_FOUND = 'No such domain';
-DomainsError.ALREADY_EXISTS = 'Domain already exists';
-DomainsError.EXTERNAL_ERROR = 'External error';
-DomainsError.BAD_FIELD = 'Bad Field';
-DomainsError.STILL_BUSY = 'Still busy';
-DomainsError.IN_USE = 'In Use';
-DomainsError.INTERNAL_ERROR = 'Internal error';
-DomainsError.ACCESS_DENIED = 'Access denied';
-DomainsError.INVALID_PROVIDER = 'provider must be route53, gcdns, digitalocean, gandi, cloudflare, noop, manual or caas';
+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) {
@@ -80,8 +77,6 @@ function api(provider) {
     case 'route53': return require('./dns/route53.js');
     case 'gcdns': return require('./dns/gcdns.js');
     case 'digitalocean': return require('./dns/digitalocean.js');
-    case 'gandi': return require('./dns/gandi.js');
-    case 'godaddy': return require('./dns/godaddy.js');
     case 'noop': return require('./dns/noop.js');
     case 'manual': return require('./dns/manual.js');
     default: return null;
@@ -97,7 +92,7 @@ function verifyDnsConfig(config, domain, zoneName, provider, ip, callback) {
     assert.strictEqual(typeof callback, 'function');
 
     var backend = api(provider);
-    if (!backend) return callback(new DomainsError(DomainsError.INVALID_PROVIDER));
+    if (!backend) return callback(new DomainError(DomainError.INVALID_PROVIDER));
 
     api(provider).verifyDnsConfig(config, domain, zoneName, ip, callback);
 }
@@ -112,40 +107,40 @@ function add(domain, zoneName, provider, config, fallbackCertificate, tlsConfig,
     assert.strictEqual(typeof tlsConfig, 'object');
     assert.strictEqual(typeof callback, 'function');
 
-    if (!tld.isValid(domain)) return callback(new DomainsError(DomainsError.BAD_FIELD, 'Invalid domain'));
+    if (!tld.isValid(domain)) return callback(new DomainError(DomainError.BAD_FIELD, 'Invalid domain'));
 
     if (zoneName) {
-        if (!tld.isValid(zoneName)) return callback(new DomainsError(DomainsError.BAD_FIELD, 'Invalid zoneName'));
+        if (!tld.isValid(zoneName)) return callback(new DomainError(DomainError.BAD_FIELD, 'Invalid zoneName'));
     } else {
         zoneName = tld.getDomain(domain) || domain;
     }
 
     if (fallbackCertificate) {
-        let error = reverseProxy.validateCertificate(`test.${domain}`, fallbackCertificate.cert, fallbackCertificate.key);
-        if (error) return callback(new DomainsError(DomainsError.BAD_FIELD, error.message));
+        let error = reverseProxy.validateCertificate(fallbackCertificate.cert, fallbackCertificate.key, domain);
+        if (error) return callback(new DomainError(DomainError.BAD_FIELD, error.message));
     }
 
     if (tlsConfig.provider !== 'fallback' && tlsConfig.provider !== 'caas' && tlsConfig.provider.indexOf('letsencrypt-') !== 0) {
-        return callback(new DomainsError(DomainsError.BAD_FIELD, 'tlsConfig.provider must be caas, fallback or le-*'));
+        return callback(new DomainError(DomainError.BAD_FIELD, 'tlsConfig.provider must be caas, fallback or le-*'));
     }
 
     sysinfo.getPublicIp(function (error, ip) {
-        if (error) return callback(new DomainsError(DomainsError.INTERNAL_ERROR, 'Error getting IP:' + error.message));
+        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 === DomainsError.ACCESS_DENIED) return callback(new DomainsError(DomainsError.BAD_FIELD, 'Error adding A record. Access denied'));
-            if (error && error.reason === DomainsError.NOT_FOUND) return callback(new DomainsError(DomainsError.BAD_FIELD, 'Zone not found'));
-            if (error && error.reason === DomainsError.EXTERNAL_ERROR) return callback(new DomainsError(DomainsError.BAD_FIELD, 'Error adding A record: ' + error.message));
-            if (error && error.reason === DomainsError.BAD_FIELD) return callback(new DomainsError(DomainsError.BAD_FIELD, error.message));
-            if (error && error.reason === DomainsError.INVALID_PROVIDER) return callback(new DomainsError(DomainsError.BAD_FIELD, error.message));
-            if (error) return callback(new DomainsError(DomainsError.INTERNAL_ERROR, error));
+            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: zoneName, provider: provider, config: result, tlsConfig: tlsConfig }, function (error) {
-                if (error && error.reason === DatabaseError.ALREADY_EXISTS) return callback(new DomainsError(DomainsError.ALREADY_EXISTS));
-                if (error) return callback(new DomainsError(DomainsError.INTERNAL_ERROR, 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));
 
                 reverseProxy.setFallbackCertificate(domain, fallbackCertificate, function (error) {
-                    if (error) return callback(new DomainsError(DomainsError.INTERNAL_ERROR, error));
+                    if (error) return callback(new DomainError(DomainError.INTERNAL_ERROR, error));
 
                     callback();
                 });
@@ -160,16 +155,16 @@ function get(domain, callback) {
 
     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 DomainsError(DomainsError.NOT_FOUND));
-        if (error) return callback(new DomainsError(DomainsError.INTERNAL_ERROR, 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));
 
         reverseProxy.getFallbackCertificate(domain, function (error, bundle) {
-            if (error && error.reason !== ReverseProxyError.NOT_FOUND) return callback(new DomainsError(DomainsError.INTERNAL_ERROR, error));
+            if (error && error.reason !== ReverseProxyError.NOT_FOUND) return callback(new DomainError(DomainError.INTERNAL_ERROR, error));
 
             var cert = safe.fs.readFileSync(bundle.certFilePath, 'utf-8');
             var key = safe.fs.readFileSync(bundle.keyFilePath, 'utf-8');
 
-            if (!cert || !key) return callback(new DomainsError(DomainsError.INTERNAL_ERROR, 'unable to read certificates from disk'));
+            if (!cert || !key) return callback(new DomainError(DomainError.INTERNAL_ERROR, error));
 
             result.fallbackCertificate = { cert: cert, key: key };
 
@@ -182,7 +177,7 @@ function getAll(callback) {
     assert.strictEqual(typeof callback, 'function');
 
     domaindb.getAll(function (error, result) {
-        if (error) return callback(new DomainsError(DomainsError.INTERNAL_ERROR, error));
+        if (error) return callback(new DomainError(DomainError.INTERNAL_ERROR, error));
 
         return callback(null, result);
     });
@@ -197,37 +192,37 @@ function update(domain, provider, config, fallbackCertificate, tlsConfig, callba
     assert.strictEqual(typeof callback, 'function');
 
     domaindb.get(domain, function (error, result) {
-        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new DomainsError(DomainsError.NOT_FOUND));
-        if (error) return callback(new DomainsError(DomainsError.INTERNAL_ERROR, 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) {
-            let error = reverseProxy.validateCertificate(`test.${domain}`, fallbackCertificate.cert, fallbackCertificate.key);
-            if (error) return callback(new DomainsError(DomainsError.BAD_FIELD, error.message));
+            let error = reverseProxy.validateCertificate(fallbackCertificate.cert, fallbackCertificate.key, domain);
+            if (error) return callback(new DomainError(DomainError.BAD_FIELD, error.message));
         }
 
         if (tlsConfig.provider !== 'fallback' && tlsConfig.provider !== 'caas' && tlsConfig.provider.indexOf('letsencrypt-') !== 0) {
-            return callback(new DomainsError(DomainsError.BAD_FIELD, 'tlsConfig.provider must be caas, fallback or letsencrypt-*'));
+            return callback(new DomainError(DomainError.BAD_FIELD, 'tlsConfig.provider must be caas, fallback or letsencrypt-*'));
         }
 
         sysinfo.getPublicIp(function (error, ip) {
-            if (error) return callback(new DomainsError(DomainsError.INTERNAL_ERROR, 'Error getting IP:' + error.message));
+            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 === DomainsError.ACCESS_DENIED) return callback(new DomainsError(DomainsError.BAD_FIELD, 'Error adding A record. Access denied'));
-                if (error && error.reason === DomainsError.NOT_FOUND) return callback(new DomainsError(DomainsError.BAD_FIELD, 'Zone not found'));
-                if (error && error.reason === DomainsError.EXTERNAL_ERROR) return callback(new DomainsError(DomainsError.BAD_FIELD, 'Error adding A record:' + error.message));
-                if (error && error.reason === DomainsError.BAD_FIELD) return callback(new DomainsError(DomainsError.BAD_FIELD, error.message));
-                if (error && error.reason === DomainsError.INVALID_PROVIDER) return callback(new DomainsError(DomainsError.BAD_FIELD, error.message));
-                if (error) return callback(new DomainsError(DomainsError.INTERNAL_ERROR, error));
+                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: provider, config: result, tlsConfig: tlsConfig }, function (error) {
-                    if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new DomainsError(DomainsError.NOT_FOUND));
-                    if (error) return callback(new DomainsError(DomainsError.INTERNAL_ERROR, 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();
 
                     reverseProxy.setFallbackCertificate(domain, fallbackCertificate, function (error) {
-                        if (error) return callback(new DomainsError(DomainsError.INTERNAL_ERROR, error));
+                        if (error) return callback(new DomainError(DomainError.INTERNAL_ERROR, error));
 
                         callback();
                     });
@@ -242,9 +237,9 @@ function del(domain, callback) {
     assert.strictEqual(typeof callback, 'function');
 
     domaindb.del(domain, function (error) {
-        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new DomainsError(DomainsError.NOT_FOUND));
-        if (error && error.reason === DatabaseError.IN_USE) return callback(new DomainsError(DomainsError.IN_USE));
-        if (error) return callback(new DomainsError(DomainsError.INTERNAL_ERROR, 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);
     });
@@ -261,14 +256,14 @@ function getName(domain, subdomain) {
     return subdomain === '' ? part : subdomain + '.' + part;
 }
 
-function getDnsRecords(subdomain, domain, type, callback) {
+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 DomainsError(DomainsError.INTERNAL_ERROR, error));
+        if (error) return callback(new DomainError(DomainError.INTERNAL_ERROR, error));
 
         api(result.provider).get(result.config, result.zoneName, getName(result, subdomain), type, function (error, values) {
             if (error) return callback(error);
@@ -278,7 +273,7 @@ function getDnsRecords(subdomain, domain, type, callback) {
     });
 }
 
-function upsertDnsRecords(subdomain, domain, type, values, callback) {
+function upsertDNSRecords(subdomain, domain, type, values, callback) {
     assert.strictEqual(typeof subdomain, 'string');
     assert.strictEqual(typeof domain, 'string');
     assert.strictEqual(typeof type, 'string');
@@ -288,7 +283,7 @@ function upsertDnsRecords(subdomain, domain, type, values, callback) {
     debug('upsertDNSRecord: %s on %s type %s values', subdomain, domain, type, values);
 
     get(domain, function (error, result) {
-        if (error) return callback(new DomainsError(DomainsError.INTERNAL_ERROR, error));
+        if (error) return callback(new DomainError(DomainError.INTERNAL_ERROR, error));
 
         api(result.provider).upsert(result.config, result.zoneName, getName(result, subdomain), type, values, function (error, changeId) {
             if (error) return callback(error);
@@ -298,7 +293,7 @@ function upsertDnsRecords(subdomain, domain, type, values, callback) {
     });
 }
 
-function removeDnsRecords(subdomain, domain, type, values, callback) {
+function removeDNSRecords(subdomain, domain, type, values, callback) {
     assert.strictEqual(typeof subdomain, 'string');
     assert.strictEqual(typeof domain, 'string');
     assert.strictEqual(typeof type, 'string');
@@ -311,25 +306,29 @@ function removeDnsRecords(subdomain, domain, type, values, callback) {
         if (error) return callback(error);
 
         api(result.provider).del(result.config, result.zoneName, getName(result, subdomain), type, values, function (error) {
-            if (error && error.reason !== DomainsError.NOT_FOUND) return callback(error);
+            if (error && error.reason !== DomainError.NOT_FOUND) return callback(error);
 
             callback(null);
         });
     });
 }
 
-// only wait for A record
-function waitForDnsRecord(fqdn, domain, value, options, callback) {
+function waitForDNSRecord(fqdn, domain, value, type, options, callback) {
     assert.strictEqual(typeof fqdn, 'string');
     assert.strictEqual(typeof domain, 'string');
-    assert.strictEqual(typeof value, '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) {
-        if (error) return callback(error);
+        // 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));
 
-        api(result.provider).waitForDns(fqdn, result ? result.zoneName : domain, value, options, callback);
+        // 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);
     });
 }
 
@@ -345,7 +344,7 @@ function setAdmin(domain, callback) {
         var setPtrRecord = config.provider() === 'caas' ? caas.setPtrRecord : function (d, next) { next(); };
 
         setPtrRecord(domain, function (error) {
-            if (error) return callback(new DomainsError(DomainsError.EXTERNAL_ERROR, 'Error setting PTR record:' + error.message));
+            if (error) return callback(new DomainError(DomainError.EXTERNAL_ERROR, 'Error setting PTR record:' + error.message));
 
             config.setAdminDomain(result.domain);
             config.setAdminLocation('my');
@@ -362,8 +361,3 @@ function fqdn(location, domain, provider) {
     return location + (location ? (provider !== 'caas' ? '.' : '-') : '') + domain;
 }
 
-function removePrivateFields(domain) {
-    var result = _.pick(domain, 'domain', 'zoneName', 'provider', 'config', 'tlsConfig', 'fallbackCertificate');
-    if (result.fallbackCertificate) delete result.fallbackCertificate.key;  // do not return the 'key'. in caas, this is private
-    return result;
-}

src/dyndns.js

@@ -23,7 +23,7 @@ function sync(callback) {
 
         debug('refreshDNS: current ip %s', ip);
 
-        domains.upsertDnsRecords(config.adminLocation(), config.adminDomain(), 'A', [ ip ], function (error) {
+        domains.upsertDNSRecords(config.adminLocation(), config.adminDomain(), 'A', [ ip ], function (error) {
             if (error) return callback(error);
 
             debug('refreshDNS: done for admin location');
@@ -35,7 +35,7 @@ function sync(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();
 
-                    domains.upsertDnsRecords(app.location, app.domain, 'A', [ ip ], callback);
+                    domains.upsertDNSRecords(app.location, app.domain, 'A', [ ip ], callback);
                 }, function (error) {
                     if (error) return callback(error);
 

src/eventlog.js

@@ -22,6 +22,7 @@ exports = module.exports = {
     ACTION_BACKUP_START: 'backup.start',
     ACTION_BACKUP_CLEANUP: 'backup.cleanup',
     ACTION_CERTIFICATE_RENEWAL: 'certificate.renew',
+    ACTION_CLI_MODE: 'settings.climode',
     ACTION_START: 'cloudron.start',
     ACTION_UPDATE: 'cloudron.update',
     ACTION_USER_ADD: 'user.add',
@@ -90,14 +91,14 @@ function get(id, callback) {
     });
 }
 
-function getAllPaged(actions, search, page, perPage, callback) {
-    assert(Array.isArray(actions));
+function getAllPaged(action, search, page, perPage, callback) {
+    assert(typeof action === 'string' || action === null);
     assert(typeof search === 'string' || search === null);
     assert.strictEqual(typeof page, 'number');
     assert.strictEqual(typeof perPage, 'number');
     assert.strictEqual(typeof callback, 'function');
 
-    eventlogdb.getAllPaged(actions, search, page, perPage, function (error, events) {
+    eventlogdb.getAllPaged(action, search, page, perPage, function (error, events) {
         if (error) return callback(new EventLogError(EventLogError.INTERNAL_ERROR, error));
 
         callback(null, events);
@@ -121,7 +122,14 @@ function cleanup(callback) {
     var d = new Date();
     d.setDate(d.getDate() - 10); // 10 days ago
 
-    eventlogdb.delByCreationTime(d, function (error) {
+    // only cleanup high frequency events
+    var actions = [
+        exports.ACTION_USER_LOGIN,
+        exports.ACTION_BACKUP_START,
+        exports.ACTION_BACKUP_FINISH
+    ];
+
+    eventlogdb.delByCreationTime(d, actions, function (error) {
         if (error) return callback(new EventLogError(EventLogError.INTERNAL_ERROR, error));
 
         callback(null);

src/eventlogdb.js

@@ -40,8 +40,8 @@ function get(eventId, callback) {
     });
 }
 
-function getAllPaged(actions, search, page, perPage, callback) {
-    assert(Array.isArray(actions));
+function getAllPaged(action, search, page, perPage, callback) {
+    assert(typeof action === 'string' || action === null);
     assert(typeof search === 'string' || search === null);
     assert.strictEqual(typeof page, 'number');
     assert.strictEqual(typeof perPage, 'number');
@@ -50,15 +50,14 @@ function getAllPaged(actions, search, page, perPage, callback) {
     var data = [];
     var query = 'SELECT ' + EVENTLOGS_FIELDS + ' FROM eventlog';
 
-    if (actions.length || search) query += ' WHERE';
+    if (action || search) query += ' WHERE';
     if (search) query += ' (source LIKE ' + mysql.escape('%' + search + '%') + ' OR data LIKE ' + mysql.escape('%' + search + '%') + ')';
+    if (action && search) query += ' AND ';
 
-    if (actions.length && search) query += ' AND ( ';
-    actions.forEach(function (action, i) {
-        query += ' (action LIKE ' + mysql.escape(`%${action}%`) + ') ';
-        if (i < actions.length-1) query += ' OR ';
-    });
-    if (actions.length && search) query += ' ) ';
+    if (action) {
+        query += ' action=?';
+        data.push(action);
+    }
 
     query += ' ORDER BY creationTime DESC LIMIT ?,?';
 
@@ -121,13 +120,15 @@ function clear(callback) {
     });
 }
 
-function delByCreationTime(creationTime, callback) {
+function delByCreationTime(creationTime, actions, callback) {
     assert(util.isDate(creationTime));
+    assert(Array.isArray(actions));
     assert.strictEqual(typeof callback, 'function');
 
-    var query = 'DELETE FROM eventlog WHERE creationTime < ?';
+    var query = 'DELETE FROM eventlog WHERE creationTime < ? ';
+    if (actions.length) query += ' AND ( ' + actions.map(function () { return 'action != ?'; }).join(' AND ') + ' ) ';
 
-    database.query(query, [ creationTime ], function (error) {
+    database.query(query, [ creationTime ].concat(actions), function (error) {
         if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
 
         callback(error);

src/groups.js

@@ -1,7 +1,7 @@
 'use strict';
 
 exports = module.exports = {
-    GroupsError: GroupsError,
+    GroupError: GroupError,
 
     create: create,
     remove: remove,
@@ -24,12 +24,13 @@ var assert = require('assert'),
     constants = require('./constants.js'),
     DatabaseError = require('./databaseerror.js'),
     groupdb = require('./groupdb.js'),
+    mailboxdb = require('./mailboxdb.js'),
     util = require('util'),
     uuid = require('uuid');
 
 // http://dustinsenos.com/articles/customErrorsInNode
 // http://code.google.com/p/v8/wiki/JavaScriptStackTraceApi
-function GroupsError(reason, errorOrMessage) {
+function GroupError(reason, errorOrMessage) {
     assert.strictEqual(typeof reason, 'string');
     assert(errorOrMessage instanceof Error || typeof errorOrMessage === 'string' || typeof errorOrMessage === 'undefined');
 
@@ -47,28 +48,28 @@ function GroupsError(reason, errorOrMessage) {
         this.nestedError = errorOrMessage;
     }
 }
-util.inherits(GroupsError, Error);
-GroupsError.INTERNAL_ERROR = 'Internal Error';
-GroupsError.ALREADY_EXISTS = 'Already Exists';
-GroupsError.NOT_FOUND = 'Not Found';
-GroupsError.BAD_FIELD = 'Field error';
-GroupsError.NOT_EMPTY = 'Not Empty';
-GroupsError.NOT_ALLOWED = 'Not Allowed';
+util.inherits(GroupError, Error);
+GroupError.INTERNAL_ERROR = 'Internal Error';
+GroupError.ALREADY_EXISTS = 'Already Exists';
+GroupError.NOT_FOUND = 'Not Found';
+GroupError.BAD_FIELD = 'Field error';
+GroupError.NOT_EMPTY = 'Not Empty';
+GroupError.NOT_ALLOWED = 'Not Allowed';
 
 // keep this in sync with validateUsername
 function validateGroupname(name) {
     assert.strictEqual(typeof name, 'string');
 
-    if (name.length < 1) return new GroupsError(GroupsError.BAD_FIELD, 'name must be atleast 1 char');
-    if (name.length >= 200) return new GroupsError(GroupsError.BAD_FIELD, 'name too long');
+    if (name.length < 1) return new GroupError(GroupError.BAD_FIELD, 'name must be atleast 1 char');
+    if (name.length >= 200) return new GroupError(GroupError.BAD_FIELD, 'name too long');
 
-    if (constants.RESERVED_NAMES.indexOf(name) !== -1) return new GroupsError(GroupsError.BAD_FIELD, 'name is reserved');
+    if (constants.RESERVED_NAMES.indexOf(name) !== -1) return new GroupError(GroupError.BAD_FIELD, 'name is reserved');
 
     // +/- can be tricky in emails. also need to consider valid LDAP characters here (e.g '+' is reserved)
-    if (/[^a-zA-Z0-9.]/.test(name)) return new GroupsError(GroupsError.BAD_FIELD, 'name can only contain alphanumerals and dot');
+    if (/[^a-zA-Z0-9.]/.test(name)) return new GroupError(GroupError.BAD_FIELD, 'name can only contain alphanumerals and dot');
 
     // app emails are sent using the .app suffix
-    if (name.indexOf('.app') !== -1) return new GroupsError(GroupsError.BAD_FIELD, 'name pattern is reserved for apps');
+    if (name.indexOf('.app') !== -1) return new GroupError(GroupError.BAD_FIELD, 'name pattern is reserved for apps');
 
     return null;
 }
@@ -85,8 +86,8 @@ function create(name, callback) {
 
     var id = 'gid-' + uuid.v4();
     groupdb.add(id, name, function (error) {
-        if (error && error.reason === DatabaseError.ALREADY_EXISTS) return callback(new GroupsError(GroupsError.ALREADY_EXISTS));
-        if (error) return callback(new GroupsError(GroupsError.INTERNAL_ERROR, error));
+        if (error && error.reason === DatabaseError.ALREADY_EXISTS) return callback(new GroupError(GroupError.ALREADY_EXISTS));
+        if (error) return callback(new GroupError(GroupError.INTERNAL_ERROR, error));
 
         callback(null, { id: id, name: name });
     });
@@ -97,13 +98,17 @@ function remove(id, callback) {
     assert.strictEqual(typeof callback, 'function');
 
     // never allow admin group to be deleted
-    if (id === constants.ADMIN_GROUP_ID) return callback(new GroupsError(GroupsError.NOT_ALLOWED));
+    if (id === constants.ADMIN_GROUP_ID) return callback(new GroupError(GroupError.NOT_ALLOWED));
 
-    groupdb.del(id, function (error) {
-        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new GroupsError(GroupsError.NOT_FOUND));
-        if (error) return callback(new GroupsError(GroupsError.INTERNAL_ERROR, error));
+    mailboxdb.delByOwnerId(id, function (error) {
+        if (error) return callback(new GroupError(GroupError.INTERNAL_ERROR, error));
 
-        callback(null);
+        groupdb.del(id, function (error) {
+            if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new GroupError(GroupError.NOT_FOUND));
+            if (error) return callback(new GroupError(GroupError.INTERNAL_ERROR, error));
+
+            callback(null);
+        });
     });
 }
 
@@ -112,8 +117,8 @@ function get(id, callback) {
     assert.strictEqual(typeof callback, 'function');
 
     groupdb.get(id, function (error, result) {
-        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new GroupsError(GroupsError.NOT_FOUND));
-        if (error) return callback(new GroupsError(GroupsError.INTERNAL_ERROR, error));
+        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new GroupError(GroupError.NOT_FOUND));
+        if (error) return callback(new GroupError(GroupError.INTERNAL_ERROR, error));
 
         return callback(null, result);
     });
@@ -124,8 +129,8 @@ function getWithMembers(id, callback) {
     assert.strictEqual(typeof callback, 'function');
 
     groupdb.getWithMembers(id, function (error, result) {
-        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new GroupsError(GroupsError.NOT_FOUND));
-        if (error) return callback(new GroupsError(GroupsError.INTERNAL_ERROR, error));
+        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new GroupError(GroupError.NOT_FOUND));
+        if (error) return callback(new GroupError(GroupError.INTERNAL_ERROR, error));
 
         return callback(null, result);
     });
@@ -135,7 +140,7 @@ function getAll(callback) {
     assert.strictEqual(typeof callback, 'function');
 
     groupdb.getAll(function (error, result) {
-        if (error) return callback(new GroupsError(GroupsError.INTERNAL_ERROR, error));
+        if (error) return callback(new GroupError(GroupError.INTERNAL_ERROR, error));
 
         return callback(null, result);
     });
@@ -145,7 +150,7 @@ function getAllWithMembers(callback) {
     assert.strictEqual(typeof callback, 'function');
 
     groupdb.getAllWithMembers(function (error, result) {
-        if (error) return callback(new GroupsError(GroupsError.INTERNAL_ERROR, error));
+        if (error) return callback(new GroupError(GroupError.INTERNAL_ERROR, error));
 
         return callback(null, result);
     });
@@ -156,8 +161,8 @@ function getMembers(groupId, callback) {
     assert.strictEqual(typeof callback, 'function');
 
     groupdb.getMembers(groupId, function (error, result) {
-        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new GroupsError(GroupsError.NOT_FOUND));
-        if (error) return callback(new GroupsError(GroupsError.INTERNAL_ERROR, error));
+        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new GroupError(GroupError.NOT_FOUND));
+        if (error) return callback(new GroupError(GroupError.INTERNAL_ERROR, error));
 
         return callback(null, result);
     });
@@ -168,8 +173,8 @@ function getGroups(userId, callback) {
     assert.strictEqual(typeof callback, 'function');
 
     groupdb.getGroups(userId, function (error, result) {
-        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new GroupsError(GroupsError.NOT_FOUND));
-        if (error) return callback(new GroupsError(GroupsError.INTERNAL_ERROR, error));
+        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new GroupError(GroupError.NOT_FOUND));
+        if (error) return callback(new GroupError(GroupError.INTERNAL_ERROR, error));
 
         return callback(null, result);
     });
@@ -181,8 +186,8 @@ function setGroups(userId, groupIds, callback) {
     assert.strictEqual(typeof callback, 'function');
 
     groupdb.setGroups(userId, groupIds, function (error) {
-        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new GroupsError(GroupsError.NOT_FOUND));
-        if (error) return callback(new GroupsError(GroupsError.INTERNAL_ERROR, error));
+        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new GroupError(GroupError.NOT_FOUND));
+        if (error) return callback(new GroupError(GroupError.INTERNAL_ERROR, error));
 
         return callback(null);
     });
@@ -194,8 +199,8 @@ function addMember(groupId, userId, callback) {
     assert.strictEqual(typeof callback, 'function');
 
     groupdb.addMember(groupId, userId, function (error) {
-        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new GroupsError(GroupsError.NOT_FOUND));
-        if (error) return callback(new GroupsError(GroupsError.INTERNAL_ERROR, error));
+        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new GroupError(GroupError.NOT_FOUND));
+        if (error) return callback(new GroupError(GroupError.INTERNAL_ERROR, error));
 
         return callback(null);
     });
@@ -207,8 +212,8 @@ function setMembers(groupId, userIds, callback) {
     assert.strictEqual(typeof callback, 'function');
 
     groupdb.setMembers(groupId, userIds, function (error) {
-        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new GroupsError(GroupsError.NOT_FOUND, 'Invalid group or user id'));
-        if (error) return callback(new GroupsError(GroupsError.INTERNAL_ERROR, error));
+        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new GroupError(GroupError.NOT_FOUND, 'Invalid group or user id'));
+        if (error) return callback(new GroupError(GroupError.INTERNAL_ERROR, error));
 
         return callback(null);
     });
@@ -220,8 +225,8 @@ function removeMember(groupId, userId, callback) {
     assert.strictEqual(typeof callback, 'function');
 
     groupdb.removeMember(groupId, userId, function (error) {
-        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new GroupsError(GroupsError.NOT_FOUND));
-        if (error) return callback(new GroupsError(GroupsError.INTERNAL_ERROR, error));
+        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new GroupError(GroupError.NOT_FOUND));
+        if (error) return callback(new GroupError(GroupError.INTERNAL_ERROR, error));
 
         return callback(null);
     });
@@ -233,8 +238,8 @@ function isMember(groupId, userId, callback) {
     assert.strictEqual(typeof callback, 'function');
 
     groupdb.isMember(groupId, userId, function (error, result) {
-        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new GroupsError(GroupsError.NOT_FOUND));
-        if (error) return callback(new GroupsError(GroupsError.INTERNAL_ERROR, error));
+        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new GroupError(GroupError.NOT_FOUND));
+        if (error) return callback(new GroupError(GroupError.INTERNAL_ERROR, error));
 
         return callback(null, result);
     });

src/infra_version.js

@@ -18,7 +18,7 @@ exports = module.exports = {
         'postgresql': { repo: 'cloudron/postgresql', tag: 'cloudron/postgresql:1.0.0' },
         'mongodb': { repo: 'cloudron/mongodb', tag: 'cloudron/mongodb:1.0.1' },
         'redis': { repo: 'cloudron/redis', tag: 'cloudron/redis:1.0.0' },
-        'mail': { repo: 'cloudron/mail', tag: 'cloudron/mail:1.2.3' },
+        'mail': { repo: 'cloudron/mail', tag: 'cloudron/mail:1.0.0' },
         'graphite': { repo: 'cloudron/graphite', tag: 'cloudron/graphite:1.0.0' }
     }
 };

src/ldap.js

@@ -13,8 +13,8 @@ var assert = require('assert'),
     DatabaseError = require('./databaseerror.js'),
     debug = require('debug')('box:ldap'),
     eventlog = require('./eventlog.js'),
-    users = require('./users.js'),
-    UsersError = users.UsersError,
+    user = require('./user.js'),
+    UserError = user.UserError,
     ldap = require('ldapjs'),
     mail = require('./mail.js'),
     MailError = mail.MailError,
@@ -51,7 +51,7 @@ function getUsersWithAccessToApp(req, callback) {
     getAppByRequest(req, function (error, app) {
         if (error) return callback(error);
 
-        users.list(function (error, result){
+        user.list(function (error, result){
             if (error) return callback(new ldap.OperationsError(error.toString()));
 
             async.filter(result, apps.hasAccessTo.bind(null, app), function (error, result) {
@@ -258,83 +258,38 @@ function groupAdminsCompare(req, res, next) {
 function mailboxSearch(req, res, next) {
     debug('mailbox search: dn %s, scope %s, filter %s (from %s)', req.dn.toString(), req.scope, req.filter.toString(), req.connection.ldap.id);
 
-    // if cn is set we only search for one mailbox specifically
-    if (req.dn.rdns[0].attrs.cn) {
-        var email = req.dn.rdns[0].attrs.cn.value.toLowerCase();
-        var parts = email.split('@');
-        if (parts.length !== 2) return next(new ldap.NoSuchObjectError(req.dn.toString()));
+    if (!req.dn.rdns[0].attrs.cn) return next(new ldap.NoSuchObjectError(req.dn.toString()));
 
-        mailboxdb.getMailbox(parts[0], parts[1], 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()));
+    var email = req.dn.rdns[0].attrs.cn.value.toLowerCase();
+    var parts = email.split('@');
+    if (parts.length !== 2) return next(new ldap.NoSuchObjectError(req.dn.toString()));
 
-            var obj = {
-                dn: req.dn.toString(),
-                attributes: {
-                    objectclass: ['mailbox'],
-                    objectcategory: 'mailbox',
-                    cn: `${mailbox.name}@${mailbox.domain}`,
-                    uid: `${mailbox.name}@${mailbox.domain}`,
-                    mail: `${mailbox.name}@${mailbox.domain}`,
-                    ownerType: mailbox.ownerType,
-                    displayname: 'Max Mustermann',
-                    givenName: 'Max',
-                    username: 'mmustermann',
-                    samaccountname: 'mmustermann'
-                }
-            };
+    mailboxdb.getMailbox(parts[0], parts[1], 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()));
 
-            // ensure all filter values are also lowercase
-            var lowerCaseFilter = safe(function () { return ldap.parseFilter(req.filter.toString().toLowerCase()); }, null);
-            if (!lowerCaseFilter) return next(new ldap.OperationsError(safe.error.toString()));
-
-            if (lowerCaseFilter.matches(obj.attributes)) {
-                finalSend([ obj ], req, res, next);
-            } else {
-                res.end();
+        var obj = {
+            dn: req.dn.toString(),
+            attributes: {
+                objectclass: ['mailbox'],
+                objectcategory: 'mailbox',
+                cn: `${mailbox.name}@${mailbox.domain}`,
+                uid: `${mailbox.name}@${mailbox.domain}`,
+                mail: `${mailbox.name}@${mailbox.domain}`,
+                ownerType: mailbox.ownerType
             }
-        });
-    } else if (req.dn.rdns[0].attrs.domain) {
-        var domain = req.dn.rdns[0].attrs.domain.value.toLowerCase();
+        };
 
-        mailboxdb.listMailboxes(domain, function (error, result) {
-            if (error) return next(new ldap.OperationsError(error.toString()));
+        // ensure all filter values are also lowercase
+        var lowerCaseFilter = safe(function () { return ldap.parseFilter(req.filter.toString().toLowerCase()); }, null);
+        if (!lowerCaseFilter) return next(new ldap.OperationsError(safe.error.toString()));
 
-            var results = [];
-
-            // only send user mailboxes
-            result = result.filter(function (m) { return m.ownerType === mailboxdb.OWNER_TYPE_USER; });
-
-            // send mailbox objects
-            result.forEach(function (mailbox) {
-                var dn = ldap.parseDN(`cn=${mailbox.name}@${domain},domain=${domain},ou=mailboxes,dc=cloudron`);
-
-                var obj = {
-                    dn: dn.toString(),
-                    attributes: {
-                        objectclass: ['mailbox'],
-                        objectcategory: 'mailbox',
-                        cn: `${mailbox.name}@${domain}`,
-                        uid: `${mailbox.name}@${domain}`,
-                        mail: `${mailbox.name}@${domain}`,
-                        ownerType: mailbox.ownerType
-                    }
-                };
-
-                // ensure all filter values are also lowercase
-                var lowerCaseFilter = safe(function () { return ldap.parseFilter(req.filter.toString().toLowerCase()); }, null);
-                if (!lowerCaseFilter) return next(new ldap.OperationsError(safe.error.toString()));
-
-                if ((req.dn.equals(dn) || req.dn.parentOf(dn)) && lowerCaseFilter.matches(obj.attributes)) {
-                    results.push(obj);
-                }
-            });
-
-            finalSend(results, req, res, next);
-        });
-    } else {
-        return next(new ldap.NoSuchObjectError(req.dn.toString()));
-    }
+        if (lowerCaseFilter.matches(obj.attributes)) {
+            finalSend([ obj ], req, res, next);
+        } else {
+            res.end();
+        }
+    });
 }
 
 function mailAliasSearch(req, res, next) {
@@ -423,18 +378,18 @@ function authenticateUser(req, res, next) {
 
     var api;
     if (attributeName === 'mail') {
-        api = users.verifyWithEmail;
+        api = user.verifyWithEmail;
     } else if (commonName.indexOf('@') !== -1) { // if mail is specified, enforce mail check
-        api = users.verifyWithEmail;
+        api = user.verifyWithEmail;
     } else if (commonName.indexOf('uid-') === 0) {
-        api = users.verify;
+        api = user.verify;
     } else {
-        api = users.verifyWithUsername;
+        api = user.verifyWithUsername;
     }
 
     api(commonName, req.credentials || '', function (error, user) {
-        if (error && error.reason === UsersError.NOT_FOUND) return next(new ldap.NoSuchObjectError(req.dn.toString()));
-        if (error && error.reason === UsersError.WRONG_PASSWORD) return next(new ldap.InvalidCredentialsError(req.dn.toString()));
+        if (error && error.reason === UserError.NOT_FOUND) return next(new ldap.NoSuchObjectError(req.dn.toString()));
+        if (error && error.reason === UserError.WRONG_PASSWORD) return next(new ldap.InvalidCredentialsError(req.dn.toString()));
         if (error) return next(new ldap.OperationsError(error.message));
 
         req.user = user;
@@ -455,7 +410,7 @@ function authorizeUserForApp(req, res, next) {
             // we return no such object, to avoid leakage of a users existence
             if (!result) return next(new ldap.NoSuchObjectError(req.dn.toString()));
 
-            eventlog.add(eventlog.ACTION_USER_LOGIN, { authType: 'ldap', appId: app.id, app: app }, { userId: req.user.id, user: users.removePrivateFields(req.user) });
+            eventlog.add(eventlog.ACTION_USER_LOGIN, { authType: 'ldap', appId: app.id }, { userId: req.user.id });
 
             res.end();
         });
@@ -463,8 +418,6 @@ function authorizeUserForApp(req, res, next) {
 }
 
 function authenticateMailbox(req, res, next) {
-    debug('mailbox auth: %s (from %s)', req.dn.toString(), req.connection.ldap.id);
-
     if (!req.dn.rdns[0].attrs.cn) return next(new ldap.NoSuchObjectError(req.dn.toString()));
 
     var email = req.dn.rdns[0].attrs.cn.value.toLowerCase();
@@ -475,11 +428,11 @@ function authenticateMailbox(req, res, next) {
         if (error && error.reason === DatabaseError.NOT_FOUND) return next(new ldap.NoSuchObjectError(req.dn.toString()));
         if (error) return next(new ldap.OperationsError(error.message));
 
-        mail.getDomain(parts[1], function (error, domain) {
+        mail.get(parts[1], function (error, domain) {
             if (error && error.reason === MailError.NOT_FOUND) return next(new ldap.NoSuchObjectError(req.dn.toString()));
             if (error) return next(new ldap.OperationsError(error.message));
 
-            if (mailbox.ownerType === mailboxdb.OWNER_TYPE_APP) {
+            if (mailbox.ownerType === mailboxdb.TYPE_APP) {
                 var addonId = req.dn.rdns[1].attrs.ou.value.toLowerCase(); // 'sendmail' or 'recvmail'
                 var name;
                 if (addonId === 'sendmail') name = 'MAIL_SMTP_PASSWORD';
@@ -493,15 +446,15 @@ function authenticateMailbox(req, res, next) {
                     eventlog.add(eventlog.ACTION_APP_LOGIN, { authType: 'ldap', mailboxId: name }, { appId: mailbox.ownerId, addonId: addonId });
                     return res.end();
                 });
-            } else if (mailbox.ownerType === mailboxdb.OWNER_TYPE_USER) {
+            } else if (mailbox.ownerType === mailboxdb.TYPE_USER) {
                 if (!domain.enabled) return next(new ldap.NoSuchObjectError(req.dn.toString()));
 
-                users.verify(mailbox.ownerId, req.credentials || '', function (error, result) {
-                    if (error && error.reason === UsersError.NOT_FOUND) return next(new ldap.NoSuchObjectError(req.dn.toString()));
-                    if (error && error.reason === UsersError.WRONG_PASSWORD) return next(new ldap.InvalidCredentialsError(req.dn.toString()));
+                user.verifyWithUsername(parts[0], req.credentials || '', function (error, user) {
+                    if (error && error.reason === UserError.NOT_FOUND) return next(new ldap.NoSuchObjectError(req.dn.toString()));
+                    if (error && error.reason === UserError.WRONG_PASSWORD) return next(new ldap.InvalidCredentialsError(req.dn.toString()));
                     if (error) return next(new ldap.OperationsError(error.message));
 
-                    eventlog.add(eventlog.ACTION_USER_LOGIN, { authType: 'ldap', mailboxId: email }, { userId: result.id, user: users.removePrivateFields(result) });
+                    eventlog.add(eventlog.ACTION_USER_LOGIN, { authType: 'ldap', mailboxId: email }, { userId: user.username });
                     res.end();
                 });
             } else {
@@ -534,7 +487,6 @@ function start(callback) {
     gServer.search('ou=mailaliases,dc=cloudron', mailAliasSearch);
     gServer.search('ou=mailinglists,dc=cloudron', mailingListSearch);
 
-    gServer.bind('ou=mailboxes,dc=cloudron', authenticateMailbox);
     gServer.bind('ou=recvmail,dc=cloudron', authenticateMailbox);
     gServer.bind('ou=sendmail,dc=cloudron', authenticateMailbox);
 

src/mail.js

@@ -3,14 +3,11 @@
 exports = module.exports = {
     getStatus: getStatus,
 
-    getDomains: getDomains,
+    get: get,
+    getAll: getAll,
 
-    getDomain: getDomain,
-    addDomain: addDomain,
-    removeDomain: removeDomain,
-    updateDomain: updateDomain,
-
-    addDnsRecords: addDnsRecords,
+    add: add,
+    del: del,
 
     setMailFromValidation: setMailFromValidation,
     setCatchAllAddress: setCatchAllAddress,
@@ -22,20 +19,16 @@ exports = module.exports = {
     sendTestMail: sendTestMail,
 
     getMailboxes: getMailboxes,
-    removeMailboxes: removeMailboxes,
-    getMailbox: getMailbox,
-    addMailbox: addMailbox,
-    updateMailbox: updateMailbox,
-    removeMailbox: removeMailbox,
+    getUserMailbox: getUserMailbox,
+    enableUserMailbox: enableUserMailbox,
+    disableUserMailbox: disableUserMailbox,
 
-    listAliases: listAliases,
     getAliases: getAliases,
     setAliases: setAliases,
 
     getLists: getLists,
     getList: getList,
     addList: addList,
-    updateList: updateList,
     removeList: removeList,
 
     _readDkimPublicKeySync: readDkimPublicKeySync,
@@ -49,8 +42,10 @@ var assert = require('assert'),
     constants = require('./constants.js'),
     DatabaseError = require('./databaseerror.js'),
     debug = require('debug')('box:mail'),
-    dns = require('./native-dns.js'),
+    dig = require('./dig.js'),
     domains = require('./domains.js'),
+    groups = require('./groups.js'),
+    GroupError = groups.GroupError,
     infra = require('./infra_version.js'),
     mailboxdb = require('./mailboxdb.js'),
     maildb = require('./maildb.js'),
@@ -65,11 +60,12 @@ var assert = require('assert'),
     shell = require('./shell.js'),
     smtpTransport = require('nodemailer-smtp-transport'),
     sysinfo = require('./sysinfo.js'),
-    users = require('./users.js'),
+    user = require('./user.js'),
+    UserError = user.UserError,
     util = require('util'),
     _ = require('underscore');
 
-const DNS_OPTIONS = { server: '127.0.0.1', timeout: 5000 }; // unbound runs on 127.0.0.1
+const digOptions = { server: '127.0.0.1', port: 53, timeout: 5000 };
 var NOOP_CALLBACK = function (error) { if (error) debug(error); };
 
 function MailError(reason, errorOrMessage) {
@@ -95,19 +91,20 @@ MailError.INTERNAL_ERROR = 'Internal Error';
 MailError.BAD_FIELD = 'Bad Field';
 MailError.ALREADY_EXISTS = 'Already Exists';
 MailError.NOT_FOUND = 'Not Found';
-MailError.IN_USE = 'In Use';
 
-function validateName(name) {
-    assert.strictEqual(typeof name, 'string');
+function validateAlias(alias) {
+    assert.strictEqual(typeof alias, 'string');
 
-    if (name.length < 1) return new MailError(MailError.BAD_FIELD, 'mailbox name must be atleast 1 char');
-    if (name.length >= 200) return new MailError(MailError.BAD_FIELD, 'mailbox name too long');
+    if (alias.length < 1) return new MailError(MailError.BAD_FIELD, 'alias must be atleast 1 char');
+    if (alias.length >= 200) return new MailError(MailError.BAD_FIELD, 'alias too long');
+
+    if (constants.RESERVED_NAMES.indexOf(alias) !== -1) return new MailError(MailError.BAD_FIELD, 'alias is reserved');
 
     // +/- can be tricky in emails. also need to consider valid LDAP characters here (e.g '+' is reserved)
-    if (/[^a-zA-Z0-9.]/.test(name)) return new MailError(MailError.BAD_FIELD, 'mailbox name can only contain alphanumerals and dot');
+    if (/[^a-zA-Z0-9.]/.test(alias)) return new MailError(MailError.BAD_FIELD, 'alias can only contain alphanumerals and dot');
 
     // app emails are sent using the .app suffix
-    if (name.indexOf('.app') !== -1) return new MailError(MailError.BAD_FIELD, 'mailbox name pattern is reserved for apps');
+    if (alias.indexOf('.app') !== -1) return new MailError(MailError.BAD_FIELD, 'alias pattern is reserved for apps');
 
     return null;
 }
@@ -121,7 +118,7 @@ function checkOutboundPort25(callback) {
         'smtp.mail.yahoo.com',
         'smtp.o2.ie',
         'smtp.comcast.net',
-        'smtp.1und1.de',
+        'outgoing.verizon.net'
     ]);
 
     var relay = {
@@ -182,11 +179,9 @@ function verifyRelay(relay, callback) {
     assert.strictEqual(typeof relay, 'object');
     assert.strictEqual(typeof callback, 'function');
 
-    // we used to verify cloudron-smtp with checkOutboundPort25 but that is unreliable given that we just
-    // randomly select some smtp server
-    if (relay.provider === 'cloudron-smtp') return callback();
+    var verifier = relay.provider === 'cloudron-smtp' ? checkOutboundPort25 : checkSmtpRelay.bind(null, relay);
 
-    checkSmtpRelay(relay, function (error) {
+    verifier(function (error) {
         if (error) return callback(new MailError(MailError.BAD_FIELD, error.message));
 
         callback();
@@ -205,13 +200,14 @@ function checkDkim(domain, callback) {
     var dkimKey = readDkimPublicKeySync(domain);
     if (!dkimKey) return callback(new Error('Failed to read dkim public key'), dkim);
 
-    dkim.expected = 'v=DKIM1; t=s; p=' + dkimKey;
+    dkim.expected = '"v=DKIM1; t=s; p=' + dkimKey + '"';
 
-    dns.resolve(dkim.domain, dkim.type, DNS_OPTIONS, function (error, txtRecords) {
+    dig.resolve(dkim.domain, dkim.type, digOptions, function (error, txtRecords) {
+        if (error && error.code === 'ENOTFOUND') return callback(null, dkim);    // not setup
         if (error) return callback(error, dkim);
 
-        if (txtRecords.length !== 0) {
-            dkim.value = txtRecords[0].join('');
+        if (Array.isArray(txtRecords) && txtRecords.length !== 0) {
+            dkim.value = txtRecords[0];
             dkim.status = (dkim.value === dkim.expected);
         }
 
@@ -224,18 +220,21 @@ function checkSpf(domain, callback) {
         domain: domain,
         type: 'TXT',
         value: null,
-        expected: 'v=spf1 a:' + config.mailFqdn() + ' ~all',
+        expected: '"v=spf1 a:' + config.mailFqdn() + ' ~all"',
         status: false
     };
 
-    dns.resolve(spf.domain, spf.type, DNS_OPTIONS, function (error, txtRecords) {
+    // https://agari.zendesk.com/hc/en-us/articles/202952749-How-long-can-my-SPF-record-be-
+    dig.resolve(spf.domain, spf.type, digOptions, function (error, txtRecords) {
+        if (error && error.code === 'ENOTFOUND') return callback(null, spf);    // not setup
         if (error) return callback(error, spf);
 
+        if (!Array.isArray(txtRecords)) return callback(null, spf);
+
         var i;
         for (i = 0; i < txtRecords.length; i++) {
-            let txtRecord = txtRecords[i].join(''); // https://agari.zendesk.com/hc/en-us/articles/202952749-How-long-can-my-SPF-record-be-
-            if (txtRecord.indexOf('v=spf1 ') !== 0) continue; // not SPF
-            spf.value = txtRecord;
+            if (txtRecords[i].indexOf('"v=spf1 ') !== 0) continue; // not SPF
+            spf.value = txtRecords[i];
             spf.status = spf.value.indexOf(' a:' + config.adminFqdn()) !== -1;
             break;
         }
@@ -243,7 +242,7 @@ function checkSpf(domain, callback) {
         if (spf.status) {
             spf.expected = spf.value;
         } else if (i !== txtRecords.length) {
-            spf.expected = 'v=spf1 a:' + config.adminFqdn() + ' ' + spf.value.slice('v=spf1 '.length);
+            spf.expected = '"v=spf1 a:' + config.adminFqdn() + ' ' + spf.value.slice('"v=spf1 '.length);
         }
 
         callback(null, spf);
@@ -259,12 +258,13 @@ function checkMx(domain, callback) {
         status: false
     };
 
-    dns.resolve(mx.domain, mx.type, DNS_OPTIONS, function (error, mxRecords) {
+    dig.resolve(mx.domain, mx.type, digOptions, function (error, mxRecords) {
+        if (error && error.code === 'ENOTFOUND') return callback(null, mx);    // not setup
         if (error) return callback(error, mx);
 
-        if (mxRecords.length !== 0) {
-            mx.status = mxRecords.length == 1 && mxRecords[0].exchange === config.mailFqdn();
-            mx.value = mxRecords.map(function (r) { return r.priority + ' ' + r.exchange + '.'; }).join(' ');
+        if (Array.isArray(mxRecords) && mxRecords.length !== 0) {
+            mx.status = mxRecords.length == 1 && mxRecords[0].exchange === (config.mailFqdn() + '.');
+            mx.value = mxRecords.map(function (r) { return r.priority + ' ' + r.exchange; }).join(' ');
         }
 
         callback(null, mx);
@@ -276,15 +276,16 @@ function checkDmarc(domain, callback) {
         domain: '_dmarc.' + domain,
         type: 'TXT',
         value: null,
-        expected: 'v=DMARC1; p=reject; pct=100',
+        expected: '"v=DMARC1; p=reject; pct=100"',
         status: false
     };
 
-    dns.resolve(dmarc.domain, dmarc.type, DNS_OPTIONS, function (error, txtRecords) {
+    dig.resolve(dmarc.domain, dmarc.type, digOptions, function (error, txtRecords) {
+        if (error && error.code === 'ENOTFOUND') return callback(null, dmarc);    // not setup
         if (error) return callback(error, dmarc);
 
-        if (txtRecords.length !== 0) {
-            dmarc.value = txtRecords[0].join('');
+        if (Array.isArray(txtRecords) && txtRecords.length !== 0) {
+            dmarc.value = txtRecords[0];
             dmarc.status = (dmarc.value === dmarc.expected);
         }
 
@@ -297,7 +298,7 @@ function checkPtr(callback) {
         domain: null,
         type: 'PTR',
         value: null,
-        expected: config.mailFqdn(), // any trailing '.' is added by client software (https://lists.gt.net/spf/devel/7918)
+        expected: config.mailFqdn() + '.',
         status: false
     };
 
@@ -306,10 +307,11 @@ function checkPtr(callback) {
 
         ptr.domain = ip.split('.').reverse().join('.') + '.in-addr.arpa';
 
-        dns.resolve(ptr.domain, 'PTR', DNS_OPTIONS, function (error, ptrRecords) {
+        dig.resolve(ip, 'PTR', digOptions, function (error, ptrRecords) {
+            if (error && error.code === 'ENOTFOUND') return callback(null, ptr);    // not setup
             if (error) return callback(error, ptr);
 
-            if (ptrRecords.length !== 0) {
+            if (Array.isArray(ptrRecords) && ptrRecords.length !== 0) {
                 ptr.value = ptrRecords.join(' ');
                 ptr.status = ptrRecords.some(function (v) { return v === ptr.expected; });
             }
@@ -321,31 +323,15 @@ function checkPtr(callback) {
 
 // https://raw.githubusercontent.com/jawsome/node-dnsbl/master/list.json
 const RBL_LIST = [
-    {
-        'name': 'Abuse.ch',
-        'dns': 'spam.abuse.ch',
-        'site': 'http://abuse.ch/'
-    },
-
     {
         'name': 'Barracuda',
         'dns': 'b.barracudacentral.org',
         'site': 'http://www.barracudacentral.org/rbl/removal-request'
     },
     {
-        'name': 'Composite Blocking List',
-        'dns': 'cbl.abuseat.org',
-        'site': 'http://www.abuseat.org'
-    },
-    {
-        'name': 'Multi SURBL',
-        'dns': 'multi.surbl.org',
-        'site': 'http://www.surbl.org'
-    },
-    {
-        'name': 'Passive Spam Block List',
-        'dns': 'psbl.surriel.com',
-        'site': 'https://psbl.org'
+        'name': 'SpamCop',
+        'dns': 'bl.spamcop.net',
+        'site': 'http://spamcop.net'
     },
     {
         'name': 'Sorbs Aggregate Zone',
@@ -358,20 +344,30 @@ const RBL_LIST = [
         'site': 'http://sorbs.net'
     },
     {
-        'name': 'Spam Cannibal',
-        'dns': 'bl.spamcannibal.org',
-        'site': 'http://www.spamcannibal.org/cannibal.cgi'
-    },
-    {
-        'name': 'SpamCop',
-        'dns': 'bl.spamcop.net',
-        'site': 'http://spamcop.net'
+        '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': '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': 'dnsbl.abuse.ch',
+        'dns': 'spam.abuse.ch',
+        'site': 'http://dnsbl.abuse.ch/'
+    },
     {
         'name': 'The Unsubscribe Blacklist(UBL)',
         'dns': 'ubl.unsubscore.com ',
@@ -395,15 +391,15 @@ function checkRblStatus(domain, callback) {
 
         // https://tools.ietf.org/html/rfc5782
         async.map(RBL_LIST, function (rblServer, iteratorDone) {
-            dns.resolve(flippedIp + '.' + rblServer.dns, 'A', DNS_OPTIONS, function (error, records) {
+            dig.resolve(flippedIp + '.' + rblServer.dns, 'A', digOptions, function (error, records) {
                 if (error || !records) return iteratorDone(null, null);    // not listed
 
                 debug('checkRblStatus: %s (ip: %s) is in the blacklist of %j', domain, flippedIp, rblServer);
 
                 var result = _.extend({ }, rblServer);
 
-                dns.resolve(flippedIp + '.' + rblServer.dns, 'TXT', DNS_OPTIONS, function (error, txtRecords) {
-                    result.txtRecords = error || !txtRecords ? 'No txt record' : txtRecords.map(x => x.join(''));
+                dig.resolve(flippedIp + '.' + rblServer.dns, 'TXT', digOptions, function (error, txtRecords) {
+                    result.txtRecords = error || !txtRecords ? 'No txt record' : txtRecords;
 
                     debug('checkRblStatus: %s (error: %s) (txtRecords: %j)', domain, error, txtRecords);
 
@@ -443,7 +439,7 @@ function getStatus(domain, callback) {
         };
     }
 
-    getDomain(domain, function (error, result) {
+    get(domain, function (error, result) {
         if (error) return callback(error);
 
         var checks = [
@@ -473,59 +469,45 @@ function getStatus(domain, callback) {
 function createMailConfig(callback) {
     assert.strictEqual(typeof callback, 'function');
 
+    const mailFqdn = config.mailFqdn();
+
     debug('createMailConfig: generating mail config');
 
-    getDomains(function (error, mailDomains) {
+    maildb.getAll(function (error, mailOutDomains) {
         if (error) return callback(error);
 
-        users.getOwner(function (error, owner) {
-            const mailFqdn = config.mailFqdn();
-            const defaultDomain = config.adminDomain();
-            const alertsFrom = `no-reply@${defaultDomain}`;
+        var mailDomain = mailOutDomains[0]; // mail container can only handle one domain at this point
 
+        const alertsFrom = `no-reply@${mailDomain.domain}`;
+
+        user.getOwner(function (error, owner) {
             const alertsTo = config.provider() === 'caas' ? [ 'support@cloudron.io' ] : [ ];
             alertsTo.concat(error ? [] : owner.email).join(','); // owner may not exist yet
 
-            const mailOutDomains = mailDomains.map(function (d) { return d.domain; }).join(',');
-            const mailInDomains = mailDomains.filter(function (d) { return d.enabled; }).map(function (d) { return d.domain; }).join(',');
+            const mailOutDomain = mailDomain.domain;
+            const mailInDomain = mailDomain.enabled ? mailDomain.domain : '';
+            const catchAll = mailDomain.catchAll.map(function (c) { return `${c}@${mailDomain.domain}`; }).join(',');
+            const mailFromValidation = mailDomain.mailFromValidation;
 
-            if (!safe.fs.writeFileSync(path.join(paths.ADDON_CONFIG_DIR, 'mail/mail.ini'),
-                `mail_in_domains=${mailInDomains}\nmail_out_domains=${mailOutDomains}\nmail_default_domain=${defaultDomain}\nmail_server_name=${mailFqdn}\nalerts_from=${alertsFrom}\nalerts_to=${alertsTo}\n\n`, 'utf8')) {
+            if (!safe.fs.writeFileSync(paths.ADDON_CONFIG_DIR + '/mail/mail.ini',
+                `mail_in_domains=${mailInDomain}\nmail_out_domains=${mailOutDomain}\nmail_default_domain=${mailDomain.domain}\nmail_server_name=${mailFqdn}\nalerts_from=${alertsFrom}\nalerts_to=${alertsTo}\ncatch_all=${catchAll}\nmail_from_validation=${mailFromValidation}\n`, 'utf8')) {
                 return callback(new Error('Could not create mail var file:' + safe.error.message));
             }
 
-            // enable_outbound makes plugin forward email for relayed mail. non-relayed mail always hits LMTP plugin first
-            if (!safe.fs.writeFileSync(path.join(paths.ADDON_CONFIG_DIR, 'mail/smtp_forward.ini'), 'enable_outbound=false\ndomain_selector=mail_from\n', 'utf8')) {
-                return callback(new Error('Could not create smtp forward file:' + safe.error.message));
+            var relay = mailDomain.relay;
+
+            const enabled = relay.provider !== 'cloudron-smtp' ? true : false,
+                host = relay.host || '',
+                port = relay.port || 25,
+                username = relay.username || '',
+                password = relay.password || '';
+
+            if (!safe.fs.writeFileSync(paths.ADDON_CONFIG_DIR + '/mail/smtp_forward.ini',
+                `enable_outbound=${enabled}\nhost=${host}\nport=${port}\nenable_tls=true\nauth_type=plain\nauth_user=${username}\nauth_pass=${password}`, 'utf8')) {
+                return callback(new Error('Could not create mail var file:' + safe.error.message));
             }
 
-            // create sections for per-domain configuration
-            mailDomains.forEach(function (domain) {
-                const catchAll = domain.catchAll.map(function (c) { return `${c}@${domain.domain}`; }).join(',');
-                const mailFromValidation = domain.mailFromValidation;
-
-                if (!safe.fs.appendFileSync(path.join(paths.ADDON_CONFIG_DIR, 'mail/mail.ini'),
-                    `[${domain.domain}]\ncatch_all=${catchAll}\nmail_from_validation=${mailFromValidation}\n\n`, 'utf8')) {
-                    return callback(new Error('Could not create mail var file:' + safe.error.message));
-                }
-
-                const relay = domain.relay;
-
-                const enableRelay = relay.provider !== 'cloudron-smtp',
-                    host = relay.host || '',
-                    port = relay.port || 25,
-                    username = relay.username || '',
-                    password = relay.password || '';
-
-                if (!enableRelay) return;
-
-                if (!safe.fs.appendFileSync(paths.ADDON_CONFIG_DIR + '/mail/smtp_forward.ini',
-                    `[${domain.domain}]\nenable_outbound=true\nhost=${host}\nport=${port}\nenable_tls=true\nauth_type=plain\nauth_user=${username}\nauth_pass=${password}\n\n`, 'utf8')) {
-                    return callback(new Error('Could not create mail var file:' + safe.error.message));
-                }
-            });
-
-            callback(null, mailInDomains.length !== 0 /* allowInbound */);
+            callback(null, mailInDomain.length !== 0);
         });
     });
 }
@@ -542,7 +524,7 @@ function restartMail(callback) {
     const memoryLimit = Math.max((1 + Math.round(os.totalmem()/(1024*1024*1024)/4)) * 128, 256);
 
     // admin and mail share the same certificate
-    reverseProxy.getCertificate({ fqdn: config.adminFqdn(), domain: config.adminDomain() }, function (error, bundle) {
+    reverseProxy.getCertificate({ intrinsicFqdn: config.adminFqdn(), domain: config.adminDomain() }, function (error, bundle) {
         if (error) return callback(error);
 
         // the setup script copies dhparams.pem to /addons/mail
@@ -569,7 +551,6 @@ function restartMail(callback) {
                         -v "${paths.MAIL_DATA_DIR}:/app/data" \
                         -v "${paths.PLATFORM_DATA_DIR}/addons/mail:/etc/mail" \
                         ${ports} \
-                        -p 127.0.0.1:2020:2020 \
                         --read-only -v /run -v /tmp ${tag}`;
 
             shell.execSync('startMail', cmd);
@@ -579,7 +560,7 @@ function restartMail(callback) {
     });
 }
 
-function getDomain(domain, callback) {
+function get(domain, callback) {
     assert.strictEqual(typeof domain, 'string');
     assert.strictEqual(typeof callback, 'function');
 
@@ -591,7 +572,7 @@ function getDomain(domain, callback) {
     });
 }
 
-function getDomains(callback) {
+function getAll(callback) {
     assert.strictEqual(typeof callback, 'function');
 
     maildb.getAll(function (error, results) {
@@ -601,57 +582,16 @@ function getDomains(callback) {
     });
 }
 
-// https://agari.zendesk.com/hc/en-us/articles/202952749-How-long-can-my-SPF-record-be-
-function txtRecordsWithSpf(domain, callback) {
+function ensureDkimKey(domain, callback) {
     assert.strictEqual(typeof domain, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    domains.getDnsRecords('', domain, 'TXT', function (error, txtRecords) {
-        if (error) return callback(error);
+    var dkimPath = path.join(paths.MAIL_DATA_DIR, `dkim/${domain}`);
+    var dkimPrivateKeyFile = path.join(dkimPath, 'private');
+    var dkimPublicKeyFile = path.join(dkimPath, 'public');
+    var dkimSelectorFile = path.join(dkimPath, 'selector');
 
-        debug('txtRecordsWithSpf: current txt records - %j', txtRecords);
-
-        var i, matches, validSpf;
-
-        for (i = 0; i < txtRecords.length; i++) {
-            matches = txtRecords[i].match(/^("?v=spf1) /); // DO backend may return without quotes
-            if (matches === null) continue;
-
-            // this won't work if the entry is arbitrarily "split" across quoted strings
-            validSpf = txtRecords[i].indexOf('a:' + config.mailFqdn()) !== -1;
-            break; // there can only be one SPF record
-        }
-
-        if (validSpf) return callback(null, null);
-
-        if (!matches) { // no spf record was found, create one
-            txtRecords.push('"v=spf1 a:' + config.mailFqdn() + ' ~all"');
-            debug('txtRecordsWithSpf: adding txt record');
-        } else { // just add ourself
-            txtRecords[i] = matches[1] + ' a:' + config.mailFqdn() + txtRecords[i].slice(matches[1].length);
-            debug('txtRecordsWithSpf: inserting txt record');
-        }
-
-        return callback(null, txtRecords);
-    });
-}
-
-function ensureDkimKeySync(domain) {
-    assert.strictEqual(typeof domain, 'string');
-
-    const dkimPath = path.join(paths.MAIL_DATA_DIR, `dkim/${domain}`);
-    const dkimPrivateKeyFile = path.join(dkimPath, 'private');
-    const dkimPublicKeyFile = path.join(dkimPath, 'public');
-    const dkimSelectorFile = path.join(dkimPath, 'selector');
-
-    if (safe.fs.existsSync(dkimPublicKeyFile) &&
-        safe.fs.existsSync(dkimPublicKeyFile) &&
-        safe.fs.existsSync(dkimPublicKeyFile)) {
-        debug(`Reusing existing DKIM keys for ${domain}`);
-        return null;
-    }
-
-    debug(`Generating new DKIM keys for ${domain}`);
+    debug('Generating new DKIM keys');
 
     if (!safe.fs.mkdirSync(dkimPath) && safe.error.code !== 'EEXIST') {
         debug('Error creating dkim.', safe.error);
@@ -663,7 +603,41 @@ function ensureDkimKeySync(domain) {
 
     if (!safe.fs.writeFileSync(dkimSelectorFile, config.dkimSelector(), 'utf8')) return new MailError(MailError.INTERNAL_ERROR, safe.error);
 
-    return null;
+    callback();
+}
+
+// https://agari.zendesk.com/hc/en-us/articles/202952749-How-long-can-my-SPF-record-be-
+function txtRecordsWithSpf(callback) {
+    assert.strictEqual(typeof callback, 'function');
+
+    domains.getDNSRecords('', config.adminDomain(), 'TXT', function (error, txtRecords) {
+        if (error) return callback(error);
+
+        debug('txtRecordsWithSpf: current txt records - %j', txtRecords);
+
+        var i, matches, validSpf;
+
+        for (i = 0; i < txtRecords.length; i++) {
+            matches = txtRecords[i].match(/^("?v=spf1) /); // DO backend may return without quotes
+            if (matches === null) continue;
+
+            // this won't work if the entry is arbitrarily "split" across quoted strings
+            validSpf = txtRecords[i].indexOf('a:' + config.adminFqdn()) !== -1;
+            break; // there can only be one SPF record
+        }
+
+        if (validSpf) return callback(null, null);
+
+        if (!matches) { // no spf record was found, create one
+            txtRecords.push('"v=spf1 a:' + config.adminFqdn() + ' ~all"');
+            debug('txtRecordsWithSpf: adding txt record');
+        } else { // just add ourself
+            txtRecords[i] = matches[1] + ' a:' + config.adminFqdn() + txtRecords[i].slice(matches[1].length);
+            debug('txtRecordsWithSpf: inserting txt record');
+        }
+
+        return callback(null, txtRecords);
+    });
 }
 
 function readDkimPublicKeySync(domain) {
@@ -689,9 +663,6 @@ function addDnsRecords(domain, callback) {
     assert.strictEqual(typeof domain, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    var error = ensureDkimKeySync(domain);
-    if (error) return callback(error);
-
     if (process.env.BOX_ENV === 'test') return callback();
 
     var dkimKey = readDkimPublicKeySync(domain);
@@ -705,67 +676,58 @@ function addDnsRecords(domain, callback) {
 
     debug('addDnsRecords: %j', records);
 
-    txtRecordsWithSpf(domain, function (error, txtRecords) {
-        if (error) return callback(error);
+    async.retry({ times: 10, interval: 20000 }, function (retryCallback) {
+        txtRecordsWithSpf(function (error, txtRecords) {
+            if (error) return retryCallback(error);
 
-        if (txtRecords) records.push({ subdomain: '', domain: domain, type: 'TXT', values: txtRecords });
+            if (txtRecords) records.push({ subdomain: '', domain: domain, type: 'TXT', values: txtRecords });
 
-        debug('addDnsRecords: will update %j', records);
+            debug('addDnsRecords: will update %j', records);
 
-        async.mapSeries(records, function (record, 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);
+            async.mapSeries(records, function (record, 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);
 
-            callback(error);
+                retryCallback(error);
+            });
+        });
+    }, function (error) {
+        if (error) debug('addDnsRecords: done updating records with error:', error);
+        else debug('addDnsRecords: done');
+
+        callback(error);
+    });
+}
+
+function add(domain, callback) {
+    assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    ensureDkimKey(domain, function (error) {
+        if (error) return callback(new MailError(MailError.INTERNAL_ERROR, error));
+
+        maildb.add(domain, function (error) {
+            if (error && error.reason === DatabaseError.ALREADY_EXISTS) return callback(new MailError(MailError.ALREADY_EXISTS, 'Domain already exists'));
+            if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new MailError(MailError.NOT_FOUND, 'No such domain'));
+            if (error) return callback(new MailError(MailError.INTERNAL_ERROR, error));
+
+            addDnsRecords(domain, NOOP_CALLBACK); // add the required dns records asynchronously
+
+            callback();
         });
     });
 }
 
-function addDomain(domain, callback) {
-    assert.strictEqual(typeof domain, 'string');
-    assert.strictEqual(typeof callback, 'function');
-
-    maildb.add(domain, function (error) {
-        if (error && error.reason === DatabaseError.ALREADY_EXISTS) return callback(new MailError(MailError.ALREADY_EXISTS, 'Domain already exists'));
-        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new MailError(MailError.NOT_FOUND, 'No such domain'));
-        if (error) return callback(new MailError(MailError.INTERNAL_ERROR, error));
-
-        async.series([
-            addDnsRecords.bind(null, domain), // do this first to ensure DKIM keys
-            restartMail
-        ], NOOP_CALLBACK); // do these asynchronously
-
-        callback();
-    });
-}
-
-// this is just a way to resync the mail "dns" records via the UI
-function updateDomain(domain, callback) {
-    assert.strictEqual(typeof domain, 'string');
-    assert.strictEqual(typeof callback, 'function');
-
-    getDomain(domain, function (error) {
-        if (error) return callback(error);
-
-        addDnsRecords(domain, NOOP_CALLBACK);
-
-        callback();
-    });
-}
-
-function removeDomain(domain, callback) {
+function del(domain, callback) {
     assert.strictEqual(typeof domain, 'string');
     assert.strictEqual(typeof callback, 'function');
 
     maildb.del(domain, function (error) {
-        if (error && error.reason === DatabaseError.IN_USE) return callback(new MailError(MailError.IN_USE));
         if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new MailError(MailError.NOT_FOUND, error.message));
         if (error) return callback(new MailError(MailError.INTERNAL_ERROR, error));
 
-        restartMail(NOOP_CALLBACK);
-
         callback();
     });
 }
@@ -779,22 +741,22 @@ function setMailFromValidation(domain, enabled, callback) {
         if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new MailError(MailError.NOT_FOUND));
         if (error) return callback(new MailError(MailError.INTERNAL_ERROR, error));
 
-        restartMail(NOOP_CALLBACK); // have to restart mail container since haraka cannot watch symlinked config files (mail.ini)
+        createMailConfig(NOOP_CALLBACK);
 
         callback(null);
     });
 }
 
-function setCatchAllAddress(domain, addresses, callback) {
+function setCatchAllAddress(domain, address, callback) {
     assert.strictEqual(typeof domain, 'string');
-    assert(Array.isArray(addresses));
+    assert(Array.isArray(address));
     assert.strictEqual(typeof callback, 'function');
 
-    maildb.update(domain, { catchAll: addresses }, function (error) {
+    maildb.update(domain, { catchAll: address }, function (error) {
         if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new MailError(MailError.NOT_FOUND));
         if (error) return callback(new MailError(MailError.INTERNAL_ERROR, error));
 
-        restartMail(NOOP_CALLBACK); // have to restart mail container since haraka cannot watch symlinked config files (mail.ini)
+        createMailConfig(NOOP_CALLBACK);
 
         callback(null);
     });
@@ -838,7 +800,7 @@ function setMailEnabled(domain, enabled, callback) {
         ];
 
         async.mapSeries(records, function (record, iteratorCallback) {
-            domains.upsertDnsRecords(record.subdomain, domain, record.type, record.values, iteratorCallback);
+            domains.upsertDNSRecords(record.subdomain, domain, record.type, record.values, iteratorCallback);
         }, NOOP_CALLBACK);
 
         callback(null);
@@ -850,7 +812,7 @@ function sendTestMail(domain, to, callback) {
     assert.strictEqual(typeof to, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    getDomain(domain, function (error, result) {
+    get(domain, function (error, result) {
         if (error) return callback(error);
 
         mailer.sendTestMail(result.domain, to);
@@ -870,102 +832,72 @@ function getMailboxes(domain, callback) {
     });
 }
 
-function removeMailboxes(domain, callback) {
-    assert.strictEqual(typeof domain, 'string');
-    assert.strictEqual(typeof callback, 'function');
-
-    mailboxdb.delByDomain(domain, function (error) {
-        if (error) return callback(new MailError(MailError.INTERNAL_ERROR, error));
-
-        callback();
-    });
-}
-
-function getMailbox(name, domain, callback) {
-    assert.strictEqual(typeof name, 'string');
-    assert.strictEqual(typeof domain, 'string');
-    assert.strictEqual(typeof callback, 'function');
-
-    mailboxdb.getMailbox(name, domain, function (error, result) {
-        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new MailError(MailError.NOT_FOUND, 'no such mailbox'));
-        if (error) return callback(new MailError(MailError.INTERNAL_ERROR, error));
-
-        callback(null, result);
-    });
-}
-
-function addMailbox(name, domain, userId, callback) {
-    assert.strictEqual(typeof name, 'string');
+function getUserMailbox(domain, userId, callback) {
     assert.strictEqual(typeof domain, 'string');
     assert.strictEqual(typeof userId, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    name = name.toLowerCase();
-
-    var error = validateName(name);
-    if (error) return callback(error);
-
-    mailboxdb.addMailbox(name, domain, userId, mailboxdb.OWNER_TYPE_USER, function (error) {
-        if (error && error.reason === DatabaseError.ALREADY_EXISTS) return callback(new MailError(MailError.ALREADY_EXISTS, `mailbox ${name} already exists`));
+    user.get(userId, function (error, result) {
+        if (error && error.reason === UserError.NOT_FOUND) return callback(new MailError(MailError.NOT_FOUND, 'no such user'));
         if (error) return callback(new MailError(MailError.INTERNAL_ERROR, error));
 
-        callback(null);
+        mailboxdb.getMailbox(result.username, domain, function (error, result) {
+            if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new MailError(MailError.NOT_FOUND, 'no such mailbox'));
+            if (error) return callback(new MailError(MailError.INTERNAL_ERROR, error));
+
+            callback(null, result);
+        });
     });
 }
 
-function updateMailbox(name, domain, userId, callback) {
-    assert.strictEqual(typeof name, 'string');
+function enableUserMailbox(domain, userId, callback) {
     assert.strictEqual(typeof domain, 'string');
     assert.strictEqual(typeof userId, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    name = name.toLowerCase();
+    user.get(userId, function (error, result) {
+        if (error && error.reason === UserError.NOT_FOUND) return callback(new MailError(MailError.NOT_FOUND, 'no such user'));
+        if (error) return callback(new MailError(MailError.INTERNAL_ERROR));
 
-    var error = validateName(name);
-    if (error) return callback(error);
+        mailboxdb.add(result.username, domain, userId, mailboxdb.TYPE_USER, function (error) {
+            if (error && error.reason === DatabaseError.ALREADY_EXISTS) return callback(new MailError(MailError.ALREADY_EXISTS, 'mailbox already exists'));
+            if (error) return callback(new MailError(MailError.INTERNAL_ERROR, error));
 
-    mailboxdb.updateMailbox(name, domain, userId, mailboxdb.OWNER_TYPE_USER, function (error) {
-        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new MailError(MailError.NOT_FOUND, 'no such mailbox'));
-        if (error) return callback(new MailError(MailError.INTERNAL_ERROR, error));
-
-        callback(null);
+            callback(null);
+        });
     });
 }
 
-function removeMailbox(name, domain, callback) {
+function disableUserMailbox(domain, userId, callback) {
     assert.strictEqual(typeof domain, 'string');
-    assert.strictEqual(typeof name, 'string');
+    assert.strictEqual(typeof userId, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    mailboxdb.del(name, domain, function (error) {
-        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new MailError(MailError.NOT_FOUND, 'no such mailbox'));
+    user.get(userId, function (error, result) {
+        if (error && error.reason === UserError.NOT_FOUND) return callback(new MailError(MailError.NOT_FOUND, 'no such user'));
         if (error) return callback(new MailError(MailError.INTERNAL_ERROR, error));
 
-        callback(null);
+        mailboxdb.del(result.username, domain, function (error) {
+            if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new MailError(MailError.NOT_FOUND, 'no such mailbox'));
+            if (error) return callback(new MailError(MailError.INTERNAL_ERROR, error));
+
+            callback(null);
+        });
     });
 }
 
-function listAliases(domain, callback) {
+function getAliases(domain, userId, callback) {
     assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof userId, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    mailboxdb.listAliases(domain, function (error, result) {
-        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new MailError(MailError.NOT_FOUND, error.message));
+    user.get(userId, function (error, result) {
+        if (error && error.reason === UserError.NOT_FOUND) return callback(new MailError(MailError.NOT_FOUND, 'no such user'));
         if (error) return callback(new MailError(MailError.INTERNAL_ERROR, error));
 
-        callback(null, result);
-    });
-}
+        if (!result.username) return callback(null, []);
 
-function getAliases(name, domain, callback) {
-    assert.strictEqual(typeof name, 'string');
-    assert.strictEqual(typeof domain, 'string');
-    assert.strictEqual(typeof callback, 'function');
-
-    getMailbox(name, domain, function (error) {
-        if (error) return callback(error);
-
-        mailboxdb.getAliasesForName(name, domain, function (error, aliases) {
+        mailboxdb.getAliasesForName(result.username, domain, function (error, aliases) {
             if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new MailError(MailError.NOT_FOUND, 'no such mailbox'));
             if (error) return callback(new MailError(MailError.INTERNAL_ERROR, error));
 
@@ -974,30 +906,30 @@ function getAliases(name, domain, callback) {
     });
 }
 
-function setAliases(name, domain, aliases, callback) {
-    assert.strictEqual(typeof name, 'string');
+function setAliases(domain, userId, aliases, callback) {
     assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof userId, 'string');
     assert(Array.isArray(aliases));
     assert.strictEqual(typeof callback, 'function');
 
     for (var i = 0; i < aliases.length; i++) {
         aliases[i] = aliases[i].toLowerCase();
 
-        var error = validateName(aliases[i]);
+        var error = validateAlias(aliases[i]);
         if (error) return callback(error);
     }
 
-    mailboxdb.setAliasesForName(name, domain, aliases, function (error) {
-        if (error && error.reason === DatabaseError.ALREADY_EXISTS && error.message.indexOf('mailboxes_name_domain_unique_index') !== -1) {
-            var aliasMatch = error.message.match(new RegExp(`^ER_DUP_ENTRY: Duplicate entry '(.*)-${domain}' for key 'mailboxes_name_domain_unique_index'$`))
-            if (!aliasMatch) return callback(new MailError(MailError.ALREADY_EXISTS, error.message));
-            return callback(new MailError(MailError.ALREADY_EXISTS, `Mailbox, mailinglist or alias for ${aliasMatch[1]} already exists`));
-        }
-        if (error && error.reason === DatabaseError.ALREADY_EXISTS) return callback(new MailError(MailError.ALREADY_EXISTS, error.message));
-        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new MailError(MailError.NOT_FOUND, 'no such mailbox'));
+    user.get(userId, function (error, result) {
+        if (error && error.reason === UserError.NOT_FOUND) return callback(new MailError(MailError.NOT_FOUND, 'no such user'));
         if (error) return callback(new MailError(MailError.INTERNAL_ERROR, error));
 
-        callback(null);
+        mailboxdb.setAliasesForName(result.username, domain, aliases, function (error) {
+            if (error && error.reason === DatabaseError.ALREADY_EXISTS) return callback(new MailError(MailError.ALREADY_EXISTS, error.message));
+            if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new MailError(MailError.NOT_FOUND, 'no such mailbox'));
+            if (error) return callback(new MailError(MailError.INTERNAL_ERROR, error));
+
+            callback(null);
+        });
     });
 }
 
@@ -1012,80 +944,56 @@ function getLists(domain, callback) {
     });
 }
 
-function getList(domain, listName, callback) {
+function getList(domain, groupId, callback) {
     assert.strictEqual(typeof domain, 'string');
-    assert.strictEqual(typeof listName, 'string');
+    assert.strictEqual(typeof groupId, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    mailboxdb.getGroup(listName, domain, function (error, result) {
-        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new MailError(MailError.NOT_FOUND, 'no such list'));
+    groups.get(groupId, function (error, result) {
+        if (error && error.reason === GroupError.NOT_FOUND) return callback(new MailError(MailError.NOT_FOUND, 'no such group'));
         if (error) return callback(new MailError(MailError.INTERNAL_ERROR, error));
 
-        callback(null, result);
+        mailboxdb.getGroup(result.name, domain, function (error, result) {
+            if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new MailError(MailError.NOT_FOUND, 'no such list'));
+            if (error) return callback(new MailError(MailError.INTERNAL_ERROR, error));
+
+            callback(null, result);
+        });
     });
 }
 
-function addList(name, domain, members, callback) {
+function addList(domain, groupId, callback) {
     assert.strictEqual(typeof domain, 'string');
-    assert.strictEqual(typeof name, 'string');
-    assert(Array.isArray(members));
+    assert.strictEqual(typeof groupId, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    name = name.toLowerCase();
-
-    var error = validateName(name);
-    if (error) return callback(error);
-
-    for (var i = 0; i < members.length; i++) {
-        members[i] = members[i].toLowerCase();
-
-        error = validateName(members[i]);
-        if (error) return callback(error);
-    }
-
-    mailboxdb.addGroup(name, domain, members, function (error) {
-        if (error && error.reason === DatabaseError.ALREADY_EXISTS) return callback(new MailError(MailError.ALREADY_EXISTS, 'list already exits'));
+    groups.get(groupId, function (error, result) {
+        if (error && error.reason === GroupError.NOT_FOUND) return callback(new MailError(MailError.NOT_FOUND, 'no such group'));
         if (error) return callback(new MailError(MailError.INTERNAL_ERROR, error));
 
-        callback();
+        mailboxdb.add(result.name, domain, groupId, mailboxdb.TYPE_GROUP, function (error) {
+            if (error && error.reason === DatabaseError.ALREADY_EXISTS) return callback(new MailError(MailError.ALREADY_EXISTS, 'list already exits'));
+            if (error) return callback(new MailError(MailError.INTERNAL_ERROR, error));
+
+            callback();
+        });
     });
 }
 
-function updateList(name, domain, members, callback) {
-    assert.strictEqual(typeof name, 'string');
+function removeList(domain, groupId, callback) {
     assert.strictEqual(typeof domain, 'string');
-    assert(Array.isArray(members));
+    assert.strictEqual(typeof groupId, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    name = name.toLowerCase();
-
-    var error = validateName(name);
-    if (error) return callback(error);
-
-    for (var i = 0; i < members.length; i++) {
-        members[i] = members[i].toLowerCase();
-
-        error = validateName(members[i]);
-        if (error) return callback(error);
-    }
-
-    mailboxdb.updateList(name, domain, members, function (error) {
-        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new MailError(MailError.NOT_FOUND, 'no such mailbox'));
+    groups.get(groupId, function (error, result) {
+        if (error && error.reason === GroupError.NOT_FOUND) return callback(new MailError(MailError.NOT_FOUND, 'no such group'));
         if (error) return callback(new MailError(MailError.INTERNAL_ERROR, error));
 
-        callback(null);
-    });
-}
-
-function removeList(domain, listName, callback) {
-    assert.strictEqual(typeof domain, 'string');
-    assert.strictEqual(typeof listName, 'string');
-    assert.strictEqual(typeof callback, 'function');
-
-    mailboxdb.del(listName, domain, function (error) {
-        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new MailError(MailError.NOT_FOUND, 'no such list'));
-        if (error) return callback(new MailError(MailError.INTERNAL_ERROR, error));
-
-        callback();
+        mailboxdb.del(result.name, domain, function (error) {
+            if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new MailError(MailError.NOT_FOUND, 'no such list'));
+            if (error) return callback(new MailError(MailError.INTERNAL_ERROR, error));
+
+            callback();
+        });
     });
 }

src/mail_templates/app_down.ejs

@@ -9,7 +9,7 @@ This is most likely a problem in the application.
 To resolve this, you can try the following:
 * Restart the app in the app configuration dialog
 * Restore the app to the latest backup
-* Contact us via support@cloudron.io or https://forum.cloudron.io
+* Contact us via support@cloudron.io or https://chat.cloudron.io
 
 
 Powered by https://cloudron.io

src/mail_templates/app_update_available.ejs

@@ -46,4 +46,6 @@ Sent at: <%= new Date().toUTCString() %>
 
     </center>
 
+    <img src="https://analytics.cloudron.io/piwik.php?idsite=2&rec=1&e_c=CloudronEmail&e_a=update" style="border:0" alt="" />
+
 <% } %>

src/mail_templates/box_update_available.ejs

@@ -52,5 +52,7 @@ Sent at: <%= new Date().toUTCString() %>
 
 </center>
 
+<img src="https://analytics.cloudron.io/piwik.php?idsite=2&rec=1&e_c=CloudronEmail&e_a=update" style="border:0" alt="" />
+
 <% } %>
 

src/mail_templates/digest.ejs

@@ -174,4 +174,5 @@ Sent at: <%= new Date().toUTCString() %>
     </div>
 </center>
 
+<img src="https://analytics.cloudron.io/piwik.php?idsite=2&rec=1&e_c=CloudronEmail&e_a=digest" style="border:0" alt="" />
 <% } %>

src/mail_templates/password_reset.ejs

@@ -38,4 +38,6 @@ Powered by https://cloudron.io
 
 </center>
 
+<img src="https://analytics.cloudron.io/piwik.php?idsite=2&rec=1&e_c=CloudronEmail&e_a=passwordReset" style="border:0" alt="" />
+
 <% } %>

src/mail_templates/user_added.ejs

@@ -44,4 +44,6 @@ Powered by https://cloudron.io
 
 </center>
 
+<img src="https://analytics.cloudron.io/piwik.php?idsite=2&rec=1&e_c=CloudronEmail&e_a=userAdded" style="border:0" alt="" />
+
 <% } %>

src/mail_templates/welcome_user.ejs

@@ -43,4 +43,6 @@ Powered by https://cloudron.io
 
 </center>
 
+<img src="https://analytics.cloudron.io/piwik.php?idsite=2&rec=1&e_c=CloudronEmail&e_a=welcomeUser" style="border:0" alt="" />
+
 <% } %>

src/mailboxdb.js

@@ -1,11 +1,7 @@
 'use strict';
 
 exports = module.exports = {
-    addMailbox: addMailbox,
-    addGroup: addGroup,
-
-    updateMailbox: updateMailbox,
-    updateList: updateList,
+    add: add,
     del: del,
 
     listAliases: listAliases,
@@ -21,44 +17,31 @@ exports = module.exports = {
 
     getByOwnerId: getByOwnerId,
     delByOwnerId: delByOwnerId,
-    delByDomain: delByDomain,
 
     updateName: updateName,
 
     _clear: clear,
 
-    TYPE_MAILBOX: 'mailbox',
-    TYPE_LIST: 'list',
-    TYPE_ALIAS: 'alias',
-
-    OWNER_TYPE_USER: 'user',
-    OWNER_TYPE_APP: 'app',
-    OWNER_TYPE_GROUP: 'group' // obsolete
+    TYPE_USER: 'user',
+    TYPE_APP: 'app',
+    TYPE_GROUP: 'group'
 };
 
 var assert = require('assert'),
     database = require('./database.js'),
     DatabaseError = require('./databaseerror.js'),
-    safe = require('safetydance'),
     util = require('util');
 
-var MAILBOX_FIELDS = [ 'name', 'type', 'ownerId', 'ownerType', 'aliasTarget', 'creationTime', 'membersJson', 'domain' ].join(',');
+var MAILBOX_FIELDS = [ 'name', 'ownerId', 'ownerType', 'aliasTarget', 'creationTime', 'domain' ].join(',');
 
-function postProcess(data) {
-    data.members = safe.JSON.parse(data.membersJson) || [ ];
-    delete data.membersJson;
-
-    return data;
-}
-
-function addMailbox(name, domain, 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, type, domain, ownerId, ownerType) VALUES (?, ?, ?, ?, ?)', [ name, exports.TYPE_MAILBOX, domain, 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));
 
@@ -66,51 +49,6 @@ function addMailbox(name, domain, ownerId, ownerType, callback) {
     });
 }
 
-function updateMailbox(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('UPDATE mailboxes SET ownerId = ? WHERE name = ? AND domain = ? AND ownerType = ?', [ ownerId, name, domain, ownerType ], function (error, result) {
-        if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
-        if (result.affectedRows === 0) return callback(new DatabaseError(DatabaseError.NOT_FOUND));
-
-        callback(null);
-    });
-}
-
-function addGroup(name, domain, members, callback) {
-    assert.strictEqual(typeof name, 'string');
-    assert.strictEqual(typeof domain, 'string');
-    assert(Array.isArray(members));
-    assert.strictEqual(typeof callback, 'function');
-
-    database.query('INSERT INTO mailboxes (name, type, domain, ownerId, ownerType, membersJson) VALUES (?, ?, ?, ?, ?, ?)',
-        [ name, exports.TYPE_LIST, domain, 'admin', exports.OWNER_TYPE_GROUP, JSON.stringify(members) ], 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));
-
-            callback(null);
-        });
-}
-
-function updateList(name, domain, members, callback) {
-    assert.strictEqual(typeof name, 'string');
-    assert.strictEqual(typeof domain, 'string');
-    assert(Array.isArray(members));
-    assert.strictEqual(typeof callback, 'function');
-
-    database.query('UPDATE mailboxes SET membersJson = ? WHERE name = ? AND domain = ?',
-        [ JSON.stringify(members), 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));
-
-            callback(null);
-        });
-}
-
 function clear(callback) {
     assert.strictEqual(typeof callback, 'function');
 
@@ -134,21 +72,11 @@ function del(name, domain, callback) {
     });
 }
 
-function delByDomain(domain, callback) {
-    assert.strictEqual(typeof domain, 'string');
-    assert.strictEqual(typeof callback, 'function');
-
-    database.query('DELETE FROM mailboxes WHERE domain = ?', [ domain ], function (error) {
-        if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
-
-        callback(null);
-    });
-}
-
 function delByOwnerId(id, callback) {
     assert.strictEqual(typeof id, 'string');
     assert.strictEqual(typeof callback, 'function');
 
+    // deletes aliases as well
     database.query('DELETE FROM mailboxes WHERE ownerId=?', [ id ], function (error) {
         if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
 
@@ -180,41 +108,35 @@ function getMailbox(name, domain, callback) {
     assert.strictEqual(typeof domain, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    database.query('SELECT ' + MAILBOX_FIELDS + ' FROM mailboxes WHERE name = ? AND type = ? AND domain = ?',
-        [ name, exports.TYPE_MAILBOX, 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));
+    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));
 
-            callback(null, postProcess(results[0]));
-        });
+        callback(null, results[0]);
+    });
 }
 
 function listMailboxes(domain, callback) {
     assert.strictEqual(typeof domain, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    database.query('SELECT ' + MAILBOX_FIELDS + ' FROM mailboxes WHERE type = ? AND domain = ? ORDER BY name',
-        [ exports.TYPE_MAILBOX, domain ], function (error, results) {
-            if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
+    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));
 
-            results.forEach(function (result) { postProcess(result); });
-
-            callback(null, results);
-        });
+        callback(null, results);
+    });
 }
 
 function listGroups(domain, callback) {
     assert.strictEqual(typeof domain, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    database.query('SELECT ' + MAILBOX_FIELDS + ' FROM mailboxes WHERE type = ? AND domain = ?',
-        [ exports.TYPE_LIST, domain ], function (error, results) {
-            if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
+    database.query('SELECT ' + MAILBOX_FIELDS + ' FROM mailboxes WHERE domain = ? AND ownerType = ? AND aliasTarget IS NULL', [ 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));
 
-            results.forEach(function (result) { postProcess(result); });
-
-            callback(null, results);
-        });
+        callback(null, results);
+    });
 }
 
 function getGroup(name, domain, callback) {
@@ -222,13 +144,25 @@ function getGroup(name, domain, callback) {
     assert.strictEqual(typeof domain, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    database.query('SELECT ' + MAILBOX_FIELDS + ' FROM mailboxes WHERE type = ? AND name = ? AND domain = ?',
-        [ exports.TYPE_LIST, 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));
+    // This can be merged into a single query but cannot get 'not found' information
+    // SELECT users.username FROM mailboxes
+    //    INNER JOIN groupMembers ON mailboxes.ownerId = groupMembers.groupId
+    //    INNER JOIN users ON groupMembers.userId = users.id
+    //    WHERE mailboxes.name = <name>
 
-            callback(null, postProcess(results[0]));
+    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));
+
+        // username can be null if the user has not signed up with the invite yet
+        database.query('SELECT users.username FROM groupMembers INNER JOIN users ON groupMembers.userId = users.id WHERE groupMembers.groupId = ? AND users.username IS NOT NULL', [ results[0].ownerId ], function (error, memberList) {
+            if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
+
+            results[0].members = memberList.map(function (m) { return m.username; });
+
+            callback(null, results[0]);
         });
+    });
 }
 
 function getByOwnerId(ownerId, callback) {
@@ -239,8 +173,6 @@ function getByOwnerId(ownerId, callback) {
         if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
         if (results.length === 0) return callback(new DatabaseError(DatabaseError.NOT_FOUND));
 
-        results.forEach(function (result) { postProcess(result); });
-
         callback(null, results);
     });
 }
@@ -256,11 +188,10 @@ function setAliasesForName(name, domain, aliases, callback) {
         if (results.length === 0) return callback(new DatabaseError(DatabaseError.NOT_FOUND));
 
         var queries = [];
-        // clear existing aliases
-        queries.push({ query: 'DELETE FROM mailboxes WHERE aliasTarget = ? AND domain = ? AND type = ?', args: [ name, domain, exports.TYPE_ALIAS ] });
+        queries.push({ query: 'DELETE FROM mailboxes WHERE aliasTarget = ? AND domain = ?', args: [ name, domain ] });
         aliases.forEach(function (alias) {
-            queries.push({ query: 'INSERT INTO mailboxes (name, type, domain, aliasTarget, ownerId, ownerType) VALUES (?, ?, ?, ?, ?, ?)',
-                args: [ alias, exports.TYPE_ALIAS, domain, 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) {
@@ -277,27 +208,23 @@ function getAliasesForName(name, domain, callback) {
     assert.strictEqual(typeof domain, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    database.query('SELECT name FROM mailboxes WHERE type = ? AND aliasTarget = ? AND domain = ? ORDER BY name',
-        [ exports.TYPE_ALIAS, name, domain ], function (error, results) {
-            if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
+    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; });
-            callback(null, results);
-        });
+        results = results.map(function (r) { return r.name; });
+        callback(null, results);
+    });
 }
 
 function listAliases(domain, callback) {
     assert.strictEqual(typeof domain, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    database.query('SELECT ' + MAILBOX_FIELDS + ' FROM mailboxes WHERE domain = ? AND type = ? ORDER BY name',
-        [ domain, exports.TYPE_ALIAS ], function (error, results) {
-            if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
+    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));
 
-            results.forEach(function (result) { postProcess(result); });
-
-            callback(null, results);
-        });
+        callback(null, results);
+    });
 }
 
 function getAlias(name, domain, callback) {
@@ -305,13 +232,10 @@ function getAlias(name, domain, callback) {
     assert.strictEqual(typeof domain, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    database.query('SELECT ' + MAILBOX_FIELDS + ' FROM mailboxes WHERE name = ? AND type = ? AND domain = ?',
-        [ name, exports.TYPE_ALIAS, 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));
+    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));
 
-            results.forEach(function (result) { postProcess(result); });
-
-            callback(null, results[0]);
-        });
+        callback(null, results[0]);
+    });
 }

src/maildb.js

@@ -61,7 +61,6 @@ function del(domain, callback) {
 
     // deletes aliases as well
     database.query('DELETE FROM mail 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 === 0) return callback(new DatabaseError(DatabaseError.NOT_FOUND));
 

src/mailer.js

@@ -39,7 +39,7 @@ var assert = require('assert'),
     settings = require('./settings.js'),
     showdown = require('showdown'),
     smtpTransport = require('nodemailer-smtp-transport'),
-    users = require('./users.js'),
+    users = require('./user.js'),
     util = require('util'),
     _ = require('underscore');
 
@@ -74,7 +74,7 @@ function getMailConfig(callback) {
                 cloudronName = 'Cloudron';
             }
 
-            mail.getDomains(function (error, domains) {
+            mail.getAll(function (error, domains) {
                 if (error) return callback(error);
                 if (domains.length === 0) return callback('No domains configured');
 

src/native-dns.js

@@ -1,35 +0,0 @@
-'use strict';
-
-exports = module.exports = {
-    resolve: resolve
-};
-
-var assert = require('assert'),
-    dns = require('dns');
-
-// a note on TXT records. It doesn't have quotes ("") at the DNS level. Those quotes
-// are added for DNS server software to enclose spaces. Such quotes may also be returned
-// by the DNS REST API of some providers
-function resolve(hostname, rrtype, options, callback) {
-    assert.strictEqual(typeof hostname, 'string');
-    assert.strictEqual(typeof rrtype, 'string');
-    assert(options && typeof options === 'object');
-    assert.strictEqual(typeof callback, 'function');
-
-    const resolver = new dns.Resolver();
-    if (options.server) resolver.setServers([ options.server ]);
-
-    // should callback with ECANCELLED but looks like we might hit https://github.com/nodejs/node/issues/14814
-    const timerId = setTimeout(resolver.cancel.bind(resolver), options.timeout || 5000);
-
-    resolver.resolve(hostname, rrtype, function (error, result) {
-        clearTimeout(timerId);
-
-        if (error && error.code === 'ECANCELLED') error.code = 'TIMEOUT';
-
-        // result is an empty array if there was no error but there is no record. when you query a random
-        // domain, it errors with ENOTFOUND. But if you query an existing domain (A record) but with different
-        // type (CNAME) it is not an error and empty array
-        callback(error, result);
-    });
-}

src/oauth2views/login.ejs

@@ -24,20 +24,16 @@
         <form id="loginForm" action="" method="post">
           <input type="hidden" name="_csrf" value="<%= csrf %>"/>
           <div class="form-group">
-            <label class="control-label" for="inputUsername">Username</label>
+            <label class="control-label" for="inputUsername">Username or Email</label>
             <input type="text" class="form-control" id="inputUsername" name="username" value="<%= username %>" autofocus required>
           </div>
           <div class="form-group">
             <label class="control-label" for="inputPassword">Password</label>
             <input type="password" class="form-control" name="password" id="inputPassword" value="<%= password %>" required>
           </div>
-          <div class="form-group">
-            <label class="control-label" for="inputPassword">2FA Token (if enabled)</label>
-            <input type="text" class="form-control" name="totpToken" id="inputTotpToken" value="">
-          </div>
           <input class="btn btn-primary btn-outline pull-right" type="submit" value="Sign in"/>
         </form>
-        <a href="/api/v1/session/password/resetRequest.html">Reset password</a>
+        <a href="/api/v1/session/password/resetRequest.html">Reset your password</a>
       </div>
     </div>
   </div>

src/oauth2views/password_reset.ejs

@@ -42,7 +42,7 @@ app.controller('Controller', [function () {}]);
             </div>
             <input type="password" class="form-control" id="inputPasswordRepeat" ng-model="passwordRepeat" name="passwordRepeat" required>
           </div>
-          <input class="btn btn-primary btn-outline pull-right" type="submit" value="Set New Password" ng-disabled="resetForm.$invalid || password !== passwordRepeat"/>
+          <input class="btn btn-primary btn-outline pull-right" type="submit" value="Create" ng-disabled="resetForm.$invalid || password !== passwordRepeat"/>
         </form>
       </div>
     </div>

src/oauth2views/password_reset_request.ejs

@@ -5,7 +5,7 @@
 <div class="layout-content">
 
   <center>
-    <h2>Reset password</h2>
+    <h2>Reset your password</h2>
   </center>
 
   <br/>
@@ -16,7 +16,7 @@
         <form action="/api/v1/session/password/resetRequest" method="post" autocomplete="off">
           <input type="hidden" name="_csrf" value="<%= csrf %>"/>
           <div class="form-group">
-            <label class="control-label" for="inputIdentifier">Username</label>
+            <label class="control-label" for="inputIdentifier">Username or Email</label>
             <input type="text" class="form-control" id="inputIdentifier" name="identifier" autofocus required>
           </div>
           <input class="btn btn-primary btn-outline pull-right" type="submit" value="Reset"/>

src/progress.js

@@ -41,7 +41,7 @@ function setDetail(tag, detail) {
     assert.strictEqual(typeof tag, 'string');
     assert.strictEqual(typeof detail, 'string');
 
-    if (!progress[tag]) return debug('[%s] %s', tag, detail);
+    if (!progress[tag]) return debug('unable to set detail %s', detail);
 
     progress[tag].detail = detail;
 }

src/reverseproxy.js

@@ -32,7 +32,6 @@ var acme = require('./cert/acme.js'),
     caas = require('./cert/caas.js'),
     config = require('./config.js'),
     constants = require('./constants.js'),
-    crypto = require('crypto'),
     debug = require('debug')('box:certificates'),
     domains = require('./domains.js'),
     ejs = require('ejs'),
@@ -40,13 +39,13 @@ var acme = require('./cert/acme.js'),
     fallback = require('./cert/fallback.js'),
     fs = require('fs'),
     mailer = require('./mailer.js'),
-    os = require('os'),
     path = require('path'),
     paths = require('./paths.js'),
     platform = require('./platform.js'),
     safe = require('safetydance'),
     shell = require('./shell.js'),
-    users = require('./users.js'),
+    tld = require('tldjs'),
+    user = require('./user.js'),
     util = require('util');
 
 var NGINX_APPCONFIG_EJS = fs.readFileSync(__dirname + '/../setup/start/nginx/appconfig.ejs', { encoding: 'utf8' }),
@@ -85,11 +84,12 @@ function getApi(app, callback) {
 
         if (domain.tlsConfig.provider === 'fallback') return callback(null, fallback, {});
 
-        var api = domain.tlsConfig.provider === 'caas' ? caas : acme;
+        // use acme if we have altDomain or the tlsConfig is not caas
+        var api = (app.altDomain || domain.tlsConfig.provider !== 'caas') ? acme : caas;
 
         var options = { };
         if (domain.tlsConfig.provider === 'caas') {
-            options.prod = true;
+            options.prod = true; // with altDomain, we will choose acme setting based on this
         } else { // acme
             options.prod = domain.tlsConfig.provider.match(/.*-prod/) !== null; // matches 'le-prod' or 'letsencrypt-prod'
         }
@@ -98,7 +98,7 @@ function getApi(app, callback) {
         // we cannot use admin@fqdn because the user might not have set it up.
         // we simply update the account with the latest email we have each time when getting letsencrypt certs
         // https://github.com/ietf-wg-acme/acme/issues/30
-        users.getOwner(function (error, owner) {
+        user.getOwner(function (error, owner) {
             options.email = error ? 'support@cloudron.io' : (owner.fallbackEmail || owner.email); // can error if not activated yet
 
             callback(null, api, options);
@@ -138,11 +138,22 @@ function validateCertificate(domain, cert, key) {
     if (!cert && key) return new ReverseProxyError(ReverseProxyError.INVALID_CERT, 'missing cert');
     if (cert && !key) return new ReverseProxyError(ReverseProxyError.INVALID_CERT, 'missing key');
 
-    // -checkhost checks for SAN or CN exclusively. SAN takes precedence and if present, ignores the CN.
-    var result = safe.child_process.execSync(`openssl x509 -noout -checkhost "${domain}"`, { encoding: 'utf8', input: cert });
+    var result = safe.child_process.execSync('openssl x509 -noout -checkhost "' + domain + '"', { encoding: 'utf8', input: cert });
     if (!result) return new ReverseProxyError(ReverseProxyError.INVALID_CERT, 'Unable to get certificate subject.');
 
-    if (result.indexOf('does match certificate') === -1) return new ReverseProxyError(ReverseProxyError.INVALID_CERT, `Certificate is not valid for this domain. Expecting ${domain}`);
+    // 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" | \
+                   grep "DNS:" | \
+                   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 ReverseProxyError(ReverseProxyError.INVALID_CERT, util.format('Certificate is not valid for this domain. Expecting %s in %j', domain, 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 });
@@ -175,14 +186,8 @@ function setFallbackCertificate(domain, fallback, callback) {
         if (!safe.fs.writeFileSync(path.join(paths.APP_CERTS_DIR, `${domain}.host.cert`), fallback.cert)) return callback(new ReverseProxyError(ReverseProxyError.INTERNAL_ERROR, safe.error.message));
         if (!safe.fs.writeFileSync(path.join(paths.APP_CERTS_DIR, `${domain}.host.key`), fallback.key)) return callback(new ReverseProxyError(ReverseProxyError.INTERNAL_ERROR, safe.error.message));
     } else if (!fs.existsSync(certFilePath) || !fs.existsSync(keyFilePath)) { // generate it
-        let opensslConf = safe.fs.readFileSync('/etc/ssl/openssl.cnf', 'utf8');
-        // SAN must contain all the domains since CN check is based on implementation if SAN is found. -checkhost also checks only SAN if present!
-        let opensslConfWithSan = `${opensslConf}\n[SAN]\nsubjectAltName=DNS:${domain},DNS:*.${domain}\n`;
-        let configFile = path.join(os.tmpdir(), 'openssl-' + crypto.randomBytes(4).readUInt32LE(0) + '.conf');
-        safe.fs.writeFileSync(configFile, opensslConfWithSan, 'utf8');
-        let certCommand = util.format(`openssl req -x509 -newkey rsa:2048 -keyout ${keyFilePath} -out ${certFilePath} -days 3650 -subj /CN=*.${domain} -extensions SAN -config ${configFile} -nodes`);
+        var certCommand = util.format('openssl req -x509 -newkey rsa:2048 -keyout %s -out %s -days 3650 -subj /CN=*.%s -nodes', keyFilePath, certFilePath, domain);
         if (!safe.child_process.execSync(certCommand)) return callback(new ReverseProxyError(ReverseProxyError.INTERNAL_ERROR, safe.error.message));
-        safe.fs.unlinkSync(configFile);
     }
 
     platform.handleCertChanged('*.' + domain);
@@ -215,13 +220,15 @@ function getCertificate(app, callback) {
     assert.strictEqual(typeof app, 'object');
     assert.strictEqual(typeof callback, 'function');
 
-    var certFilePath = path.join(paths.APP_CERTS_DIR, `${app.fqdn}.user.cert`);
-    var keyFilePath = path.join(paths.APP_CERTS_DIR, `${app.fqdn}.user.key`);
+    var vhost = app.altDomain || app.intrinsicFqdn;
+
+    var certFilePath = path.join(paths.APP_CERTS_DIR, `${vhost}.user.cert`);
+    var keyFilePath = path.join(paths.APP_CERTS_DIR, `${vhost}.user.key`);
 
     if (fs.existsSync(certFilePath) && fs.existsSync(keyFilePath)) return callback(null, { certFilePath, keyFilePath });
 
-    certFilePath = path.join(paths.APP_CERTS_DIR, `${app.fqdn}.cert`);
-    keyFilePath = path.join(paths.APP_CERTS_DIR, `${app.fqdn}.key`);
+    certFilePath = path.join(paths.APP_CERTS_DIR, `${vhost}.cert`);
+    keyFilePath = path.join(paths.APP_CERTS_DIR, `${vhost}.key`);
 
     if (fs.existsSync(certFilePath) && fs.existsSync(keyFilePath)) return callback(null, { certFilePath, keyFilePath });
 
@@ -233,7 +240,7 @@ function ensureCertificate(app, auditSource, callback) {
     assert.strictEqual(typeof auditSource, 'object');
     assert.strictEqual(typeof callback, 'function');
 
-    const vhost = app.fqdn;
+    var vhost = app.altDomain || app.intrinsicFqdn;
 
     var certFilePath = path.join(paths.APP_CERTS_DIR, `${vhost}.user.cert`);
     var keyFilePath = path.join(paths.APP_CERTS_DIR, `${vhost}.user.key`);
@@ -271,7 +278,7 @@ function ensureCertificate(app, auditSource, callback) {
             eventlog.add(eventlog.ACTION_CERTIFICATE_RENEWAL, auditSource, { domain: vhost, errorMessage: errorMessage });
 
             // if no cert was returned use fallback. the fallback/caas provider will not provide any for example
-            if (!certFilePath || !keyFilePath) return getFallbackCertificate(app.domain, callback);
+            if (!certFilePath || !keyFilePath) return getFallbackCertificate(app.altDomain ? tld.getDomain(app.altDomain) : app.domain, callback);
 
             callback(null, { certFilePath, keyFilePath, reason: 'new-le' });
         });
@@ -307,7 +314,7 @@ function configureAdmin(auditSource, callback) {
     assert.strictEqual(typeof auditSource, 'object');
     assert.strictEqual(typeof callback, 'function');
 
-    var adminApp = { domain: config.adminDomain(), fqdn: config.adminFqdn() };
+    var adminApp = { domain: config.adminDomain(), intrinsicFqdn: config.adminFqdn() };
     ensureCertificate(adminApp, auditSource, function (error, bundle) {
         if (error) return callback(error);
 
@@ -322,11 +329,12 @@ function configureAppInternal(app, bundle, callback) {
 
     var sourceDir = path.resolve(__dirname, '..');
     var endpoint = 'app';
+    var vhost = app.altDomain || app.intrinsicFqdn;
 
     var data = {
         sourceDir: sourceDir,
         adminOrigin: config.adminOrigin(),
-        vhost: app.fqdn,
+        vhost: vhost,
         hasIPv6: config.hasIPv6(),
         port: app.httpPort,
         endpoint: endpoint,
@@ -338,10 +346,10 @@ function configureAppInternal(app, bundle, callback) {
     var nginxConf = ejs.render(NGINX_APPCONFIG_EJS, data);
 
     var nginxConfigFilename = path.join(paths.NGINX_APPCONFIG_DIR, app.id + '.conf');
-    debug('writing config for "%s" to %s with options %j', app.fqdn, nginxConfigFilename, data);
+    debug('writing config for "%s" to %s with options %j', vhost, nginxConfigFilename, data);
 
     if (!safe.fs.writeFileSync(nginxConfigFilename, nginxConf)) {
-        debug('Error creating nginx config for "%s" : %s', app.fqdn, safe.error.message);
+        debug('Error creating nginx config for "%s" : %s', vhost, safe.error.message);
         return callback(safe.error);
     }
 
@@ -364,9 +372,11 @@ function unconfigureApp(app, callback) {
     assert.strictEqual(typeof app, 'object');
     assert.strictEqual(typeof callback, 'function');
 
+    var vhost = app.altDomain || app.intrinsicFqdn;
+
     var nginxConfigFilename = path.join(paths.NGINX_APPCONFIG_DIR, app.id + '.conf');
     if (!safe.fs.unlinkSync(nginxConfigFilename)) {
-        if (safe.error.code !== 'ENOENT') debug('Error removing nginx configuration of "%s": %s', app.fqdn, safe.error.message);
+        if (safe.error.code !== 'ENOENT') debug('Error removing nginx configuration of "%s": %s', vhost, safe.error.message);
         return callback(null);
     }
 
@@ -382,21 +392,21 @@ function renewAll(auditSource, callback) {
     apps.getAll(function (error, allApps) {
         if (error) return callback(error);
 
-        allApps.push({ domain: config.adminDomain(), fqdn: config.adminFqdn() }); // inject fake webadmin app
+        allApps.push({ domain: config.adminDomain(), intrinsicFqdn: config.adminFqdn() }); // inject fake webadmin app
 
         async.eachSeries(allApps, function (app, iteratorCallback) {
             ensureCertificate(app, auditSource, function (error, bundle) {
                 if (bundle.reason !== 'new-le' && bundle.reason !== 'fallback') return iteratorCallback();
 
                 // reconfigure for the case where we got a renewed cert after fallback
-                var configureFunc = app.fqdn === config.adminFqdn() ?
+                var configureFunc = app.intrinsicFqdn === config.adminFqdn() ?
                     configureAdminInternal.bind(null, bundle, constants.NGINX_ADMIN_CONFIG_FILE_NAME, config.adminFqdn())
                     : configureAppInternal.bind(null, app, bundle);
 
                 configureFunc(function (ignoredError) {
                     if (ignoredError) debug('fallbackExpiredCertificates: error reconfiguring app', ignoredError);
 
-                    platform.handleCertChanged(app.fqdn);
+                    platform.handleCertChanged(app.intrinsicFqdn);
 
                     iteratorCallback(); // move to next app
                 });

src/routes/accesscontrol.js

@@ -1,56 +0,0 @@
-'use strict';
-
-exports = module.exports = {
-    scope: scope,
-    websocketAuth: websocketAuth
-};
-
-var accesscontrol = require('../accesscontrol.js'),
-    assert = require('assert'),
-    HttpError = require('connect-lastmile').HttpError,
-    passport = require('passport');
-
-//  The scope middleware provides an auth middleware for routes.
-//
-//  It is used for API routes, which are authenticated using accesstokens.
-//  Those accesstokens carry OAuth scopes and the middleware takes the required
-//  scope as an argument and will verify the accesstoken against it.
-//
-//  See server.js:
-//    var profileScope = routes.oauth2.scope('profile');
-//
-function scope(requestedScope) {
-    assert.strictEqual(typeof requestedScope, 'string');
-
-    var requestedScopes = requestedScope.split(',');
-
-    return [
-        passport.authenticate(['bearer'], { session: false }),
-
-        function (req, res, next) {
-            var error = accesscontrol.validateRequestedScopes(req.authInfo || null, requestedScopes);
-            if (error) return next(new HttpError(403, error.message));
-
-            next();
-        }
-    ];
-}
-
-function websocketAuth(requestedScopes, req, res, next) {
-    assert(Array.isArray(requestedScopes));
-
-    if (typeof req.query.access_token !== 'string') return next(new HttpError(401, 'Unauthorized'));
-
-    accesscontrol.accessTokenAuth(req.query.access_token, function (error, user, info) {
-        if (error) return next(new HttpError(500, error.message));
-        if (!user) return next(new HttpError(401, 'Unauthorized'));
-
-        req.user = user;
-        req.authInfo = info;
-
-        var e = accesscontrol.validateRequestedScopes(req.authInfo, requestedScopes);
-        if (e) return next(new HttpError(401, e.message));
-
-        next();
-    });
-}

src/routes/apps.js

@@ -3,7 +3,6 @@
 exports = module.exports = {
     getApp: getApp,
     getApps: getApps,
-    getAllByUser: getAllByUser,
     getAppIcon: getAppIcon,
     installApp: installApp,
     configureApp: configureApp,
@@ -43,6 +42,34 @@ function auditSource(req) {
     return { ip: ip, username: req.user ? req.user.username : null, userId: req.user ? req.user.id : null };
 }
 
+function removeInternalAppFields(app) {
+    return {
+        id: app.id,
+        appStoreId: app.appStoreId,
+        installationState: app.installationState,
+        installationProgress: app.installationProgress,
+        runState: app.runState,
+        health: app.health,
+        location: app.location,
+        domain: app.domain,
+        accessRestriction: app.accessRestriction,
+        manifest: app.manifest,
+        portBindings: app.portBindings,
+        iconUrl: app.iconUrl,
+        fqdn: app.fqdn,
+        memoryLimit: app.memoryLimit,
+        altDomain: app.altDomain,
+        cnameTarget: app.cnameTarget,
+        xFrameOptions: app.xFrameOptions,
+        sso: app.sso,
+        debugMode: app.debugMode,
+        robotsTxt: app.robotsTxt,
+        enableBackup: app.enableBackup,
+        creationTime: app.creationTime.toISOString(),
+        updateTime: app.updateTime.toISOString()
+    };
+}
+
 function getApp(req, res, next) {
     assert.strictEqual(typeof req.params.id, 'string');
 
@@ -50,29 +77,18 @@ function getApp(req, res, next) {
         if (error && error.reason === AppsError.NOT_FOUND) return next(new HttpError(404, 'No such app'));
         if (error) return next(new HttpError(500, error));
 
-        next(new HttpSuccess(200, apps.removeInternalAppFields(app)));
+        next(new HttpSuccess(200, removeInternalAppFields(app)));
     });
 }
 
 function getApps(req, res, next) {
     assert.strictEqual(typeof req.user, 'object');
 
-    apps.getAll(function (error, allApps) {
+    var func = req.user.admin ? apps.getAll : apps.getAllByUser.bind(null, req.user);
+    func(function (error, allApps) {
         if (error) return next(new HttpError(500, error));
 
-        allApps = allApps.map(apps.removeInternalAppFields);
-
-        next(new HttpSuccess(200, { apps: allApps }));
-    });
-}
-
-function getAllByUser(req, res, next) {
-    assert.strictEqual(typeof req.user, 'object');
-
-    apps.getAllByUser(req.user, function (error, allApps) {
-        if (error) return next(new HttpError(500, error));
-
-        allApps = allApps.map(apps.removeInternalAppFields);
+        allApps = allApps.map(removeInternalAppFields);
 
         next(new HttpSuccess(200, { apps: allApps }));
     });
@@ -118,6 +134,9 @@ function installApp(req, res, next) {
 
     if ('memoryLimit' in data && typeof data.memoryLimit !== 'number') return next(new HttpError(400, 'memoryLimit is not a number'));
 
+    // falsy value in altDomain unsets it
+    if (data.altDomain && typeof data.altDomain !== 'string') return next(new HttpError(400, 'altDomain must be a string'));
+
     if (data.xFrameOptions && typeof data.xFrameOptions !== 'string') return next(new HttpError(400, 'xFrameOptions must be a string'));
 
     if ('sso' in data && typeof data.sso !== 'boolean') return next(new HttpError(400, 'sso must be a boolean'));
@@ -162,6 +181,7 @@ function configureApp(req, res, next) {
     if (!data.cert && data.key) return next(new HttpError(400, 'cert must be provided'));
 
     if ('memoryLimit' in data && typeof data.memoryLimit !== 'number') return next(new HttpError(400, 'memoryLimit is not a number'));
+    if (data.altDomain && typeof data.altDomain !== 'string') return next(new HttpError(400, 'altDomain must be a string'));
     if (data.xFrameOptions && typeof data.xFrameOptions !== 'string') return next(new HttpError(400, 'xFrameOptions must be a string'));
 
     if ('enableBackup' in data && typeof data.enableBackup !== 'boolean') return next(new HttpError(400, 'enableBackup must be a boolean'));
@@ -223,13 +243,9 @@ function cloneApp(req, res, next) {
 
     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.PORT_RESERVED) return next(new HttpError(409, 'Port ' + error.message + ' is reserved.'));
-        if (error && error.reason === AppsError.PORT_CONFLICT) return next(new HttpError(409, 'Port ' + error.message + ' is already in use.'));
-        if (error && error.reason === AppsError.ALREADY_EXISTS) return next(new HttpError(409, error.message));
         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.BAD_CERTIFICATE) return next(new HttpError(400, error.message));
         if (error && error.reason === AppsError.EXTERNAL_ERROR) return next(new HttpError(424, error.message));
         if (error) return next(new HttpError(500, error));
 

src/routes/clients.js

@@ -5,9 +5,9 @@ exports = module.exports = {
     get: get,
     del: del,
     getAll: getAll,
-    addToken: addToken,
-    getTokens: getTokens,
-    delTokens: delTokens,
+    addClientToken: addClientToken,
+    getClientTokens: getClientTokens,
+    delClientTokens: delClientTokens,
     delToken: delToken
 };
 
@@ -72,38 +72,36 @@ function getAll(req, res, next) {
     });
 }
 
-function addToken(req, res, next) {
+function addClientToken(req, res, next) {
     assert.strictEqual(typeof req.params.clientId, 'string');
     assert.strictEqual(typeof req.user, 'object');
-    assert.strictEqual(typeof req.body, 'object');
 
-    var data = req.body;
-    var expiresAt = data.expiresAt ? parseInt(data.expiresAt, 10) : Date.now() + constants.DEFAULT_TOKEN_EXPIRATION;
+    var expiresAt = req.query.expiresAt ? parseInt(req.query.expiresAt, 10) : Date.now() + constants.DEFAULT_TOKEN_EXPIRATION;
     if (isNaN(expiresAt) || expiresAt <= Date.now()) return next(new HttpError(400, 'expiresAt must be a timestamp in the future'));
 
-    clients.addTokenByUserId(req.params.clientId, req.user.id, expiresAt, function (error, result) {
+    clients.addClientTokenByUserId(req.params.clientId, req.user.id, expiresAt, function (error, result) {
         if (error && error.reason === ClientsError.NOT_FOUND) return next(new HttpError(404, error.message));
         if (error) return next(new HttpError(500, error));
         next(new HttpSuccess(201, { token: result }));
     });
 }
 
-function getTokens(req, res, next) {
+function getClientTokens(req, res, next) {
     assert.strictEqual(typeof req.params.clientId, 'string');
     assert.strictEqual(typeof req.user, 'object');
 
-    clients.getTokensByUserId(req.params.clientId, req.user.id, function (error, result) {
+    clients.getClientTokensByUserId(req.params.clientId, req.user.id, function (error, result) {
         if (error && error.reason === ClientsError.NOT_FOUND) return next(new HttpError(404, error.message));
         if (error) return next(new HttpError(500, error));
         next(new HttpSuccess(200, { tokens: result }));
     });
 }
 
-function delTokens(req, res, next) {
+function delClientTokens(req, res, next) {
     assert.strictEqual(typeof req.params.clientId, 'string');
     assert.strictEqual(typeof req.user, 'object');
 
-    clients.delTokensByUserId(req.params.clientId, req.user.id, function (error) {
+    clients.delClientTokensByUserId(req.params.clientId, req.user.id, function (error) {
         if (error && error.reason === ClientsError.NOT_FOUND) return next(new HttpError(404, error.message));
         if (error) return next(new HttpError(500, error));
         next(new HttpSuccess(204));

src/routes/cloudron.js

@@ -44,6 +44,10 @@ 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', 'adminFqdn', 'version', 'progress', 'isDemo', 'cloudronName', 'provider');
+        }
+
         next(new HttpSuccess(200, cloudronConfig));
     });
 }
@@ -85,7 +89,6 @@ function feedback(req, res, next) {
     if (VALID_TYPES.indexOf(req.body.type) === -1) return next(new HttpError(400, 'unknown type'));
     if (typeof req.body.subject !== 'string' || !req.body.subject) return next(new HttpError(400, 'subject must be string'));
     if (typeof req.body.description !== 'string' || !req.body.description) return next(new HttpError(400, 'description must be string'));
-    if (req.body.appId && typeof req.body.appId !== 'string') return next(new HttpError(400, 'appId must be string'));
 
     appstore.sendFeedback(_.extend(req.body, { email: req.user.email, displayName: req.user.displayName }), function (error) {
         if (error && error.reason === AppstoreError.BILLING_REQUIRED) return next(new HttpError(402, 'Login to App Store to create support tickets. You can also email support@cloudron.io'));

src/routes/developer.js

@@ -4,31 +4,26 @@ exports = module.exports = {
     login: login
 };
 
-var clients = require('../clients.js'),
+var developer = require('../developer.js'),
     passport = require('passport'),
     HttpError = require('connect-lastmile').HttpError,
-    HttpSuccess = require('connect-lastmile').HttpSuccess,
-    speakeasy = require('speakeasy');
+    HttpSuccess = require('connect-lastmile').HttpSuccess;
+
+function auditSource(req) {
+    var ip = req.headers['x-forwarded-for'] || req.connection.remoteAddress || null;
+    return { ip: ip, username: req.user ? req.user.username : null, userId: req.user ? req.user.id : null };
+}
 
 function login(req, res, next) {
     passport.authenticate('local', function (error, user) {
         if (error) return next(new HttpError(500, error));
         if (!user) return next(new HttpError(401, 'Invalid credentials'));
 
-        var ip = req.headers['x-forwarded-for'] || req.connection.remoteAddress || null;
-
-        if (user.twoFactorAuthenticationEnabled) {
-            if (!req.body.totpToken) return next(new HttpError(401, 'A totpToken must be provided'));
-
-            let verified = speakeasy.totp.verify({ secret: user.twoFactorAuthenticationSecret, encoding: 'base32', token: req.body.totpToken });
-            if (!verified) return next(new HttpError(401, 'Invalid totpToken'));
-        }
-
-        clients.issueDeveloperToken(user, ip, function (error, result) {
+        developer.issueDeveloperToken(user, auditSource(req), function (error, result) {
             if (error) return next(new HttpError(500, error));
 
-            next(new HttpSuccess(200, result));
+            next(new HttpSuccess(200, { token: result.token, expiresAt: result.expiresAt }));
         });
-    })(req, res, next);
+  })(req, res, next);
 }
 

src/routes/domains.js

@@ -5,12 +5,14 @@ exports = module.exports = {
     get: get,
     getAll: getAll,
     update: update,
-    del: del
+    del: del,
+
+    setAdmin: setAdmin
 };
 
 var assert = require('assert'),
     domains = require('../domains.js'),
-    DomainsError = domains.DomainsError,
+    DomainError = domains.DomainError,
     HttpError = require('connect-lastmile').HttpError,
     HttpSuccess = require('connect-lastmile').HttpSuccess;
 
@@ -27,13 +29,10 @@ function add(req, res, next) {
     if ('tlsConfig' in req.body && typeof req.body.tlsConfig !== 'object') return next(new HttpError(400, 'tlsConfig must be a object with a provider string property'));
     if (req.body.tlsConfig && (!req.body.tlsConfig.provider || typeof req.body.tlsConfig.provider !== 'string')) return next(new HttpError(400, 'tlsConfig.provider must be a string'));
 
-    // some DNS providers like DigitalOcean take a really long time to verify credentials (https://github.com/expressjs/timeout/issues/26)
-    req.clearTimeout();
-
     domains.add(req.body.domain, req.body.zoneName || '', req.body.provider, req.body.config, req.body.fallbackCertificate || null, req.body.tlsConfig || { provider: 'letsencrypt-prod' }, function (error) {
-        if (error && error.reason === DomainsError.ALREADY_EXISTS) return next(new HttpError(409, error.message));
-        if (error && error.reason === DomainsError.BAD_FIELD) return next(new HttpError(400, error.message));
-        if (error && error.reason === DomainsError.INVALID_PROVIDER) return next(new HttpError(400, error.message));
+        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 }));
@@ -44,10 +43,12 @@ function get(req, res, next) {
     assert.strictEqual(typeof req.params.domain, 'string');
 
     domains.get(req.params.domain, function (error, result) {
-        if (error && error.reason === DomainsError.NOT_FOUND) return next(new HttpError(404, error.message));
+        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, domains.removePrivateFields(result)));
+        delete result.fallbackCertificate.key; // do not return the 'key'. in caas, this is private
+
+        next(new HttpSuccess(200, result));
     });
 }
 
@@ -55,8 +56,6 @@ function getAll(req, res, next) {
     domains.getAll(function (error, result) {
         if (error) return next(new HttpError(500, error));
 
-        result = result.map(domains.removePrivateFields);
-
         next(new HttpSuccess(200, { domains: result }));
     });
 }
@@ -73,13 +72,10 @@ function update(req, res, next) {
     if ('tlsConfig' in req.body && typeof req.body.tlsConfig !== 'object') return next(new HttpError(400, 'tlsConfig must be a object with a provider string property'));
     if (req.body.tlsConfig && (!req.body.tlsConfig.provider || typeof req.body.tlsConfig.provider !== 'string')) return next(new HttpError(400, 'tlsConfig.provider must be a string'));
 
-    // some DNS providers like DigitalOcean take a really long time to verify credentials (https://github.com/expressjs/timeout/issues/26)
-    req.clearTimeout();
-
     domains.update(req.params.domain, req.body.provider, req.body.config, req.body.fallbackCertificate || null, req.body.tlsConfig || { provider: 'letsencrypt-prod' }, function (error) {
-        if (error && error.reason === DomainsError.NOT_FOUND) return next(new HttpError(404, error.message));
-        if (error && error.reason === DomainsError.BAD_FIELD) return next(new HttpError(400, error.message));
-        if (error && error.reason === DomainsError.INVALID_PROVIDER) return next(new HttpError(400, error.message));
+        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, {}));
@@ -90,11 +86,21 @@ function del(req, res, next) {
     assert.strictEqual(typeof req.params.domain, 'string');
 
     domains.del(req.params.domain, function (error) {
-        if (error && error.reason === DomainsError.NOT_FOUND) return next(new HttpError(404, error.message));
-        if (error && error.reason === DomainsError.IN_USE) return next(new HttpError(409, 'Domain is still in use. Remove all apps and mailboxes using this domain'));
+        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/eventlog.js

@@ -15,14 +15,10 @@ function get(req, res, next) {
     var perPage = typeof req.query.per_page !== 'undefined'? parseInt(req.query.per_page) : 25;
     if (!perPage || perPage < 0) return next(new HttpError(400, 'per_page query param has to be a postive number'));
 
-    if (req.query.actions && typeof req.query.actions !== 'string') return next(new HttpError(400, 'actions must be a comma separated string'));
     if (req.query.action && typeof req.query.action !== 'string') return next(new HttpError(400, 'action must be a string'));
     if (req.query.search && typeof req.query.search !== 'string') return next(new HttpError(400, 'search must be a string'));
 
-    var actions = req.query.actions ? req.query.actions.split(',').map(function (s) { return s.trim(); }) : [];
-    if (req.query.action) actions.push(req.query.action);
-
-    eventlog.getAllPaged(actions, req.query.search || null, page, perPage, function (error, result) {
+    eventlog.getAllPaged(req.query.action || null, req.query.search || null, page, perPage, function (error, result) {
         if (error) return next(new HttpError(500, error));
 
         next(new HttpSuccess(200, { eventlogs: result }));

src/routes/groups.js

@@ -13,7 +13,7 @@ var assert = require('assert'),
     HttpError = require('connect-lastmile').HttpError,
     HttpSuccess = require('connect-lastmile').HttpSuccess,
     groups = require('../groups.js'),
-    GroupsError = groups.GroupsError;
+    GroupError = groups.GroupError;
 
 function create(req, res, next) {
     assert.strictEqual(typeof req.body, 'object');
@@ -21,8 +21,8 @@ function create(req, res, next) {
     if (typeof req.body.name !== 'string') return next(new HttpError(400, 'name must be string'));
 
     groups.create(req.body.name, function (error, group) {
-        if (error && error.reason === GroupsError.BAD_FIELD) return next(new HttpError(400, error.message));
-        if (error && error.reason === GroupsError.ALREADY_EXISTS) return next(new HttpError(409, 'Already exists'));
+        if (error && error.reason === GroupError.BAD_FIELD) return next(new HttpError(400, error.message));
+        if (error && error.reason === GroupError.ALREADY_EXISTS) return next(new HttpError(409, 'Already exists'));
         if (error) return next(new HttpError(500, error));
 
         var groupInfo = {
@@ -38,7 +38,7 @@ function get(req, res, next) {
     assert.strictEqual(typeof req.params.groupId, 'string');
 
     groups.getWithMembers(req.params.groupId, function (error, result) {
-        if (error && error.reason === GroupsError.NOT_FOUND) return next(new HttpError(404, 'No such group'));
+        if (error && error.reason === GroupError.NOT_FOUND) return next(new HttpError(404, 'No such group'));
         if (error) return next(new HttpError(500, error));
 
         next(new HttpSuccess(200, result));
@@ -52,7 +52,7 @@ function updateMembers(req, res, next) {
     if (!Array.isArray(req.body.userIds)) return next(new HttpError(404, 'userIds must be an array'));
 
     groups.setMembers(req.params.groupId, req.body.userIds, function (error) {
-        if (error && error.reason === GroupsError.NOT_FOUND) return next(new HttpError(404, 'Invalid group or user id'));
+        if (error && error.reason === GroupError.NOT_FOUND) return next(new HttpError(404, 'Invalid group or user id'));
         if (error) return next(new HttpError(500, error));
 
         next(new HttpSuccess(200));
@@ -71,8 +71,8 @@ function remove(req, res, next) {
     assert.strictEqual(typeof req.params.groupId, 'string');
 
     groups.remove(req.params.groupId, function (error) {
-        if (error && error.reason === GroupsError.NOT_FOUND) return next(new HttpError(404, 'Group not found'));
-        if (error && error.reason === GroupsError.NOT_ALLOWED) return next(new HttpError(409, 'Group deletion not allowed'));
+        if (error && error.reason === GroupError.NOT_FOUND) return next(new HttpError(404, 'Group not found'));
+        if (error && error.reason === GroupError.NOT_ALLOWED) return next(new HttpError(409, 'Group deletion not allowed'));
         if (error) return next(new HttpError(500, error));
 
         next(new HttpSuccess(204));

src/routes/index.js

@@ -1,7 +1,6 @@
 'use strict';
 
 exports = module.exports = {
-    accesscontrol: require('./accesscontrol.js'),
     apps: require('./apps.js'),
     backups: require('./backups.js'),
     caas: require('./caas.js'),
@@ -19,6 +18,5 @@ exports = module.exports = {
     sysadmin: require('./sysadmin.js'),
     settings: require('./settings.js'),
     ssh: require('./ssh.js'),
-    user: require('./user.js'),
-    users: require('./users.js')
+    user: require('./user.js')
 };

src/routes/mail.js

@@ -1,11 +1,10 @@
 'use strict';
 
 exports = module.exports = {
-    getDomain: getDomain,
-    addDomain: addDomain,
-    getDomainStats: getDomainStats,
-    updateDomain: updateDomain,
-    removeDomain: removeDomain,
+    get: get,
+
+    add: add,
+    del: del,
 
     getStatus: getStatus,
 
@@ -17,19 +16,16 @@ exports = module.exports = {
     sendTestMail: sendTestMail,
 
     getMailboxes: getMailboxes,
-    getMailbox: getMailbox,
-    addMailbox: addMailbox,
-    updateMailbox: updateMailbox,
-    removeMailbox: removeMailbox,
+    getUserMailbox: getUserMailbox,
+    enableUserMailbox: enableUserMailbox,
+    disableUserMailbox: disableUserMailbox,
 
-    listAliases: listAliases,
     getAliases: getAliases,
     setAliases: setAliases,
 
     getLists: getLists,
     getList: getList,
     addList: addList,
-    updateList: updateList,
     removeList: removeList
 };
 
@@ -37,16 +33,12 @@ var assert = require('assert'),
     mail = require('../mail.js'),
     MailError = mail.MailError,
     HttpError = require('connect-lastmile').HttpError,
-    HttpSuccess = require('connect-lastmile').HttpSuccess,
-    middleware = require('../middleware/index.js'),
-    url = require('url');
+    HttpSuccess = require('connect-lastmile').HttpSuccess;
 
-var mailProxy = middleware.proxy(url.parse('http://127.0.0.1:2020'));
-
-function getDomain(req, res, next) {
+function get(req, res, next) {
     assert.strictEqual(typeof req.params.domain, 'string');
 
-    mail.getDomain(req.params.domain, function (error, result) {
+    mail.get(req.params.domain, function (error, result) {
         if (error && error.reason === MailError.NOT_FOUND) return next(new HttpError(404, error.message));
         if (error) return next(new HttpError(500, error));
 
@@ -54,12 +46,12 @@ function getDomain(req, res, next) {
     });
 }
 
-function addDomain(req, res, next) {
+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'));
 
-    mail.addDomain(req.body.domain, function (error) {
+    mail.add(req.body.domain, function (error) {
         if (error && error.reason === MailError.NOT_FOUND) return next(new HttpError(404, error.message));
         if (error && error.reason === MailError.ALREADY_EXISTS) return next(new HttpError(409, 'domain already exists'));
         if (error) return next(new HttpError(500, error));
@@ -68,39 +60,13 @@ function addDomain(req, res, next) {
     });
 }
 
-function getDomainStats(req, res, next) {
+function del(req, res, next) {
     assert.strictEqual(typeof req.params.domain, 'string');
 
-    var parsedUrl = url.parse(req.url, true /* parseQueryString */);
-    delete parsedUrl.query['access_token'];
-    delete req.headers['authorization'];
-    delete req.headers['cookies'];
-
-    req.url = url.format({ pathname: req.params.domain, query: parsedUrl.query });
-
-    mailProxy(req, res, next);
-}
-
-function updateDomain(req, res, next) {
-    assert.strictEqual(typeof req.body, 'object');
-    assert.strictEqual(typeof req.params.domain, 'string');
-
-    mail.updateDomain(req.params.domain, function (error) {
+    mail.del(req.params.domain, function (error) {
         if (error && error.reason === MailError.NOT_FOUND) return next(new HttpError(404, error.message));
         if (error) return next(new HttpError(500, error));
 
-        next(new HttpSuccess(202));
-    });
-}
-
-function removeDomain(req, res, next) {
-    assert.strictEqual(typeof req.params.domain, 'string');
-
-    mail.removeDomain(req.params.domain, function (error) {
-        if (error && error.reason === MailError.NOT_FOUND) return next(new HttpError(404, error.message));
-        if (error && error.reason === MailError.IN_USE) return next(new HttpError(409, 'Mail domain is still in use. Remove existing mailboxes'));
-        if (error) return next(new HttpError(500, error));
-
         next(new HttpSuccess(204));
     });
 }
@@ -108,9 +74,6 @@ function removeDomain(req, res, next) {
 function getStatus(req, res, next) {
     assert.strictEqual(typeof req.params.domain, 'string');
 
-    // can take a while to query all the DNS entries
-    req.clearTimeout();
-
     mail.getStatus(req.params.domain, function (error, records) {
         if (error && error.reason === MailError.NOT_FOUND) return next(new HttpError(404, error.message));
         if (error) return next(new HttpError(500, error));
@@ -138,14 +101,13 @@ function setCatchAllAddress(req, res, next) {
     assert.strictEqual(typeof req.params.domain, 'string');
     assert.strictEqual(typeof req.body, 'object');
 
-    if (!req.body.addresses) return next(new HttpError(400, 'addresses is required'));
-    if (!Array.isArray(req.body.addresses)) return next(new HttpError(400, 'addresses must be an array of strings'));
+    if (!req.body.address || !Array.isArray(req.body.address)) return next(new HttpError(400, 'address array is required'));
 
-    for (var i = 0; i < req.body.addresses.length; i++) {
-        if (typeof req.body.addresses[i] !== 'string') return next(new HttpError(400, 'addresses must be an array of strings'));
+    for (var i = 0; i < req.body.address.length; i++) {
+        if (typeof req.body.address[i] !== 'string') return next(new HttpError(400, 'address must be an array of string'));
     }
 
-    mail.setCatchAllAddress(req.params.domain, req.body.addresses, function (error) {
+    mail.setCatchAllAddress(req.params.domain, req.body.address, function (error) {
         if (error && error.reason === MailError.NOT_FOUND) return next(new HttpError(404, error.message));
         if (error && error.reason === MailError.BAD_FIELD) return next(new HttpError(400, error.message));
         if (error) return next(new HttpError(500, error));
@@ -213,11 +175,11 @@ function getMailboxes(req, res, next) {
     });
 }
 
-function getMailbox(req, res, next) {
+function getUserMailbox(req, res, next) {
     assert.strictEqual(typeof req.params.domain, 'string');
-    assert.strictEqual(typeof req.params.name, 'string');
+    assert.strictEqual(typeof req.params.userId, 'string');
 
-    mail.getMailbox(req.params.name, req.params.domain, function (error, result) {
+    mail.getUserMailbox(req.params.domain, req.params.userId, function (error, result) {
         if (error && error.reason === MailError.NOT_FOUND) return next(new HttpError(404, error.message));
         if (error) return next(new HttpError(500, error));
 
@@ -225,65 +187,36 @@ function getMailbox(req, res, next) {
     });
 }
 
-function addMailbox(req, res, next) {
+function enableUserMailbox(req, res, next) {
     assert.strictEqual(typeof req.params.domain, 'string');
+    assert.strictEqual(typeof req.params.userId, 'string');
 
-    if (typeof req.body.name !== 'string') return next(new HttpError(400, 'name must be a string'));
-    if (typeof req.body.userId !== 'string') return next(new HttpError(400, 'userId must be a string'));
-
-    mail.addMailbox(req.body.name, req.params.domain, req.body.userId, function (error) {
+    mail.enableUserMailbox(req.params.domain, req.params.userId, function (error) {
         if (error && error.reason === MailError.NOT_FOUND) return next(new HttpError(404, error.message));
-        if (error && error.reason === MailError.ALREADY_EXISTS) return next(new HttpError(409, error.message));
-        if (error && error.reason === MailError.BAD_FIELD) return next(new HttpError(400, error.message));
+        if (error && error.reason === MailError.ALREADY_EXISTS) return next(new HttpSuccess(201, {}));
         if (error) return next(new HttpError(500, error));
 
         next(new HttpSuccess(201, {}));
     });
 }
 
-function updateMailbox(req, res, next) {
+function disableUserMailbox(req, res, next) {
     assert.strictEqual(typeof req.params.domain, 'string');
-    assert.strictEqual(typeof req.params.name, 'string');
+    assert.strictEqual(typeof req.params.userId, 'string');
 
-    if (typeof req.body.userId !== 'string') return next(new HttpError(400, 'userId must be a string'));
-
-    mail.updateMailbox(req.params.name, req.params.domain, req.body.userId, function (error) {
-        if (error && error.reason === MailError.NOT_FOUND) return next(new HttpError(404, error.message));
-        if (error && error.reason === MailError.BAD_FIELD) return next(new HttpError(400, error.message));
-        if (error) return next(new HttpError(500, error));
-
-        next(new HttpSuccess(204));
-    });
-}
-
-function removeMailbox(req, res, next) {
-    assert.strictEqual(typeof req.params.domain, 'string');
-    assert.strictEqual(typeof req.params.name, 'string');
-
-    mail.removeMailbox(req.params.name, req.params.domain, function (error) {
-        if (error && error.reason === MailError.NOT_FOUND) return next(new HttpError(404, error.message));
+    mail.disableUserMailbox(req.params.domain, req.params.userId, function (error) {
+        if (error && error.reason === MailError.NOT_FOUND) return next(new HttpSuccess(201, {}));
         if (error) return next(new HttpError(500, error));
 
         next(new HttpSuccess(201, {}));
     });
 }
 
-function listAliases(req, res, next) {
-    assert.strictEqual(typeof req.params.domain, 'string');
-
-    mail.listAliases(req.params.domain, function (error, result) {
-        if (error && error.reason === MailError.NOT_FOUND) return next(new HttpError(404, error.message));
-        if (error) return next(new HttpError(500, error));
-
-        next(new HttpSuccess(200, { aliases: result }));
-    });
-}
-
 function getAliases(req, res, next) {
     assert.strictEqual(typeof req.params.domain, 'string');
-    assert.strictEqual(typeof req.params.name, 'string');
+    assert.strictEqual(typeof req.params.userId, 'string');
 
-    mail.getAliases(req.params.name, req.params.domain, function (error, result) {
+    mail.getAliases(req.params.domain, req.params.userId, function (error, result) {
         if (error && error.reason === MailError.NOT_FOUND) return next(new HttpError(404, error.message));
         if (error) return next(new HttpError(500, error));
 
@@ -293,7 +226,7 @@ function getAliases(req, res, next) {
 
 function setAliases(req, res, next) {
     assert.strictEqual(typeof req.params.domain, 'string');
-    assert.strictEqual(typeof req.params.name, 'string');
+    assert.strictEqual(typeof req.params.userId, 'string');
     assert.strictEqual(typeof req.body, 'object');
 
     if (!Array.isArray(req.body.aliases)) return next(new HttpError(400, 'aliases must be an array'));
@@ -302,10 +235,8 @@ function setAliases(req, res, next) {
         if (typeof req.body.aliases[i] !== 'string') return next(new HttpError(400, 'alias must be a string'));
     }
 
-    mail.setAliases(req.params.name, req.params.domain, req.body.aliases, function (error) {
+    mail.setAliases(req.params.domain, req.params.userId, req.body.aliases, function (error) {
         if (error && error.reason === MailError.NOT_FOUND) return next(new HttpError(404, error.message));
-        if (error && error.reason === MailError.ALREADY_EXISTS) return next(new HttpError(409, error.message));
-        if (error && error.reason === MailError.BAD_FIELD) return next(new HttpError(400, error.message));
         if (error) return next(new HttpError(500, error));
 
         next(new HttpSuccess(202));
@@ -325,9 +256,9 @@ function getLists(req, res, next) {
 
 function getList(req, res, next) {
     assert.strictEqual(typeof req.params.domain, 'string');
-    assert.strictEqual(typeof req.params.name, 'string');
+    assert.strictEqual(typeof req.params.groupId, 'string');
 
-    mail.getList(req.params.domain, req.params.name, function (error, result) {
+    mail.getList(req.params.domain, req.params.groupId, function (error, result) {
         if (error && error.reason === MailError.NOT_FOUND) return next(new HttpError(404, error.message));
         if (error) return next(new HttpError(500, error));
 
@@ -339,47 +270,22 @@ function addList(req, res, next) {
     assert.strictEqual(typeof req.params.domain, 'string');
     assert.strictEqual(typeof req.body, 'object');
 
-    if (typeof req.body.name !== 'string') return next(new HttpError(400, 'name must be a string'));
-    if (!Array.isArray(req.body.members)) return next(new HttpError(400, 'members must be a string'));
+    if (typeof req.body.groupId !== 'string') return next(new HttpError(400, 'groupId must be a string'));
 
-    for (var i = 0; i < req.body.members.length; i++) {
-        if (typeof req.body.members[i] !== 'string') return next(new HttpError(400, 'member must be a string'));
-    }
-
-    mail.addList(req.body.name, req.params.domain, req.body.members, function (error) {
+    mail.addList(req.params.domain, req.body.groupId, function (error) {
         if (error && error.reason === MailError.NOT_FOUND) return next(new HttpError(404, error.message));
         if (error && error.reason === MailError.ALREADY_EXISTS) return next(new HttpError(409, 'list already exists'));
-        if (error && error.reason === MailError.BAD_FIELD) return next(new HttpError(400, error.message));
         if (error) return next(new HttpError(500, error));
 
         next(new HttpSuccess(201, {}));
     });
 }
 
-function updateList(req, res, next) {
-    assert.strictEqual(typeof req.params.domain, 'string');
-    assert.strictEqual(typeof req.params.name, 'string');
-
-    if (!Array.isArray(req.body.members)) return next(new HttpError(400, 'members must be a string'));
-
-    for (var i = 0; i < req.body.members.length; i++) {
-        if (typeof req.body.members[i] !== 'string') return next(new HttpError(400, 'member must be a string'));
-    }
-
-    mail.updateList(req.params.name, req.params.domain, req.body.members, function (error) {
-        if (error && error.reason === MailError.NOT_FOUND) return next(new HttpError(404, error.message));
-        if (error && error.reason === MailError.BAD_FIELD) return next(new HttpError(400, error.message));
-        if (error) return next(new HttpError(500, error));
-
-        next(new HttpSuccess(204));
-    });
-}
-
 function removeList(req, res, next) {
     assert.strictEqual(typeof req.params.domain, 'string');
-    assert.strictEqual(typeof req.params.name, 'string');
+    assert.strictEqual(typeof req.params.groupId, 'string');
 
-    mail.removeList(req.params.domain, req.params.name, function (error) {
+    mail.removeList(req.params.domain, req.params.groupId, function (error) {
         if (error && error.reason === MailError.NOT_FOUND) return next(new HttpError(404, error.message));
         if (error) return next(new HttpError(500, error));
 

src/routes/oauth2.js

@@ -1,33 +1,14 @@
 'use strict';
 
-exports = module.exports = {
-    initialize: initialize,
-    uninitialize: uninitialize,
-    loginForm: loginForm,
-    login: login,
-    logout: logout,
-    sessionCallback: sessionCallback,
-    passwordResetRequestSite: passwordResetRequestSite,
-    passwordResetRequest: passwordResetRequest,
-    passwordSentSite: passwordSentSite,
-    passwordResetSite: passwordResetSite,
-    passwordReset: passwordReset,
-    accountSetupSite: accountSetupSite,
-    accountSetup: accountSetup,
-    authorization: authorization,
-    token: token,
-    csrf: csrf
-};
-
-var accesscontrol = require('../accesscontrol.js'),
-    apps = require('../apps.js'),
+var apps = require('../apps'),
     assert = require('assert'),
-    authcodedb = require('../authcodedb.js'),
+    auth = require('../auth.js'),
+    authcodedb = require('../authcodedb'),
     clients = require('../clients'),
     ClientsError = clients.ClientsError,
     config = require('../config.js'),
-    constants = require('../constants.js'),
-    DatabaseError = require('../databaseerror.js'),
+    constants = require('../constants'),
+    DatabaseError = require('../databaseerror'),
     debug = require('debug')('box:routes/oauth2'),
     eventlog = require('../eventlog.js'),
     hat = require('hat'),
@@ -37,138 +18,124 @@ var accesscontrol = require('../accesscontrol.js'),
     passport = require('passport'),
     querystring = require('querystring'),
     session = require('connect-ensure-login'),
-    settings = require('../settings.js'),
-    speakeasy = require('speakeasy'),
-    tokendb = require('../tokendb.js'),
+    settings = require('../settings'),
+    tokendb = require('../tokendb'),
     url = require('url'),
-    users = require('../users.js'),
-    UsersError = users.UsersError,
+    user = require('../user.js'),
+    UserError = user.UserError,
     util = require('util'),
     _ = require('underscore');
 
-// appObject is optional here
-function auditSource(req, appId, appObject) {
+function auditSource(req, appId) {
     var ip = req.headers['x-forwarded-for'] || req.connection.remoteAddress || null;
-    return { authType: 'oauth', ip: ip, appId: appId, app: appObject };
+    return { authType: 'oauth', ip: ip, appId: appId };
 }
 
 // create OAuth 2.0 server
-var gServer = null;
+var gServer = oauth2orize.createServer();
 
-function initialize() {
-    assert(gServer === null);
+// Register serialialization and deserialization functions.
+//
+// The client id is stored in the session and can thus be retrieved for each
+// step in the oauth flow transaction, which involves multiple http requests.
 
-    gServer = oauth2orize.createServer();
+gServer.serializeClient(function (client, callback) {
+    return callback(null, client.id);
+});
 
-    // Register serialialization and deserialization functions.
-    //
-    // The client id is stored in the session and can thus be retrieved for each
-    // step in the oauth flow transaction, which involves multiple http requests.
+gServer.deserializeClient(function (id, callback) {
+    clients.get(id, callback);
+});
 
-    gServer.serializeClient(function (client, callback) {
-        return callback(null, client.id);
+
+// Register supported grant types.
+
+// Grant authorization codes.  The callback takes the `client` requesting
+// authorization, the `redirectURI` (which is used as a verifier in the
+// subsequent exchange), the authenticated `user` granting access, and
+// their response, which contains approved scope, duration, etc. as parsed by
+// the application.  The application issues a code, which is bound to these
+// values, and will be exchanged for an access token.
+
+gServer.grant(oauth2orize.grant.code({ scopeSeparator: ',' }, function (client, redirectURI, user, ares, callback) {
+    debug('grant code:', client.id, redirectURI, user.id, ares);
+
+    var code = hat(256);
+    var expiresAt = Date.now() + 60 * 60000; // 1 hour
+
+    authcodedb.add(code, client.id, user.id, expiresAt, function (error) {
+        if (error) return callback(error);
+
+        debug('grant code: new auth code for client %s code %s', client.id, code);
+
+        callback(null, code);
     });
+}));
 
-    gServer.deserializeClient(function (id, callback) {
-        clients.get(id, callback);
+
+gServer.grant(oauth2orize.grant.token({ scopeSeparator: ',' }, function (client, user, ares, callback) {
+    debug('grant token:', client.id, user.id, ares);
+
+    var token = tokendb.generateToken();
+    var expires = Date.now() + constants.DEFAULT_TOKEN_EXPIRATION;
+
+    tokendb.add(token, user.id, client.id, expires, client.scope, function (error) {
+        if (error) return callback(error);
+
+        debug('grant token: new access token for client %s token %s', client.id, token);
+
+        callback(null, token);
     });
+}));
 
 
-    // Register supported grant types.
+// Exchange authorization codes for access tokens.  The callback accepts the
+// `client`, which is exchanging `code` and any `redirectURI` from the
+// authorization request for verification.  If these values are validated, the
+// application issues an access token on behalf of the user who authorized the
+// code.
 
-    // Grant authorization codes.  The callback takes the `client` requesting
-    // authorization, the `redirectURI` (which is used as a verifier in the
-    // subsequent exchange), the authenticated `user` granting access, and
-    // their response, which contains approved scope, duration, etc. as parsed by
-    // the application.  The application issues a code, which is bound to these
-    // values, and will be exchanged for an access token.
+gServer.exchange(oauth2orize.exchange.code(function (client, code, redirectURI, callback) {
+    debug('exchange:', client, code, redirectURI);
 
-    gServer.grant(oauth2orize.grant.code({ scopeSeparator: ',' }, function (client, redirectURI, user, ares, callback) {
-        debug('grant code:', client.id, redirectURI, user.id, ares);
+    authcodedb.get(code, function (error, authCode) {
+        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(null, false);
+        if (error) return callback(error);
+        if (client.id !== authCode.clientId) return callback(null, false);
 
-        var code = hat(256);
-        var expiresAt = Date.now() + 60 * 60000; // 1 hour
+        authcodedb.del(code, function (error) {
+            if(error) return callback(error);
 
-        authcodedb.add(code, client.id, user.id, expiresAt, function (error) {
-            if (error) return callback(error);
+            var token = tokendb.generateToken();
+            var expires = Date.now() + constants.DEFAULT_TOKEN_EXPIRATION;
 
-            debug('grant code: new auth code for client %s code %s', client.id, code);
+            tokendb.add(token, authCode.userId, authCode.clientId, expires, client.scope, function (error) {
+                if (error) return callback(error);
 
-            callback(null, code);
-        });
-    }));
+                debug('exchange: new access token for client %s token %s', client.id, token);
 
-
-    gServer.grant(oauth2orize.grant.token({ scopeSeparator: ',' }, function (client, user, ares, callback) {
-        debug('grant token:', client.id, user.id, ares);
-
-        var token = tokendb.generateToken();
-        var expires = Date.now() + constants.DEFAULT_TOKEN_EXPIRATION;
-        var scope = accesscontrol.normalizeScope(user.scope, client.scope);
-
-        tokendb.add(token, user.id, client.id, expires, scope, function (error) {
-            if (error) return callback(error);
-
-            debug('grant token: new access token for client %s token %s', client.id, token);
-
-            callback(null, token);
-        });
-    }));
-
-
-    // Exchange authorization codes for access tokens.  The callback accepts the
-    // `client`, which is exchanging `code` and any `redirectURI` from the
-    // authorization request for verification.  If these values are validated, the
-    // application issues an access token on behalf of the user who authorized the
-    // code.
-
-    gServer.exchange(oauth2orize.exchange.code(function (client, code, redirectURI, callback) {
-        debug('exchange:', client, code, redirectURI);
-
-        authcodedb.get(code, function (error, authCode) {
-            if (error && error.reason === DatabaseError.NOT_FOUND) return callback(null, false);
-            if (error) return callback(error);
-            if (client.id !== authCode.clientId) return callback(null, false);
-
-            authcodedb.del(code, function (error) {
-                if(error) return callback(error);
-
-                var token = tokendb.generateToken();
-                var expires = Date.now() + constants.DEFAULT_TOKEN_EXPIRATION;
-                var scope = accesscontrol.canonicalScope(client.scope);
-
-                tokendb.add(token, authCode.userId, authCode.clientId, expires, client.scope, function (error) {
-                    if (error) return callback(error);
-
-                    debug('exchange: new access token for client %s token %s', client.id, token);
-
-                    callback(null, token);
-                });
+                callback(null, token);
             });
         });
-    }));
+    });
+}));
 
-    // overwrite the session.ensureLoggedIn to not use res.redirect() due to a chrome bug not sending cookies on redirects
-    session.ensureLoggedIn = function (redirectTo) {
-        assert.strictEqual(typeof redirectTo, 'string');
+// overwrite the session.ensureLoggedIn to not use res.redirect() due to a chrome bug not sending cookies on redirects
+session.ensureLoggedIn = function (redirectTo) {
+    assert.strictEqual(typeof redirectTo, 'string');
 
-        return function (req, res, next) {
-            if (!req.isAuthenticated || !req.isAuthenticated()) {
-                if (req.session) {
-                    req.session.returnTo = req.originalUrl || req.url;
-                }
-
-                res.status(200).send(util.format('<script>window.location.href = "%s";</script>', redirectTo));
-            } else {
-                next();
+    return function (req, res, next) {
+        if (!req.isAuthenticated || !req.isAuthenticated()) {
+            if (req.session) {
+                req.session.returnTo = req.originalUrl || req.url;
             }
-        };
-    };
-}
 
-function uninitialize() {
-    gServer = null;
-}
+            res.status(200).send(util.format('<script>window.location.href = "%s";</script>', redirectTo));
+        } else {
+            next();
+        }
+    };
+};
 
 function renderTemplate(res, template, data) {
     assert.strictEqual(typeof res, 'object');
@@ -264,15 +231,15 @@ function loginForm(req, res) {
         if (error) return sendError(req, res, 'Unknown OAuth client');
 
         switch (result.type) {
-        case clients.TYPE_BUILT_IN: return renderBuiltIn();
-        case clients.TYPE_EXTERNAL: return render(result.appId, '/api/v1/cloudron/avatar');
-        default: break;
+            case clients.TYPE_BUILT_IN: return renderBuiltIn();
+            case clients.TYPE_EXTERNAL: return render(result.appId, '/api/v1/cloudron/avatar');
+            default: break;
         }
 
         apps.get(result.appId, function (error, result) {
             if (error) return sendErrorPageOrRedirect(req, res, 'Unknown Application for those OAuth credentials');
 
-            var applicationName = result.fqdn;
+            var applicationName = result.altDomain || result.intrinsicFqdn;
             render(applicationName, '/api/v1/apps/' + result.id + '/icon');
         });
     });
@@ -286,19 +253,6 @@ function login(req, res) {
     passport.authenticate('local', {
         failureRedirect: '/api/v1/session/login?' + failureQuery
     })(req, res, function () {
-        if (req.user.twoFactorAuthenticationEnabled) {
-            if (!req.body.totpToken) {
-                let failureQuery = querystring.stringify({ error: 'A 2FA token is required', returnTo: returnTo });
-                return res.redirect('/api/v1/session/login?' + failureQuery);
-            }
-
-            let verified = speakeasy.totp.verify({ secret: req.user.twoFactorAuthenticationSecret, encoding: 'base32', token: req.body.totpToken });
-            if (!verified) {
-                let failureQuery = querystring.stringify({ error: 'The 2FA token is invalid', returnTo: returnTo });
-                return res.redirect('/api/v1/session/login?' + failureQuery);
-            }
-        }
-
         res.redirect(returnTo);
     });
 }
@@ -331,8 +285,8 @@ function passwordResetRequest(req, res, next) {
 
     debug('passwordResetRequest: email or username %s.', req.body.identifier);
 
-    users.resetPasswordByIdentifier(req.body.identifier, function (error) {
-        if (error && error.reason !== UsersError.NOT_FOUND) {
+    user.resetPasswordByIdentifier(req.body.identifier, function (error) {
+        if (error && error.reason !== UserError.NOT_FOUND) {
             console.error(error);
             return sendErrorPageOrRedirect(req, res, 'User not found');
         }
@@ -360,7 +314,7 @@ function renderAccountSetupSite(res, req, userObject, error) {
 function accountSetupSite(req, res) {
     if (!req.query.reset_token) return sendError(req, res, 'Missing Reset Token');
 
-    users.getByResetToken(req.query.reset_token, function (error, userObject) {
+    user.getByResetToken(req.query.reset_token, function (error, userObject) {
         if (error) return sendError(req, res, 'Invalid Reset Token');
 
         renderAccountSetupSite(res, req, userObject, '');
@@ -378,22 +332,22 @@ function accountSetup(req, res, next) {
 
     debug('acountSetup: with token %s.', req.body.resetToken);
 
-    users.getByResetToken(req.body.resetToken, function (error, userObject) {
+    user.getByResetToken(req.body.resetToken, function (error, userObject) {
         if (error) return sendError(req, res, 'Invalid Reset Token');
 
         var data = _.pick(req.body, 'username', 'displayName');
-        users.update(userObject.id, data, auditSource(req), function (error) {
-            if (error && error.reason === UsersError.ALREADY_EXISTS) return renderAccountSetupSite(res, req, userObject, 'Username already exists');
-            if (error && error.reason === UsersError.BAD_FIELD) return renderAccountSetupSite(res, req, userObject, error.message);
-            if (error && error.reason === UsersError.NOT_FOUND) return renderAccountSetupSite(res, req, userObject, 'No such user');
+        user.update(userObject.id, data, auditSource(req), function (error) {
+            if (error && error.reason === UserError.ALREADY_EXISTS) return renderAccountSetupSite(res, req, userObject, 'Username already exists');
+            if (error && error.reason === UserError.BAD_FIELD) return renderAccountSetupSite(res, req, userObject, error.message);
+            if (error && error.reason === UserError.NOT_FOUND) return renderAccountSetupSite(res, req, userObject, 'No such user');
             if (error) return next(new HttpError(500, error));
 
             userObject.username = req.body.username;
             userObject.displayName = req.body.displayName;
 
             // setPassword clears the resetToken
-            users.setPassword(userObject.id, req.body.password, function (error, result) {
-                if (error && error.reason === UsersError.BAD_FIELD) return renderAccountSetupSite(res, req, userObject, error.message);
+            user.setPassword(userObject.id, req.body.password, function (error, result) {
+                if (error && error.reason === UserError.BAD_FIELD) return renderAccountSetupSite(res, req, userObject, error.message);
 
                 if (error) return next(new HttpError(500, error));
 
@@ -407,7 +361,7 @@ function accountSetup(req, res, next) {
 function passwordResetSite(req, res, next) {
     if (!req.query.reset_token) return next(new HttpError(400, 'Missing reset_token'));
 
-    users.getByResetToken(req.query.reset_token, function (error, user) {
+    user.getByResetToken(req.query.reset_token, function (error, user) {
         if (error) return next(new HttpError(401, 'Invalid reset_token'));
 
         renderTemplate(res, 'password_reset', {
@@ -428,17 +382,17 @@ function passwordReset(req, res, next) {
 
     debug('passwordReset: with token %s.', req.body.resetToken);
 
-    users.getByResetToken(req.body.resetToken, function (error, userObject) {
+    user.getByResetToken(req.body.resetToken, function (error, userObject) {
         if (error) return next(new HttpError(401, 'Invalid resetToken'));
 
         if (!userObject.username) return next(new HttpError(401, 'No username set'));
 
         // setPassword clears the resetToken
-        users.setPassword(userObject.id, req.body.password, function (error) {
-            if (error && error.reason === UsersError.BAD_FIELD) return next(new HttpError(406, error.message));
+        user.setPassword(userObject.id, req.body.password, function (error, result) {
+            if (error && error.reason === UserError.BAD_FIELD) return next(new HttpError(406, error.message));
             if (error) return next(new HttpError(500, error));
 
-            res.redirect(config.adminOrigin());
+            res.redirect(util.format('%s?accessToken=%s&expiresAt=%s', config.adminOrigin(), result.token, result.expiresAt));
         });
     });
 }
@@ -447,14 +401,13 @@ function passwordReset(req, res, next) {
 // The callback page takes the redirectURI and the authCode and redirects the browser accordingly
 //
 // -> GET /api/v1/session/callback
-function sessionCallback() {
-    return [
-        session.ensureLoggedIn('/api/v1/session/login'),
-        function (req, res) {
-            renderTemplate(res, 'callback', { callbackServer: req.query.redirectURI });
-        }
-    ];
-}
+var callback = [
+    session.ensureLoggedIn('/api/v1/session/login'),
+    function (req, res) {
+        renderTemplate(res, 'callback', { callbackServer: req.query.redirectURI });
+    }
+];
+
 
 // The authorization endpoint is the entry point for an OAuth login.
 //
@@ -466,55 +419,54 @@ function sessionCallback() {
 //  - Then it will redirect the browser to the given <callbackURL> containing the authcode in the query
 //
 // -> GET /api/v1/oauth/dialog/authorize
-function authorization() {
-    return [
-        function (req, res, next) {
-            if (!req.query.redirect_uri) return sendErrorPageOrRedirect(req, res, 'Invalid request. redirect_uri query param is not set.');
-            if (!req.query.client_id) return sendErrorPageOrRedirect(req, res, 'Invalid request. client_id query param is not set.');
-            if (!req.query.response_type) return sendErrorPageOrRedirect(req, res, 'Invalid request. response_type query param is not set.');
-            if (req.query.response_type !== 'code' && req.query.response_type !== 'token') return sendErrorPageOrRedirect(req, res, 'Invalid request. Only token and code response types are supported.');
+var authorization = [
+    function (req, res, next) {
+        if (!req.query.redirect_uri) return sendErrorPageOrRedirect(req, res, 'Invalid request. redirect_uri query param is not set.');
+        if (!req.query.client_id) return sendErrorPageOrRedirect(req, res, 'Invalid request. client_id query param is not set.');
+        if (!req.query.response_type) return sendErrorPageOrRedirect(req, res, 'Invalid request. response_type query param is not set.');
+        if (req.query.response_type !== 'code' && req.query.response_type !== 'token') return sendErrorPageOrRedirect(req, res, 'Invalid request. Only token and code response types are supported.');
 
-            session.ensureLoggedIn('/api/v1/session/login?returnTo=' + req.query.redirect_uri)(req, res, next);
-        },
-        gServer.authorization({}, function (clientId, redirectURI, callback) {
-            debug('authorization: client %s with callback to %s.', clientId, redirectURI);
+        session.ensureLoggedIn('/api/v1/session/login?returnTo=' + req.query.redirect_uri)(req, res, next);
+    },
+    gServer.authorization({}, function (clientId, redirectURI, callback) {
+        debug('authorization: client %s with callback to %s.', clientId, redirectURI);
 
-            clients.get(clientId, function (error, client) {
-                if (error && error.reason === ClientsError.NOT_FOUND) return callback(null, false);
-                if (error) return callback(error);
+        clients.get(clientId, function (error, client) {
+            if (error && error.reason === ClientsError.NOT_FOUND) return callback(null, false);
+            if (error) return callback(error);
 
-                // ignore the origin passed into form the client, but use the one from the clientdb
-                var redirectPath = url.parse(redirectURI).path;
-                var redirectOrigin = client.redirectURI;
+            // ignore the origin passed into form the client, but use the one from the clientdb
+            var redirectPath = url.parse(redirectURI).path;
+            var redirectOrigin = client.redirectURI;
 
-                callback(null, client, '/api/v1/session/callback?redirectURI=' + encodeURIComponent(url.resolve(redirectOrigin, redirectPath)));
+            callback(null, client, '/api/v1/session/callback?redirectURI=' + encodeURIComponent(url.resolve(redirectOrigin, redirectPath)));
+        });
+    }),
+    function (req, res, next) {
+        // Handle our different types of oauth clients
+        var type = req.oauth2.client.type;
+
+        if (type === clients.TYPE_EXTERNAL || type === clients.TYPE_BUILT_IN) {
+            eventlog.add(eventlog.ACTION_USER_LOGIN, auditSource(req, req.oauth2.client.appId), { userId: req.oauth2.user.id });
+            return next();
+        }
+
+        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) {
+                if (error) return sendError(req, res, 'Internal error');
+                if (!access) return sendErrorPageOrRedirect(req, res, 'No access to this app.');
+
+                eventlog.add(eventlog.ACTION_USER_LOGIN, auditSource(req, appObject.id), { userId: req.oauth2.user.id });
+
+                next();
             });
-        }),
-        function (req, res, next) {
-            // Handle our different types of oauth clients
-            var type = req.oauth2.client.type;
+        });
+    },
+    gServer.decision({ loadTransaction: false })
+];
 
-            if (type === clients.TYPE_EXTERNAL || type === clients.TYPE_BUILT_IN) {
-                eventlog.add(eventlog.ACTION_USER_LOGIN, auditSource(req, req.oauth2.client.appId), { userId: req.oauth2.user.id, user: users.removePrivateFields(req.oauth2.user) });
-                return next();
-            }
-
-            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) {
-                    if (error) return sendError(req, res, 'Internal error');
-                    if (!access) return sendErrorPageOrRedirect(req, res, 'No access to this app.');
-
-                    eventlog.add(eventlog.ACTION_USER_LOGIN, auditSource(req, appObject.id, appObject), { userId: req.oauth2.user.id, user: users.removePrivateFields(req.oauth2.user) });
-
-                    next();
-                });
-            });
-        },
-        gServer.decision({ loadTransaction: false })
-    ];
-}
 
 //  The token endpoint allows an OAuth client to exchange an authcode with an accesstoken.
 //
@@ -523,22 +475,109 @@ function authorization() {
 //  An authcode is only good for one such exchange to an accesstoken.
 //
 // -> POST /api/v1/oauth/token
-function token() {
-    return [
-        passport.authenticate(['basic', 'oauth2-client-password'], { session: false }),
-        gServer.token(),
-        gServer.errorHandler()
-    ];
+var token = [
+    passport.authenticate(['basic', 'oauth2-client-password'], { session: false }),
+    gServer.token(),
+    gServer.errorHandler()
+];
+
+// tests if all requestedScopes are attached to the request
+function validateRequestedScopes(req, requestedScopes) {
+    assert.strictEqual(typeof req, 'object');
+    assert(Array.isArray(requestedScopes));
+
+    if (!req.authInfo || !req.authInfo.scope) return new Error('No scope found');
+
+    var scopes = req.authInfo.scope.split(',');
+
+    // check for roles separately
+    if (requestedScopes.indexOf(clients.SCOPE_ROLE_SDK) !== -1 && scopes.indexOf(clients.SCOPE_ROLE_SDK) === -1) {
+        return new Error('Missing required scope role "' + clients.SCOPE_ROLE_SDK + '"');
+    }
+
+    if (scopes.indexOf('*') !== -1) return null;
+
+    for (var i = 0; i < requestedScopes.length; ++i) {
+        if (scopes.indexOf(requestedScopes[i]) === -1) {
+            debug('scope: missing scope "%s".', requestedScopes[i]);
+            return new Error('Missing required scope "' + requestedScopes[i] + '"');
+        }
+    }
+
+    return null;
 }
 
-// Cross-site request forgery protection middleware for login form
-function csrf() {
-    return [
-        middleware.csrf(),
-        function (err, req, res, next) {
-            if (err.code !== 'EBADCSRFTOKEN') return next(err);
+//  The scope middleware provides an auth middleware for routes.
+//
+//  It is used for API routes, which are authenticated using accesstokens.
+//  Those accesstokens carry OAuth scopes and the middleware takes the required
+//  scope as an argument and will verify the accesstoken against it.
+//
+//  See server.js:
+//    var profileScope = routes.oauth2.scope('profile');
+//
+function scope(requestedScope) {
+    assert.strictEqual(typeof requestedScope, 'string');
 
-            sendErrorPageOrRedirect(req, res, 'Form expired');
+    var requestedScopes = requestedScope.split(',');
+    debug('scope: add routes with requested scopes', requestedScopes);
+
+    return [
+        passport.authenticate(['bearer'], { session: false }),
+        function (req, res, next) {
+            var error = validateRequestedScopes(req, requestedScopes);
+            if (error) return next(new HttpError(401, error.message));
+
+            next();
         }
     ];
 }
+
+function websocketAuth(requestedScopes, req, res, next) {
+    assert(Array.isArray(requestedScopes));
+
+    if (typeof req.query.access_token !== 'string') return next(new HttpError(401, 'Unauthorized'));
+
+    auth.accessTokenAuth(req.query.access_token, function (error, user, info) {
+        if (error) return next(new HttpError(500, error.message));
+        if (!user) return next(new HttpError(401, 'Unauthorized'));
+
+        req.user = user;
+        req.authInfo = info;
+
+        var error = validateRequestedScopes(req, requestedScopes);
+        if (error) return next(new HttpError(401, error.message));
+
+        next();
+    });
+}
+
+// Cross-site request forgery protection middleware for login form
+var csrf = [
+    middleware.csrf(),
+    function (err, req, res, next) {
+        if (err.code !== 'EBADCSRFTOKEN') return next(err);
+
+        sendErrorPageOrRedirect(req, res, 'Form expired');
+    }
+];
+
+exports = module.exports = {
+    loginForm: loginForm,
+    login: login,
+    logout: logout,
+    callback: callback,
+    passwordResetRequestSite: passwordResetRequestSite,
+    passwordResetRequest: passwordResetRequest,
+    passwordSentSite: passwordSentSite,
+    passwordResetSite: passwordResetSite,
+    passwordReset: passwordReset,
+    accountSetupSite: accountSetupSite,
+    accountSetup: accountSetup,
+    authorization: authorization,
+    token: token,
+    validateRequestedScopes: validateRequestedScopes,
+    scope: scope,
+    websocketAuth: websocketAuth,
+    csrf: csrf
+};

src/routes/profile.js

@@ -3,18 +3,14 @@
 exports = module.exports = {
     get: get,
     update: update,
-    changePassword: changePassword,
-    setTwoFactorAuthenticationSecret: setTwoFactorAuthenticationSecret,
-    enableTwoFactorAuthentication: enableTwoFactorAuthentication,
-    disableTwoFactorAuthentication: disableTwoFactorAuthentication
+    changePassword: changePassword
 };
 
-var accesscontrol = require('../accesscontrol.js'),
-    assert = require('assert'),
+var assert = require('assert'),
     HttpError = require('connect-lastmile').HttpError,
     HttpSuccess = require('connect-lastmile').HttpSuccess,
-    users = require('../users.js'),
-    UsersError = users.UsersError,
+    user = require('../user.js'),
+    UserError = user.UserError,
     _ = require('underscore');
 
 function auditSource(req) {
@@ -31,9 +27,7 @@ function get(req, res, next) {
         email: req.user.email,
         fallbackEmail: req.user.fallbackEmail,
         admin: req.user.admin,
-        scope: accesscontrol.canonicalScope(req.authInfo.scope), // this returns the token scope and not the user's scope
-        displayName: req.user.displayName,
-        twoFactorAuthenticationEnabled: req.user.twoFactorAuthenticationEnabled
+        displayName: req.user.displayName
     }));
 }
 
@@ -47,10 +41,10 @@ function update(req, res, next) {
 
     var data = _.pick(req.body, 'email', 'fallbackEmail', 'displayName');
 
-    users.update(req.user.id, data, auditSource(req), function (error) {
-        if (error && error.reason === UsersError.BAD_FIELD) return next(new HttpError(400, error.message));
-        if (error && error.reason === UsersError.ALREADY_EXISTS) return next(new HttpError(409, error.message));
-        if (error && error.reason === UsersError.NOT_FOUND) return next(new HttpError(404, 'User not found'));
+    user.update(req.user.id, data, auditSource(req), function (error) {
+        if (error && error.reason === UserError.BAD_FIELD) return next(new HttpError(400, error.message));
+        if (error && error.reason === UserError.ALREADY_EXISTS) return next(new HttpError(409, error.message));
+        if (error && error.reason === UserError.NOT_FOUND) return next(new HttpError(404, 'User not found'));
         if (error) return next(new HttpError(500, error));
 
         next(new HttpSuccess(204));
@@ -63,48 +57,11 @@ function changePassword(req, res, next) {
 
     if (typeof req.body.newPassword !== 'string') return next(new HttpError(400, 'newPassword must be a string'));
 
-    users.setPassword(req.user.id, req.body.newPassword, function (error) {
-        if (error && error.reason === UsersError.BAD_FIELD) return next(new HttpError(400, error.message));
-        if (error && error.reason === UsersError.NOT_FOUND) return next(new HttpError(403, 'Wrong password'));
+    user.setPassword(req.user.id, req.body.newPassword, function (error) {
+        if (error && error.reason === UserError.BAD_FIELD) return next(new HttpError(400, error.message));
+        if (error && error.reason === UserError.NOT_FOUND) return next(new HttpError(403, 'Wrong password'));
         if (error) return next(new HttpError(500, error));
 
         next(new HttpSuccess(204));
     });
 }
-
-function setTwoFactorAuthenticationSecret(req, res, next) {
-    assert.strictEqual(typeof req.user, 'object');
-
-    users.setTwoFactorAuthenticationSecret(req.user.id, function (error, result) {
-        if (error && error.reason === UsersError.ALREADY_EXISTS) return next(new HttpError(409, 'TwoFactor Authentication is enabled, disable first'));
-        if (error) return next(new HttpError(500, error));
-
-        next(new HttpSuccess(201, { secret: result.secret, qrcode: result.qrcode }));
-    });
-}
-
-function enableTwoFactorAuthentication(req, res, next) {
-    assert.strictEqual(typeof req.body, 'object');
-    assert.strictEqual(typeof req.user, 'object');
-
-    if (!req.body.totpToken || typeof req.body.totpToken !== 'string') return next(new HttpError(400, 'totpToken must be a nonempty string'));
-
-    users.enableTwoFactorAuthentication(req.user.id, req.body.totpToken, function (error) {
-        if (error && error.reason === UsersError.NOT_FOUND) return next(new HttpError(404, 'User not found'));
-        if (error && error.reason === UsersError.BAD_TOKEN) return next(new HttpError(403, 'Invalid token'));
-        if (error && error.reason === UsersError.ALREADY_EXISTS) return next(new HttpError(409, 'TwoFactor Authentication is already enabled'));
-        if (error) return next(new HttpError(500, error));
-
-        next(new HttpSuccess(202, {}));
-    });
-}
-
-function disableTwoFactorAuthentication(req, res, next) {
-    assert.strictEqual(typeof req.user, 'object');
-
-    users.disableTwoFactorAuthentication(req.user.id, function (error) {
-        if (error) return next(new HttpError(500, error));
-
-        next(new HttpSuccess(202, {}));
-    });
-}

src/routes/settings.js

@@ -1,11 +1,8 @@
 'use strict';
 
 exports = module.exports = {
-    getAppAutoupdatePattern: getAppAutoupdatePattern,
-    setAppAutoupdatePattern: setAppAutoupdatePattern,
-
-    getBoxAutoupdatePattern: getBoxAutoupdatePattern,
-    setBoxAutoupdatePattern: setBoxAutoupdatePattern,
+    getAutoupdatePattern: getAutoupdatePattern,
+    setAutoupdatePattern: setAutoupdatePattern,
 
     getCloudronName: getCloudronName,
     setCloudronName: setCloudronName,
@@ -30,41 +27,20 @@ var assert = require('assert'),
     settings = require('../settings.js'),
     SettingsError = settings.SettingsError;
 
-function getAppAutoupdatePattern(req, res, next) {
-    settings.getAppAutoupdatePattern(function (error, pattern) {
+function getAutoupdatePattern(req, res, next) {
+    settings.getAutoupdatePattern(function (error, pattern) {
         if (error) return next(new HttpError(500, error));
 
         next(new HttpSuccess(200, { pattern: pattern }));
     });
 }
 
-function setAppAutoupdatePattern(req, res, next) {
+function setAutoupdatePattern(req, res, next) {
     assert.strictEqual(typeof req.body, 'object');
 
     if (typeof req.body.pattern !== 'string') return next(new HttpError(400, 'pattern is required'));
 
-    settings.setAppAutoupdatePattern(req.body.pattern, 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 getBoxAutoupdatePattern(req, res, next) {
-    settings.getBoxAutoupdatePattern(function (error, pattern) {
-        if (error) return next(new HttpError(500, error));
-
-        next(new HttpSuccess(200, { pattern: pattern }));
-    });
-}
-
-function setBoxAutoupdatePattern(req, res, next) {
-    assert.strictEqual(typeof req.body, 'object');
-
-    if (typeof req.body.pattern !== 'string') return next(new HttpError(400, 'pattern is required'));
-
-    settings.setBoxAutoupdatePattern(req.body.pattern, function (error) {
+    settings.setAutoupdatePattern(req.body.pattern, function (error) {
         if (error && error.reason === SettingsError.BAD_FIELD) return next(new HttpError(400, error.message));
         if (error) return next(new HttpError(500, error));
 
@@ -153,10 +129,6 @@ function setBackupConfig(req, res, next) {
     if (typeof req.body.provider !== 'string') return next(new HttpError(400, 'provider is required'));
     if (typeof req.body.retentionSecs !== 'number') return next(new HttpError(400, 'retentionSecs is required'));
     if ('key' in req.body && typeof req.body.key !== 'string') return next(new HttpError(400, 'key must be a string'));
-    if ('syncConcurrency' in req.body) {
-        if (typeof req.body.syncConcurrency !== 'number') return next(new HttpError(400, 'syncConcurrency must be a positive integer'));
-        if (req.body.syncConcurrency < 1) return next(new HttpError(400, 'syncConcurrency must be a positive integer'));
-    }
     if (typeof req.body.format !== 'string') return next(new HttpError(400, 'format must be a string'));
     if ('acceptSelfSignedCerts' in req.body && typeof req.body.acceptSelfSignedCerts !== 'boolean') return next(new HttpError(400, 'format must be a boolean'));
 

src/routes/test/accesscontrol-test.js

@@ -1,117 +0,0 @@
-/* jslint node:true */
-/* global it:false */
-/* global describe:false */
-/* global before:false */
-/* global after:false */
-
-'use strict';
-
-var accesscontrol = require('../accesscontrol.js'),
-    expect = require('expect.js'),
-    HttpError = require('connect-lastmile').HttpError,
-    passport = require('passport');
-
-describe('scopes middleware', function () {
-    var passportAuthenticateSave = null;
-
-    before(function () {
-        passportAuthenticateSave = passport.authenticate;
-        passport.authenticate = function () {
-            return function (req, res, next) { next(); };
-        };
-    });
-
-    after(function () {
-        passport.authenticate = passportAuthenticateSave;
-    });
-
-    it('fails due to missing authInfo', function (done) {
-        var mw = accesscontrol.scope('admin')[1];
-        var req = {};
-
-        mw(req, null, function (error) {
-            expect(error).to.be.a(HttpError);
-            done();
-        });
-    });
-
-    it('fails due to missing scope property in authInfo', function (done) {
-        var mw = accesscontrol.scope('admin')[1];
-        var req = { authInfo: {} };
-
-        mw(req, null, function (error) {
-            expect(error).to.be.a(HttpError);
-            done();
-        });
-    });
-
-    it('fails due to missing scope in request', function (done) {
-        var mw = accesscontrol.scope('admin')[1];
-        var req = { authInfo: { scope: '' } };
-
-        mw(req, null, function (error) {
-            expect(error).to.be.a(HttpError);
-            done();
-        });
-    });
-
-    it('fails due to wrong scope in request', function (done) {
-        var mw = accesscontrol.scope('admin')[1];
-        var req = { authInfo: { scope: 'foobar,something' } };
-
-        mw(req, null, function (error) {
-            expect(error).to.be.a(HttpError);
-            done();
-        });
-    });
-
-    it('fails due to wrong scope in request', function (done) {
-        var mw = accesscontrol.scope('admin,users')[1];
-        var req = { authInfo: { scope: 'foobar,admin' } };
-
-        mw(req, null, function (error) {
-            expect(error).to.be.a(HttpError);
-            done();
-        });
-    });
-
-    it('succeeds with one requested scope and one provided scope', function (done) {
-        var mw = accesscontrol.scope('admin')[1];
-        var req = { authInfo: { scope: 'admin' } };
-
-        mw(req, null, function (error) {
-            expect(error).to.not.be.ok();
-            done();
-        });
-    });
-
-    it('succeeds with one requested scope and two provided scopes', function (done) {
-        var mw = accesscontrol.scope('admin')[1];
-        var req = { authInfo: { scope: 'foobar,admin' } };
-
-        mw(req, null, function (error) {
-            expect(error).to.not.be.ok();
-            done();
-        });
-    });
-
-    it('succeeds with two requested scope and two provided scopes', function (done) {
-        var mw = accesscontrol.scope('admin,foobar')[1];
-        var req = { authInfo: { scope: 'foobar,admin' } };
-
-        mw(req, null, function (error) {
-            expect(error).to.not.be.ok();
-            done();
-        });
-    });
-
-    it('succeeds with two requested scope and provided wildcard scope', function (done) {
-        var mw = accesscontrol.scope('admin,foobar')[1];
-        var req = { authInfo: { scope: '*' } };
-
-        mw(req, null, function (error) {
-            expect(error).to.not.be.ok();
-            done();
-        });
-    });
-});

src/routes/test/clients-test.js

@@ -5,8 +5,7 @@
 /* global before:false */
 /* global after:false */
 
-var accesscontrol = require('../../accesscontrol.js'),
-    async = require('async'),
+var async = require('async'),
     config = require('../../config.js'),
     clients = require('../../clients.js'),
     database = require('../../database.js'),
@@ -61,8 +60,8 @@ describe('OAuth Clients API', function () {
         after(cleanup);
 
         it('fails without token', function (done) {
-            superagent.post(SERVER_URL + '/api/v1/clients')
-                .send({ appId: 'someApp', redirectURI: 'http://foobar.com', scope: accesscontrol.SCOPE_PROFILE })
+            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();
@@ -70,9 +69,9 @@ describe('OAuth Clients API', function () {
         });
 
         it('fails without appId', function (done) {
-            superagent.post(SERVER_URL + '/api/v1/clients')
+            superagent.post(SERVER_URL + '/api/v1/oauth/clients')
                 .query({ access_token: token })
-                .send({ redirectURI: 'http://foobar.com', scope: accesscontrol.SCOPE_PROFILE })
+                .send({ redirectURI: 'http://foobar.com', scope: 'profile' })
                 .end(function (error, result) {
                     expect(result.statusCode).to.equal(400);
                     done();
@@ -80,9 +79,9 @@ describe('OAuth Clients API', function () {
         });
 
         it('fails with empty appId', function (done) {
-            superagent.post(SERVER_URL + '/api/v1/clients')
+            superagent.post(SERVER_URL + '/api/v1/oauth/clients')
                 .query({ access_token: token })
-                .send({ appId: '', redirectURI: 'http://foobar.com', scope: accesscontrol.SCOPE_PROFILE })
+                .send({ appId: '', redirectURI: 'http://foobar.com', scope: 'profile' })
                 .end(function (error, result) {
                     expect(result.statusCode).to.equal(400);
                     done();
@@ -90,7 +89,7 @@ describe('OAuth Clients API', function () {
         });
 
         it('fails without scope', function (done) {
-            superagent.post(SERVER_URL + '/api/v1/clients')
+            superagent.post(SERVER_URL + '/api/v1/oauth/clients')
                 .query({ access_token: token })
                 .send({ appId: 'someApp', redirectURI: 'http://foobar.com' })
                 .end(function (error, result) {
@@ -100,7 +99,7 @@ describe('OAuth Clients API', function () {
         });
 
         it('fails with empty scope', function (done) {
-            superagent.post(SERVER_URL + '/api/v1/clients')
+            superagent.post(SERVER_URL + '/api/v1/oauth/clients')
                 .query({ access_token: token })
                 .send({ appId: 'someApp', redirectURI: 'http://foobar.com', scope: '' })
                 .end(function (error, result) {
@@ -110,9 +109,9 @@ describe('OAuth Clients API', function () {
         });
 
         it('fails without redirectURI', function (done) {
-            superagent.post(SERVER_URL + '/api/v1/clients')
+            superagent.post(SERVER_URL + '/api/v1/oauth/clients')
                 .query({ access_token: token })
-                .send({ appId: 'someApp', scope: accesscontrol.SCOPE_PROFILE })
+                .send({ appId: 'someApp', scope: 'profile' })
                 .end(function (error, result) {
                     expect(result.statusCode).to.equal(400);
                     done();
@@ -120,9 +119,9 @@ describe('OAuth Clients API', function () {
         });
 
         it('fails with empty redirectURI', function (done) {
-            superagent.post(SERVER_URL + '/api/v1/clients')
+            superagent.post(SERVER_URL + '/api/v1/oauth/clients')
                 .query({ access_token: token })
-                .send({ appId: 'someApp', redirectURI: '', scope: accesscontrol.SCOPE_PROFILE })
+                .send({ appId: 'someApp', redirectURI: '', scope: 'profile' })
                 .end(function (error, result) {
                     expect(result.statusCode).to.equal(400);
                     done();
@@ -130,9 +129,9 @@ describe('OAuth Clients API', function () {
         });
 
         it('fails with malformed redirectURI', function (done) {
-            superagent.post(SERVER_URL + '/api/v1/clients')
+            superagent.post(SERVER_URL + '/api/v1/oauth/clients')
                 .query({ access_token: token })
-                .send({ appId: 'someApp', redirectURI: 'foobar', scope: accesscontrol.SCOPE_PROFILE })
+                .send({ appId: 'someApp', redirectURI: 'foobar', scope: 'profile' })
                 .end(function (error, result) {
                     expect(result.statusCode).to.equal(400);
                     done();
@@ -140,9 +139,9 @@ describe('OAuth Clients API', function () {
         });
 
         it('fails with invalid name', function (done) {
-            superagent.post(SERVER_URL + '/api/v1/clients')
+            superagent.post(SERVER_URL + '/api/v1/oauth/clients')
                 .query({ access_token: token })
-                .send({ appId: '$"$%^45asdfasdfadf.adf.', redirectURI: 'http://foobar.com', scope: accesscontrol.SCOPE_PROFILE })
+                .send({ appId: '$"$%^45asdfasdfadf.adf.', redirectURI: 'http://foobar.com', scope: 'profile' })
                 .end(function (error, result) {
                     expect(result.statusCode).to.equal(400);
                     done();
@@ -150,9 +149,9 @@ describe('OAuth Clients API', function () {
         });
 
         it('succeeds with dash', function (done) {
-            superagent.post(SERVER_URL + '/api/v1/clients')
+            superagent.post(SERVER_URL + '/api/v1/oauth/clients')
                 .query({ access_token: token })
-                .send({ appId: 'fo-1234-bar', redirectURI: 'http://foobar.com', scope: accesscontrol.SCOPE_PROFILE })
+                .send({ appId: 'fo-1234-bar', redirectURI: 'http://foobar.com', scope: 'profile' })
                 .end(function (error, result) {
                     expect(result.statusCode).to.equal(201);
                     done();
@@ -160,9 +159,9 @@ describe('OAuth Clients API', function () {
         });
 
         it('succeeds', function (done) {
-            superagent.post(SERVER_URL + '/api/v1/clients')
+            superagent.post(SERVER_URL + '/api/v1/oauth/clients')
                 .query({ access_token: token })
-                .send({ appId: 'someApp', redirectURI: 'http://foobar.com', scope: accesscontrol.SCOPE_PROFILE })
+                .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');
@@ -182,7 +181,7 @@ describe('OAuth Clients API', function () {
             id: '',
             appId: 'someAppId-0',
             redirectURI: 'http://some.callback0',
-            scope: accesscontrol.SCOPE_PROFILE
+            scope: 'profile'
         };
 
         before(function (done) {
@@ -190,7 +189,7 @@ describe('OAuth Clients API', function () {
                 setup,
 
                 function (callback) {
-                    superagent.post(SERVER_URL + '/api/v1/clients')
+                    superagent.post(SERVER_URL + '/api/v1/oauth/clients')
                         .query({ access_token: token })
                         .send({ appId: CLIENT_0.appId, redirectURI: CLIENT_0.redirectURI, scope: CLIENT_0.scope })
                         .end(function (error, result) {
@@ -207,7 +206,7 @@ describe('OAuth Clients API', function () {
         after(cleanup);
 
         it('fails without token', function (done) {
-            superagent.get(SERVER_URL + '/api/v1/clients/' + CLIENT_0.id)
+            superagent.get(SERVER_URL + '/api/v1/oauth/clients/' + CLIENT_0.id)
                 .end(function (error, result) {
                     expect(result.statusCode).to.equal(401);
                     done();
@@ -216,7 +215,7 @@ describe('OAuth Clients API', function () {
 
 
         it('fails with unknown id', function (done) {
-            superagent.get(SERVER_URL + '/api/v1/clients/' + CLIENT_0.id.toUpperCase())
+            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);
@@ -225,7 +224,7 @@ describe('OAuth Clients API', function () {
         });
 
         it('succeeds', function (done) {
-            superagent.get(SERVER_URL + '/api/v1/clients/' + CLIENT_0.id)
+            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);
@@ -240,14 +239,14 @@ describe('OAuth Clients API', function () {
             id: '',
             appId: 'someAppId-0',
             redirectURI: 'http://some.callback0',
-            scope: accesscontrol.SCOPE_PROFILE
+            scope: 'profile'
         };
 
         var CLIENT_1 = {
             id: '',
             appId: 'someAppId-1',
             redirectURI: 'http://some.callback1',
-            scope: accesscontrol.SCOPE_PROFILE,
+            scope: 'profile',
             type: clients.TYPE_OAUTH
         };
 
@@ -256,7 +255,7 @@ describe('OAuth Clients API', function () {
                 setup,
 
                 function (callback) {
-                    superagent.post(SERVER_URL + '/api/v1/clients')
+                    superagent.post(SERVER_URL + '/api/v1/oauth/clients')
                         .query({ access_token: token })
                         .send({ appId: CLIENT_0.appId, redirectURI: CLIENT_0.redirectURI, scope: CLIENT_0.scope })
                         .end(function (error, result) {
@@ -273,7 +272,7 @@ describe('OAuth Clients API', function () {
         after(cleanup);
 
         it('fails without token', function (done) {
-            superagent.del(SERVER_URL + '/api/v1/clients/' + CLIENT_0.id)
+            superagent.del(SERVER_URL + '/api/v1/oauth/clients/' + CLIENT_0.id)
                 .end(function (error, result) {
                     expect(result.statusCode).to.equal(401);
                     done();
@@ -282,7 +281,7 @@ describe('OAuth Clients API', function () {
 
 
         it('fails with unknown id', function (done) {
-            superagent.del(SERVER_URL + '/api/v1/clients/' + CLIENT_0.id.toUpperCase())
+            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);
@@ -291,12 +290,12 @@ describe('OAuth Clients API', function () {
         });
 
         it('succeeds', function (done) {
-            superagent.del(SERVER_URL + '/api/v1/clients/' + CLIENT_0.id)
+            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/clients/' + CLIENT_0.id)
+                    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);
@@ -307,12 +306,12 @@ describe('OAuth Clients API', function () {
         });
 
         it('fails for cid-webadmin', function (done) {
-            superagent.del(SERVER_URL + '/api/v1/clients/cid-webadmin')
+            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/clients/cid-webadmin')
+                    superagent.get(SERVER_URL + '/api/v1/oauth/clients/cid-webadmin')
                         .query({ access_token: token })
                         .end(function (error, result) {
                             expect(result.statusCode).to.equal(200);
@@ -328,12 +327,12 @@ describe('OAuth Clients API', function () {
 
                 CLIENT_1.id = result.id;
 
-                superagent.del(SERVER_URL + '/api/v1/clients/' + CLIENT_1.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/clients/' + CLIENT_1.id)
+                        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);
@@ -360,11 +359,9 @@ describe('Clients', function () {
     };
 
     // make csrf always succeed for testing
-    oauth2.csrf = function () {
-        return function (req, res, next) {
-            req.csrfToken = function () { return hat(256); };
-            next();
-        };
+    oauth2.csrf = function (req, res, next) {
+        req.csrfToken = function () { return hat(256); };
+        next();
     };
 
     function setup2(done) {
@@ -372,7 +369,7 @@ describe('Clients', function () {
             setup,
 
             function (callback) {
-                superagent.get(SERVER_URL + '/api/v1/user/profile')
+                superagent.get(SERVER_URL + '/api/v1/profile')
                     .query({ access_token: token })
                     .end(function (error, result) {
                         expect(result).to.be.ok();
@@ -391,7 +388,7 @@ describe('Clients', function () {
         after(cleanup);
 
         it('fails due to missing token', function (done) {
-            superagent.get(SERVER_URL + '/api/v1/clients')
+            superagent.get(SERVER_URL + '/api/v1/oauth/clients')
                 .end(function (error, result) {
                     expect(result.statusCode).to.equal(401);
                     done();
@@ -399,7 +396,7 @@ describe('Clients', function () {
         });
 
         it('fails due to empty token', function (done) {
-            superagent.get(SERVER_URL + '/api/v1/clients')
+            superagent.get(SERVER_URL + '/api/v1/oauth/clients')
                 .query({ access_token: '' })
                 .end(function (error, result) {
                     expect(result.statusCode).to.equal(401);
@@ -408,7 +405,7 @@ describe('Clients', function () {
         });
 
         it('fails due to wrong token', function (done) {
-            superagent.get(SERVER_URL + '/api/v1/clients')
+            superagent.get(SERVER_URL + '/api/v1/oauth/clients')
                 .query({ access_token: token.toUpperCase() })
                 .end(function (error, result) {
                     expect(result.statusCode).to.equal(401);
@@ -417,7 +414,7 @@ describe('Clients', function () {
         });
 
         it('succeeds', function (done) {
-            superagent.get(SERVER_URL + '/api/v1/clients')
+            superagent.get(SERVER_URL + '/api/v1/oauth/clients')
                 .query({ access_token: token })
                 .end(function (error, result) {
                     expect(result.statusCode).to.equal(200);
@@ -434,7 +431,7 @@ describe('Clients', function () {
         after(cleanup);
 
         it('fails due to missing token', function (done) {
-            superagent.get(SERVER_URL + '/api/v1/clients/cid-webadmin/tokens')
+            superagent.get(SERVER_URL + '/api/v1/oauth/clients/cid-webadmin/tokens')
                 .end(function (error, result) {
                     expect(result.statusCode).to.equal(401);
                     done();
@@ -442,7 +439,7 @@ describe('Clients', function () {
         });
 
         it('fails due to empty token', function (done) {
-            superagent.get(SERVER_URL + '/api/v1/clients/cid-webadmin/tokens')
+            superagent.get(SERVER_URL + '/api/v1/oauth/clients/cid-webadmin/tokens')
                 .query({ access_token: '' })
                 .end(function (error, result) {
                     expect(result.statusCode).to.equal(401);
@@ -451,7 +448,7 @@ describe('Clients', function () {
         });
 
         it('fails due to wrong token', function (done) {
-            superagent.get(SERVER_URL + '/api/v1/clients/cid-webadmin/tokens')
+            superagent.get(SERVER_URL + '/api/v1/oauth/clients/cid-webadmin/tokens')
                 .query({ access_token: token.toUpperCase() })
                 .end(function (error, result) {
                     expect(result.statusCode).to.equal(401);
@@ -460,7 +457,7 @@ describe('Clients', function () {
         });
 
         it('fails due to unkown client', function (done) {
-            superagent.get(SERVER_URL + '/api/v1/clients/CID-WEBADMIN/tokens')
+            superagent.get(SERVER_URL + '/api/v1/oauth/clients/CID-WEBADMIN/tokens')
                 .query({ access_token: token })
                 .end(function (error, result) {
                     expect(result.statusCode).to.equal(404);
@@ -469,7 +466,7 @@ describe('Clients', function () {
         });
 
         it('succeeds', function (done) {
-            superagent.get(SERVER_URL + '/api/v1/clients/cid-webadmin/tokens')
+            superagent.get(SERVER_URL + '/api/v1/oauth/clients/cid-webadmin/tokens')
                 .query({ access_token: token })
                 .end(function (error, result) {
                     expect(result.statusCode).to.equal(200);
@@ -487,7 +484,7 @@ describe('Clients', function () {
         after(cleanup);
 
         it('fails due to missing token', function (done) {
-            superagent.del(SERVER_URL + '/api/v1/clients/cid-webadmin/tokens')
+            superagent.del(SERVER_URL + '/api/v1/oauth/clients/cid-webadmin/tokens')
                 .end(function (error, result) {
                     expect(result.statusCode).to.equal(401);
                     done();
@@ -495,7 +492,7 @@ describe('Clients', function () {
         });
 
         it('fails due to empty token', function (done) {
-            superagent.del(SERVER_URL + '/api/v1/clients/cid-webadmin/tokens')
+            superagent.del(SERVER_URL + '/api/v1/oauth/clients/cid-webadmin/tokens')
                 .query({ access_token: '' })
                 .end(function (error, result) {
                     expect(result.statusCode).to.equal(401);
@@ -504,7 +501,7 @@ describe('Clients', function () {
         });
 
         it('fails due to wrong token', function (done) {
-            superagent.del(SERVER_URL + '/api/v1/clients/cid-webadmin/tokens')
+            superagent.del(SERVER_URL + '/api/v1/oauth/clients/cid-webadmin/tokens')
                 .query({ access_token: token.toUpperCase() })
                 .end(function (error, result) {
                     expect(result.statusCode).to.equal(401);
@@ -513,7 +510,7 @@ describe('Clients', function () {
         });
 
         it('fails due to unkown client', function (done) {
-            superagent.del(SERVER_URL + '/api/v1/clients/CID-WEBADMIN/tokens')
+            superagent.del(SERVER_URL + '/api/v1/oauth/clients/CID-WEBADMIN/tokens')
                 .query({ access_token: token })
                 .end(function (error, result) {
                     expect(result.statusCode).to.equal(404);
@@ -522,7 +519,7 @@ describe('Clients', function () {
         });
 
         it('succeeds', function (done) {
-            superagent.get(SERVER_URL + '/api/v1/clients/cid-webadmin/tokens')
+            superagent.get(SERVER_URL + '/api/v1/oauth/clients/cid-webadmin/tokens')
                 .query({ access_token: token })
                 .end(function (error, result) {
                     expect(result.statusCode).to.equal(200);
@@ -530,13 +527,13 @@ describe('Clients', function () {
                     expect(result.body.tokens.length).to.eql(1);
                     expect(result.body.tokens[0].identifier).to.eql(USER_0.id);
 
-                    superagent.del(SERVER_URL + '/api/v1/clients/cid-webadmin/tokens')
+                    superagent.del(SERVER_URL + '/api/v1/oauth/clients/cid-webadmin/tokens')
                         .query({ access_token: token })
                         .end(function (error, result) {
                             expect(result.statusCode).to.equal(204);
 
                             // further calls with this token should not work
-                            superagent.get(SERVER_URL + '/api/v1/user/profile')
+                            superagent.get(SERVER_URL + '/api/v1/profile')
                                 .query({ access_token: token })
                                 .end(function (error, result) {
                                     expect(result.statusCode).to.equal(401);

src/routes/test/cloudron-test.js

@@ -5,8 +5,7 @@
 /* global before:false */
 /* global after:false */
 
-var accesscontrol = require('../../accesscontrol.js'),
-    async = require('async'),
+var async = require('async'),
     config = require('../../config.js'),
     database = require('../../database.js'),
     expect = require('expect.js'),
@@ -167,7 +166,7 @@ describe('Cloudron', function () {
                             userId_1 = result.body.id;
 
                             // HACK to get a token for second user (passwords are generated and the user should have gotten a password setup link...)
-                            tokendb.add(token_1, userId_1, 'test-client-id',  Date.now() + 100000, accesscontrol.SCOPE_ANY, callback);
+                            tokendb.add(token_1, userId_1, 'test-client-id',  Date.now() + 100000, '*', callback);
                         });
                 }
             ], done);
@@ -203,11 +202,25 @@ describe('Cloudron', function () {
                 });
         });
 
-        it('fails (non-admin)', function (done) {
+        it('succeeds (non-admin)', function (done) {
             superagent.get(SERVER_URL + '/api/v1/cloudron/config')
                 .query({ access_token: token_1 })
                 .end(function (error, result) {
-                    expect(result.statusCode).to.equal(403);
+                    expect(result.statusCode).to.equal(200);
+
+                    expect(result.body.apiServerOrigin).to.eql('http://localhost:6060');
+                    expect(result.body.webServerOrigin).to.eql(null);
+                    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');
+                    expect(result.body.provider).to.be.a('string');
+
+                    expect(result.body.update).to.be(undefined);
+                    expect(result.body.size).to.be(undefined);
+                    expect(result.body.region).to.be(undefined);
+                    expect(result.body.memory).to.be(undefined);
+
                     done();
                 });
         });

src/routes/test/developer-test.js

@@ -10,7 +10,6 @@ var async = require('async'),
     config = require('../../config.js'),
     database = require('../../database.js'),
     expect = require('expect.js'),
-    speakeasy = require('speakeasy'),
     superagent = require('superagent'),
     server = require('../../server.js');
 
@@ -37,8 +36,6 @@ function cleanup(done) {
 }
 
 describe('Developer API', function () {
-    this.timeout(20000);
-
     describe('login', function () {
         before(function (done) {
             async.series([
@@ -134,8 +131,8 @@ describe('Developer API', function () {
                 .send({ username: USERNAME, password: PASSWORD })
                 .end(function (error, result) {
                     expect(result.statusCode).to.equal(200);
-                    expect(new Date(result.body.expires).toString()).to.not.be('Invalid Date');
-                    expect(result.body.accessToken).to.be.a('string');
+                    expect(new Date(result.body.expiresAt).toString()).to.not.be('Invalid Date');
+                    expect(result.body.token).to.be.a('string');
                     done();
                 });
         });
@@ -145,8 +142,8 @@ describe('Developer API', function () {
                 .send({ username: USERNAME.toUpperCase(), password: PASSWORD })
                 .end(function (error, result) {
                     expect(result.statusCode).to.equal(200);
-                    expect(new Date(result.body.expires).toString()).to.not.be('Invalid Date');
-                    expect(result.body.accessToken).to.be.a('string');
+                    expect(new Date(result.body.expiresAt).toString()).to.not.be('Invalid Date');
+                    expect(result.body.token).to.be.a('string');
                     done();
                 });
         });
@@ -156,8 +153,8 @@ describe('Developer API', function () {
                 .send({ username: EMAIL, password: PASSWORD })
                 .end(function (error, result) {
                     expect(result.statusCode).to.equal(200);
-                    expect(new Date(result.body.expires).toString()).to.not.be('Invalid Date');
-                    expect(result.body.accessToken).to.be.a('string');
+                    expect(new Date(result.body.expiresAt).toString()).to.not.be('Invalid Date');
+                    expect(result.body.token).to.be.a('string');
                     done();
                 });
         });
@@ -167,90 +164,13 @@ describe('Developer API', function () {
                 .send({ username: EMAIL.toUpperCase(), password: PASSWORD })
                 .end(function (error, result) {
                     expect(result.statusCode).to.equal(200);
-                    expect(new Date(result.body.expires).toString()).to.not.be('Invalid Date');
-                    expect(result.body.accessToken).to.be.a('string');
+                    expect(new Date(result.body.expiresAt).toString()).to.not.be('Invalid Date');
+                    expect(result.body.token).to.be.a('string');
                     done();
                 });
         });
     });
 
-    describe('2fa login', function () {
-        var secret, accessToken;
-
-        before(function (done) {
-            async.series([
-                setup,
-                function (callback) {
-                    superagent.post(`${SERVER_URL}/api/v1/cloudron/activate`).query({ setupToken: 'somesetuptoken' }).send({ username: USERNAME, password: PASSWORD, email: EMAIL }).end(function (error, result) {
-                        callback(error);
-                    });
-                },
-                function (callback) {
-                    superagent.post(`${SERVER_URL}/api/v1/developer/login`).send({ username: USERNAME, password: PASSWORD }).end(function (error, result) {
-                        accessToken = result.body.accessToken;
-                        callback(error);
-                    });
-                },
-                function (callback) {
-                    superagent.post(`${SERVER_URL}/api/v1/user/profile/twofactorauthentication`).query({ access_token: accessToken }).end(function (error, result) {
-                        secret = result.body.secret;
-                        callback(error);
-                    });
-                },
-                function (callback) {
-                    var totpToken = speakeasy.totp({
-                        secret: secret,
-                        encoding: 'base32'
-                    });
-
-                    superagent.post(`${SERVER_URL}/api/v1/user/profile/twofactorauthentication/enable`).query({ access_token: accessToken }).send({ totpToken: totpToken }).end(function (error, result) {
-                        callback(error);
-                    });
-                }
-            ], done);
-        });
-
-        after(function (done) {
-            async.series([
-                function (callback) {
-                    superagent.post(`${SERVER_URL}/api/v1/user/profile/twofactorauthentication/disable`).query({ access_token: accessToken }).send({ password: PASSWORD }).end(function (error, result) {
-                        callback(error);
-                    });
-                },
-                cleanup
-            ], done);
-        });
-
-        it('fails due to missing token', function (done) {
-            superagent.post(`${SERVER_URL}/api/v1/developer/login`).send({ username: USERNAME, password: PASSWORD }).end(function (error, result) {
-                expect(result.statusCode).to.equal(401);
-                done();
-            });
-        });
-
-        it('fails due to wrong token', function (done) {
-            superagent.post(`${SERVER_URL}/api/v1/developer/login`).send({ username: USERNAME, password: PASSWORD }).send({ totpToken: 'wrongtoken' }).end(function (error, result) {
-                expect(result.statusCode).to.equal(401);
-                done();
-            });
-        });
-
-        it('succeeds', function (done) {
-            var totpToken = speakeasy.totp({
-                secret: secret,
-                encoding: 'base32'
-            });
-
-            superagent.post(`${SERVER_URL}/api/v1/developer/login`).send({ username: USERNAME, password: PASSWORD }).send({ totpToken: totpToken }).end(function (error, result) {
-                expect(error).to.be(null);
-                expect(result.statusCode).to.equal(200);
-                expect(result.body).to.be.an(Object);
-                expect(result.body.accessToken).to.be.a('string');
-                done();
-            });
-        });
-    });
-
     describe('sdk tokens are valid without password checks', function () {
         var token_normal, token_sdk;
 
@@ -264,16 +184,16 @@ describe('Developer API', function () {
                         .end(function (error, result) {
                             expect(result).to.be.ok();
 
-                            token_normal = result.body.accessToken;
+                            token_normal = result.body.token;
 
                             superagent.post(SERVER_URL + '/api/v1/developer/login')
                                 .send({ username: USERNAME, password: PASSWORD })
                                 .end(function (error, result) {
                                     expect(result.statusCode).to.equal(200);
-                                    expect(new Date(result.body.expires).toString()).to.not.be('Invalid Date');
-                                    expect(result.body.accessToken).to.be.a('string');
+                                    expect(new Date(result.body.expiresAt).toString()).to.not.be('Invalid Date');
+                                    expect(result.body.token).to.be.a('string');
 
-                                    token_sdk = result.body.accessToken;
+                                    token_sdk = result.body.token;
 
                                     callback();
                                 });
@@ -285,14 +205,14 @@ describe('Developer API', function () {
         after(cleanup);
 
         it('fails with non sdk token', function (done) {
-            superagent.post(SERVER_URL + '/api/v1/user/profile/password').query({ access_token: token_normal }).send({ newPassword: 'Some?$123' }).end(function (error, result) {
-                expect(result.statusCode).to.equal(401);
+            superagent.post(SERVER_URL + '/api/v1/profile/password').query({ access_token: token_normal }).send({ newPassword: 'Some?$123' }).end(function (error, result) {
+                expect(result.statusCode).to.equal(400);
                 done();
             });
         });
 
         it('succeeds', function (done) {
-            superagent.post(SERVER_URL + '/api/v1/user/profile/password').query({ access_token: token_sdk }).send({ newPassword: 'Some?$123' }).end(function (error, result) {
+            superagent.post(SERVER_URL + '/api/v1/profile/password').query({ access_token: token_sdk }).send({ newPassword: 'Some?$123' }).end(function (error, result) {
                 expect(result.statusCode).to.equal(204);
                 done();
             });

src/routes/test/domains-test.js

@@ -6,16 +6,11 @@
 /* global after:false */
 
 var async = require('async'),
-    child_process = require('child_process'),
     config = require('../../config.js'),
     database = require('../../database.js'),
     expect = require('expect.js'),
-    fs = require('fs'),
-    path = require('path'),
-    paths = require('../../paths.js'),
     superagent = require('superagent'),
-    server = require('../../server.js'),
-    _ = require('underscore');
+    server = require('../../server.js');
 
 var SERVER_URL = 'http://localhost:' + config.get('port');
 
@@ -133,17 +128,6 @@ describe('Domains API', function () {
                 });
         });
 
-        it('fails without token', function (done) {
-            superagent.post(SERVER_URL + '/api/v1/domains')
-                .query({ })
-                .send(DOMAIN_0)
-                .end(function (error, result) {
-                    expect(result.statusCode).to.equal(401);
-
-                    done();
-                });
-        });
-
         it('succeeds', function (done) {
             superagent.post(SERVER_URL + '/api/v1/domains')
                 .query({ access_token: token })
@@ -268,116 +252,4 @@ describe('Domains API', function () {
                 });
         });
     });
-
-    describe('Certificates API', function () {
-        var validCert0, validKey0, // example.com
-            validCert1, validKey1; // *.example.com
-
-        before(function (done) {
-            child_process.execSync(`openssl req -subj "/CN=${DOMAIN_0.domain}/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=*.${DOMAIN_0.domain}/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');
-
-            superagent.post(SERVER_URL + '/api/v1/domains')
-                .query({ access_token: token })
-                .send(DOMAIN_0)
-                .end(function (error, result) {
-                    expect(result.statusCode).to.equal(201);
-
-                    done();
-                });
-        });
-
-        it('cannot set certificate without certificate', function (done) {
-            var d = _.extend({}, DOMAIN_0);
-            d.fallbackCertificate = { key: validKey1 };
-
-            superagent.put(`${SERVER_URL}/api/v1/domains/${DOMAIN_0.domain}`)
-                .query({ access_token: token })
-                .send(d)
-                .end(function (error, result) {
-                    expect(result.statusCode).to.equal(400);
-                    done();
-                });
-        });
-
-        it('cannot set certificate without key', function (done) {
-            var d = _.extend({}, DOMAIN_0);
-            d.fallbackCertificate = { cert: validCert1 };
-
-            superagent.put(`${SERVER_URL}/api/v1/domains/${DOMAIN_0.domain}`)
-                .query({ access_token: token })
-                .send(d)
-                .end(function (error, result) {
-                    expect(result.statusCode).to.equal(400);
-                    done();
-                });
-        });
-
-        it('cannot set certificate with cert not being a string', function (done) {
-            var d = _.extend({}, DOMAIN_0);
-            d.fallbackCertificate = { cert: 1234, key: validKey1 };
-
-            superagent.put(`${SERVER_URL}/api/v1/domains/${DOMAIN_0.domain}`)
-                .query({ access_token: token })
-                .send(d)
-                .end(function (error, result) {
-                    expect(result.statusCode).to.equal(400);
-                    done();
-                });
-        });
-
-        it('cannot set certificate with key not being a string', function (done) {
-            var d = _.extend({}, DOMAIN_0);
-            d.fallbackCertificate = { cert: validCert1, key: true };
-
-            superagent.put(`${SERVER_URL}/api/v1/domains/${DOMAIN_0.domain}`)
-                .query({ access_token: token })
-                .send(d)
-                .end(function (error, result) {
-                    expect(result.statusCode).to.equal(400);
-                    done();
-                });
-        });
-
-        it('cannot set non-fallback certificate', function (done) {
-            var d = _.extend({}, DOMAIN_0);
-            d.fallbackCertificate = { cert: validCert0, key: validKey0 };
-
-            superagent.put(`${SERVER_URL}/api/v1/domains/${DOMAIN_0.domain}`)
-                .query({ access_token: token })
-                .send(d)
-                .end(function (error, result) {
-                    expect(result.statusCode).to.equal(400);
-                    done();
-                });
-        });
-
-        it('can set fallback certificate', function (done) {
-            var d = _.extend({}, DOMAIN_0);
-            d.fallbackCertificate = { cert: validCert1, key: validKey1 };
-
-            superagent.put(`${SERVER_URL}/api/v1/domains/${DOMAIN_0.domain}`)
-                .query({ access_token: token })
-                .send(d)
-                .end(function (error, result) {
-                    expect(result.statusCode).to.equal(204);
-                    done();
-                });
-        });
-
-        it('did set the certificate', function (done) {
-            var cert = fs.readFileSync(path.join(paths.APP_CERTS_DIR, `${DOMAIN_0.domain}.host.cert`), 'utf-8');
-            expect(cert).to.eql(validCert1);
-
-            var key = fs.readFileSync(path.join(paths.APP_CERTS_DIR, `${DOMAIN_0.domain}.host.key`), 'utf-8');
-            expect(key).to.eql(validKey1);
-
-            done();
-        });
-    });
 });

src/routes/test/eventlog-test.js

@@ -6,8 +6,7 @@
 
 'use strict';
 
-var accesscontrol = require('../../accesscontrol.js'),
-    async = require('async'),
+var async = require('async'),
     config = require('../../config.js'),
     database = require('../../database.js'),
     expect = require('expect.js'),
@@ -63,7 +62,7 @@ function setup(done) {
             token_1 = tokendb.generateToken();
 
             // HACK to get a token for second user (passwords are generated and the user should have gotten a password setup link...)
-            tokendb.add(token_1, USER_1_ID, 'test-client-id',  Date.now() + 100000, accesscontrol.SCOPE_PROFILE, callback);
+            tokendb.add(token_1, USER_1_ID, 'test-client-id',  Date.now() + 100000, '*', callback);
         }
 
     ], done);
@@ -78,8 +77,6 @@ function cleanup(done) {
 }
 
 describe('Eventlog API', function () {
-    this.timeout(10000);
-
     before(setup);
     after(cleanup);
 
@@ -114,7 +111,7 @@ describe('Eventlog API', function () {
                 });
         });
 
-        it('succeeds with deprecated action', function (done) {
+        it('succeeds with action', function (done) {
             superagent.get(SERVER_URL + '/api/v1/cloudron/eventlog')
                 .query({ access_token: token, page: 1, per_page: 10, action: 'cloudron.activate' })
                 .end(function (error, result) {
@@ -125,17 +122,6 @@ describe('Eventlog API', function () {
                 });
         });
 
-        it('succeeds with actions', function (done) {
-            superagent.get(SERVER_URL + '/api/v1/cloudron/eventlog')
-                .query({ access_token: token, page: 1, per_page: 10, actions: 'cloudron.activate, user.add' })
-                .end(function (error, result) {
-                    expect(result.statusCode).to.equal(200);
-                    expect(result.body.eventlogs.length).to.equal(3);
-
-                    done();
-                });
-        });
-
         it('succeeds with search', function (done) {
             superagent.get(SERVER_URL + '/api/v1/cloudron/eventlog')
                 .query({ access_token: token, page: 1, per_page: 10, search: EMAIL })
@@ -149,7 +135,7 @@ describe('Eventlog API', function () {
 
         it('succeeds with search', function (done) {
             superagent.get(SERVER_URL + '/api/v1/cloudron/eventlog')
-                .query({ access_token: token, page: 1, per_page: 10, search: EMAIL, actions: 'cloudron.activate' })
+                .query({ access_token: token, page: 1, per_page: 10, search: EMAIL, action: 'cloudron.activate' })
                 .end(function (error, result) {
                     expect(result.statusCode).to.equal(200);
                     expect(result.body.eventlogs.length).to.equal(0);

src/routes/test/groups-test.js

@@ -6,8 +6,7 @@
 
 'use strict';
 
-var accesscontrol = require('../../accesscontrol.js'),
-    async = require('async'),
+var async = require('async'),
     config = require('../../config.js'),
     database = require('../../database.js'),
     expect = require('expect.js'),
@@ -46,7 +45,7 @@ function setup(done) {
                     // stash token for further use
                     token = result.body.token;
 
-                    superagent.get(SERVER_URL + '/api/v1/user/profile')
+                    superagent.get(SERVER_URL + '/api/v1/profile')
                         .query({ access_token: token })
                         .end(function (error, result) {
                             expect(result).to.be.ok();
@@ -70,7 +69,7 @@ function setup(done) {
                     userId_1 = result.body.id;
 
                     // HACK to get a token for second user (passwords are generated and the user should have gotten a password setup link...)
-                    tokendb.add(token_1, userId_1, 'test-client-id',  Date.now() + 100000, accesscontrol.SCOPE_PROFILE, callback);
+                    tokendb.add(token_1, userId_1, 'test-client-id',  Date.now() + 100000, '*', callback);
                 });
         }
     ], done);
@@ -280,20 +279,6 @@ describe('Groups API', function () {
                 });
         });
 
-        it('can add user_1 to admin', function (done) {
-            superagent.put(SERVER_URL + '/api/v1/users/' + userId_1 + '/groups')
-                .query({ access_token: token })
-                .send({ groupIds: [ 'admin' ]})
-                .end(function (error, result) {
-                    expect(result.statusCode).to.equal(204);
-
-                    token_1 = tokendb.generateToken();
-
-                    // HACK to get a token for second user (passwords are generated and the user should have gotten a password setup link...)
-                    tokendb.add(token_1, userId_1, 'test-client-id',  Date.now() + 100000, accesscontrol.SCOPE_ANY, done);
-                });
-        });
-
         it('remove activation user from admin', function (done) {
             superagent.put(SERVER_URL + '/api/v1/users/' + userId + '/groups')
                 .query({ access_token: token_1 })

src/routes/test/mail-test.js

@@ -26,10 +26,11 @@ const DOMAIN_0 = {
     fallbackCertificate: null,
     tlsConfig: { provider: 'fallback' }
 };
-const USERNAME = 'superadmin', PASSWORD = 'Foobar?1337', EMAIL ='silly@me.com', MAILBOX_NAME = 'superman';
-const LIST_NAME = 'devs';
+var USERNAME = 'superadmin', PASSWORD = 'Foobar?1337', EMAIL ='silly@me.com';
+const GROUP_NAME = 'maillistgroup';
 var token = null;
 var userId = '';
+var groupObject = null;
 
 function setup(done) {
     config._reset();
@@ -78,7 +79,7 @@ function cleanup(done) {
 }
 
 describe('Mail API', function () {
-    this.timeout(10000);
+    this.timeout(5000);
 
     before(setup);
     after(cleanup);
@@ -197,18 +198,16 @@ describe('Mail API', function () {
         this.timeout(10000);
 
         before(function (done) {
-            var dns = require('../../native-dns.js');
+            var dig = require('../../dig.js');
 
             // replace dns resolveTxt()
-            resolve = dns.resolve;
-            dns.resolve = function (hostname, type, options, callback) {
+            resolve = dig.resolve;
+            dig.resolve = function (hostname, type, options, callback) {
                 expect(hostname).to.be.a('string');
                 expect(callback).to.be.a('function');
 
                 if (!dnsAnswerQueue[hostname] || !(type in dnsAnswerQueue[hostname])) return callback(new Error('no mock answer'));
 
-                if (dnsAnswerQueue[hostname][type] === null) return callback(new Error({ code: 'ENODATA'} ));
-
                 callback(null, dnsAnswerQueue[hostname][type]);
             };
 
@@ -223,13 +222,13 @@ describe('Mail API', function () {
                 .end(function (err, res) {
                     expect(res.statusCode).to.equal(201);
                     done();
-                });
+            });
         });
 
         after(function (done) {
-            var dns = require('../../native-dns.js');
+            var dig = require('../../dig.js');
 
-            dns.resolve = resolve;
+            dig.resolve = resolve;
 
             superagent.del(SERVER_URL + '/api/v1/mail/' + DOMAIN_0.domain)
                 .send({ password: PASSWORD })
@@ -269,20 +268,20 @@ describe('Mail API', function () {
                     expect(res.body.dns.dkim.domain).to.eql(dkimDomain);
                     expect(res.body.dns.dkim.type).to.eql('TXT');
                     expect(res.body.dns.dkim.value).to.eql(null);
-                    expect(res.body.dns.dkim.expected).to.eql('v=DKIM1; t=s; p=' + mail._readDkimPublicKeySync(DOMAIN_0.domain));
+                    expect(res.body.dns.dkim.expected).to.eql('"v=DKIM1; t=s; p=' + mail._readDkimPublicKeySync(DOMAIN_0.domain) + '"');
                     expect(res.body.dns.dkim.status).to.eql(false);
 
                     expect(res.body.dns.spf).to.be.an('object');
                     expect(res.body.dns.spf.domain).to.eql(spfDomain);
                     expect(res.body.dns.spf.type).to.eql('TXT');
                     expect(res.body.dns.spf.value).to.eql(null);
-                    expect(res.body.dns.spf.expected).to.eql('v=spf1 a:' + config.adminFqdn() + ' ~all');
+                    expect(res.body.dns.spf.expected).to.eql('"v=spf1 a:' + config.adminFqdn() + ' ~all"');
                     expect(res.body.dns.spf.status).to.eql(false);
 
                     expect(res.body.dns.dmarc).to.be.an('object');
                     expect(res.body.dns.dmarc.type).to.eql('TXT');
                     expect(res.body.dns.dmarc.value).to.eql(null);
-                    expect(res.body.dns.dmarc.expected).to.eql('v=DMARC1; p=reject; pct=100');
+                    expect(res.body.dns.dmarc.expected).to.eql('"v=DMARC1; p=reject; pct=100"');
                     expect(res.body.dns.dmarc.status).to.eql(false);
 
                     expect(res.body.dns.mx).to.be.an('object');
@@ -294,7 +293,7 @@ describe('Mail API', function () {
                     expect(res.body.dns.ptr).to.be.an('object');
                     expect(res.body.dns.ptr.type).to.eql('PTR');
                     // expect(res.body.ptr.value).to.eql(null); this will be anything random
-                    expect(res.body.dns.ptr.expected).to.eql(config.mailFqdn());
+                    expect(res.body.dns.ptr.expected).to.eql(config.mailFqdn() + '.');
                     expect(res.body.dns.ptr.status).to.eql(false);
 
                     done();
@@ -315,17 +314,17 @@ describe('Mail API', function () {
                     expect(res.statusCode).to.equal(200);
 
                     expect(res.body.dns.spf).to.be.an('object');
-                    expect(res.body.dns.spf.expected).to.eql('v=spf1 a:' + config.adminFqdn() + ' ~all');
+                    expect(res.body.dns.spf.expected).to.eql('"v=spf1 a:' + config.adminFqdn() + ' ~all"');
                     expect(res.body.dns.spf.status).to.eql(false);
                     expect(res.body.dns.spf.value).to.eql(null);
 
                     expect(res.body.dns.dkim).to.be.an('object');
-                    expect(res.body.dns.dkim.expected).to.eql('v=DKIM1; t=s; p=' + mail._readDkimPublicKeySync(DOMAIN_0.domain));
+                    expect(res.body.dns.dkim.expected).to.eql('"v=DKIM1; t=s; p=' + mail._readDkimPublicKeySync(DOMAIN_0.domain) + '"');
                     expect(res.body.dns.dkim.status).to.eql(false);
                     expect(res.body.dns.dkim.value).to.eql(null);
 
                     expect(res.body.dns.dmarc).to.be.an('object');
-                    expect(res.body.dns.dmarc.expected).to.eql('v=DMARC1; p=reject; pct=100');
+                    expect(res.body.dns.dmarc.expected).to.eql('"v=DMARC1; p=reject; pct=100"');
                     expect(res.body.dns.dmarc.status).to.eql(false);
                     expect(res.body.dns.dmarc.value).to.eql(null);
 
@@ -335,7 +334,7 @@ describe('Mail API', function () {
                     expect(res.body.dns.mx.value).to.eql(null);
 
                     expect(res.body.dns.ptr).to.be.an('object');
-                    expect(res.body.dns.ptr.expected).to.eql(config.mailFqdn());
+                    expect(res.body.dns.ptr.expected).to.eql(config.mailFqdn() + '.');
                     expect(res.body.dns.ptr.status).to.eql(false);
                     // expect(res.body.ptr.value).to.eql(null); this will be anything random
 
@@ -346,10 +345,10 @@ describe('Mail API', function () {
         it('succeeds with all different spf, dkim, dmarc, mx, ptr records', function (done) {
             clearDnsAnswerQueue();
 
-            dnsAnswerQueue[mxDomain].MX = [ { priority: '20', exchange: config.mailFqdn() }, { priority: '30', exchange: config.mailFqdn() } ];
-            dnsAnswerQueue[dmarcDomain].TXT = [['v=DMARC2; p=reject; pct=100']];
-            dnsAnswerQueue[dkimDomain].TXT = [['v=DKIM2; t=s; p=' + mail._readDkimPublicKeySync(DOMAIN_0.domain)]];
-            dnsAnswerQueue[spfDomain].TXT = [['v=spf1 a:random.com ~all']];
+            dnsAnswerQueue[mxDomain].MX = [ { priority: '20', exchange: config.mailFqdn() + '.' }, { priority: '30', exchange: config.mailFqdn() + '.'} ];
+            dnsAnswerQueue[dmarcDomain].TXT = ['"v=DMARC2; p=reject; pct=100"'];
+            dnsAnswerQueue[dkimDomain].TXT = ['"v=DKIM2; t=s; p=' + mail._readDkimPublicKeySync(DOMAIN_0.domain) + '"'];
+            dnsAnswerQueue[spfDomain].TXT = ['"v=spf1 a:random.com ~all"'];
 
             superagent.get(SERVER_URL + '/api/v1/mail/' + DOMAIN_0.domain + '/status')
                 .query({ access_token: token })
@@ -357,19 +356,19 @@ describe('Mail API', function () {
                     expect(res.statusCode).to.equal(200);
 
                     expect(res.body.dns.spf).to.be.an('object');
-                    expect(res.body.dns.spf.expected).to.eql('v=spf1 a:' + config.adminFqdn() + ' a:random.com ~all');
+                    expect(res.body.dns.spf.expected).to.eql('"v=spf1 a:' + config.adminFqdn() + ' a:random.com ~all"');
                     expect(res.body.dns.spf.status).to.eql(false);
-                    expect(res.body.dns.spf.value).to.eql('v=spf1 a:random.com ~all');
+                    expect(res.body.dns.spf.value).to.eql('"v=spf1 a:random.com ~all"');
 
                     expect(res.body.dns.dkim).to.be.an('object');
-                    expect(res.body.dns.dkim.expected).to.eql('v=DKIM1; t=s; p=' + mail._readDkimPublicKeySync(DOMAIN_0.domain));
+                    expect(res.body.dns.dkim.expected).to.eql('"v=DKIM1; t=s; p=' + mail._readDkimPublicKeySync(DOMAIN_0.domain) + '"');
                     expect(res.body.dns.dkim.status).to.eql(false);
-                    expect(res.body.dns.dkim.value).to.eql('v=DKIM2; t=s; p=' + mail._readDkimPublicKeySync(DOMAIN_0.domain));
+                    expect(res.body.dns.dkim.value).to.eql('"v=DKIM2; t=s; p=' + mail._readDkimPublicKeySync(DOMAIN_0.domain) + '"');
 
                     expect(res.body.dns.dmarc).to.be.an('object');
-                    expect(res.body.dns.dmarc.expected).to.eql('v=DMARC1; p=reject; pct=100');
+                    expect(res.body.dns.dmarc.expected).to.eql('"v=DMARC1; p=reject; pct=100"');
                     expect(res.body.dns.dmarc.status).to.eql(false);
-                    expect(res.body.dns.dmarc.value).to.eql('v=DMARC2; p=reject; pct=100');
+                    expect(res.body.dns.dmarc.value).to.eql('"v=DMARC2; p=reject; pct=100"');
 
                     expect(res.body.dns.mx).to.be.an('object');
                     expect(res.body.dns.mx.status).to.eql(false);
@@ -377,7 +376,7 @@ describe('Mail API', function () {
                     expect(res.body.dns.mx.value).to.eql('20 ' + config.mailFqdn() + '. 30 ' + config.mailFqdn() + '.');
 
                     expect(res.body.dns.ptr).to.be.an('object');
-                    expect(res.body.dns.ptr.expected).to.eql(config.mailFqdn());
+                    expect(res.body.dns.ptr.expected).to.eql(config.mailFqdn() + '.');
                     expect(res.body.dns.ptr.status).to.eql(false);
                     // expect(res.body.ptr.value).to.eql(null); this will be anything random
 
@@ -390,7 +389,7 @@ describe('Mail API', function () {
         it('succeeds with existing embedded spf', function (done) {
             clearDnsAnswerQueue();
 
-            dnsAnswerQueue[spfDomain].TXT = [['v=spf1 a:example.com a:' + config.mailFqdn() + ' ~all']];
+            dnsAnswerQueue[spfDomain].TXT = ['"v=spf1 a:example.com a:' + config.mailFqdn() + ' ~all"'];
 
             superagent.get(SERVER_URL + '/api/v1/mail/' + DOMAIN_0.domain + '/status')
                 .query({ access_token: token })
@@ -400,8 +399,8 @@ describe('Mail API', function () {
                     expect(res.body.dns.spf).to.be.an('object');
                     expect(res.body.dns.spf.domain).to.eql(spfDomain);
                     expect(res.body.dns.spf.type).to.eql('TXT');
-                    expect(res.body.dns.spf.value).to.eql('v=spf1 a:example.com a:' + config.mailFqdn() + ' ~all');
-                    expect(res.body.dns.spf.expected).to.eql('v=spf1 a:example.com a:' + config.mailFqdn() + ' ~all');
+                    expect(res.body.dns.spf.value).to.eql('"v=spf1 a:example.com a:' + config.mailFqdn() + ' ~all"');
+                    expect(res.body.dns.spf.expected).to.eql('"v=spf1 a:example.com a:' + config.mailFqdn() + ' ~all"');
                     expect(res.body.dns.spf.status).to.eql(true);
 
                     done();
@@ -411,10 +410,10 @@ describe('Mail API', function () {
         it('succeeds with all correct records', function (done) {
             clearDnsAnswerQueue();
 
-            dnsAnswerQueue[mxDomain].MX = [ { priority: '10', exchange: config.mailFqdn() } ];
-            dnsAnswerQueue[dmarcDomain].TXT = [['v=DMARC1; p=reject; pct=100']];
-            dnsAnswerQueue[dkimDomain].TXT = [['v=DKIM1; t=s; p=', mail._readDkimPublicKeySync(DOMAIN_0.domain) ]];
-            dnsAnswerQueue[spfDomain].TXT = [['v=spf1 a:' + config.adminFqdn() + ' ~all']];
+            dnsAnswerQueue[mxDomain].MX = [ { priority: '10', exchange: config.mailFqdn() + '.' } ];
+            dnsAnswerQueue[dmarcDomain].TXT = ['"v=DMARC1; p=reject; pct=100"'];
+            dnsAnswerQueue[dkimDomain].TXT = ['"v=DKIM1; t=s; p=' + mail._readDkimPublicKeySync(DOMAIN_0.domain) + '"'];
+            dnsAnswerQueue[spfDomain].TXT = ['"v=spf1 a:' + config.adminFqdn() + ' ~all"'];
 
             superagent.get(SERVER_URL + '/api/v1/mail/' + DOMAIN_0.domain + '/status')
                 .query({ access_token: token })
@@ -424,21 +423,21 @@ describe('Mail API', function () {
                     expect(res.body.dns.dkim).to.be.an('object');
                     expect(res.body.dns.dkim.domain).to.eql(dkimDomain);
                     expect(res.body.dns.dkim.type).to.eql('TXT');
-                    expect(res.body.dns.dkim.value).to.eql('v=DKIM1; t=s; p=' + mail._readDkimPublicKeySync(DOMAIN_0.domain));
-                    expect(res.body.dns.dkim.expected).to.eql('v=DKIM1; t=s; p=' + mail._readDkimPublicKeySync(DOMAIN_0.domain));
+                    expect(res.body.dns.dkim.value).to.eql('"v=DKIM1; t=s; p=' + mail._readDkimPublicKeySync(DOMAIN_0.domain) + '"');
+                    expect(res.body.dns.dkim.expected).to.eql('"v=DKIM1; t=s; p=' + mail._readDkimPublicKeySync(DOMAIN_0.domain) + '"');
                     expect(res.body.dns.dkim.status).to.eql(true);
 
                     expect(res.body.dns.spf).to.be.an('object');
                     expect(res.body.dns.spf.domain).to.eql(spfDomain);
                     expect(res.body.dns.spf.type).to.eql('TXT');
-                    expect(res.body.dns.spf.value).to.eql('v=spf1 a:' + config.adminFqdn() + ' ~all');
-                    expect(res.body.dns.spf.expected).to.eql('v=spf1 a:' + config.adminFqdn() + ' ~all');
+                    expect(res.body.dns.spf.value).to.eql('"v=spf1 a:' + config.adminFqdn() + ' ~all"');
+                    expect(res.body.dns.spf.expected).to.eql('"v=spf1 a:' + config.adminFqdn() + ' ~all"');
                     expect(res.body.dns.spf.status).to.eql(true);
 
                     expect(res.body.dns.dmarc).to.be.an('object');
-                    expect(res.body.dns.dmarc.expected).to.eql('v=DMARC1; p=reject; pct=100');
+                    expect(res.body.dns.dmarc.expected).to.eql('"v=DMARC1; p=reject; pct=100"');
                     expect(res.body.dns.dmarc.status).to.eql(true);
-                    expect(res.body.dns.dmarc.value).to.eql('v=DMARC1; p=reject; pct=100');
+                    expect(res.body.dns.dmarc.value).to.eql('"v=DMARC1; p=reject; pct=100"');
 
                     expect(res.body.dns.mx).to.be.an('object');
                     expect(res.body.dns.mx.status).to.eql(true);
@@ -458,7 +457,7 @@ describe('Mail API', function () {
                 .end(function (err, res) {
                     expect(res.statusCode).to.equal(201);
                     done();
-                });
+            });
         });
 
         after(function (done) {
@@ -510,7 +509,7 @@ describe('Mail API', function () {
                 .end(function (err, res) {
                     expect(res.statusCode).to.equal(201);
                     done();
-                });
+            });
         });
 
         after(function (done) {
@@ -533,7 +532,7 @@ describe('Mail API', function () {
                 });
         });
 
-        it('cannot set without addresses field', function (done) {
+        it('cannot set without address field', function (done) {
             superagent.post(SERVER_URL + '/api/v1/mail/' + DOMAIN_0.domain + '/catch_all')
                 .query({ access_token: token })
                 .end(function (err, res) {
@@ -542,10 +541,10 @@ describe('Mail API', function () {
                 });
         });
 
-        it('cannot set with bad addresses field', function (done) {
+        it('cannot set with bad address field', function (done) {
             superagent.post(SERVER_URL + '/api/v1/mail/' + DOMAIN_0.domain + '/catch_all')
                 .query({ access_token: token })
-                .send({ addresses: [ 'user1', 123 ] })
+                .send({ address: [ 'user1', 123 ] })
                 .end(function (err, res) {
                     expect(res.statusCode).to.equal(400);
                     done();
@@ -555,7 +554,7 @@ describe('Mail API', function () {
         it('set succeeds', function (done) {
             superagent.post(SERVER_URL + '/api/v1/mail/' + DOMAIN_0.domain + '/catch_all')
                 .query({ access_token: token })
-                .send({ addresses: [ 'user1' ] })
+                .send({ address: [ 'user1' ] })
                 .end(function (err, res) {
                     expect(res.statusCode).to.equal(202);
                     done();
@@ -581,7 +580,7 @@ describe('Mail API', function () {
                 .end(function (err, res) {
                     expect(res.statusCode).to.equal(201);
                     done();
-                });
+            });
         });
 
         after(function (done) {
@@ -659,7 +658,7 @@ describe('Mail API', function () {
                 .end(function (err, res) {
                     expect(res.statusCode).to.equal(201);
                     done();
-                });
+            });
         });
 
         after(function (done) {
@@ -672,9 +671,17 @@ describe('Mail API', function () {
                 });
         });
 
-        it('add succeeds', function (done) {
-            superagent.post(SERVER_URL + '/api/v1/mail/' + DOMAIN_0.domain + '/mailboxes')
-                .send({ name: MAILBOX_NAME, userId: userId })
+        it('add fails if user does not exist', function (done) {
+            superagent.post(SERVER_URL + '/api/v1/mail/' + DOMAIN_0.domain + '/mailboxes/' + 'someuserdoesnotexist')
+                .query({ access_token: token })
+                .end(function (err, res) {
+                    expect(res.statusCode).to.equal(404);
+                    done();
+                });
+        });
+
+        it('add/enable succeeds', function (done) {
+            superagent.post(SERVER_URL + '/api/v1/mail/' + DOMAIN_0.domain + '/mailboxes/' + userId)
                 .query({ access_token: token })
                 .end(function (err, res) {
                     expect(res.statusCode).to.equal(201);
@@ -682,12 +689,11 @@ describe('Mail API', function () {
                 });
         });
 
-        it('cannot add again', function (done) {
-            superagent.post(SERVER_URL + '/api/v1/mail/' + DOMAIN_0.domain + '/mailboxes')
-                .send({ name: MAILBOX_NAME, userId: userId })
+        it('enable again succeeds if already enabled', function (done) {
+            superagent.post(SERVER_URL + '/api/v1/mail/' + DOMAIN_0.domain + '/mailboxes/' + userId)
                 .query({ access_token: token })
                 .end(function (err, res) {
-                    expect(res.statusCode).to.equal(409);
+                    expect(res.statusCode).to.equal(201);
                     done();
                 });
         });
@@ -702,12 +708,12 @@ describe('Mail API', function () {
         });
 
         it('get succeeds', function (done) {
-            superagent.get(SERVER_URL + '/api/v1/mail/' + DOMAIN_0.domain + '/mailboxes/' + MAILBOX_NAME)
+            superagent.get(SERVER_URL + '/api/v1/mail/' + DOMAIN_0.domain + '/mailboxes/' + userId)
                 .query({ access_token: token })
                 .end(function (err, res) {
                     expect(res.statusCode).to.equal(200);
                     expect(res.body.mailbox).to.be.an('object');
-                    expect(res.body.mailbox.name).to.equal(MAILBOX_NAME);
+                    expect(res.body.mailbox.name).to.equal(USERNAME);
                     expect(res.body.mailbox.ownerId).to.equal(userId);
                     expect(res.body.mailbox.ownerType).to.equal('user');
                     expect(res.body.mailbox.aliasTarget).to.equal(null);
@@ -723,7 +729,7 @@ describe('Mail API', function () {
                     expect(res.statusCode).to.equal(200);
                     expect(res.body.mailboxes.length).to.eql(1);
                     expect(res.body.mailboxes[0]).to.be.an('object');
-                    expect(res.body.mailboxes[0].name).to.equal(MAILBOX_NAME);
+                    expect(res.body.mailboxes[0].name).to.equal(USERNAME);
                     expect(res.body.mailboxes[0].ownerId).to.equal(userId);
                     expect(res.body.mailboxes[0].ownerType).to.equal('user');
                     expect(res.body.mailboxes[0].aliasTarget).to.equal(null);
@@ -732,21 +738,21 @@ describe('Mail API', function () {
                 });
         });
 
-        it('disable fails even if not exist', function (done) {
+        it('disable succeeds even if not exist', function (done) {
             superagent.del(SERVER_URL + '/api/v1/mail/' + DOMAIN_0.domain + '/mailboxes/' + 'someuserdoesnotexist')
                 .query({ access_token: token })
                 .end(function (err, res) {
-                    expect(res.statusCode).to.equal(404);
+                    expect(res.statusCode).to.equal(201);
                     done();
                 });
         });
 
         it('disable succeeds', function (done) {
-            superagent.del(SERVER_URL + '/api/v1/mail/' + DOMAIN_0.domain + '/mailboxes/' + MAILBOX_NAME)
+            superagent.del(SERVER_URL + '/api/v1/mail/' + DOMAIN_0.domain + '/mailboxes/' + userId)
                 .query({ access_token: token })
                 .end(function (err, res) {
                     expect(res.statusCode).to.equal(201);
-                    superagent.get(SERVER_URL + '/api/v1/mail/' + DOMAIN_0.domain + '/mailboxes/' + MAILBOX_NAME)
+                    superagent.get(SERVER_URL + '/api/v1/mail/' + DOMAIN_0.domain + '/mailboxes/' + userId)
                         .query({ access_token: token })
                         .end(function (err, res) {
                             expect(res.statusCode).to.equal(404);
@@ -764,25 +770,21 @@ describe('Mail API', function () {
                 .end(function (err, res) {
                     expect(res.statusCode).to.equal(201);
                     done();
-                });
-        });
-
-        after(function (done) {
-            mail.removeMailboxes(DOMAIN_0.domain, function (error) {
-                if (error) return done(error);
-
-                superagent.del(SERVER_URL + '/api/v1/mail/' + DOMAIN_0.domain)
-                    .send({ password: PASSWORD })
-                    .query({ access_token: token })
-                    .end(function (err, res) {
-                        expect(res.statusCode).to.equal(204);
-                        done();
-                    });
             });
         });
 
+        after(function (done) {
+            superagent.del(SERVER_URL + '/api/v1/mail/' + DOMAIN_0.domain)
+                .send({ password: PASSWORD })
+                .query({ access_token: token })
+                .end(function (err, res) {
+                    expect(res.statusCode).to.equal(204);
+                    done();
+                });
+        });
+
         it('set fails if aliases is missing', function (done) {
-            superagent.put(SERVER_URL + '/api/v1/mail/' + DOMAIN_0.domain + '/aliases/' + MAILBOX_NAME)
+            superagent.put(SERVER_URL + '/api/v1/mail/' + DOMAIN_0.domain + '/aliases/' + userId)
                 .query({ access_token: token })
                 .end(function (err, res) {
                     expect(res.statusCode).to.equal(400);
@@ -801,7 +803,7 @@ describe('Mail API', function () {
         });
 
         it('set fails if aliases is the wrong type', function (done) {
-            superagent.put(SERVER_URL + '/api/v1/mail/' + DOMAIN_0.domain + '/aliases/' + MAILBOX_NAME)
+            superagent.put(SERVER_URL + '/api/v1/mail/' + DOMAIN_0.domain + '/aliases/' + userId)
                 .send({ aliases: 'hello, there' })
                 .query({ access_token: token })
                 .end(function (err, res) {
@@ -811,7 +813,7 @@ describe('Mail API', function () {
         });
 
         it('set fails if user is not enabled', function (done) {
-            superagent.put(SERVER_URL + '/api/v1/mail/' + DOMAIN_0.domain + '/aliases/' + MAILBOX_NAME)
+            superagent.put(SERVER_URL + '/api/v1/mail/' + DOMAIN_0.domain + '/aliases/' + userId)
                 .send({ aliases: ['hello', 'there'] })
                 .query({ access_token: token })
                 .end(function (err, res) {
@@ -820,9 +822,8 @@ describe('Mail API', function () {
                 });
         });
 
-        it('now add the mailbox', function (done) {
-            superagent.post(SERVER_URL + '/api/v1/mail/' + DOMAIN_0.domain + '/mailboxes')
-                .send({ name: MAILBOX_NAME, userId: userId })
+        it('now enable the user', function (done) {
+            superagent.post(SERVER_URL + '/api/v1/mail/' + DOMAIN_0.domain + '/mailboxes/' + userId)
                 .query({ access_token: token })
                 .end(function (err, res) {
                     expect(res.statusCode).to.equal(201);
@@ -831,7 +832,7 @@ describe('Mail API', function () {
         });
 
         it('set succeeds', function (done) {
-            superagent.put(SERVER_URL + '/api/v1/mail/' + DOMAIN_0.domain + '/aliases/' + MAILBOX_NAME)
+            superagent.put(SERVER_URL + '/api/v1/mail/' + DOMAIN_0.domain + '/aliases/' + userId)
                 .send({ aliases: ['hello', 'there'] })
                 .query({ access_token: token })
                 .end(function (err, res) {
@@ -841,7 +842,7 @@ describe('Mail API', function () {
         });
 
         it('get succeeds', function (done) {
-            superagent.get(SERVER_URL + '/api/v1/mail/' + DOMAIN_0.domain + '/aliases/' + MAILBOX_NAME)
+            superagent.get(SERVER_URL + '/api/v1/mail/' + DOMAIN_0.domain + '/aliases/' + userId)
                 .query({ access_token: token })
                 .end(function (err, res) {
                     expect(res.statusCode).to.equal(200);
@@ -850,27 +851,7 @@ describe('Mail API', function () {
                 });
         });
 
-        it('listing succeeds', function (done) {
-            superagent.get(SERVER_URL + '/api/v1/mail/' + DOMAIN_0.domain + '/aliases')
-                .query({ access_token: token })
-                .end(function (err, res) {
-                    expect(res.statusCode).to.equal(200);
-                    expect(res.body.aliases.length).to.eql(2);
-                    expect(res.body.aliases[0].name).to.equal('hello');
-                    expect(res.body.aliases[0].ownerId).to.equal(userId);
-                    expect(res.body.aliases[0].ownerType).to.equal('user');
-                    expect(res.body.aliases[0].aliasTarget).to.equal(MAILBOX_NAME);
-                    expect(res.body.aliases[0].domain).to.equal(DOMAIN_0.domain);
-                    expect(res.body.aliases[1].name).to.equal('there');
-                    expect(res.body.aliases[1].ownerId).to.equal(userId);
-                    expect(res.body.aliases[1].ownerType).to.equal('user');
-                    expect(res.body.aliases[1].aliasTarget).to.equal(MAILBOX_NAME);
-                    expect(res.body.aliases[1].domain).to.equal(DOMAIN_0.domain);
-                    done();
-                });
-        });
-
-        it('get fails if mailbox does not exist', function (done) {
+        it('get succeeds if mailbox does not exist', function (done) {
             superagent.get(SERVER_URL + '/api/v1/mail/' + DOMAIN_0.domain + '/aliases/' + 'someuserdoesnotexist')
                 .query({ access_token: token })
                 .end(function (err, res) {
@@ -891,22 +872,37 @@ describe('Mail API', function () {
                             expect(res.statusCode).to.equal(201);
                             done();
                         });
+                },
+                function (done) {
+                    superagent.post(SERVER_URL + '/api/v1/groups')
+                        .query({ access_token: token })
+                        .send({ name: GROUP_NAME})
+                        .end(function (error, result) {
+                            expect(result.statusCode).to.equal(201);
+                            groupObject = result.body;
+                            done();
+                        });
+                },
+                function (done) {
+                    superagent.put(SERVER_URL + '/api/v1/users/' + userId + '/groups')
+                        .query({ access_token: token })
+                        .send({ groupIds: [ 'admin', groupObject.id ]})
+                        .end(function (error, result) {
+                            expect(result.statusCode).to.equal(204);
+                            done();
+                        });
                 }
             ], done);
         });
 
         after(function (done) {
-            mail.removeMailboxes(DOMAIN_0.domain, function (error) {
-                if (error) return done(error);
-
-                superagent.del(SERVER_URL + '/api/v1/mail/' + DOMAIN_0.domain)
-                    .send({ password: PASSWORD })
-                    .query({ access_token: token })
-                    .end(function (err, res) {
-                        expect(res.statusCode).to.equal(204);
-                        done();
-                    });
-            });
+            superagent.del(SERVER_URL + '/api/v1/mail/' + DOMAIN_0.domain)
+                .send({ password: PASSWORD })
+                .query({ access_token: token })
+                .end(function (err, res) {
+                    expect(res.statusCode).to.equal(204);
+                    done();
+                });
         });
 
         it('add fails without groupId', function (done) {
@@ -928,19 +924,19 @@ describe('Mail API', function () {
                 });
         });
 
-        it('add fails without members array', function (done) {
+        it('add fails with non-existing groupId', function (done) {
             superagent.post(SERVER_URL + '/api/v1/mail/' + DOMAIN_0.domain + '/lists')
-                .send({ name: LIST_NAME })
+                .send({ groupId: 'doesnotexist' })
                 .query({ access_token: token })
                 .end(function (err, res) {
-                    expect(res.statusCode).to.equal(400);
+                    expect(res.statusCode).to.equal(404);
                     done();
                 });
         });
 
         it('add succeeds', function (done) {
             superagent.post(SERVER_URL + '/api/v1/mail/' + DOMAIN_0.domain + '/lists')
-                .send({ name: LIST_NAME, members: [ 'admin2', USERNAME ]})
+                .send({ groupId: groupObject.id })
                 .query({ access_token: token })
                 .end(function (err, res) {
                     expect(res.statusCode).to.equal(201);
@@ -950,7 +946,7 @@ describe('Mail API', function () {
 
         it('add twice fails', function (done) {
             superagent.post(SERVER_URL + '/api/v1/mail/' + DOMAIN_0.domain + '/lists')
-                .send({ name: LIST_NAME, members: [ 'admin2', USERNAME ] })
+                .send({ groupId: groupObject.id })
                 .query({ access_token: token })
                 .end(function (err, res) {
                     expect(res.statusCode).to.equal(409);
@@ -968,17 +964,17 @@ describe('Mail API', function () {
         });
 
         it('get succeeds', function (done) {
-            superagent.get(SERVER_URL + `/api/v1/mail/${DOMAIN_0.domain}/lists/${LIST_NAME}`)
+            superagent.get(SERVER_URL + '/api/v1/mail/' + DOMAIN_0.domain + '/lists/' + groupObject.id)
                 .query({ access_token: token })
                 .end(function (err, res) {
                     expect(res.statusCode).to.equal(200);
                     expect(res.body.list).to.be.an('object');
-                    expect(res.body.list.name).to.equal(LIST_NAME);
-                    expect(res.body.list.ownerId).to.equal('admin');
+                    expect(res.body.list.name).to.equal(GROUP_NAME);
+                    expect(res.body.list.ownerId).to.equal(groupObject.id);
                     expect(res.body.list.ownerType).to.equal('group');
                     expect(res.body.list.aliasTarget).to.equal(null);
                     expect(res.body.list.domain).to.equal(DOMAIN_0.domain);
-                    expect(res.body.list.members).to.eql([ 'admin2', 'superadmin' ]);
+                    expect(res.body.list.members).to.eql([ 'superadmin' ]);
                     done();
                 });
         });
@@ -990,12 +986,11 @@ describe('Mail API', function () {
                     expect(res.statusCode).to.equal(200);
                     expect(res.body.lists).to.be.an(Array);
                     expect(res.body.lists.length).to.equal(1);
-                    expect(res.body.lists[0].name).to.equal(LIST_NAME);
-                    expect(res.body.lists[0].ownerId).to.equal('admin');
+                    expect(res.body.lists[0].name).to.equal(GROUP_NAME);
+                    expect(res.body.lists[0].ownerId).to.equal(groupObject.id);
                     expect(res.body.lists[0].ownerType).to.equal('group');
                     expect(res.body.lists[0].aliasTarget).to.equal(null);
                     expect(res.body.lists[0].domain).to.equal(DOMAIN_0.domain);
-                    expect(res.body.lists[0].members).to.eql([ 'admin2', 'superadmin' ]);
                     done();
                 });
         });
@@ -1010,12 +1005,12 @@ describe('Mail API', function () {
         });
 
         it('del succeeds', function (done) {
-            superagent.del(SERVER_URL + '/api/v1/mail/' + DOMAIN_0.domain + '/lists/' + LIST_NAME)
+            superagent.del(SERVER_URL + '/api/v1/mail/' + DOMAIN_0.domain + '/lists/' + groupObject.id)
                 .query({ access_token: token })
                 .end(function (err, res) {
                     expect(res.statusCode).to.equal(204);
 
-                    superagent.get(SERVER_URL + '/api/v1/mail/' + DOMAIN_0.domain + '/lists/' + LIST_NAME)
+                    superagent.get(SERVER_URL + '/api/v1/mail/' + DOMAIN_0.domain + '/lists/' + groupObject.id)
                         .query({ access_token: token })
                         .end(function (err, res) {
                             expect(res.statusCode).to.equal(404);

src/routes/test/oauth2-test.js

@@ -6,32 +6,137 @@
 
 'use strict';
 
-var accesscontrol = require('../../accesscontrol.js'),
-    appdb = require('../../appdb.js'),
+var expect = require('expect.js'),
+    uuid = require('uuid'),
     async = require('async'),
-    clientdb = require('../../clientdb.js'),
-    clients = require('../../clients.js'),
-    config = require('../../config.js'),
+    hat = require('hat'),
+    urlParse = require('url').parse,
+    nock = require('nock'),
+    HttpError = require('connect-lastmile').HttpError,
+    oauth2 = require('../oauth2.js'),
+    server = require('../../server.js'),
+    querystring = require('querystring'),
     database = require('../../database.js'),
     domains = require('../../domains.js'),
-    expect = require('expect.js'),
-    hat = require('hat'),
-    nock = require('nock'),
-    oauth2 = require('../oauth2.js'),
-    querystring = require('querystring'),
-    request = require('request'),
-    server = require('../../server.js'),
-    speakeasy = require('speakeasy'),
-    superagent = require('superagent'),
-    urlParse = require('url').parse,
+    clientdb = require('../../clientdb.js'),
+    clients = require('../../clients.js'),
     userdb = require('../../userdb.js'),
-    users = require('../../users.js'),
-    uuid = require('uuid');
+    user = require('../../user.js'),
+    appdb = require('../../appdb.js'),
+    config = require('../../config.js'),
+    request = require('request'),
+    superagent = require('superagent'),
+    passport = require('passport');
 
 var SERVER_URL = 'http://localhost:' + config.get('port');
 
 describe('OAuth2', function () {
 
+    describe('scopes middleware', function () {
+        var passportAuthenticateSave = null;
+
+        before(function () {
+            passportAuthenticateSave = passport.authenticate;
+            passport.authenticate = function () {
+                return function (req, res, next) { next(); };
+            };
+        });
+
+        after(function () {
+            passport.authenticate = passportAuthenticateSave;
+        });
+
+        it('fails due to missing authInfo', function (done) {
+            var mw = oauth2.scope('admin')[1];
+            var req = {};
+
+            mw(req, null, function (error) {
+                expect(error).to.be.a(HttpError);
+                done();
+            });
+        });
+
+        it('fails due to missing scope property in authInfo', function (done) {
+            var mw = oauth2.scope('admin')[1];
+            var req = { authInfo: {} };
+
+            mw(req, null, function (error) {
+                expect(error).to.be.a(HttpError);
+                done();
+            });
+        });
+
+        it('fails due to missing scope in request', function (done) {
+            var mw = oauth2.scope('admin')[1];
+            var req = { authInfo: { scope: '' } };
+
+            mw(req, null, function (error) {
+                expect(error).to.be.a(HttpError);
+                done();
+            });
+        });
+
+        it('fails due to wrong scope in request', function (done) {
+            var mw = oauth2.scope('admin')[1];
+            var req = { authInfo: { scope: 'foobar,something' } };
+
+            mw(req, null, function (error) {
+                expect(error).to.be.a(HttpError);
+                done();
+            });
+        });
+
+        it('fails due to wrong scope in request', function (done) {
+            var mw = oauth2.scope('admin,users')[1];
+            var req = { authInfo: { scope: 'foobar,admin' } };
+
+            mw(req, null, function (error) {
+                expect(error).to.be.a(HttpError);
+                done();
+            });
+        });
+
+        it('succeeds with one requested scope and one provided scope', function (done) {
+            var mw = oauth2.scope('admin')[1];
+            var req = { authInfo: { scope: 'admin' } };
+
+            mw(req, null, function (error) {
+                expect(error).to.not.be.ok();
+                done();
+            });
+        });
+
+        it('succeeds with one requested scope and two provided scopes', function (done) {
+            var mw = oauth2.scope('admin')[1];
+            var req = { authInfo: { scope: 'foobar,admin' } };
+
+            mw(req, null, function (error) {
+                expect(error).to.not.be.ok();
+                done();
+            });
+        });
+
+        it('succeeds with two requested scope and two provided scopes', function (done) {
+            var mw = oauth2.scope('admin,foobar')[1];
+            var req = { authInfo: { scope: 'foobar,admin' } };
+
+            mw(req, null, function (error) {
+                expect(error).to.not.be.ok();
+                done();
+            });
+        });
+
+        it('succeeds with two requested scope and provided wildcard scope', function (done) {
+            var mw = oauth2.scope('admin,foobar')[1];
+            var req = { authInfo: { scope: '*' } };
+
+            mw(req, null, function (error) {
+                expect(error).to.not.be.ok();
+                done();
+            });
+        });
+    });
+
     describe('flow', function () {
         const DOMAIN_0 = {
             domain: 'example.com',
@@ -62,7 +167,8 @@ describe('OAuth2', function () {
             domain: DOMAIN_0.domain,
             portBindings: {},
             accessRestriction: null,
-            memoryLimit: 0
+            memoryLimit: 0,
+            altDomain: null
         };
 
         var APP_1 = {
@@ -73,7 +179,8 @@ describe('OAuth2', function () {
             domain: DOMAIN_0.domain,
             portBindings: {},
             accessRestriction: { users: [ 'foobar' ] },
-            memoryLimit: 0
+            memoryLimit: 0,
+            altDomain: null
         };
 
         var APP_2 = {
@@ -84,7 +191,8 @@ describe('OAuth2', function () {
             domain: DOMAIN_0.domain,
             portBindings: {},
             accessRestriction: { users: [ USER_0.id ] },
-            memoryLimit: 0
+            memoryLimit: 0,
+            altDomain: null
         };
 
         var APP_3 = {
@@ -95,7 +203,8 @@ describe('OAuth2', function () {
             domain: DOMAIN_0.domain,
             portBindings: {},
             accessRestriction: { groups: [ 'someothergroup', 'admin', 'anothergroup' ] },
-            memoryLimit: 0
+            memoryLimit: 0,
+            altDomain: null
         };
 
         // unknown app
@@ -105,7 +214,7 @@ describe('OAuth2', function () {
             type: clients.TYPE_OAUTH,
             clientSecret: 'secret0',
             redirectURI: 'http://redirect0',
-            scope: accesscontrol.SCOPE_PROFILE
+            scope: 'profile'
         };
 
         // unknown app through addon
@@ -115,7 +224,7 @@ describe('OAuth2', function () {
             type: clients.TYPE_OAUTH,
             clientSecret: 'secret1',
             redirectURI: 'http://redirect1',
-            scope: accesscontrol.SCOPE_PROFILE
+            scope: 'profile'
         };
 
         // known app
@@ -125,7 +234,7 @@ describe('OAuth2', function () {
             type: clients.TYPE_OAUTH,
             clientSecret: 'secret2',
             redirectURI: 'http://redirect2',
-            scope: accesscontrol.SCOPE_PROFILE
+            scope: 'profile'
         };
 
         // known app through addon
@@ -135,7 +244,7 @@ describe('OAuth2', function () {
             type: clients.TYPE_OAUTH,
             clientSecret: 'secret3',
             redirectURI: 'http://redirect1',
-            scope: accesscontrol.SCOPE_PROFILE
+            scope: 'profile'
         };
 
         // unknown app through proxy
@@ -145,7 +254,7 @@ describe('OAuth2', function () {
             type: clients.TYPE_PROXY,
             clientSecret: 'secret4',
             redirectURI: 'http://redirect4',
-            scope: accesscontrol.SCOPE_PROFILE
+            scope: 'profile'
         };
 
         // known app through proxy
@@ -155,7 +264,7 @@ describe('OAuth2', function () {
             type: clients.TYPE_PROXY,
             clientSecret: 'secret5',
             redirectURI: 'http://redirect5',
-            scope: accesscontrol.SCOPE_PROFILE
+            scope: 'profile'
         };
 
         // app with accessRestriction not allowing user
@@ -165,7 +274,7 @@ describe('OAuth2', function () {
             type: clients.TYPE_OAUTH,
             clientSecret: 'secret6',
             redirectURI: 'http://redirect6',
-            scope: accesscontrol.SCOPE_PROFILE
+            scope: 'profile'
         };
 
         // app with accessRestriction allowing user
@@ -175,7 +284,7 @@ describe('OAuth2', function () {
             type: clients.TYPE_OAUTH,
             clientSecret: 'secret7',
             redirectURI: 'http://redirect7',
-            scope: accesscontrol.SCOPE_PROFILE
+            scope: 'profile'
         };
 
         // app with accessRestriction allowing group
@@ -185,15 +294,13 @@ describe('OAuth2', function () {
             type: clients.TYPE_OAUTH,
             clientSecret: 'secret9',
             redirectURI: 'http://redirect9',
-            scope: accesscontrol.SCOPE_PROFILE
+            scope: 'profile'
         };
 
         // make csrf always succeed for testing
-        oauth2.csrf = function () {
-            return function (req, res, next) {
-                req.csrfToken = function () { return hat(256); };
-                next();
-            };
+        oauth2.csrf = function (req, res, next) {
+            req.csrfToken = function () { return hat(256); };
+            next();
         };
 
         function setup(done) {
@@ -219,7 +326,7 @@ describe('OAuth2', function () {
                 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) {
-                    users.create(USER_0.username, USER_0.password, USER_0.email, USER_0.displayName, null /* source */, function (error, userObject) {
+                    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();
 
                         // update the global objects to reflect the new user id
@@ -246,60 +353,60 @@ describe('OAuth2', function () {
 
             it('fails due to missing redirect_uri param', function (done) {
                 superagent.get(SERVER_URL + '/api/v1/oauth/dialog/authorize')
-                    .end(function (error, result) {
-                        expect(result.text.indexOf('<!-- error tester -->')).to.not.equal(-1);
-                        expect(result.text.indexOf('Invalid request. redirect_uri query param is not set.')).to.not.equal(-1);
-                        expect(result.statusCode).to.equal(200);
-                        done();
-                    });
+                .end(function (error, result) {
+                    expect(result.text.indexOf('<!-- error tester -->')).to.not.equal(-1);
+                    expect(result.text.indexOf('Invalid request. redirect_uri query param is not set.')).to.not.equal(-1);
+                    expect(result.statusCode).to.equal(200);
+                    done();
+                });
             });
 
             it('fails due to missing client_id param', function (done) {
                 superagent.get(SERVER_URL + '/api/v1/oauth/dialog/authorize?redirect_uri=http://someredirect')
-                    .end(function (error, result) {
-                        expect(result.text.indexOf('<!-- error tester -->')).to.not.equal(-1);
-                        expect(result.text.indexOf('Invalid request. client_id query param is not set.')).to.not.equal(-1);
-                        expect(result.statusCode).to.equal(200);
-                        done();
-                    });
+                .end(function (error, result) {
+                    expect(result.text.indexOf('<!-- error tester -->')).to.not.equal(-1);
+                    expect(result.text.indexOf('Invalid request. client_id query param is not set.')).to.not.equal(-1);
+                    expect(result.statusCode).to.equal(200);
+                    done();
+                });
             });
 
             it('fails due to missing response_type param', function (done) {
                 superagent.get(SERVER_URL + '/api/v1/oauth/dialog/authorize?redirect_uri=http://someredirect&client_id=someclientid')
-                    .end(function (error, result) {
-                        expect(result.text.indexOf('<!-- error tester -->')).to.not.equal(-1);
-                        expect(result.text.indexOf('Invalid request. response_type query param is not set.')).to.not.equal(-1);
-                        expect(result.statusCode).to.equal(200);
-                        done();
-                    });
+                .end(function (error, result) {
+                    expect(result.text.indexOf('<!-- error tester -->')).to.not.equal(-1);
+                    expect(result.text.indexOf('Invalid request. response_type query param is not set.')).to.not.equal(-1);
+                    expect(result.statusCode).to.equal(200);
+                    done();
+                });
             });
 
             it('fails for unkown grant type', function (done) {
                 superagent.get(SERVER_URL + '/api/v1/oauth/dialog/authorize?redirect_uri=http://someredirect&client_id=someclientid&response_type=foobar')
-                    .end(function (error, result) {
-                        expect(result.text.indexOf('<!-- error tester -->')).to.not.equal(-1);
-                        expect(result.text.indexOf('Invalid request. Only token and code response types are supported.')).to.not.equal(-1);
-                        expect(result.statusCode).to.equal(200);
-                        done();
-                    });
+                .end(function (error, result) {
+                    expect(result.text.indexOf('<!-- error tester -->')).to.not.equal(-1);
+                    expect(result.text.indexOf('Invalid request. Only token and code response types are supported.')).to.not.equal(-1);
+                    expect(result.statusCode).to.equal(200);
+                    done();
+                });
             });
 
             it('succeeds for grant type code', function (done) {
                 superagent.get(SERVER_URL + '/api/v1/oauth/dialog/authorize?redirect_uri=http://someredirect&client_id=someclientid&response_type=code')
-                    .end(function (error, result) {
-                        expect(result.text).to.eql('<script>window.location.href = "/api/v1/session/login?returnTo=http://someredirect";</script>');
-                        expect(result.statusCode).to.equal(200);
-                        done();
-                    });
+                .end(function (error, result) {
+                    expect(result.text).to.eql('<script>window.location.href = "/api/v1/session/login?returnTo=http://someredirect";</script>');
+                    expect(result.statusCode).to.equal(200);
+                    done();
+                });
             });
 
             it('succeeds for grant type token', function (done) {
                 superagent.get(SERVER_URL + '/api/v1/oauth/dialog/authorize?redirect_uri=http://someredirect&client_id=someclientid&response_type=token')
-                    .end(function (error, result) {
-                        expect(result.text).to.eql('<script>window.location.href = "/api/v1/session/login?returnTo=http://someredirect";</script>');
-                        expect(result.statusCode).to.equal(200);
-                        done();
-                    });
+                .end(function (error, result) {
+                    expect(result.text).to.eql('<script>window.location.href = "/api/v1/session/login?returnTo=http://someredirect";</script>');
+                    expect(result.statusCode).to.equal(200);
+                    done();
+                });
             });
         });
 
@@ -309,36 +416,36 @@ describe('OAuth2', function () {
 
             it('fails without prior authentication call and not returnTo query', function (done) {
                 superagent.get(SERVER_URL + '/api/v1/session/login')
-                    .end(function (error, result) {
-                        expect(result.text.indexOf('<!-- error tester -->')).to.not.equal(-1);
-                        expect(result.text.indexOf('Invalid login request. No returnTo provided.')).to.not.equal(-1);
-                        expect(result.statusCode).to.equal(200);
+                .end(function (error, result) {
+                    expect(result.text.indexOf('<!-- error tester -->')).to.not.equal(-1);
+                    expect(result.text.indexOf('Invalid login request. No returnTo provided.')).to.not.equal(-1);
+                    expect(result.statusCode).to.equal(200);
 
-                        done();
-                    });
+                    done();
+                });
             });
 
             it('redirects without prior authentication call', function (done) {
                 superagent.get(SERVER_URL + '/api/v1/session/login?returnTo=http://someredirect')
-                    .redirects(0)
-                    .end(function (error, result) {
-                        expect(result.statusCode).to.equal(302);
-                        expect(result.headers.location).to.eql('http://someredirect');
+                .redirects(0)
+                .end(function (error, result) {
+                    expect(result.statusCode).to.equal(302);
+                    expect(result.headers.location).to.eql('http://someredirect');
 
-                        done();
-                    });
+                    done();
+                });
             });
 
             it('fails due to unknown missing client_id', function (done) {
                 superagent.get(SERVER_URL + '/api/v1/oauth/dialog/authorize?redirect_uri=http://someredirect&response_type=code')
-                    .redirects(0)
-                    .end(function (error, result) {
-                        expect(result.text.indexOf('<!-- error tester -->')).to.not.equal(-1);
-                        expect(result.text.indexOf('Invalid request. client_id query param is not set.')).to.not.equal(-1);
-                        expect(result.statusCode).to.equal(200);
+                .redirects(0)
+                .end(function (error, result) {
+                    expect(result.text.indexOf('<!-- error tester -->')).to.not.equal(-1);
+                    expect(result.text.indexOf('Invalid request. client_id query param is not set.')).to.not.equal(-1);
+                    expect(result.statusCode).to.equal(200);
 
-                        done();
-                    });
+                    done();
+                });
             });
 
             it('fails due to unknown oauth client', function (done) {
@@ -588,129 +695,6 @@ describe('OAuth2', function () {
             });
         });
 
-        describe('loginForm 2FA submit', function () {
-            var secret, accessToken;
-
-            before(function (done) {
-                async.series([
-                    setup,
-                    function (callback) {
-                        superagent.post(`${SERVER_URL}/api/v1/developer/login`).send({ username: USER_0.username, password: USER_0.password }).end(function (error, result) {
-                            accessToken = result.body.accessToken;
-                            callback(error);
-                        });
-                    },
-                    function (callback) {
-                        superagent.post(`${SERVER_URL}/api/v1/user/profile/twofactorauthentication`).query({ access_token: accessToken }).end(function (error, result) {
-                            secret = result.body.secret;
-                            callback(error);
-                        });
-                    },
-                    function (callback) {
-                        var totpToken = speakeasy.totp({
-                            secret: secret,
-                            encoding: 'base32'
-                        });
-
-                        superagent.post(`${SERVER_URL}/api/v1/user/profile/twofactorauthentication/enable`).query({ access_token: accessToken }).send({ totpToken: totpToken }).end(function (error, result) {
-                            callback(error);
-                        });
-                    }
-                ], done);
-            });
-
-            after(cleanup);
-
-            function startAuthorizationFlow(client, callback) {
-                var jar = request.jar();
-                var url = SERVER_URL + '/api/v1/oauth/dialog/authorize?redirect_uri=' + client.redirectURI + '&client_id=' + client.id + '&response_type=code';
-
-                request.get(url, { jar: jar }, function (error, response, body) {
-                    expect(error).to.not.be.ok();
-                    expect(response.statusCode).to.eql(200);
-                    expect(body).to.eql('<script>window.location.href = "/api/v1/session/login?returnTo=' + client.redirectURI + '";</script>');
-
-                    request.get(SERVER_URL + '/api/v1/session/login?returnTo=' + client.redirectURI, { jar: jar, followRedirect: false }, function (error, response, body) {
-                        expect(error).to.not.be.ok();
-                        expect(response.statusCode).to.eql(200);
-                        expect(body.indexOf('<!-- login tester -->')).to.not.equal(-1);
-
-                        callback(jar);
-                    });
-                });
-            }
-
-            it('fails due to missing token', function (done) {
-                startAuthorizationFlow(CLIENT_2, function (jar) {
-                    var url = SERVER_URL + '/api/v1/session/login?returnTo=' + CLIENT_2.redirectURI;
-                    var data = {
-                        username: USER_0.username,
-                        password: USER_0.password
-                    };
-
-                    request.post({ url: url, jar: jar, form: data }, function (error, response, body) {
-                        expect(error).to.not.be.ok();
-                        expect(response.statusCode).to.eql(302);
-
-                        var tmp = urlParse(response.headers.location, true);
-                        expect(tmp.query.error).to.eql('A 2FA token is required');
-                        expect(tmp.query.returnTo).to.eql('/api/v1/oauth/dialog/authorize?redirect_uri=' + CLIENT_2.redirectURI + '&client_id=' + CLIENT_2.id + '&response_type=code');
-
-                        done();
-                    });
-                });
-            });
-
-            it('fails due to wrong token', function (done) {
-                startAuthorizationFlow(CLIENT_2, function (jar) {
-                    var url = SERVER_URL + '/api/v1/session/login?returnTo=' + CLIENT_2.redirectURI;
-                    var data = {
-                        username: USER_0.username,
-                        password: USER_0.password,
-                        totpToken: 'wrongtoken'
-                    };
-
-                    request.post({ url: url, jar: jar, form: data }, function (error, response, body) {
-                        expect(error).to.not.be.ok();
-                        expect(response.statusCode).to.eql(302);
-
-                        var tmp = urlParse(response.headers.location, true);
-                        expect(tmp.query.error).to.eql('The 2FA token is invalid');
-                        expect(tmp.query.returnTo).to.eql('/api/v1/oauth/dialog/authorize?redirect_uri=' + CLIENT_2.redirectURI + '&client_id=' + CLIENT_2.id + '&response_type=code');
-
-                        done();
-                    });
-                });
-            });
-
-            it('succeeds', function (done) {
-                startAuthorizationFlow(CLIENT_2, function (jar) {
-                    var totpToken = speakeasy.totp({
-                        secret: secret,
-                        encoding: 'base32'
-                    });
-                    var url = SERVER_URL + '/api/v1/session/login?returnTo=' + CLIENT_2.redirectURI;
-                    var data = {
-                        username: USER_0.username,
-                        password: USER_0.password,
-                        totpToken: totpToken
-                    };
-
-                    request.post({ url: url, jar: jar, form: data }, function (error, response, body) {
-                        expect(error).to.not.be.ok();
-                        expect(response.statusCode).to.eql(302);
-
-                        var tmp = urlParse(response.headers.location, true);
-                        expect(tmp.query.redirect_uri).to.eql(CLIENT_2.redirectURI);
-                        expect(tmp.query.client_id).to.eql(CLIENT_2.id);
-                        expect(tmp.query.response_type).to.eql('code');
-
-                        done();
-                    });
-                });
-            });
-        });
-
         describe('authorization with valid session', function () {
             before(setup);
             after(cleanup);
@@ -865,7 +849,7 @@ describe('OAuth2', function () {
                         expect(foo.token_type).to.eql('Bearer');
 
                         // Ensure the token is also usable
-                        superagent.get(SERVER_URL + '/api/v1/user/profile?access_token=' + foo.access_token, function (error, result) {
+                        superagent.get(SERVER_URL + '/api/v1/profile?access_token=' + foo.access_token, function (error, result) {
                             expect(error).to.not.be.ok();
                             expect(result.status).to.eql(200);
                             expect(result.body.username).to.equal(USER_0.username.toLowerCase());
@@ -1252,7 +1236,7 @@ describe('OAuth2', function () {
                             expect(body.token_type).to.eql('Bearer');
 
                             // Ensure the token is also usable
-                            superagent.get(SERVER_URL + '/api/v1/user/profile?access_token=' + body.access_token, function (error, result) {
+                            superagent.get(SERVER_URL + '/api/v1/profile?access_token=' + body.access_token, function (error, result) {
                                 expect(error).to.not.be.ok();
                                 expect(result.status).to.eql(200);
                                 expect(result.body.username).to.equal(USER_0.username.toLowerCase());
@@ -1283,11 +1267,9 @@ describe('Password', function () {
     };
 
     // make csrf always succeed for testing
-    oauth2.csrf = function () {
-        return function (req, res, next) {
-            req.csrfToken = function () { return hat(256); };
-            next();
-        };
+    oauth2.csrf = function (req, res, next) {
+        req.csrfToken = function () { return hat(256); };
+        next();
     };
 
     function setup(done) {
@@ -1315,76 +1297,76 @@ describe('Password', function () {
 
         it('reset request succeeds', function (done) {
             superagent.get(SERVER_URL + '/api/v1/session/password/resetRequest.html')
-                .end(function (error, result) {
-                    expect(result.statusCode).to.equal(200);
-                    expect(result.text.indexOf('<!-- tester -->')).to.not.equal(-1);
-                    done();
-                });
+            .end(function (error, result) {
+                expect(result.statusCode).to.equal(200);
+                expect(result.text.indexOf('<!-- tester -->')).to.not.equal(-1);
+                done();
+            });
         });
 
         it('setup fails due to missing reset_token', function (done) {
             superagent.get(SERVER_URL + '/api/v1/session/account/setup.html')
-                .end(function (error, result) {
-                    expect(result.statusCode).to.equal(200);
-                    expect(result.text.indexOf('<!-- error tester -->')).to.not.equal(-1);
-                    done();
-                });
+            .end(function (error, result) {
+                expect(result.statusCode).to.equal(200);
+                expect(result.text.indexOf('<!-- error tester -->')).to.not.equal(-1);
+                done();
+            });
         });
 
         it('setup fails due to invalid reset_token', function (done) {
             superagent.get(SERVER_URL + '/api/v1/session/account/setup.html')
-                .query({ reset_token: hat(256) })
-                .end(function (error, result) {
-                    expect(result.statusCode).to.equal(200);
-                    expect(result.text.indexOf('<!-- error tester -->')).to.not.equal(-1);
-                    done();
-                });
+            .query({ reset_token: hat(256) })
+            .end(function (error, result) {
+                expect(result.statusCode).to.equal(200);
+                expect(result.text.indexOf('<!-- error tester -->')).to.not.equal(-1);
+                done();
+            });
         });
 
         it('setup succeeds', function (done) {
             superagent.get(SERVER_URL + '/api/v1/session/account/setup.html')
-                .query({ reset_token: USER_0.resetToken })
-                .end(function (error, result) {
-                    expect(result.statusCode).to.equal(200);
-                    expect(result.text.indexOf('<!-- tester -->')).to.not.equal(-1);
-                    done();
-                });
+            .query({ reset_token: USER_0.resetToken })
+            .end(function (error, result) {
+                expect(result.statusCode).to.equal(200);
+                expect(result.text.indexOf('<!-- tester -->')).to.not.equal(-1);
+                done();
+            });
         });
 
         it('reset fails due to missing reset_token', function (done) {
             superagent.get(SERVER_URL + '/api/v1/session/password/reset.html')
-                .end(function (error, result) {
-                    expect(result.statusCode).to.equal(400);
-                    done();
-                });
+            .end(function (error, result) {
+                expect(result.statusCode).to.equal(400);
+                done();
+            });
         });
 
         it('reset fails due to invalid reset_token', function (done) {
             superagent.get(SERVER_URL + '/api/v1/session/password/reset.html')
-                .query({ reset_token: hat(256) })
-                .end(function (error, result) {
-                    expect(result.statusCode).to.equal(401);
-                    done();
-                });
+            .query({ reset_token: hat(256) })
+            .end(function (error, result) {
+                expect(result.statusCode).to.equal(401);
+                done();
+            });
         });
 
         it('reset succeeds', function (done) {
             superagent.get(SERVER_URL + '/api/v1/session/password/reset.html')
-                .query({ reset_token: USER_0.resetToken })
-                .end(function (error, result) {
-                    expect(result.text.indexOf('<!-- tester -->')).to.not.equal(-1);
-                    expect(result.statusCode).to.equal(200);
-                    done();
-                });
+            .query({ reset_token: USER_0.resetToken })
+            .end(function (error, result) {
+                expect(result.text.indexOf('<!-- tester -->')).to.not.equal(-1);
+                expect(result.statusCode).to.equal(200);
+                done();
+            });
         });
 
         it('sent succeeds', function (done) {
             superagent.get(SERVER_URL + '/api/v1/session/password/sent.html')
-                .end(function (error, result) {
-                    expect(result.text.indexOf('<!-- tester -->')).to.not.equal(-1);
-                    expect(result.statusCode).to.equal(200);
-                    done();
-                });
+            .end(function (error, result) {
+                expect(result.text.indexOf('<!-- tester -->')).to.not.equal(-1);
+                expect(result.statusCode).to.equal(200);
+                done();
+            });
         });
     });
 
@@ -1394,12 +1376,12 @@ describe('Password', function () {
 
         it('succeeds', function (done) {
             superagent.post(SERVER_URL + '/api/v1/session/password/resetRequest')
-                .send({ identifier: USER_0.email })
-                .end(function (error, result) {
-                    expect(result.text.indexOf('<!-- tester -->')).to.not.equal(-1);
-                    expect(result.statusCode).to.equal(200);
-                    done();
-                });
+            .send({ identifier: USER_0.email })
+            .end(function (error, result) {
+                expect(result.text.indexOf('<!-- tester -->')).to.not.equal(-1);
+                expect(result.statusCode).to.equal(200);
+                done();
+            });
         });
     });
 
@@ -1409,63 +1391,65 @@ describe('Password', function () {
 
         it('fails due to missing resetToken', function (done) {
             superagent.post(SERVER_URL + '/api/v1/session/password/reset')
-                .send({ password: 'somepassword' })
-                .end(function (error, result) {
-                    expect(result.statusCode).to.equal(400);
-                    done();
-                });
+            .send({ password: 'somepassword' })
+            .end(function (error, result) {
+                expect(result.statusCode).to.equal(400);
+                done();
+            });
         });
 
         it('fails due to missing password', function (done) {
             superagent.post(SERVER_URL + '/api/v1/session/password/reset')
-                .send({ resetToken: hat(256) })
-                .end(function (error, result) {
-                    expect(result.statusCode).to.equal(400);
-                    done();
-                });
+            .send({ resetToken: hat(256) })
+            .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/session/password/reset')
-                .send({ password: '', resetToken: hat(256) })
-                .end(function (error, result) {
-                    expect(result.statusCode).to.equal(401);
-                    done();
-                });
+            .send({ password: '', resetToken: hat(256) })
+            .end(function (error, result) {
+                expect(result.statusCode).to.equal(401);
+                done();
+            });
         });
 
         it('fails due to empty resetToken', function (done) {
             superagent.post(SERVER_URL + '/api/v1/session/password/reset')
-                .send({ password: '', resetToken: '' })
-                .end(function (error, result) {
-                    expect(result.statusCode).to.equal(401);
-                    done();
-                });
+            .send({ password: '', resetToken: '' })
+            .end(function (error, result) {
+                expect(result.statusCode).to.equal(401);
+                done();
+            });
         });
 
         it('fails due to weak password', function (done) {
             superagent.post(SERVER_URL + '/api/v1/session/password/reset')
-                .send({ password: 'foobar', resetToken: USER_0.resetToken })
-                .end(function (error, result) {
-                    expect(result.statusCode).to.equal(406);
-                    done();
-                });
+            .send({ password: 'foobar', resetToken: USER_0.resetToken })
+            .end(function (error, result) {
+                expect(result.statusCode).to.equal(406);
+                done();
+            });
         });
 
         it('succeeds', function (done) {
             var scope = nock(config.adminOrigin())
                 .filteringPath(function (path) {
+                    path = path.replace(/accessToken=[^&]*/, 'accessToken=token');
+                    path = path.replace(/expiresAt=[^&]*/, 'expiresAt=1234');
                     return path;
                 })
-                .get('/').reply(200, {});
+                .get('/?accessToken=token&expiresAt=1234').reply(200, {});
 
             superagent.post(SERVER_URL + '/api/v1/session/password/reset')
-                .send({ password: 'ASF23$%somepassword', resetToken: USER_0.resetToken })
-                .end(function (error, result) {
-                    expect(scope.isDone()).to.be.ok();
-                    expect(result.statusCode).to.equal(200);
-                    done();
-                });
+            .send({ password: 'ASF23$%somepassword', resetToken: USER_0.resetToken })
+            .end(function (error, result) {
+                expect(scope.isDone()).to.be.ok();
+                expect(result.statusCode).to.equal(200);
+                done();
+            });
         });
     });
 });

src/routes/test/profile-test.js

@@ -6,14 +6,13 @@
 
 'use strict';
 
-var accesscontrol = require('../../accesscontrol.js'),
-    config = require('../../config.js'),
+var config = require('../../config.js'),
     database = require('../../database.js'),
+    tokendb = require('../../tokendb.js'),
     expect = require('expect.js'),
     mailer = require('../../mailer.js'),
     superagent = require('superagent'),
-    server = require('../../server.js'),
-    tokendb = require('../../tokendb.js');
+    server = require('../../server.js');
 
 const SERVER_URL = 'http://localhost:' + config.get('port');
 
@@ -73,7 +72,7 @@ describe('Profile API', function () {
         after(cleanup);
 
         it('fails without token', function (done) {
-            superagent.get(SERVER_URL + '/api/v1/user/profile/').end(function (error, result) {
+            superagent.get(SERVER_URL + '/api/v1/profile/').end(function (error, result) {
                 expect(result.statusCode).to.equal(401);
 
                 done();
@@ -81,7 +80,7 @@ describe('Profile API', function () {
         });
 
         it('fails with empty token', function (done) {
-            superagent.get(SERVER_URL + '/api/v1/user/profile/').query({ access_token: '' }).end(function (error, result) {
+            superagent.get(SERVER_URL + '/api/v1/profile/').query({ access_token: '' }).end(function (error, result) {
                 expect(result.statusCode).to.equal(401);
 
                 done();
@@ -89,7 +88,7 @@ describe('Profile API', function () {
         });
 
         it('fails with invalid token', function (done) {
-            superagent.get(SERVER_URL + '/api/v1/user/profile/').query({ access_token: 'some token' }).end(function (error, result) {
+            superagent.get(SERVER_URL + '/api/v1/profile/').query({ access_token: 'some token' }).end(function (error, result) {
                 expect(result.statusCode).to.equal(401);
 
                 done();
@@ -97,7 +96,7 @@ describe('Profile API', function () {
         });
 
         it('succeeds', function (done) {
-            superagent.get(SERVER_URL + '/api/v1/user/profile/').query({ access_token: token_0 }).end(function (error, result) {
+            superagent.get(SERVER_URL + '/api/v1/profile/').query({ access_token: token_0 }).end(function (error, result) {
                 expect(result.statusCode).to.equal(200);
                 expect(result.body.username).to.equal(USERNAME_0.toLowerCase());
                 expect(result.body.email).to.equal(EMAIL_0.toLowerCase());
@@ -117,10 +116,10 @@ describe('Profile API', function () {
             var token = tokendb.generateToken();
             var expires = Date.now() - 2000; // 1 sec
 
-            tokendb.add(token, user_0.id, null, expires, accesscontrol.SCOPE_ANY, function (error) {
+            tokendb.add(token, user_0.id, null, expires, '*', function (error) {
                 expect(error).to.not.be.ok();
 
-                superagent.get(SERVER_URL + '/api/v1/user/profile').query({ access_token: token }).end(function (error, result) {
+                superagent.get(SERVER_URL + '/api/v1/profile').query({ access_token: token }).end(function (error, result) {
                     expect(result.statusCode).to.equal(401);
 
                     done();
@@ -129,14 +128,14 @@ describe('Profile API', function () {
         });
 
         it('fails with invalid token in auth header', function (done) {
-            superagent.get(SERVER_URL + '/api/v1/user/profile').set('Authorization', 'Bearer ' + 'x' + token_0).end(function (error, result) {
+            superagent.get(SERVER_URL + '/api/v1/profile').set('Authorization', 'Bearer ' + 'x' + token_0).end(function (error, result) {
                 expect(result.statusCode).to.equal(401);
                 done();
             });
         });
 
         it('succeeds with token in auth header', function (done) {
-            superagent.get(SERVER_URL + '/api/v1/user/profile').set('Authorization', 'Bearer ' + token_0).end(function (error, result) {
+            superagent.get(SERVER_URL + '/api/v1/profile').set('Authorization', 'Bearer ' + token_0).end(function (error, result) {
                 expect(result.statusCode).to.equal(200);
                 expect(result.body.username).to.equal(USERNAME_0.toLowerCase());
                 expect(result.body.email).to.equal(EMAIL_0.toLowerCase());
@@ -154,7 +153,7 @@ describe('Profile API', function () {
         after(cleanup);
 
         it('change email fails due to missing token', function (done) {
-            superagent.post(SERVER_URL + '/api/v1/user/profile')
+            superagent.post(SERVER_URL + '/api/v1/profile')
                 .send({ email: EMAIL_0_NEW })
                 .end(function (error, result) {
                     expect(result.statusCode).to.equal(401);
@@ -163,7 +162,7 @@ describe('Profile API', function () {
         });
 
         it('change email fails due to invalid email', function (done) {
-            superagent.post(SERVER_URL + '/api/v1/user/profile')
+            superagent.post(SERVER_URL + '/api/v1/profile')
                 .query({ access_token: token_0 })
                 .send({ email: 'foo@bar' })
                 .end(function (error, result) {
@@ -173,7 +172,7 @@ describe('Profile API', function () {
         });
 
         it('change user succeeds without email nor displayName', function (done) {
-            superagent.post(SERVER_URL + '/api/v1/user/profile')
+            superagent.post(SERVER_URL + '/api/v1/profile')
                 .query({ access_token: token_0 })
                 .send({})
                 .end(function (error, result) {
@@ -183,13 +182,13 @@ describe('Profile API', function () {
         });
 
         it('change email succeeds', function (done) {
-            superagent.post(SERVER_URL + '/api/v1/user/profile')
+            superagent.post(SERVER_URL + '/api/v1/profile')
                 .query({ access_token: token_0 })
                 .send({ email: EMAIL_0_NEW, fallbackEmail: EMAIL_0_NEW_FALLBACK })
                 .end(function (error, result) {
                     expect(result.statusCode).to.equal(204);
 
-                    superagent.get(SERVER_URL + '/api/v1/user/profile')
+                    superagent.get(SERVER_URL + '/api/v1/profile')
                         .query({ access_token: token_0 })
                         .end(function (err, res) {
                             expect(res.statusCode).to.equal(200);
@@ -205,13 +204,13 @@ describe('Profile API', function () {
         });
 
         it('change displayName succeeds', function (done) {
-            superagent.post(SERVER_URL + '/api/v1/user/profile')
+            superagent.post(SERVER_URL + '/api/v1/profile')
                 .query({ access_token: token_0 })
                 .send({ displayName: DISPLAY_NAME_0_NEW })
                 .end(function (error, result) {
                     expect(result.statusCode).to.equal(204);
 
-                    superagent.get(SERVER_URL + '/api/v1/user/profile')
+                    superagent.get(SERVER_URL + '/api/v1/profile')
                         .query({ access_token: token_0 })
                         .end(function (err, res) {
                             expect(res.statusCode).to.equal(200);
@@ -231,7 +230,7 @@ describe('Profile API', function () {
         after(cleanup);
 
         it('fails due to missing current password', function (done) {
-            superagent.post(SERVER_URL + '/api/v1/user/profile/password')
+            superagent.post(SERVER_URL + '/api/v1/profile/password')
                 .query({ access_token: token_0 })
                 .send({ newPassword: 'some wrong password' })
                 .end(function (err, res) {
@@ -241,7 +240,7 @@ describe('Profile API', function () {
         });
 
         it('fails due to missing new password', function (done) {
-            superagent.post(SERVER_URL + '/api/v1/user/profile/password')
+            superagent.post(SERVER_URL + '/api/v1/profile/password')
                 .query({ access_token: token_0 })
                 .send({ password: PASSWORD })
                 .end(function (err, res) {
@@ -251,7 +250,7 @@ describe('Profile API', function () {
         });
 
         it('fails due to wrong password', function (done) {
-            superagent.post(SERVER_URL + '/api/v1/user/profile/password')
+            superagent.post(SERVER_URL + '/api/v1/profile/password')
                 .query({ access_token: token_0 })
                 .send({ password: 'some wrong password', newPassword: 'MOre#$%34' })
                 .end(function (err, res) {
@@ -261,7 +260,7 @@ describe('Profile API', function () {
         });
 
         it('fails due to invalid password', function (done) {
-            superagent.post(SERVER_URL + '/api/v1/user/profile/password')
+            superagent.post(SERVER_URL + '/api/v1/profile/password')
                 .query({ access_token: token_0 })
                 .send({ password: PASSWORD, newPassword: 'five' })
                 .end(function (err, res) {
@@ -271,7 +270,7 @@ describe('Profile API', function () {
         });
 
         it('succeeds', function (done) {
-            superagent.post(SERVER_URL + '/api/v1/user/profile/password')
+            superagent.post(SERVER_URL + '/api/v1/profile/password')
                 .query({ access_token: token_0 })
                 .send({ password: PASSWORD, newPassword: 'MOre#$%34' })
                 .end(function (err, res) {

src/routes/test/server-test.js

@@ -14,262 +14,49 @@ var async = require('async'),
     server = require('../../server.js');
 
 var SERVER_URL = 'http://localhost:' + config.get('port');
-var DOMAIN = 'example-server-test.com';
+
 var USERNAME = 'superadmin', PASSWORD = 'Foobar?1337', EMAIL ='silly@me.com';
 var token = null;
 
 function setup(done) {
     config._reset();
+    config.setFqdn('example-server-test.com');
     config.setVersion('1.2.3');
 
     async.series([
-        server.start,
-        database._clear
+        server.start.bind(server),
+
+        database._clear,
+
+        function createAdmin(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.eql(201);
+
+                    // stash token for further use
+                    token = result.body.token;
+
+                    callback();
+                });
+        }
     ], done);
 }
 
 function cleanup(done) {
-    async.series([
-        database._clear,
-        server.stop
-    ], done);
+    database._clear(function (error) {
+        expect(!error).to.be.ok();
+
+        server.stop(done);
+    });
 }
 
 describe('REST API', function () {
     before(setup);
     after(cleanup);
 
-    it('dns setup fails without provider', function (done) {
-        superagent.post(SERVER_URL + '/api/v1/cloudron/dns_setup')
-        .send({ domain: DOMAIN, adminFqdn: 'my.' + DOMAIN, config: {} })
-        .end(function (error, result) {
-            expect(result).to.be.ok();
-            expect(result.statusCode).to.eql(400);
-
-            done();
-        });
-    });
-
-    it('dns setup fails with invalid provider', function (done) {
-        superagent.post(SERVER_URL + '/api/v1/cloudron/dns_setup')
-        .send({ provider: 'foobar', domain: DOMAIN, adminFqdn: 'my.' + DOMAIN, config: {} })
-        .end(function (error, result) {
-            expect(result).to.be.ok();
-            expect(result.statusCode).to.eql(400);
-
-            done();
-        });
-    });
-
-    it('dns setup fails with missing domain', function (done) {
-        superagent.post(SERVER_URL + '/api/v1/cloudron/dns_setup')
-        .send({ provider: 'noop', adminFqdn: 'my.' + DOMAIN, config: {} })
-        .end(function (error, result) {
-            expect(result).to.be.ok();
-            expect(result.statusCode).to.eql(400);
-
-            done();
-        });
-    });
-
-    it('dns setup fails with invalid domain', function (done) {
-        superagent.post(SERVER_URL + '/api/v1/cloudron/dns_setup')
-        .send({ provider: 'noop', domain: '.foo', adminFqdn: 'my.' + DOMAIN, config: {} })
-        .end(function (error, result) {
-            expect(result).to.be.ok();
-            expect(result.statusCode).to.eql(400);
-
-            done();
-        });
-    });
-
-    it('dns setup fails with missing adminFqdn', function (done) {
-        superagent.post(SERVER_URL + '/api/v1/cloudron/dns_setup')
-        .send({ provider: 'noop', domain: DOMAIN, config: {} })
-        .end(function (error, result) {
-            expect(result).to.be.ok();
-            expect(result.statusCode).to.eql(400);
-
-            done();
-        });
-    });
-
-    it('dns setup fails with invalid adminFqdn', function (done) {
-        superagent.post(SERVER_URL + '/api/v1/cloudron/dns_setup')
-        .send({ provider: 'noop', domain: DOMAIN, adminFqdn: 'my', config: {} })
-        .end(function (error, result) {
-            expect(result).to.be.ok();
-            expect(result.statusCode).to.eql(400);
-
-            done();
-        });
-    });
-
-    it('dns setup fails with invalid config', function (done) {
-        superagent.post(SERVER_URL + '/api/v1/cloudron/dns_setup')
-        .send({ provider: 'noop', domain: DOMAIN, adminFqdn: 'my' + DOMAIN, config: 'not an object' })
-        .end(function (error, result) {
-            expect(result).to.be.ok();
-            expect(result.statusCode).to.eql(400);
-
-            done();
-        });
-    });
-
-    it('dns setup fails with invalid zoneName', function (done) {
-        superagent.post(SERVER_URL + '/api/v1/cloudron/dns_setup')
-        .send({ provider: 'noop', domain: DOMAIN, adminFqdn: 'my' + DOMAIN, config: {}, zoneName: 1337 })
-        .end(function (error, result) {
-            expect(result).to.be.ok();
-            expect(result.statusCode).to.eql(400);
-
-            done();
-        });
-    });
-
-    it('dns setup fails with invalid tlsConfig', function (done) {
-        superagent.post(SERVER_URL + '/api/v1/cloudron/dns_setup')
-        .send({ provider: 'noop', domain: DOMAIN, adminFqdn: 'my' + DOMAIN, config: {}, tlsConfig: 'foobar' })
-        .end(function (error, result) {
-            expect(result).to.be.ok();
-            expect(result.statusCode).to.eql(400);
-
-            done();
-        });
-    });
-
-    it('dns setup fails with invalid tlsConfig provider', function (done) {
-        superagent.post(SERVER_URL + '/api/v1/cloudron/dns_setup')
-        .send({ provider: 'noop', domain: DOMAIN, adminFqdn: 'my' + DOMAIN, config: {}, tlsConfig: { provider: 1337 } })
-        .end(function (error, result) {
-            expect(result).to.be.ok();
-            expect(result.statusCode).to.eql(400);
-
-            done();
-        });
-    });
-
-    it('dns setup succeeds', function (done) {
-        superagent.post(SERVER_URL + '/api/v1/cloudron/dns_setup')
-        .send({ provider: 'noop', domain: DOMAIN, adminFqdn: 'my.' + DOMAIN, config: {} })
-        .end(function (error, result) {
-            expect(result).to.be.ok();
-            expect(result.statusCode).to.eql(200);
-
-            done();
-        });
-    });
-
-    it('dns setup twice fails', function (done) {
-        superagent.post(SERVER_URL + '/api/v1/cloudron/dns_setup')
-        .send({ provider: 'noop', domain: DOMAIN, adminFqdn: 'my.' + DOMAIN, config: {} })
-        .end(function (error, result) {
-            expect(result).to.be.ok();
-            expect(result.statusCode).to.eql(409);
-
-            done();
-        });
-    });
-
-    it('activation fails without username', function (done) {
-        superagent.post(SERVER_URL + '/api/v1/cloudron/activate')
-        .query({ setupToken: 'somesetuptoken' })
-        .send({ password: PASSWORD, email: EMAIL })
-        .end(function (error, result) {
-            expect(result).to.be.ok();
-            expect(result.statusCode).to.eql(400);
-
-            done();
-        });
-    });
-
-    it('activation fails with invalid username', function (done) {
-        superagent.post(SERVER_URL + '/api/v1/cloudron/activate')
-        .query({ setupToken: 'somesetuptoken' })
-        .send({ username: '?this.is-not!valid', password: PASSWORD, email: EMAIL })
-        .end(function (error, result) {
-            expect(result).to.be.ok();
-            expect(result.statusCode).to.eql(400);
-
-            done();
-        });
-    });
-
-    it('activation fails without email', function (done) {
-        superagent.post(SERVER_URL + '/api/v1/cloudron/activate')
-        .query({ setupToken: 'somesetuptoken' })
-        .send({ username: USERNAME, password: PASSWORD })
-        .end(function (error, result) {
-            expect(result).to.be.ok();
-            expect(result.statusCode).to.eql(400);
-
-            done();
-        });
-    });
-
-    it('activation fails with invalid email', function (done) {
-        superagent.post(SERVER_URL + '/api/v1/cloudron/activate')
-        .query({ setupToken: 'somesetuptoken' })
-        .send({ username: USERNAME, password: PASSWORD, email: 'notanemail' })
-        .end(function (error, result) {
-            expect(result).to.be.ok();
-            expect(result.statusCode).to.eql(400);
-
-            done();
-        });
-    });
-
-    it('activation fails without password', function (done) {
-        superagent.post(SERVER_URL + '/api/v1/cloudron/activate')
-        .query({ setupToken: 'somesetuptoken' })
-        .send({ username: USERNAME, email: EMAIL })
-        .end(function (error, result) {
-            expect(result).to.be.ok();
-            expect(result.statusCode).to.eql(400);
-
-            done();
-        });
-    });
-
-    it('activation fails with invalid password', function (done) {
-        superagent.post(SERVER_URL + '/api/v1/cloudron/activate')
-        .query({ setupToken: 'somesetuptoken' })
-        .send({ username: USERNAME, password: 'short', email: EMAIL })
-        .end(function (error, result) {
-            expect(result).to.be.ok();
-            expect(result.statusCode).to.eql(400);
-
-            done();
-        });
-    });
-
-    it('activation succeeds', function (done) {
-        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);
-
-            // stash token for further use
-            token = result.body.token;
-
-            done();
-        });
-    });
-
-    it('activating twice fails', function (done) {
-        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(409);
-
-            done();
-        });
-    });
-
     it('does not crash with invalid JSON', function (done) {
         superagent.post(SERVER_URL + '/api/v1/users')
             .query({ access_token: token })