More changes

This is because we added a new appstore scope

CHANGES

@@ -1248,3 +1248,108 @@
 * 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
+
+[2.3.0]
+* Add Name.com DNS provider
+* Fix issue where account setup page was crashing
+* Add advanced DNS configuration UI
+* Preserve addon/database configuration across app updates and restores
+* ManageSieve port now offers STARTTLS
+
+[2.3.1]
+* Add Name.com DNS provider
+* Fix issue where account setup page was crashing
+* Add advanced DNS configuration UI
+* Preserve addon/database configuration across app updates and restores
+* ManageSieve port now offers STARTTLS
+* Allow mailbox name to be set for apps
+* Rework the Email server UI
+* Add the ability to manually trigger a backup of an application
+* Enable/disable mail from validation within UI
+* Allow setting app visibility for non-SSO apps
+* Add Clone UI
+
+[2.3.2]
+* Fix issue where multi-db apps were not provisioned correctly
+* Improve setup, restore views to have field labels
+
+[2.4.0]
+* Use custom logging backend to have more control over log rotation
+* Make user explicitly confirm that fs backup dir is on external storage
+* Update node to 8.11.2
+* Update docker to 18.03.1
+* Fix docker exec terminal resize issue
+* Make the mailbox name follow the apps new location, if the user did not set it explicitly
+* Add backups view
+
+[2.4.1]
+* Use custom logging backend to have more control over log rotation
+* Mail logs and box logs UI
+* Make user explicitly confirm that fs backup dir is on external storage
+* Update node to 8.11.2
+* Update docker to 18.03.1
+* Fix docker exec terminal resize issue
+* Make the mailbox name follow the apps new location, if the user did not set it explicitly
+* Add backups view
+
+[3.0.0]
+* Support alternate app domains with redirects
+* Allow hyphen in mailbox names
+* Fix issue where the UI timesout when relay server is not reachable
+* Add support for personal spaces
+* Add UI to edit users in the groups dialog
+* Add UI to set groups when creating a user
+* Open logs and terminal in a new tab instead of a window
+* Add button to view backup logs
+* Add Mailjet mail relay support
+* Encryption support for incremental backups
+* Display restore errors in the UI
+* Update Haraka to 2.8.19
+* GPG verify releases
+* Allow subdomains in location field
+
+[3.0.1]
+* Support alternate app domains with redirects
+* Allow hyphen in mailbox names
+* Fix issue where the UI timesout when relay server is not reachable
+* Add support for personal spaces
+* Add UI to edit users in the groups dialog
+* Add UI to set groups when creating a user
+* Open logs and terminal in a new tab instead of a window
+* Add button to view backup logs
+* Add Mailjet mail relay support
+* Encryption support for incremental backups
+* Display restore errors in the UI
+* Update Haraka to 2.8.19
+* GPG verify releases
+* Allow subdomains in location field
+
+[3.0.2]
+* Fix issue where normal users are shown apps they don't have access to
+* Re-configure mail apps when mail is enabled/disabled
+

LICENSE

@@ -630,7 +630,7 @@ state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     box
-    Copyright (C) 2016,2017 Cloudron UG
+    Copyright (C) 2016,2017,2018 Cloudron UG
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU Affero General Public License as published

baseimage/initializeBaseUbuntuImage.sh

@@ -61,7 +61,7 @@ echo "==> Installing Docker"
 mkdir -p /etc/systemd/system/docker.service.d
 echo -e "[Service]\nExecStart=\nExecStart=/usr/bin/dockerd -H fd:// --log-driver=journald --exec-opt native.cgroupdriver=cgroupfs --storage-driver=overlay2" > /etc/systemd/system/docker.service.d/cloudron.conf
 
-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
+curl -sL https://download.docker.com/linux/ubuntu/dists/xenial/pool/stable/amd64/docker-ce_18.03.1~ce-0~ubuntu_amd64.deb -o /tmp/docker.deb
 # apt install with install deps (as opposed to dpkg -i)
 apt install -y /tmp/docker.deb
 rm /tmp/docker.deb

migrations/20180408014539-mailboxes-add-type.js

@@ -17,7 +17,7 @@ exports.up = function(db, callback) {
                     } else if (mailbox.membersJson) {
                         type = 'list';
                     }
-                    db.runSql('UPDATE mailboxes SET type = ? WHERE name = ?', [ type, mailbox.name ], iteratorCallback);
+                    db.runSql('UPDATE mailboxes SET type = ? WHERE name = ? AND domain = ?', [ type, mailbox.name, mailbox.domain ], iteratorCallback);
                 }, done);
             });
         },

migrations/20180425142932-user-add-twoFactorAuthenticationSecret.js

@@ -0,0 +1,15 @@
+'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

@@ -0,0 +1,21 @@
+'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/20180511222705-apps-add-owner-id.js

@@ -0,0 +1,28 @@
+'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 apps ADD COLUMN ownerId VARCHAR(128)'),
+        function (next) {
+            db.all('SELECT id FROM users ORDER BY createdAt LIMIT 1', [ ], function (error, results) {
+                if (error || results.length === 0) return next(error);
+
+                var ownerId = results[0].id;
+                db.runSql('UPDATE apps SET ownerId=?', [ ownerId ], next);
+            });
+        },
+        db.runSql.bind(db, 'ALTER TABLE apps MODIFY ownerId VARCHAR(128) NOT NULL'),
+        db.runSql.bind(db, 'ALTER TABLE apps ADD CONSTRAINT apps_owner_constraint FOREIGN KEY(ownerId) REFERENCES users(id)'),
+        db.runSql.bind(db, 'COMMIT'),
+    ], callback);
+};
+
+exports.down = function(db, callback) {
+    db.runSql('ALTER TABLE apps DROP COLUMN ownerId', function (error) {
+        if (error) console.error(error);
+        callback(error);
+    });
+};

migrations/20180627010633-apps-add-ts.js

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

migrations/20180628162142-subdomains-create-table.js

@@ -0,0 +1,25 @@
+'use strict';
+
+exports.up = function(db, callback) {
+    var cmd = 'CREATE TABLE IF NOT EXISTS subdomains(' +
+                'appId VARCHAR(128) NOT NULL,' +
+                'domain VARCHAR(128) NOT NULL,' +
+                'subdomain VARCHAR(128) NOT NULL,' +
+                'type VARCHAR(128) NOT NULL,' +
+                'dnsRecordId VARCHAR(512),' +
+                'FOREIGN KEY(domain) REFERENCES domains(domain),' +
+                'FOREIGN KEY(appId) REFERENCES apps(id),' +
+                'UNIQUE (subdomain, domain)) CHARACTER SET utf8 COLLATE utf8_bin';
+
+    db.runSql(cmd, function (error) {
+        if (error) console.error(error);
+        callback(error);
+    });
+};
+
+exports.down = function(db, callback) {
+    db.runSql('DROP TABLE subdomains', function (error) {
+        if (error) console.error(error);
+        callback(error);
+    });
+};

migrations/20180628163616-migrate-app-subdomains.js

@@ -0,0 +1,28 @@
+'use strict';
+
+var async = require('async');
+
+exports.up = function(db, callback) {
+    db.all('SELECT * from apps', [ ], function (error, results) {
+        if (error) return done(error);
+
+        var queries = [
+            db.runSql.bind(db, 'START TRANSACTION;')
+        ];
+
+        results.forEach(function (app) {
+            queries.push(db.runSql.bind(db, 'INSERT INTO subdomains (appId, domain, subdomain, type, dnsRecordId) VALUES (?, ?, ?, ?, ?)', [ app.id, app.domain, app.location, 'primary', app.dnsRecordId ]));
+        });
+
+        queries.push(db.runSql.bind(db, 'COMMIT'));
+
+        async.series(queries, callback);
+    });
+};
+
+exports.down = function(db, callback) {
+    db.runSql('DELETE FROM subdomains', function (error) {
+        if (error) console.error(error);
+        callback(error);
+    });
+};

migrations/20180629090543-remove-app-location-and-domain.js

@@ -0,0 +1,41 @@
+'use strict';
+
+var async = require('async');
+
+exports.up = function(db, callback) {
+    db.runSql('ALTER TABLE apps DROP INDEX location_domain_unique_index, DROP FOREIGN KEY apps_domain_constraint, DROP COLUMN domain, DROP COLUMN location, DROP COLUMN dnsRecordId', function (error) {
+        if (error) console.error(error);
+        callback(error);
+    });
+};
+
+exports.down = function(db, callback) {
+    db.all('SELECT * from subdomains WHERE type = ?', [ 'primary' ], function (error, results) {
+        if (error) return callback(error);
+
+        var cmd = 'ALTER TABLE apps'
+        + ' ADD COLUMN location VARCHAR(128),'
+        + ' ADD COLUMN domain VARCHAR(128),'
+        + ' ADD COLUMN dnsRecordId VARCHAR(512)';
+
+        db.runSql(cmd, function (error) {
+            if (error) return callback(error);
+
+            var queries = [ db.runSql.bind(db, 'START TRANSACTION;') ];
+            results.forEach(function (d) {
+                queries.push(db.runSql.bind(db, 'UPDATE apps SET domain = ?, location = ?, dnsRecordId = ? WHERE id = ?', [ d.domain, d.subdomain, d.appId, d.dnsRecordId ]));
+            });
+            queries.push(db.runSql.bind(db, 'COMMIT'));
+
+            async.series(queries, function (error) {
+                if (error) return callback(error);
+
+                var cmd = 'ALTER TABLE apps'
+                + ' ADD CONSTRAINT apps_domain_constraint FOREIGN KEY(domain) REFERENCES domains(domain),'
+                + ' ADD UNIQUE location_domain_unique_index (location, domain)';
+
+                db.runSql(cmd, callback);
+            });
+        });
+    });
+};

migrations/20180629201251-remove-subdomains-dnsRecordId.js

@@ -0,0 +1,15 @@
+'use strict';
+
+exports.up = function(db, callback) {
+    db.runSql('ALTER TABLE subdomains DROP COLUMN dnsRecordId', function (error) {
+        if (error) console.error(error);
+        callback(error);
+    });
+};
+
+exports.down = function(db, callback) {
+    db.runSql('ALTER TABLE subdomains ADD COLUMN dnsRecordId VARCHAR(512)', function (error) {
+        if (error) return callback(error);
+        callback();
+    });
+};

migrations/20180726213634-users-add-admin.js

@@ -0,0 +1,34 @@
+'use strict';
+
+var async = require('async');
+
+exports.up = function(db, callback) {
+    db.runSql('ALTER TABLE users ADD COLUMN admin BOOLEAN DEFAULT 0', function (error) {
+        if (error) return callback(error);
+
+        db.all('SELECT userId FROM groupMembers WHERE groupId=?', [ 'admin' ], function (error, results) {
+            if (error) return callback(error);
+
+            if (results.length === 0) return callback();
+
+            async.eachSeries(results, function (result, iteratorDone) {
+                db.runSql('UPDATE users SET admin=1 WHERE id=?', [ result.userId ], iteratorDone);
+            }, function (error) {
+                if (error) return callback(error);
+
+                async.series([
+                    db.runSql.bind(db, 'DELETE FROM groupMembers WHERE groupId=?', [ 'admin' ]),
+                    db.runSql.bind(db, 'DELETE FROM groups WHERE id=?', [ 'admin' ])
+                ], callback);
+            });
+        });
+    });
+};
+
+exports.down = function(db, callback) {
+    db.runSql('ALTER TABLE users DROP COLUMN admin', function (error) {
+        if (error) console.error(error);
+        callback(error);
+    });
+};
+

migrations/20180807023917-expire-existing-tokens.js

@@ -0,0 +1,13 @@
+'use strict';
+
+exports.up = function(db, callback) {
+    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,9 +21,11 @@ CREATE TABLE IF NOT EXISTS users(
     salt VARCHAR(512) NOT NULL,
     createdAt VARCHAR(512) NOT NULL,
     modifiedAt VARCHAR(512) NOT NULL,
-    admin INTEGER NOT NULL,
-    displayName VARCHAR(512) DEFAULT '',
-    fallbackEmail VARCHAR(512) DEFAULT ""
+    displayName VARCHAR(512) DEFAULT "",
+    fallbackEmail VARCHAR(512) DEFAULT "",
+    twoFactorAuthenticationSecret VARCHAR(128) DEFAULT "",
+    twoFactorAuthenticationEnabled BOOLEAN DEFAULT false,
+    admin BOOLEAN DEFAULT false,
 
     PRIMARY KEY(id));
 
@@ -67,10 +69,10 @@ CREATE TABLE IF NOT EXISTS apps(
     httpPort INTEGER,                        // this is the nginx proxy port and not manifest.httpPort
     location VARCHAR(128) NOT NULL,
     domain VARCHAR(128) NOT NULL,
-    dnsRecordId VARCHAR(512), // tracks any id that we got back to track dns updates
     accessRestrictionJson TEXT, // { users: [ ], groups: [ ] }
-    createdAt TIMESTAMP(2) NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    updatedAt TIMESTAMP(2) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    creationTime TIMESTAMP(2) NOT NULL DEFAULT CURRENT_TIMESTAMP, // when the app was installed
+    updateTime TIMESTAMP(2) NOT NULL DEFAULT CURRENT_TIMESTAMP,   // when the last app update was done
+    ts TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, // when this db record was updated (useful for UI caching)
     memoryLimit BIGINT DEFAULT 0,
     xFrameOptions VARCHAR(512),
     sso BOOLEAN DEFAULT 1, // whether user chose to enable SSO
@@ -83,7 +85,9 @@ CREATE TABLE IF NOT EXISTS apps(
     oldConfigJson TEXT, // used to pass old config to apptask (configure, restore)
     updateConfigJson TEXT, // used to pass new config to apptask (update)
 
-    FOREIGN KEY(domain) REFERENCES domains(domain),
+    ownerId VARCHAR(128),
+
+    FOREIGN KEY(ownerId) REFERENCES users(id),
     PRIMARY KEY(id));
 
 CREATE TABLE IF NOT EXISTS appPortBindings(
@@ -175,3 +179,14 @@ CREATE TABLE IF NOT EXISTS mailboxes(
     FOREIGN KEY(domain) REFERENCES mail(domain),
     UNIQUE (name, domain));
 
+CREATE TABLE IF NOT EXISTS subdomains(
+    appId VARCHAR(128) NOT NULL,
+    domain VARCHAR(128) NOT NULL,
+    subdomain VARCHAR(128) NOT NULL,
+    type VARCHAR(128) NOT NULL,
+
+    FOREIGN KEY(domain) REFERENCES domains(domain),
+    FOREIGN KEY(appId) REFERENCES apps(id),
+    UNIQUE (subdomain, domain))
+
+    CHARACTER SET utf8 COLLATE utf8_bin;

package.json

@@ -14,12 +14,12 @@
     "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.2",
+    "@google-cloud/storage": "^1.7.0",
     "@sindresorhus/df": "^2.1.0",
-    "async": "^2.6.0",
-    "aws-sdk": "^2.201.0",
-    "body-parser": "^1.18.2",
+    "async": "^2.6.1",
+    "aws-sdk": "^2.253.1",
+    "body-parser": "^1.18.3",
     "cloudron-manifestformat": "^2.11.0",
     "connect-ensure-login": "^0.1.1",
     "connect-lastmile": "^1.0.2",
@@ -28,24 +28,23 @@
     "cookie-session": "^1.3.2",
     "cron": "^1.3.0",
     "csurf": "^1.6.6",
-    "db-migrate": "^0.10.5",
+    "db-migrate": "^0.11.1",
     "db-migrate-mysql": "^1.1.10",
     "debug": "^3.1.0",
-    "dockerode": "^2.5.4",
-    "ejs": "^2.5.7",
-    "ejs-cli": "^2.0.0",
-    "express": "^4.16.2",
+    "dockerode": "^2.5.5",
+    "ejs": "^2.6.1",
+    "ejs-cli": "^2.0.1",
+    "express": "^4.16.3",
     "express-session": "^1.15.6",
-    "hat": "0.0.3",
     "json": "^9.0.3",
     "ldapjs": "^1.0.2",
     "lodash.chunk": "^4.2.0",
-    "mime": "^2.2.0",
-    "moment-timezone": "^0.5.14",
+    "mime": "^2.3.1",
+    "moment-timezone": "^0.5.17",
     "morgan": "^1.9.0",
-    "multiparty": "^4.1.2",
+    "multiparty": "^4.1.4",
     "mysql": "^2.15.0",
-    "nodemailer": "^4.6.0",
+    "nodemailer": "^4.6.5",
     "nodemailer-smtp-transport": "^2.7.4",
     "oauth2orize": "^1.11.0",
     "once": "^1.3.2",
@@ -55,38 +54,39 @@
     "passport-http-bearer": "^1.0.1",
     "passport-local": "^1.0.0",
     "passport-oauth2-client-password": "^0.1.2",
-    "password-generator": "^2.2.0",
     "progress-stream": "^2.0.0",
     "proxy-middleware": "^0.15.0",
-    "recursive-readdir": "^2.2.1",
-    "request": "^2.83.0",
-    "s3-block-read-stream": "^0.2.0",
+    "qrcode": "^1.2.0",
+    "readdirp": "^2.1.0",
+    "request": "^2.87.0",
+    "rimraf": "^2.6.2",
+    "s3-block-read-stream": "^0.5.0",
     "safetydance": "^0.7.1",
     "semver": "^5.5.0",
-    "showdown": "^1.8.2",
+    "showdown": "^1.8.6",
+    "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",
+    "superagent": "^3.8.3",
+    "supererror": "^0.7.2",
+    "tar-fs": "^1.16.2",
+    "tar-stream": "^1.6.1",
     "tldjs": "^2.3.1",
-    "underscore": "^1.7.0",
+    "underscore": "^1.9.1",
     "uuid": "^3.2.1",
     "valid-url": "^1.0.9",
-    "validator": "^9.4.1",
-    "ws": "^3.3.3"
+    "validator": "^10.3.0",
+    "ws": "^5.2.0"
   },
   "devDependencies": {
     "expect.js": "*",
     "hock": "^1.3.2",
     "istanbul": "*",
     "js2xmlparser": "^3.0.0",
-    "mocha": "^5.0.1",
+    "mocha": "^5.2.0",
     "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"
+    "recursive-readdir": "^2.2.2"
   },
   "scripts": {
     "migrate_local": "DATABASE_URL=mysql://root:@localhost/box node_modules/.bin/db-migrate up",

scripts/cloudron-activate

@@ -0,0 +1,122 @@
+#!/bin/bash
+
+set -eu -o pipefail
+
+readonly curl="curl --fail --connect-timeout 20 --retry 10 --retry-delay 2 --max-time 2400"
+
+function get_status() {
+    key="$1"
+    if status=$($curl -q -f "http://localhost:3000/api/v1/cloudron/status" 2>/dev/null); then
+        currentValue=$(echo "${status}" | python3 -c 'import sys, json; print(json.dumps(json.load(sys.stdin)[sys.argv[1]]))' "${key}")
+        echo "${currentValue}"
+        return 0
+    fi
+
+    return 1
+}
+
+function wait_for_status() {
+    key="$1"
+    expectedValue="$2"
+
+    echo "wait_for_status: $key to be $expectedValue"
+    while true; do
+        if currentValue=$(get_status "${key}"); then
+            echo "wait_for_status: $key is current: $currentValue expecting: $expectedValue"
+            if [[ "${currentValue}" == $expectedValue ]]; then
+                break
+            fi
+        fi
+        sleep 3
+    done
+}
+
+domain=""
+domainProvider=""
+domainConfigJson="{}"
+domainTlsProvider="letsencrypt-prod"
+adminUsername="superadmin"
+adminPassword="Secret123#"
+adminEmail="admin@server.local"
+appstoreUserId=""
+appstoreToken=""
+backupDir="/var/backups"
+
+args=$(getopt -o "" -l "domain:,domain-provider:,domain-tls-provider:,admin-username:,admin-password:,admin-email:,appstore-user:,appstore-token:,backup-dir:" -n "$0" -- "$@")
+eval set -- "${args}"
+
+while true; do
+    case "$1" in
+    --domain) domain="$2"; shift 2;;
+    --domain-provider) domainProvider="$2"; shift 2;;
+    --domain-tls-provider) domainTlsProvider="$2"; shift 2;;
+    --admin-username) adminUsername="$2"; shift 2;;
+    --admin-password) adminPassword="$2"; shift 2;;
+    --admin-email) adminEmail="$2"; shift 2;;
+    --appstore-user) appstoreUser="$2"; shift 2;;
+    --appstore-token) appstoreToken="$2"; shift 2;;
+    --backup-dir) backupDir="$2"; shift 2;;
+    --) break;;
+    *) echo "Unknown option $1"; exit 1;;
+    esac
+done
+
+echo "=> Waiting for cloudron to be ready"
+wait_for_status "version" '*'
+
+if [[ $(get_status "webadminStatus") != *'"tls": true'* ]]; then
+    echo "=> Domain setup"
+    dnsSetupData=$(printf '{ "domain": "%s", "adminFqdn": "%s", "provider": "%s", "config": %s, "tlsConfig": { "provider": "%s" } }' "${domain}" "my.${domain}" "${domainProvider}" "$domainConfigJson" "${domainTlsProvider}")
+
+    if ! $curl -X POST -H "Content-Type: application/json" -d "${dnsSetupData}" http://localhost:3000/api/v1/cloudron/dns_setup; then
+        echo "DNS Setup Failed"
+        exit 1
+    fi
+
+    wait_for_status "webadminStatus" '*"tls": true*'
+else
+    echo "=> Skipping Domain setup"
+fi
+
+activationData=$(printf '{"username": "%s", "password":"%s", "email": "%s" }' "${adminUsername}" "${adminPassword}" "${adminEmail}")
+if [[ $(get_status "activated") == "false" ]]; then
+    echo "=> Activating"
+
+    if ! activationResult=$($curl -X POST -H "Content-Type: application/json" -d "${activationData}" http://localhost:3000/api/v1/cloudron/activate); then
+        echo "Failed to activate with ${activationData}: ${activationResult}"
+        exit 1
+    fi
+
+    wait_for_status "activated" "true"
+else
+    echo "=> Skipping Activation"
+fi
+
+echo "=> Getting token"
+if ! activationResult=$($curl -X POST -H "Content-Type: application/json" -d "${activationData}" http://localhost:3000/api/v1/developer/login); then
+    echo "Failed to login with ${activationData}: ${activationResult}"
+    exit 1
+fi
+
+accessToken=$(echo "${activationResult}" | python3 -c 'import sys, json; print(json.load(sys.stdin)[sys.argv[1]])' "accessToken")
+
+echo "=> Setting up App Store account with accessToken ${accessToken}"
+appstoreData=$(printf '{"userId":"%s", "token":"%s" }' "${appstoreUser}" "${appstoreToken}")
+
+if ! appstoreResult=$($curl -X POST -H "Content-Type: application/json" -d "${appstoreData}" "http://localhost:3000/api/v1/settings/appstore_config?access_token=${accessToken}"); then
+    echo "Failed to setup Appstore account with ${appstoreData}: ${appstoreResult}"
+    exit 1
+fi
+
+echo "=> Setting up Backup Directory with accessToken ${accessToken}"
+backupData=$(printf '{"provider":"filesystem", "key":"", "backupFolder":"%s", "retentionSecs": 864000, "format": "tgz", "externalDisk": true}' "${backupDir}")
+
+chown -R yellowtent:yellowtent "${backupDir}"
+
+if ! backupResult=$($curl -X POST -H "Content-Type: application/json" -d "${backupData}" "http://localhost:3000/api/v1/settings/backup_config?access_token=${accessToken}"); then
+    echo "Failed to setup backup configuration with ${backupDir}: ${backupResult}"
+    exit 1
+fi
+
+echo "=> Done!"
+

scripts/cloudron-setup

@@ -36,6 +36,11 @@ if [[ "${disk_size_gb}" -lt "${MINIMUM_DISK_SIZE_GB}" ]]; then
     exit 1
 fi
 
+if systemctl -q is-active box; then
+    echo "Error: Cloudron is already installed. To reinstall, start afresh"
+    exit 1
+fi
+
 initBaseImage="true"
 # provisioning data
 provider=""

scripts/createReleaseTarball

@@ -34,8 +34,8 @@ if ! $(cd "${SOURCE_DIR}/../dashboard" && git diff --exit-code >/dev/null); then
     exit 1
 fi
 
-if [[ "$(node --version)" != "v8.9.3" ]]; then
-    echo "This script requires node 8.9.3"
+if [[ "$(node --version)" != "v8.11.2" ]]; then
+    echo "This script requires node 8.11.2"
     exit 1
 fi
 

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}}) != "18.03.1-ce" ]]; then
+    $curl -sL https://download.docker.com/linux/ubuntu/dists/xenial/pool/stable/amd64/docker-ce_18.03.1~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) != "54f4c9268492a4fd2ec2e6bcc95553855b025f35dcc8b9f60ac34e0aa307279b" ]]; then
         echo "==> installer: docker binary download is corrupt"
         exit 5
     fi
@@ -54,6 +54,12 @@ 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
@@ -63,14 +69,15 @@ if [[ $(docker version --format {{.Client.Version}}) != "18.03.0-ce" ]]; then
 fi
 
 echo "==> installer: updating node"
-if [[ "$(node --version)" != "v8.9.3" ]]; then
-    mkdir -p /usr/local/node-8.9.3
-    $curl -sL https://nodejs.org/dist/v8.9.3/node-v8.9.3-linux-x64.tar.gz | tar zxvf - --strip-components=1 -C /usr/local/node-8.9.3
-    ln -sf /usr/local/node-8.9.3/bin/node /usr/bin/node
-    ln -sf /usr/local/node-8.9.3/bin/npm /usr/bin/npm
+if [[ "$(node --version)" != "v8.11.2" ]]; then
+    mkdir -p /usr/local/node-8.11.2
+    $curl -sL https://nodejs.org/dist/v8.11.2/node-v8.11.2-linux-x64.tar.gz | tar zxvf - --strip-components=1 -C /usr/local/node-8.11.2
+    ln -sf /usr/local/node-8.11.2/bin/node /usr/bin/node
+    ln -sf /usr/local/node-8.11.2/bin/npm /usr/bin/npm
     rm -rf /usr/local/node-6.11.5
 fi
 
+# this is here (and not in updater.js) because rebuild requires the above node
 for try in `seq 1 10`; do
     # for reasons unknown, the dtrace package will fail. but rebuilding second time will work
 
@@ -87,6 +94,18 @@ if [[ ${try} -eq 10 ]]; then
     exit 4
 fi
 
+echo "==> installer: update cloudron-syslog"
+CLOUDRON_SYSLOG_DIR=/usr/local/cloudron-syslog
+CLOUDRON_SYSLOG="${CLOUDRON_SYSLOG_DIR}/bin/cloudron-syslog"
+CLOUDRON_SYSLOG_VERSION="1.0.3"
+while [[ ! -f "${CLOUDRON_SYSLOG}" || "$(${CLOUDRON_SYSLOG} --version)" != ${CLOUDRON_SYSLOG_VERSION} ]]; do
+    rm -rf "${CLOUDRON_SYSLOG_DIR}"
+    mkdir -p "${CLOUDRON_SYSLOG_DIR}"
+    if npm install --unsafe-perm -g --prefix "${CLOUDRON_SYSLOG_DIR}" cloudron-syslog@${CLOUDRON_SYSLOG_VERSION}; then break; fi
+    echo "===> installer: Failed to install cloudron-syslog, trying again"
+    sleep 5
+done
+
 if ! id "${USER}" 2>/dev/null; then
     useradd "${USER}" -m
 fi

setup/start.sh

@@ -76,6 +76,8 @@ mkdir -p "${PLATFORM_DATA_DIR}/collectd/collectd.conf.d"
 mkdir -p "${PLATFORM_DATA_DIR}/logrotate.d"
 mkdir -p "${PLATFORM_DATA_DIR}/acme"
 mkdir -p "${PLATFORM_DATA_DIR}/backup"
+mkdir -p "${PLATFORM_DATA_DIR}/logs/backup"
+mkdir -p "${PLATFORM_DATA_DIR}/update"
 
 mkdir -p "${BOX_DATA_DIR}/appicons"
 mkdir -p "${BOX_DATA_DIR}/certs"
@@ -120,6 +122,7 @@ echo "==> Adding systemd services"
 cp -r "${script_dir}/start/systemd/." /etc/systemd/system/
 systemctl daemon-reload
 systemctl enable unbound
+systemctl enable cloudron-syslog
 systemctl enable cloudron.target
 systemctl enable cloudron-firewall
 
@@ -132,6 +135,9 @@ systemctl enable --now cron
 # ensure unbound runs
 systemctl restart unbound
 
+# ensure cloudron-syslog runs
+systemctl restart cloudron-syslog
+
 echo "==> Configuring sudoers"
 rm -f /etc/sudoers.d/${USER}
 cp "${script_dir}/start/sudoers" /etc/sudoers.d/${USER}
@@ -146,6 +152,8 @@ echo "==> Configuring logrotate"
 if ! grep -q "^include ${PLATFORM_DATA_DIR}/logrotate.d" /etc/logrotate.conf; then
     echo -e "\ninclude ${PLATFORM_DATA_DIR}/logrotate.d\n" >> /etc/logrotate.conf
 fi
+cp "${script_dir}/start/app-logrotate" "${PLATFORM_DATA_DIR}/logrotate.d/app-logrotate"
+chown root:root "${PLATFORM_DATA_DIR}/logrotate.d/app-logrotate"
 
 echo "==> Adding motd message for admins"
 cp "${script_dir}/start/cloudron-motd" /etc/update-motd.d/92-cloudron
@@ -231,10 +239,13 @@ fi
 
 echo "==> Changing ownership"
 chown "${USER}:${USER}" -R "${CONFIG_DIR}"
-chown "${USER}:${USER}" -R "${PLATFORM_DATA_DIR}/nginx" "${PLATFORM_DATA_DIR}/collectd" "${PLATFORM_DATA_DIR}/logrotate.d" "${PLATFORM_DATA_DIR}/addons" "${PLATFORM_DATA_DIR}/acme" "${PLATFORM_DATA_DIR}/backup"
+chown "${USER}:${USER}" -R "${PLATFORM_DATA_DIR}/nginx" "${PLATFORM_DATA_DIR}/collectd" "${PLATFORM_DATA_DIR}/addons" "${PLATFORM_DATA_DIR}/acme" "${PLATFORM_DATA_DIR}/backup" "${PLATFORM_DATA_DIR}/logs" "${PLATFORM_DATA_DIR}/update"
 chown "${USER}:${USER}" "${PLATFORM_DATA_DIR}/INFRA_VERSION" 2>/dev/null || true
 chown "${USER}:${USER}" "${PLATFORM_DATA_DIR}"
 
+# logrotate files have to be owned by root, this is here to fixup existing installations where we were resetting the owner to yellowtent
+chown root:root -R "${PLATFORM_DATA_DIR}/logrotate.d"
+
 # do not chown the boxdata/mail directory; dovecot gets upset
 chown "${USER}:${USER}" "${BOX_DATA_DIR}"
 find "${BOX_DATA_DIR}" -mindepth 1 -maxdepth 1 -not -path "${BOX_DATA_DIR}/mail" -exec chown -R "${USER}:${USER}" {} \;

setup/start/app-logrotate

@@ -0,0 +1,10 @@
+# logrotate config for app logs
+
+/home/yellowtent/platformdata/logs/*/*.log {
+    # only keep one rotated file, we currently do not send that over the api
+    rotate 1
+    size 10M
+    # we never compress so we can simply tail the files
+    nocompress
+    copytruncate
+}

setup/start/nginx/appconfig.ejs

@@ -160,6 +160,7 @@ server {
         }
 
         # graphite paths (uncomment block below and visit /graphite/index.html)
+        # remember to comment out the CSP policy as well to access the graphite dashboard
         # location ~ ^/(graphite|content|metrics|dashboard|render|browser|composer)/ {
         #     proxy_pass   http://127.0.0.1:8000;
         #     client_max_body_size 1m;
@@ -171,6 +172,10 @@ server {
         }
 <% } else if ( endpoint === 'app' ) { %>
         proxy_pass http://127.0.0.1:<%= port %>;
+<% } else if ( endpoint === 'redirect' ) { %>
+        # redirect everything to the app. this is temporary because there is no way
+        # to clear a permanent redirect on the browser
+        return 302 https://<%= redirectTo %>$request_uri;
 <% } %>
     }
 }

setup/start/systemd/cloudron-syslog.service

@@ -0,0 +1,14 @@
+[Unit]
+Description=Cloudron Syslog
+After=network.target
+
+[Service]
+ExecStart=/usr/local/cloudron-syslog/bin/cloudron-syslog --port 2514 --logdir /home/yellowtent/platformdata/logs
+WorkingDirectory=/usr/local/cloudron-syslog
+Environment="NODE_ENV=production"
+Restart=always
+User=yellowtent
+Group=yellowtent
+
+[Install]
+WantedBy=multi-user.target

src/accesscontrol.js

@@ -0,0 +1,147 @@
+'use strict';
+
+exports = module.exports = {
+    SCOPE_APPS_READ: 'apps:read',
+    SCOPE_APPS_MANAGE: 'apps:manage',
+    SCOPE_CLIENTS: 'clients',
+    SCOPE_CLOUDRON: 'cloudron',
+    SCOPE_DOMAINS_READ: 'domains:read',
+    SCOPE_DOMAINS_MANAGE: 'domains:manage',
+    SCOPE_MAIL: 'mail',
+    SCOPE_PROFILE: 'profile',
+    SCOPE_SETTINGS: 'settings',
+    SCOPE_USERS_READ: 'users:read',
+    SCOPE_USERS_MANAGE: 'users:manage',
+    SCOPE_APPSTORE: 'appstore',
+    VALID_SCOPES: [ 'apps', 'appstore', 'clients', 'cloudron', 'domains', 'mail', 'profile', 'settings', 'users' ], // keep this sorted
+
+    SCOPE_ANY: '*',
+
+    validateScopeString: validateScopeString,
+    hasScopes: hasScopes,
+    canonicalScopeString: canonicalScopeString,
+    intersectScopes: intersectScopes,
+    validateToken: validateToken,
+    scopesForUser: scopesForUser
+};
+
+var assert = require('assert'),
+    DatabaseError = require('./databaseerror.js'),
+    debug = require('debug')('box:accesscontrol'),
+    settings = require('./settings.js'),
+    tokendb = require('./tokendb.js'),
+    users = require('./users.js'),
+    UsersError = users.UsersError,
+    _ = require('underscore');
+
+// returns scopes that does not have wildcards and is sorted
+function canonicalScopeString(scope) {
+    if (scope === exports.SCOPE_ANY) return exports.VALID_SCOPES.join(',');
+
+    return scope.split(',').sort().join(',');
+}
+
+function intersectScopes(allowedScopes, wantedScopes) {
+    assert(Array.isArray(allowedScopes), 'Expecting sorted array');
+    assert(Array.isArray(wantedScopes), 'Expecting sorted array');
+
+    if (_.isEqual(allowedScopes, wantedScopes)) return allowedScopes; // quick path
+
+    let wantedScopesMap = new Map();
+    let results = [];
+
+    // make a map of scope -> [ subscopes ]
+    for (let w of wantedScopes) {
+        let parts = w.split(':');
+        let subscopes = wantedScopesMap.get(parts[0]) || new Set();
+        subscopes.add(parts[1] || '*');
+        wantedScopesMap.set(parts[0], subscopes);
+    }
+
+    for (let a of allowedScopes) {
+        let parts = a.split(':');
+        let as = parts[1] || '*';
+
+        let subscopes = wantedScopesMap.get(parts[0]);
+        if (!subscopes) continue;
+
+        if (subscopes.has('*') || subscopes.has(as)) {
+            results.push(a);
+        } else if (as === '*') {
+            results = results.concat(Array.from(subscopes).map(function (ss) { return `${a}:${ss}`; }));
+        }
+    }
+
+    return results;
+}
+
+function validateScopeString(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.split(':')[0]) !== -1; });
+    if (!allValid) return new Error('Invalid scope. Available scopes are ' + exports.VALID_SCOPES.join(', '));
+
+    return null;
+}
+
+// tests if all requiredScopes are attached to the request
+function hasScopes(authorizedScopes, requiredScopes) {
+    assert(Array.isArray(authorizedScopes), 'Expecting array');
+    assert(Array.isArray(requiredScopes), 'Expecting array');
+
+    if (authorizedScopes.indexOf(exports.SCOPE_ANY) !== -1) return null;
+
+    for (var i = 0; i < requiredScopes.length; ++i) {
+        const scopeParts = requiredScopes[i].split(':');
+
+        // this allows apps:write if the token has a higher apps scope
+        if (authorizedScopes.indexOf(requiredScopes[i]) === -1 && authorizedScopes.indexOf(scopeParts[0]) === -1) {
+            debug('scope: missing scope "%s".', requiredScopes[i]);
+            return new Error('Missing required scope "' + requiredScopes[i] + '"');
+        }
+    }
+
+    return null;
+}
+
+function scopesForUser(user, callback) {
+    assert.strictEqual(typeof user, 'object');
+    assert.strictEqual(typeof callback, 'function');
+
+    if (user.admin) return callback(null, exports.VALID_SCOPES);
+
+    settings.getSpacesConfig(function (error, spaces) {
+        if (error) return callback(error);
+
+        callback(null, spaces.enabled ? [ 'profile', 'apps', 'domains:read', 'users:read' ] : [ 'profile', 'apps:read' ]);
+    });
+}
+
+function validateToken(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, null /* user */, 'Invalid Token'); // will end up as a 401
+        if (error) return callback(error); // this triggers 'internal error' in passport
+
+        users.get(token.identifier, function (error, user) {
+            if (error && error.reason === UsersError.NOT_FOUND) return callback(null, null /* user */, 'Invalid Token'); // will end up as a 401
+            if (error) return callback(error);
+
+            scopesForUser(user, function (error, userScopes) {
+                if (error) return callback(error);
+
+                var authorizedScopes = intersectScopes(userScopes, token.scope.split(','));
+                const skipPasswordVerification = token.clientId === 'cid-sdk' || token.clientId === 'cid-cli'; // these clients do not require password checks unlike UI
+                var info = { authorizedScopes: authorizedScopes, skipPasswordVerification: skipPasswordVerification }; // ends up in req.authInfo
+
+                callback(null, user, info);
+            });
+        });
+    });
+}

src/addons.js

@@ -15,18 +15,20 @@ exports = module.exports = {
     _teardownOauth: teardownOauth
 };
 
-var appdb = require('./appdb.js'),
+var accesscontrol = require('./accesscontrol.js'),
+    appdb = require('./appdb.js'),
     assert = require('assert'),
     async = require('async'),
     clients = require('./clients.js'),
     config = require('./config.js'),
     ClientsError = clients.ClientsError,
+    crypto = require('crypto'),
+    DatabaseError = require('./databaseerror.js'),
     debug = require('debug')('box:addons'),
     docker = require('./docker.js'),
     dockerConnection = docker.connection,
     fs = require('fs'),
-    generatePassword = require('password-generator'),
-    hat = require('hat'),
+    hat = require('./hat.js'),
     infra = require('./infra_version.js'),
     mail = require('./mail.js'),
     mailboxdb = require('./mailboxdb.js'),
@@ -205,13 +207,21 @@ function getBindsSync(app, addons) {
     assert.strictEqual(typeof app, 'object');
     assert(!addons || typeof addons === 'object');
 
-    var binds = [ ];
+    let binds = [ ];
 
     if (!addons) return binds;
 
-    for (var addon in addons) {
+    for (let addon in addons) {
         switch (addon) {
-        case 'localstorage': binds.push(path.join(paths.APPS_DATA_DIR, app.id, 'data') + ':/app/data:rw'); break;
+        case 'localstorage':
+            binds.push(path.join(paths.APPS_DATA_DIR, app.id, 'data') + ':/app/data:rw');
+            if (!Array.isArray(addons[addon].bindMounts)) break;
+
+            for (let mount of addons[addon].bindMounts) {
+                let [ host, container ] = mount.split(':');
+                binds.push(path.join(paths.APPS_DATA_DIR, app.id, 'data', path.normalize(host)) + ':' + container);
+            }
+            break;
         default: break;
         }
     }
@@ -251,7 +261,7 @@ function setupOauth(app, options, callback) {
 
     var appId = app.id;
     var redirectURI = 'https://' + app.fqdn;
-    var scope = 'profile';
+    var scope = accesscontrol.SCOPE_PROFILE;
 
     clients.delByAppIdAndType(appId, clients.TYPE_OAUTH, function (error) { // remove existing creds
         if (error && error.reason !== ClientsError.NOT_FOUND) return callback(error);
@@ -363,23 +373,28 @@ function setupSendMail(app, options, callback) {
 
     debugApp(app, 'Setting up SendMail');
 
-    mailboxdb.getByOwnerId(app.id, function (error, results) {
-        if (error) return callback(error);
+    appdb.getAddonConfigByName(app.id, 'sendmail', 'MAIL_SMTP_PASSWORD', function (error, existingPassword) {
+        if (error && error.reason !== DatabaseError.NOT_FOUND) return callback(error);
 
-        var mailbox = results.filter(function (r) { return !r.aliasTarget; })[0];
-        var password = generatePassword(128, false /* memorable */, /[\w\d_]/);
+        var password = error ? hat(4 * 48) : existingPassword; // see box#565 for password length
 
-        var env = [
-            { name: 'MAIL_SMTP_SERVER', value: 'mail' },
-            { name: 'MAIL_SMTP_PORT', value: '2525' },
-            { name: 'MAIL_SMTPS_PORT', value: '2465' },
-            { name: 'MAIL_SMTP_USERNAME', value: mailbox.name + '@' + app.domain },
-            { name: 'MAIL_SMTP_PASSWORD', value: password },
-            { name: 'MAIL_FROM', value: mailbox.name + '@' + app.domain },
-            { name: 'MAIL_DOMAIN', value: app.domain }
-        ];
-        debugApp(app, 'Setting sendmail addon config to %j', env);
-        appdb.setAddonConfig(app.id, 'sendmail', env, callback);
+        mailboxdb.getByOwnerId(app.id, function (error, results) {
+            if (error) return callback(error);
+
+            var mailbox = results.filter(function (r) { return !r.aliasTarget; })[0];
+
+            var env = [
+                { name: 'MAIL_SMTP_SERVER', value: 'mail' },
+                { name: 'MAIL_SMTP_PORT', value: '2525' },
+                { name: 'MAIL_SMTPS_PORT', value: '2465' },
+                { name: 'MAIL_SMTP_USERNAME', value: mailbox.name + '@' + app.domain },
+                { name: 'MAIL_SMTP_PASSWORD', value: password },
+                { name: 'MAIL_FROM', value: mailbox.name + '@' + app.domain },
+                { name: 'MAIL_DOMAIN', value: app.domain }
+            ];
+            debugApp(app, 'Setting sendmail addon config to %j', env);
+            appdb.setAddonConfig(app.id, 'sendmail', env, callback);
+        });
     });
 }
 
@@ -400,23 +415,28 @@ function setupRecvMail(app, options, callback) {
 
     debugApp(app, 'Setting up recvmail');
 
-    mailboxdb.getByOwnerId(app.id, function (error, results) {
-        if (error) return callback(error);
+    appdb.getAddonConfigByName(app.id, 'recvmail', 'MAIL_IMAP_PASSWORD', function (error, existingPassword) {
+        if (error && error.reason !== DatabaseError.NOT_FOUND) return callback(error);
 
-        var mailbox = results.filter(function (r) { return !r.aliasTarget; })[0];
-        var password = generatePassword(128, false /* memorable */, /[\w\d_]/);
+        var password = error ? hat(4 * 48) : existingPassword;  // see box#565 for password length
 
-        var env = [
-            { name: 'MAIL_IMAP_SERVER', value: 'mail' },
-            { name: 'MAIL_IMAP_PORT', value: '9993' },
-            { name: 'MAIL_IMAP_USERNAME', value: mailbox.name + '@' + app.domain },
-            { name: 'MAIL_IMAP_PASSWORD', value: password },
-            { name: 'MAIL_TO', value: mailbox.name + '@' + app.domain },
-            { name: 'MAIL_DOMAIN', value: app.domain }
-        ];
+        mailboxdb.getByOwnerId(app.id, function (error, results) {
+            if (error) return callback(error);
 
-        debugApp(app, 'Setting sendmail addon config to %j', env);
-        appdb.setAddonConfig(app.id, 'recvmail', env, callback);
+            var mailbox = results.filter(function (r) { return !r.aliasTarget; })[0];
+
+            var env = [
+                { name: 'MAIL_IMAP_SERVER', value: 'mail' },
+                { name: 'MAIL_IMAP_PORT', value: '9993' },
+                { name: 'MAIL_IMAP_USERNAME', value: mailbox.name + '@' + app.domain },
+                { name: 'MAIL_IMAP_PASSWORD', value: password },
+                { name: 'MAIL_TO', value: mailbox.name + '@' + app.domain },
+                { name: 'MAIL_DOMAIN', value: app.domain }
+            ];
+
+            debugApp(app, 'Setting sendmail addon config to %j', env);
+            appdb.setAddonConfig(app.id, 'recvmail', env, callback);
+        });
     });
 }
 
@@ -430,6 +450,14 @@ function teardownRecvMail(app, options, callback) {
     appdb.unsetAddonConfig(app.id, 'recvmail', callback);
 }
 
+function mysqlDatabaseName(appId) {
+    assert.strictEqual(typeof appId, 'string');
+
+    var md5sum = crypto.createHash('md5'); // get rid of "-"
+    md5sum.update(appId);
+    return md5sum.digest('hex').substring(0, 16);  // max length of mysql usernames is 16
+}
+
 function setupMySql(app, options, callback) {
     assert.strictEqual(typeof app, 'object');
     assert.strictEqual(typeof options, 'object');
@@ -437,16 +465,36 @@ function setupMySql(app, options, callback) {
 
     debugApp(app, 'Setting up mysql');
 
-    var cmd = [ '/addons/mysql/service.sh', options.multipleDatabases ? 'add-prefix' : 'add', app.id ];
+    appdb.getAddonConfigByName(app.id, 'mysql', 'MYSQL_PASSWORD', function (error, existingPassword) {
+        if (error && error.reason !== DatabaseError.NOT_FOUND) return callback(error);
 
-    docker.execContainer('mysql', cmd, { bufferStdout: true }, function (error, stdout) {
-        if (error) return callback(error);
+        const dbname = mysqlDatabaseName(app.id);
+        const password = error ? hat(4 * 48) : existingPassword; // see box#362 for password length
 
-        var result = stdout.toString('utf8').split('\n').slice(0, -1); // remove trailing newline
-        var env = result.map(function (r) { var idx = r.indexOf('='); return { name: r.substr(0, idx), value: r.substr(idx + 1) }; });
+        var cmd = [ '/addons/mysql/service.sh', options.multipleDatabases ? 'add-prefix' : 'add', dbname, password ];
 
-        debugApp(app, 'Setting mysql addon config to %j', env);
-        appdb.setAddonConfig(app.id, 'mysql', env, callback);
+        docker.execContainer('mysql', cmd, { bufferStdout: true }, function (error) {
+            if (error) return callback(error);
+
+            var env = [
+                { name: 'MYSQL_USERNAME', value: dbname },
+                { name: 'MYSQL_PASSWORD', value: password },
+                { name: 'MYSQL_HOST', value: 'mysql' },
+                { name: 'MYSQL_PORT', value: '3306' }
+            ];
+
+            if (options.multipleDatabases) {
+                env = env.concat({ name: 'MYSQL_DATABASE_PREFIX', value: `${dbname}_` });
+            } else {
+                env = env.concat(
+                    { name: 'MYSQL_URL', value: `mysql://${dbname}:${password}@mysql/${dbname}` },
+                    { name: 'MYSQL_DATABASE', value: dbname }
+                );
+            }
+
+            debugApp(app, 'Setting mysql addon config to %j', env);
+            appdb.setAddonConfig(app.id, 'mysql', env, callback);
+        });
     });
 }
 
@@ -455,7 +503,8 @@ function teardownMySql(app, options, callback) {
     assert.strictEqual(typeof options, 'object');
     assert.strictEqual(typeof callback, 'function');
 
-    var cmd = [ '/addons/mysql/service.sh', options.multipleDatabases ? 'remove-prefix' : 'remove', app.id ];
+    const dbname = mysqlDatabaseName(app.id);
+    var cmd = [ '/addons/mysql/service.sh', options.multipleDatabases ? 'remove-prefix' : 'remove', dbname ];
 
     debugApp(app, 'Tearing down mysql');
 
@@ -478,7 +527,8 @@ function backupMySql(app, options, callback) {
     var output = fs.createWriteStream(path.join(paths.APPS_DATA_DIR, app.id, 'mysqldump'));
     output.on('error', callback);
 
-    var cmd = [ '/addons/mysql/service.sh', options.multipleDatabases ? 'backup-prefix' : 'backup', app.id ];
+    const dbname = mysqlDatabaseName(app.id);
+    var cmd = [ '/addons/mysql/service.sh', options.multipleDatabases ? 'backup-prefix' : 'backup', dbname ];
 
     docker.execContainer('mysql', cmd, { stdout: output }, callback);
 }
@@ -498,7 +548,8 @@ function restoreMySql(app, options, callback) {
         var input = fs.createReadStream(path.join(paths.APPS_DATA_DIR, app.id, 'mysqldump'));
         input.on('error', callback);
 
-        var cmd = [ '/addons/mysql/service.sh', options.multipleDatabases ? 'restore-prefix' : 'restore', app.id ];
+        const dbname = mysqlDatabaseName(app.id);
+        var cmd = [ '/addons/mysql/service.sh', options.multipleDatabases ? 'restore-prefix' : 'restore', dbname ];
         docker.execContainer('mysql', cmd, { stdin: input }, callback);
     });
 }
@@ -510,16 +561,29 @@ function setupPostgreSql(app, options, callback) {
 
     debugApp(app, 'Setting up postgresql');
 
-    var cmd = [ '/addons/postgresql/service.sh', 'add', app.id ];
+    appdb.getAddonConfigByName(app.id, 'postgresql', 'POSTGRESQL_PASSWORD', function (error, existingPassword) {
+        if (error && error.reason !== DatabaseError.NOT_FOUND) return callback(error);
 
-    docker.execContainer('postgresql', cmd, { bufferStdout: true }, function (error, stdout) {
-        if (error) return callback(error);
+        const password = error ? hat(4 * 128) : existingPassword;
+        const appId = app.id.replace(/-/g, '');
 
-        var result = stdout.toString('utf8').split('\n').slice(0, -1); // remove trailing newline
-        var env = result.map(function (r) { var idx = r.indexOf('='); return { name: r.substr(0, idx), value: r.substr(idx + 1) }; });
+        var cmd = [ '/addons/postgresql/service.sh', 'add', appId, password ];
 
-        debugApp(app, 'Setting postgresql addon config to %j', env);
-        appdb.setAddonConfig(app.id, 'postgresql', env, callback);
+        docker.execContainer('postgresql', cmd, { bufferStdout: true }, function (error) {
+            if (error) return callback(error);
+
+            var env = [
+                { name: 'POSTGRESQL_URL', value: `postgres://user${appId}:${password}@postgresql/db${appId}` },
+                { name: 'POSTGRESQL_USERNAME', value: `user${appId}` },
+                { name: 'POSTGRESQL_PASSWORD', value: password },
+                { name: 'POSTGRESQL_HOST', value: 'postgresql' },
+                { name: 'POSTGRESQL_PORT', value: '5432' },
+                { name: 'POSTGRESQL_DATABASE', value: `db${appId}` }
+            ];
+
+            debugApp(app, 'Setting postgresql addon config to %j', env);
+            appdb.setAddonConfig(app.id, 'postgresql', env, callback);
+        });
     });
 }
 
@@ -528,7 +592,9 @@ function teardownPostgreSql(app, options, callback) {
     assert.strictEqual(typeof options, 'object');
     assert.strictEqual(typeof callback, 'function');
 
-    var cmd = [ '/addons/postgresql/service.sh', 'remove', app.id ];
+    const appId = app.id.replace(/-/g, '');
+
+    var cmd = [ '/addons/postgresql/service.sh', 'remove', appId ];
 
     debugApp(app, 'Tearing down postgresql');
 
@@ -551,7 +617,8 @@ function backupPostgreSql(app, options, callback) {
     var output = fs.createWriteStream(path.join(paths.APPS_DATA_DIR, app.id, 'postgresqldump'));
     output.on('error', callback);
 
-    var cmd = [ '/addons/postgresql/service.sh', 'backup', app.id ];
+    const appId = app.id.replace(/-/g, '');
+    var cmd = [ '/addons/postgresql/service.sh', 'backup', appId ];
 
     docker.execContainer('postgresql', cmd, { stdout: output }, callback);
 }
@@ -571,7 +638,8 @@ function restorePostgreSql(app, options, callback) {
         var input = fs.createReadStream(path.join(paths.APPS_DATA_DIR, app.id, 'postgresqldump'));
         input.on('error', callback);
 
-        var cmd = [ '/addons/postgresql/service.sh', 'restore', app.id ];
+        const appId = app.id.replace(/-/g, '');
+        var cmd = [ '/addons/postgresql/service.sh', 'restore', appId ];
 
         docker.execContainer('postgresql', cmd, { stdin: input }, callback);
     });
@@ -584,16 +652,30 @@ function setupMongoDb(app, options, callback) {
 
     debugApp(app, 'Setting up mongodb');
 
-    var cmd = [ '/addons/mongodb/service.sh', 'add', app.id ];
+    appdb.getAddonConfigByName(app.id, 'mongodb', 'MONGODB_PASSWORD', function (error, existingPassword) {
+        if (error && error.reason !== DatabaseError.NOT_FOUND) return callback(error);
 
-    docker.execContainer('mongodb', cmd, { bufferStdout: true }, function (error, stdout) {
-        if (error) return callback(error);
+        const password = error ? hat(4 * 128) : existingPassword;
 
-        var result = stdout.toString('utf8').split('\n').slice(0, -1); // remove trailing newline
-        var env = result.map(function (r) { var idx = r.indexOf('='); return { name: r.substr(0, idx), value: r.substr(idx + 1) }; });
+        const dbname = app.id;
 
-        debugApp(app, 'Setting mongodb addon config to %j', env);
-        appdb.setAddonConfig(app.id, 'mongodb', env, callback);
+        var cmd = [ '/addons/mongodb/service.sh', 'add', dbname, password ];
+
+        docker.execContainer('mongodb', cmd, { bufferStdout: true }, function (error) {
+            if (error) return callback(error);
+
+            var env = [
+                { name: 'MONGODB_URL', value : `mongodb://${dbname}:${password}@mongodb/${dbname}` },
+                { name: 'MONGODB_USERNAME', value : dbname },
+                { name: 'MONGODB_PASSWORD', value: password },
+                { name: 'MONGODB_HOST', value : 'mongodb' },
+                { name: 'MONGODB_PORT', value : '27017' },
+                { name: 'MONGODB_DATABASE', value : dbname }
+            ];
+
+            debugApp(app, 'Setting mongodb addon config to %j', env);
+            appdb.setAddonConfig(app.id, 'mongodb', env, callback);
+        });
     });
 }
 
@@ -602,7 +684,8 @@ function teardownMongoDb(app, options, callback) {
     assert.strictEqual(typeof options, 'object');
     assert.strictEqual(typeof callback, 'function');
 
-    var cmd = [ '/addons/mongodb/service.sh', 'remove', app.id ];
+    const dbname = app.id;
+    var cmd = [ '/addons/mongodb/service.sh', 'remove', dbname ];
 
     debugApp(app, 'Tearing down mongodb');
 
@@ -625,7 +708,8 @@ function backupMongoDb(app, options, callback) {
     var output = fs.createWriteStream(path.join(paths.APPS_DATA_DIR, app.id, 'mongodbdump'));
     output.on('error', callback);
 
-    var cmd = [ '/addons/mongodb/service.sh', 'backup', app.id ];
+    const dbname = app.id;
+    var cmd = [ '/addons/mongodb/service.sh', 'backup', dbname ];
 
     docker.execContainer('mongodb', cmd, { stdout: output }, callback);
 }
@@ -645,7 +729,9 @@ function restoreMongoDb(app, options, callback) {
         var input = fs.createReadStream(path.join(paths.APPS_DATA_DIR, app.id, 'mongodbdump'));
         input.on('error', callback);
 
-        var cmd = [ '/addons/mongodb/service.sh', 'restore', app.id ];
+        const dbname = app.id;
+        var cmd = [ '/addons/mongodb/service.sh', 'restore', dbname ];
+
         docker.execContainer('mongodb', cmd, { stdin: input }, callback);
     });
 }
@@ -656,58 +742,67 @@ function setupRedis(app, options, callback) {
     assert.strictEqual(typeof options, 'object');
     assert.strictEqual(typeof callback, 'function');
 
-    var redisPassword = generatePassword(128, false /* memorable */, /[\w\d_]/); // ensure no / in password for being sed friendly (and be uri friendly)
-    var redisVarsFile = path.join(paths.ADDON_CONFIG_DIR, 'redis-' + app.id + '_vars.sh');
-    var redisDataDir = path.join(paths.APPS_DATA_DIR, app.id + '/redis');
+    appdb.getAddonConfigByName(app.id, 'redis', 'REDIS_PASSWORD', function (error, existingPassword) {
+        if (error && error.reason !== DatabaseError.NOT_FOUND) return callback(error);
 
-    if (!safe.fs.writeFileSync(redisVarsFile, 'REDIS_PASSWORD=' + redisPassword)) {
-        return callback(new Error('Error writing redis config'));
-    }
+        const redisPassword = error ? hat(4 * 48) : existingPassword; // see box#362 for password length
 
-    if (!safe.fs.mkdirSync(redisDataDir) && safe.error.code !== 'EEXIST') return callback(new Error('Error creating redis data dir:' + safe.error));
+        var redisVarsFile = path.join(paths.ADDON_CONFIG_DIR, 'redis-' + app.id + '_vars.sh');
+        var redisDataDir = path.join(paths.APPS_DATA_DIR, app.id + '/redis');
 
-    // Compute redis memory limit based on app's memory limit (this is arbitrary)
-    var memoryLimit = app.memoryLimit || app.manifest.memoryLimit || 0;
+        if (!safe.fs.writeFileSync(redisVarsFile, 'REDIS_PASSWORD=' + redisPassword)) {
+            return callback(new Error('Error writing redis config'));
+        }
 
-    if (memoryLimit === -1) { // unrestricted (debug mode)
-        memoryLimit = 0;
-    } else if (memoryLimit === 0 || memoryLimit <= (2 * 1024 * 1024 * 1024)) { // less than 2G (ram+swap)
-        memoryLimit = 150 * 1024 * 1024; // 150m
-    } else {
-        memoryLimit = 600 * 1024 * 1024; // 600m
-    }
+        if (!safe.fs.mkdirSync(redisDataDir) && safe.error.code !== 'EEXIST') return callback(new Error('Error creating redis data dir:' + safe.error));
 
-    const tag = infra.images.redis.tag, redisName = 'redis-' + app.id;
-    const label = app.fqdn;
-    // 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} \
-                --net cloudron \
-                --net-alias ${redisName} \
-                -m ${memoryLimit/2} \
-                --memory-swap ${memoryLimit} \
-                --dns 172.18.0.1 \
-                --dns-search=. \
-                -v ${redisVarsFile}:/etc/redis/redis_vars.sh:ro \
-                -v ${redisDataDir}:/var/lib/redis:rw \
-                --read-only -v /tmp -v /run ${tag}`;
+        // Compute redis memory limit based on app's memory limit (this is arbitrary)
+        var memoryLimit = app.memoryLimit || app.manifest.memoryLimit || 0;
 
-    var env = [
-        { name: 'REDIS_URL', value: 'redis://redisuser:' + redisPassword + '@redis-' + app.id },
-        { name: 'REDIS_PASSWORD', value: redisPassword },
-        { name: 'REDIS_HOST', value: redisName },
-        { name: 'REDIS_PORT', value: '6379' }
-    ];
+        if (memoryLimit === -1) { // unrestricted (debug mode)
+            memoryLimit = 0;
+        } else if (memoryLimit === 0 || memoryLimit <= (2 * 1024 * 1024 * 1024)) { // less than 2G (ram+swap)
+            memoryLimit = 150 * 1024 * 1024; // 150m
+        } else {
+            memoryLimit = 600 * 1024 * 1024; // 600m
+        }
 
-    async.series([
-        // stop so that redis can flush itself with SIGTERM
-        shell.execSync.bind(null, 'stopRedis', `docker stop --time=10 ${redisName} 2>/dev/null || true`),
-        shell.execSync.bind(null, 'stopRedis', `docker rm --volumes ${redisName} 2>/dev/null || true`),
-        shell.execSync.bind(null, 'startRedis', cmd),
-        appdb.setAddonConfig.bind(null, app.id, 'redis', env)
-    ], function (error) {
-        if (error) debug('Error setting up redis: ', error);
-        callback(error);
+        const tag = infra.images.redis.tag, redisName = 'redis-' + app.id;
+        const label = app.fqdn;
+        // 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} \
+                    --net cloudron \
+                    --net-alias ${redisName} \
+                    --log-driver syslog \
+                    --log-opt syslog-address=udp://127.0.0.1:2514 \
+                    --log-opt syslog-format=rfc5424 \
+                    --log-opt tag="${redisName}" \
+                    -m ${memoryLimit/2} \
+                    --memory-swap ${memoryLimit} \
+                    --dns 172.18.0.1 \
+                    --dns-search=. \
+                    -v ${redisVarsFile}:/etc/redis/redis_vars.sh:ro \
+                    -v ${redisDataDir}:/var/lib/redis:rw \
+                    --read-only -v /tmp -v /run ${tag}`;
+
+        var env = [
+            { name: 'REDIS_URL', value: 'redis://redisuser:' + redisPassword + '@redis-' + app.id },
+            { name: 'REDIS_PASSWORD', value: redisPassword },
+            { name: 'REDIS_HOST', value: redisName },
+            { name: 'REDIS_PORT', value: '6379' }
+        ];
+
+        async.series([
+            // stop so that redis can flush itself with SIGTERM
+            shell.execSync.bind(null, 'stopRedis', `docker stop --time=10 ${redisName} 2>/dev/null || true`),
+            shell.execSync.bind(null, 'stopRedis', `docker rm --volumes ${redisName} 2>/dev/null || true`),
+            shell.execSync.bind(null, 'startRedis', cmd),
+            appdb.setAddonConfig.bind(null, app.id, 'redis', env)
+        ], function (error) {
+            if (error) debug('Error setting up redis: ', error);
+            callback(error);
+        });
     });
 }
 

src/appdb.js

@@ -24,6 +24,9 @@ exports = module.exports = {
     setRunCommand: setRunCommand,
     getAppStoreIds: getAppStoreIds,
 
+    setOwner: setOwner,
+    transferOwnership: transferOwnership,
+
     // installation codes (keep in sync in UI)
     ISTATE_PENDING_INSTALL: 'pending_install', // installs and fresh reinstalls
     ISTATE_PENDING_CLONE: 'pending_clone', // clone
@@ -47,6 +50,10 @@ exports = module.exports = {
     HEALTH_ERROR: 'error',
     HEALTH_DEAD: 'dead',
 
+    // subdomain table types
+    SUBDOMAIN_TYPE_PRIMARY: 'primary',
+    SUBDOMAIN_TYPE_REDIRECT: 'redirect',
+
     _clear: clear
 };
 
@@ -59,10 +66,10 @@ var assert = require('assert'),
     util = require('util');
 
 var APPS_FIELDS_PREFIXED = [ 'apps.id', 'apps.appStoreId', 'apps.installationState', 'apps.installationProgress', 'apps.runState',
-    'apps.health', 'apps.containerId', 'apps.manifestJson', 'apps.httpPort', 'apps.location', 'apps.domain', 'apps.dnsRecordId',
+    'apps.health', 'apps.containerId', 'apps.manifestJson', 'apps.httpPort', 'subdomains.subdomain AS location', 'subdomains.domain',
     'apps.accessRestrictionJson', 'apps.restoreConfigJson', 'apps.oldConfigJson', 'apps.updateConfigJson', 'apps.memoryLimit',
     'apps.xFrameOptions', 'apps.sso', 'apps.debugModeJson', 'apps.robotsTxt', 'apps.enableBackup',
-    'apps.creationTime', 'apps.updateTime' ].join(',');
+    'apps.creationTime', 'apps.updateTime', 'apps.ownerId', 'apps.ts' ].join(',');
 
 var PORT_BINDINGS_FIELDS = [ 'hostPort', 'environmentVariable', 'appId' ].join(',');
 
@@ -113,6 +120,12 @@ function postProcess(result) {
     assert(result.debugModeJson === null || typeof result.debugModeJson === 'string');
     result.debugMode = safe.JSON.parse(result.debugModeJson);
     delete result.debugModeJson;
+
+    result.alternateDomains = result.alternateDomains || [];
+    result.alternateDomains.forEach(function (d) {
+        delete d.appId;
+        delete d.type;
+    });
 }
 
 function get(id, callback) {
@@ -121,13 +134,22 @@ function get(id, callback) {
 
     database.query('SELECT ' + APPS_FIELDS_PREFIXED + ','
         + 'GROUP_CONCAT(CAST(appPortBindings.hostPort AS CHAR(6))) AS hostPorts, GROUP_CONCAT(appPortBindings.environmentVariable) AS environmentVariables'
-        + ' FROM apps LEFT OUTER JOIN appPortBindings ON apps.id = appPortBindings.appId WHERE apps.id = ? GROUP BY apps.id', [ id ], function (error, result) {
+        + ' FROM apps'
+        + '  LEFT OUTER JOIN appPortBindings ON apps.id = appPortBindings.appId'
+        + '  LEFT OUTER JOIN subdomains ON apps.id = subdomains.appId AND type = ?'
+        + ' WHERE apps.id = ? GROUP BY apps.id', [ exports.SUBDOMAIN_TYPE_PRIMARY, id ], function (error, result) {
         if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
         if (result.length === 0) return callback(new DatabaseError(DatabaseError.NOT_FOUND));
 
-        postProcess(result[0]);
+        database.query('SELECT * FROM subdomains WHERE appId = ? AND type = ?', [ id, exports.SUBDOMAIN_TYPE_REDIRECT ], function (error, alternateDomains) {
+            if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
 
-        callback(null, result[0]);
+            result[0].alternateDomains = alternateDomains;
+
+            postProcess(result[0]);
+
+            callback(null, result[0]);
+        })
     });
 }
 
@@ -137,13 +159,21 @@ function getByHttpPort(httpPort, callback) {
 
     database.query('SELECT ' + APPS_FIELDS_PREFIXED + ','
         + 'GROUP_CONCAT(CAST(appPortBindings.hostPort AS CHAR(6))) AS hostPorts, GROUP_CONCAT(appPortBindings.environmentVariable) AS environmentVariables'
-        + '  FROM apps LEFT OUTER JOIN appPortBindings ON apps.id = appPortBindings.appId WHERE httpPort = ? GROUP BY apps.id', [ httpPort ], function (error, result) {
+        + ' FROM apps'
+        + '  LEFT OUTER JOIN appPortBindings ON apps.id = appPortBindings.appId'
+        + '  LEFT OUTER JOIN subdomains ON apps.id = subdomains.appId AND type = ?'
+        + ' WHERE httpPort = ? GROUP BY apps.id', [ exports.SUBDOMAIN_TYPE_PRIMARY, httpPort ], function (error, result) {
         if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
         if (result.length === 0) return callback(new DatabaseError(DatabaseError.NOT_FOUND));
 
-        postProcess(result[0]);
+        database.query('SELECT * FROM subdomains WHERE appId = ? AND type = ?', [ result[0].id, exports.SUBDOMAIN_TYPE_REDIRECT ], function (error, alternateDomains) {
+            if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
 
-        callback(null, result[0]);
+            result[0].alternateDomains = alternateDomains;
+            postProcess(result[0]);
+
+            callback(null, result[0]);
+        });
     });
 }
 
@@ -153,13 +183,21 @@ function getByContainerId(containerId, callback) {
 
     database.query('SELECT ' + APPS_FIELDS_PREFIXED + ','
         + 'GROUP_CONCAT(CAST(appPortBindings.hostPort AS CHAR(6))) AS hostPorts, GROUP_CONCAT(appPortBindings.environmentVariable) AS environmentVariables'
-        + '  FROM apps LEFT OUTER JOIN appPortBindings ON apps.id = appPortBindings.appId WHERE containerId = ? GROUP BY apps.id', [ containerId ], function (error, result) {
+        + ' FROM apps'
+        + '  LEFT OUTER JOIN appPortBindings ON apps.id = appPortBindings.appId'
+        + '  LEFT OUTER JOIN subdomains ON apps.id = subdomains.appId AND type = ?'
+        + ' WHERE containerId = ? GROUP BY apps.id', [ exports.SUBDOMAIN_TYPE_PRIMARY, containerId ], function (error, result) {
         if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
         if (result.length === 0) return callback(new DatabaseError(DatabaseError.NOT_FOUND));
 
-        postProcess(result[0]);
+        database.query('SELECT * FROM subdomains WHERE appId = ? AND type = ?', [ result[0].id, exports.SUBDOMAIN_TYPE_REDIRECT ], function (error, alternateDomains) {
+            if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
 
-        callback(null, result[0]);
+            result[0].alternateDomains = alternateDomains;
+            postProcess(result[0]);
+
+            callback(null, result[0]);
+        });
     });
 }
 
@@ -168,23 +206,38 @@ function getAll(callback) {
 
     database.query('SELECT ' + APPS_FIELDS_PREFIXED + ','
         + 'GROUP_CONCAT(CAST(appPortBindings.hostPort AS CHAR(6))) AS hostPorts, GROUP_CONCAT(appPortBindings.environmentVariable) AS environmentVariables'
-        + ' FROM apps LEFT OUTER JOIN appPortBindings ON apps.id = appPortBindings.appId'
-        + ' GROUP BY apps.id ORDER BY apps.id', function (error, results) {
+        + ' FROM apps'
+        + '  LEFT OUTER JOIN appPortBindings ON apps.id = appPortBindings.appId'
+        + '  LEFT OUTER JOIN subdomains ON apps.id = subdomains.appId AND type = ?'
+        + ' GROUP BY apps.id ORDER BY apps.id', [ exports.SUBDOMAIN_TYPE_PRIMARY ], function (error, results) {
         if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
 
-        results.forEach(postProcess);
+        database.query('SELECT * FROM subdomains WHERE type = ?', [ exports.SUBDOMAIN_TYPE_REDIRECT ], function (error, alternateDomains) {
+            if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
 
-        callback(null, results);
+            alternateDomains.forEach(function (d) {
+                var domain = results.find(function (a) { return d.appId === a.id; });
+                if (!domain) return;
+
+                domain.alternateDomains = domain.alternateDomains || [];
+                domain.alternateDomains.push(d);
+            });
+
+            results.forEach(postProcess);
+
+            callback(null, results);
+        });
     });
 }
 
-function add(id, appStoreId, manifest, location, domain, portBindings, data, callback) {
+function add(id, appStoreId, manifest, location, domain, ownerId, portBindings, data, callback) {
     assert.strictEqual(typeof id, 'string');
     assert.strictEqual(typeof appStoreId, 'string');
     assert(manifest && typeof manifest === 'object');
     assert.strictEqual(typeof manifest.version, 'string');
     assert.strictEqual(typeof location, 'string');
     assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof ownerId, 'string');
     assert.strictEqual(typeof portBindings, 'object');
     assert(data && typeof data === 'object');
     assert.strictEqual(typeof callback, 'function');
@@ -204,10 +257,16 @@ function add(id, appStoreId, manifest, location, domain, portBindings, data, cal
     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, accessRestrictionJson, memoryLimit, xFrameOptions, restoreConfigJson, sso, debugModeJson, robotsTxt, ownerId) ' +
+            ' VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)',
+        args: [ id, appStoreId, manifestJson, installationState, accessRestrictionJson, memoryLimit, xFrameOptions, restoreConfigJson, sso, debugModeJson, robotsTxt, ownerId ]
+    });
+
+    queries.push({
+        query: 'INSERT INTO subdomains (appId, domain, subdomain, type) VALUES (?, ?, ?, ?)',
+        args: [ id, domain, location, exports.SUBDOMAIN_TYPE_PRIMARY ]
     });
 
     Object.keys(portBindings).forEach(function (env) {
@@ -225,6 +284,15 @@ function add(id, appStoreId, manifest, location, domain, portBindings, data, cal
         });
     }
 
+    if (data.alternateDomains) {
+        data.alternateDomains.forEach(function (d) {
+            queries.push({
+                query: 'INSERT INTO subdomains (appId, domain, subdomain, type) VALUES (?, ?, ?, ?)',
+                args: [ id, d.domain, d.subdomain, exports.SUBDOMAIN_TYPE_REDIRECT ]
+            });
+        });
+    }
+
     database.transaction(queries, function (error) {
         if (error && error.code === 'ER_DUP_ENTRY') return callback(new DatabaseError(DatabaseError.ALREADY_EXISTS, error.message));
         if (error && error.code === 'ER_NO_REFERENCED_ROW_2') return callback(new DatabaseError(DatabaseError.NOT_FOUND, 'no such domain'));
@@ -278,6 +346,7 @@ function del(id, callback) {
     assert.strictEqual(typeof callback, 'function');
 
     var queries = [
+        { query: 'DELETE FROM subdomains WHERE appId = ?', args: [ id ] },
         { query: 'DELETE FROM mailboxes WHERE ownerId=?', args: [ id ] },
         { query: 'DELETE FROM appPortBindings WHERE appId = ?', args: [ id ] },
         { query: 'DELETE FROM apps WHERE id = ?', args: [ id ] }
@@ -285,7 +354,7 @@ function del(id, callback) {
 
     database.transaction(queries, function (error, results) {
         if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
-        if (results[2].affectedRows !== 1) return callback(new DatabaseError(DatabaseError.NOT_FOUND));
+        if (results[3].affectedRows !== 1) return callback(new DatabaseError(DatabaseError.NOT_FOUND));
 
         callback(null);
     });
@@ -295,6 +364,7 @@ function clear(callback) {
     assert.strictEqual(typeof callback, 'function');
 
     async.series([
+        database.query.bind(null, 'DELETE FROM subdomains'),
         database.query.bind(null, 'DELETE FROM appPortBindings'),
         database.query.bind(null, 'DELETE FROM appAddonConfigs'),
         database.query.bind(null, 'DELETE FROM apps')
@@ -315,6 +385,7 @@ function updateWithConstraints(id, app, constraints, callback) {
     assert.strictEqual(typeof callback, 'function');
     assert(!('portBindings' in app) || typeof app.portBindings === 'object');
     assert(!('accessRestriction' in app) || typeof app.accessRestriction === 'object' || app.accessRestriction === '');
+    assert(!('alternateDomains' in app) || Array.isArray(app.alternateDomains));
 
     var queries = [ ];
 
@@ -328,12 +399,27 @@ function updateWithConstraints(id, app, constraints, callback) {
         });
     }
 
+    if ('location' in app) {
+        queries.push({ query: 'UPDATE subdomains SET subdomain = ? WHERE appId = ? AND type = ?', args: [ app.location, id, exports.SUBDOMAIN_TYPE_PRIMARY ]});
+    }
+
+    if ('domain' in app) {
+        queries.push({ query: 'UPDATE subdomains SET domain = ? WHERE appId = ? AND type = ?', args: [ app.domain, id, exports.SUBDOMAIN_TYPE_PRIMARY ]});
+    }
+
+    if ('alternateDomains' in app) {
+        queries.push({ query: 'DELETE FROM subdomains WHERE appId = ? AND type = ?', args: [ id, exports.SUBDOMAIN_TYPE_REDIRECT ]});
+        app.alternateDomains.forEach(function (d) {
+            queries.push({ query: 'INSERT INTO subdomains (appId, domain, subdomain, type) VALUES (?, ?, ?, ?)', args: [ id, d.domain, d.subdomain, exports.SUBDOMAIN_TYPE_REDIRECT ]});
+        });
+    }
+
     var fields = [ ], values = [ ];
     for (var p in app) {
         if (p === 'manifest' || p === 'oldConfig' || p === 'updateConfig' || p === 'restoreConfig' || p === 'accessRestriction' || p === 'debugMode') {
             fields.push(`${p}Json = ?`);
             values.push(JSON.stringify(app[p]));
-        } else if (p !== 'portBindings') {
+        } else if (p !== 'portBindings' && p !== 'location' && p !== 'domain' && p !== 'alternateDomains') {
             fields.push(p + ' = ?');
             values.push(app[p]);
         }
@@ -505,3 +591,31 @@ function getAddonConfigByName(appId, addonId, name, callback) {
         callback(null, results[0].value);
     });
 }
+
+function setOwner(appId, ownerId, callback) {
+    assert.strictEqual(typeof appId, 'string');
+    assert.strictEqual(typeof ownerId, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    database.query('UPDATE apps SET ownerId=? WHERE appId=?', [ ownerId, appId ], function (error, results) {
+        if (error && error.code === 'ER_NO_REFERENCED_ROW_2') return callback(new DatabaseError(DatabaseError.NOT_FOUND, 'No such user'));
+        if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
+
+        if (results.length === 0) return callback(new DatabaseError(DatabaseError.NOT_FOUND, 'No such app'));
+
+        callback(null);
+    });
+}
+
+function transferOwnership(oldOwnerId, newOwnerId, callback) {
+    assert.strictEqual(typeof oldOwnerId, 'string');
+    assert.strictEqual(typeof newOwnerId, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    database.query('UPDATE apps SET ownerId=? WHERE ownerId=?', [ newOwnerId, oldOwnerId ], function (error, results) {
+        if (error && error.code === 'ER_NO_REFERENCED_ROW_2') return callback(new DatabaseError(DatabaseError.NOT_FOUND, 'No such user'));
+        if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
+
+        callback(null);
+    });
+}

src/apps.js

@@ -4,6 +4,8 @@ exports = module.exports = {
     AppsError: AppsError,
 
     hasAccessTo: hasAccessTo,
+    removeInternalFields: removeInternalFields,
+    removeRestrictedFields: removeRestrictedFields,
 
     get: get,
     getByIpAddress: getByIpAddress,
@@ -40,14 +42,16 @@ exports = module.exports = {
     downloadFile: downloadFile,
     uploadFile: uploadFile,
 
+    setOwner: setOwner,
+    transferOwnership: transferOwnership,
+
     // exported for testing
     _validateHostname: validateHostname,
     _validatePortBindings: validatePortBindings,
     _validateAccessRestriction: validateAccessRestriction
 };
 
-var addons = require('./addons.js'),
-    appdb = require('./appdb.js'),
+var appdb = require('./appdb.js'),
     appstore = require('./appstore.js'),
     AppstoreError = require('./appstore.js').AppstoreError,
     assert = require('assert'),
@@ -61,10 +65,10 @@ var addons = require('./addons.js'),
     docker = require('./docker.js'),
     domaindb = require('./domaindb.js'),
     domains = require('./domains.js'),
-    DomainError = require('./domains.js').DomainError,
+    DomainsError = require('./domains.js').DomainsError,
     eventlog = require('./eventlog.js'),
     fs = require('fs'),
-    groups = require('./groups.js'),
+    mail = require('./mail.js'),
     mailboxdb = require('./mailboxdb.js'),
     manifestFormat = require('cloudron-manifestformat'),
     os = require('os'),
@@ -83,7 +87,8 @@ var addons = require('./addons.js'),
     url = require('url'),
     util = require('util'),
     uuid = require('uuid'),
-    validator = require('validator');
+    validator = require('validator'),
+    _ = require('underscore');
 
 // http://dustinsenos.com/articles/customErrorsInNode
 // http://code.google.com/p/v8/wiki/JavaScriptStackTraceApi
@@ -144,9 +149,9 @@ function validateHostname(location, domain, hostname) {
 
     if (location) {
         // label validation
-        if (location.length > 63) return new AppsError(AppsError.BAD_FIELD, 'Subdomain exceeds 63 characters');
-        if (location.match(/^[A-Za-z0-9-]+$/) === null) return new AppsError(AppsError.BAD_FIELD, 'Subdomain can only contain alphanumerics and hyphen');
-        if (location.startsWith('-') || location.endsWith('-')) return new AppsError(AppsError.BAD_FIELD, 'Subdomain cannot start or end with hyphen');
+        if (location.split('.').some(function (p) { return p.length > 63 || p.length < 1; })) return new AppsError(AppsError.BAD_FIELD, 'Invalid subdomain length');
+        if (location.match(/^[A-Za-z0-9-.]+$/) === null) return new AppsError(AppsError.BAD_FIELD, 'Subdomain can only contain alphanumeric, hyphen and dot');
+        if (/^[-.]/.test(location)) return new AppsError(AppsError.BAD_FIELD, 'Subdomain cannot start or end with hyphen or dot');
     }
 
     return null;
@@ -156,7 +161,7 @@ function validateHostname(location, domain, hostname) {
 function validatePortBindings(portBindings, tcpPorts) {
     assert.strictEqual(typeof portBindings, 'object');
 
-    // keep the public ports in sync with firewall rules in scripts/initializeBaseUbuntuImage.sh
+    // keep the public ports in sync with firewall rules in setup/start/cloudron-firewall.sh
     // these ports are reserved even if we listen only on 127.0.0.1 because we setup HostIp to be 127.0.0.1
     // for custom tcp ports
     var RESERVED_PORTS = [
@@ -173,6 +178,7 @@ function validatePortBindings(portBindings, tcpPorts) {
         2003, /* graphite (lo) */
         2004, /* graphite (lo) */
         2020, /* mail server */
+        2514, /* cloudron-syslog (lo) */
         config.get('port'), /* app server (lo) */
         config.get('sysadminPort'), /* sysadmin app server (lo) */
         config.get('smtpPort'), /* internal smtp port (lo) */
@@ -312,16 +318,31 @@ function getAppConfig(app) {
         manifest: app.manifest,
         location: app.location,
         domain: app.domain,
-        fqdn: app.fqdn,
         accessRestriction: app.accessRestriction,
         portBindings: app.portBindings,
         memoryLimit: app.memoryLimit,
         xFrameOptions: app.xFrameOptions || 'SAMEORIGIN',
         robotsTxt: app.robotsTxt,
-        sso: app.sso
+        sso: app.sso,
+        alternateDomains: app.alternateDomains || []
     };
 }
 
+function removeInternalFields(app) {
+    return _.pick(app,
+        'id', 'appStoreId', 'installationState', 'installationProgress', 'runState', 'health',
+        'location', 'domain', 'fqdn', 'mailboxName',
+        'accessRestriction', 'manifest', 'portBindings', 'iconUrl', 'memoryLimit', 'xFrameOptions',
+        'sso', 'debugMode', 'robotsTxt', 'enableBackup', 'creationTime', 'updateTime', 'ts',
+        'alternateDomains', 'ownerId');
+}
+
+function removeRestrictedFields(app) {
+    return _.pick(app,
+        'id', 'appStoreId', 'installationState', 'installationProgress', 'runState', 'health', 'ownerId',
+        'location', 'domain', 'fqdn', 'manifest', 'portBindings', 'iconUrl', 'creationTime', 'ts');
+}
+
 function getIconUrlSync(app) {
     var iconPath = paths.APP_ICONS_DIR + '/' + app.id + '.png';
     return fs.existsSync(iconPath) ? '/api/v1/apps/' + app.id + '/icon' : null;
@@ -337,20 +358,13 @@ function hasAccessTo(app, user, callback) {
     // check user access
     if (app.accessRestriction.users.some(function (e) { return e === user.id; })) return callback(null, true);
 
-    // check group access
-    groups.getGroups(user.id, function (error, groupIds) {
-        if (error) return callback(null, false);
+    if (user.admin) return callback(null, true); // admins can always access any app
 
-        const isAdmin = groupIds.indexOf(constants.ADMIN_GROUP_ID) !== -1;
+    if (!app.accessRestriction.groups) return callback(null, false);
 
-        if (isAdmin) return callback(null, true); // admins can always access any app
+    if (app.accessRestriction.groups.some(function (gid) { return user.groupIds.indexOf(gid) !== -1; })) return callback(null, true);
 
-        if (!app.accessRestriction.groups) return callback(null, false);
-
-        if (app.accessRestriction.groups.some(function (gid) { return groupIds.indexOf(gid) !== -1; })) return callback(null, true);
-
-        callback(null, false);
-    });
+    callback(null, false);
 }
 
 function get(appId, callback) {
@@ -367,7 +381,13 @@ function get(appId, callback) {
             app.iconUrl = getIconUrlSync(app);
             app.fqdn = domains.fqdn(app.location, app.domain, result.provider);
 
-            callback(null, app);
+            mailboxdb.getByOwnerId(app.id, function (error, mailboxes) {
+                if (error && error.reason !== DatabaseError.NOT_FOUND) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
+
+                if (!error) app.mailboxName = mailboxes[0].name;
+
+                callback(null, app);
+            });
         });
     });
 }
@@ -389,7 +409,13 @@ function getByIpAddress(ip, callback) {
                 app.iconUrl = getIconUrlSync(app);
                 app.fqdn = domains.fqdn(app.location, app.domain, result.provider);
 
-                callback(null, app);
+                mailboxdb.getByOwnerId(app.id, function (error, mailboxes) {
+                    if (error && error.reason !== DatabaseError.NOT_FOUND) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
+
+                    if (!error) app.mailboxName = mailboxes[0].name;
+
+                    callback(null, app);
+                });
             });
         });
     });
@@ -408,7 +434,13 @@ function getAll(callback) {
                 app.iconUrl = getIconUrlSync(app);
                 app.fqdn = domains.fqdn(app.location, app.domain, result.provider);
 
-                iteratorDone();
+                mailboxdb.getByOwnerId(app.id, function (error, mailboxes) {
+                    if (error && error.reason !== DatabaseError.NOT_FOUND) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
+
+                    if (!error) app.mailboxName = mailboxes[0].name;
+
+                    iteratorDone(null, app);
+                });
             });
         }, function (error) {
             if (error) return callback(error);
@@ -451,6 +483,10 @@ function downloadManifest(appStoreId, manifest, callback) {
     });
 }
 
+function mailboxNameForLocation(location, manifest) {
+    return (location ? location : manifest.title.toLowerCase().replace(/[^a-zA-Z0-9]/g, '')) + '.app';
+}
+
 function install(data, auditSource, callback) {
     assert(data && typeof data === 'object');
     assert.strictEqual(typeof auditSource, 'object');
@@ -470,7 +506,8 @@ function install(data, auditSource, callback) {
         robotsTxt = data.robotsTxt || null,
         enableBackup = 'enableBackup' in data ? data.enableBackup : true,
         backupId = data.backupId || null,
-        backupFormat = data.backupFormat || 'tgz';
+        backupFormat = data.backupFormat || 'tgz',
+        ownerId = data.ownerId;
 
     assert(data.appStoreId || data.manifest); // atleast one of them is required
 
@@ -519,7 +556,7 @@ function install(data, auditSource, callback) {
         }
 
         domains.get(domain, function (error, domainObject) {
-            if (error && error.reason === DomainError.NOT_FOUND) return callback(new AppsError(AppsError.NOT_FOUND, 'No such domain'));
+            if (error && error.reason === DomainsError.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);
@@ -534,28 +571,38 @@ function install(data, auditSource, callback) {
 
             debug('Will install app with id : ' + appId);
 
-            appstore.purchase(appId, appStoreId, function (error) {
-                if (error && error.reason === AppstoreError.NOT_FOUND) return callback(new AppsError(AppsError.NOT_FOUND));
-                if (error && error.reason === AppstoreError.BILLING_REQUIRED) return callback(new AppsError(AppsError.BILLING_REQUIRED, error.message));
-                if (error && error.reason === AppstoreError.EXTERNAL_ERROR) return callback(new AppsError(AppsError.EXTERNAL_ERROR, error.message));
+            var data = {
+                accessRestriction: accessRestriction,
+                memoryLimit: memoryLimit,
+                xFrameOptions: xFrameOptions,
+                sso: sso,
+                debugMode: debugMode,
+                mailboxName: mailboxNameForLocation(location, manifest),
+                restoreConfig: backupId ? { backupId: backupId, backupFormat: backupFormat } : null,
+                enableBackup: enableBackup,
+                robotsTxt: robotsTxt
+            };
+
+            appdb.add(appId, appStoreId, manifest, location, domain, ownerId, 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));
                 if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
 
-                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
-                };
+                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);
 
-                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));
-                    if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
+                            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;
+                    }
 
                     // save cert to boxdata/certs
                     if (cert && key) {
@@ -633,8 +680,18 @@ function configure(appId, data, auditSource, callback) {
             if (error) return callback(error);
         }
 
+        if ('mailboxName' in data) {
+            error = mail.validateName(data.mailboxName);
+            if (error) return callback(error);
+        }
+
+        if ('alternateDomains' in data) {
+            // TODO validate all subdomains [{ domain: '', subdomain: ''}]
+            values.alternateDomains = data.alternateDomains;
+        }
+
         domains.get(domain, function (error, domainObject) {
-            if (error && error.reason === DomainError.NOT_FOUND) return callback(new AppsError(AppsError.NOT_FOUND, 'No such domain'));
+            if (error && error.reason === DomainsError.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);
@@ -652,7 +709,7 @@ function configure(appId, data, auditSource, callback) {
                     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));
                 } 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, `${fqdn}.user.key`))) debug('Error removing key: ' + safe.error.message);
                 }
             }
 
@@ -662,9 +719,12 @@ function configure(appId, data, auditSource, callback) {
 
             debug('Will configure app with id:%s values:%j', appId, values);
 
-            var oldName = (app.location ? app.location : app.manifest.title.toLowerCase().replace(/[^a-zA-Z0-9]/g, '')) + '.app';
-            var newName = (location ? location : app.manifest.title.toLowerCase().replace(/[^a-zA-Z0-9]/g, '')) + '.app';
+            // make the mailbox name follow the apps new location, if the user did not set it explicitly
+            var oldName = app.mailboxName;
+            var newName = data.mailboxName || (app.mailboxName.endsWith('.app') ? mailboxNameForLocation(location, app.manifest) : app.mailboxName);
             mailboxdb.updateName(oldName, values.oldConfig.domain, newName, domain, function (error) {
+                if (newName.endsWith('.app')) error = null; // ignore internal mailbox conflict errors since we want to show location conflict errors in the UI
+
                 if (error && error.reason === DatabaseError.ALREADY_EXISTS) return callback(new AppsError(AppsError.ALREADY_EXISTS, 'This mailbox is already taken'));
                 if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new AppsError(AppsError.BAD_STATE));
                 if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
@@ -760,12 +820,6 @@ function update(appId, data, auditSource, callback) {
     });
 }
 
-function appLogFilter(app) {
-    var names = [ app.id ].concat(addons.getContainerNamesSync(app, app.manifest.addons));
-
-    return names.map(function (name) { return 'CONTAINER_NAME=' + name; });
-}
-
 function getLogs(appId, options, callback) {
     assert.strictEqual(typeof appId, 'string');
     assert(options && typeof options === 'object');
@@ -773,32 +827,38 @@ function getLogs(appId, options, callback) {
 
     debug('Getting logs for %s', appId);
 
-    get(appId, function (error, app) {
+    get(appId, function (error /*, app */) {
         if (error) return callback(error);
 
         var lines = options.lines || 100,
-            follow = !!options.follow,
-            format = options.format || 'json';
+            format = options.format || 'json',
+            follow = !!options.follow;
 
-        var args = [ '--no-pager', '--lines=' + lines ];
-        if (follow) args.push('--follow');
-        if (format == 'short') args.push('--output=short', '-a'); else args.push('--output=json');
-        args = args.concat(appLogFilter(app));
+        assert.strictEqual(typeof lines, 'number');
+        assert.strictEqual(typeof format, 'string');
 
-        var cp = spawn('/bin/journalctl', args);
+        var args = [ '--lines=' + lines ];
+        if (follow) args.push('--follow', '--retry', '--quiet'); // same as -F. to make it work if file doesn't exist, --quiet to not output file headers, which are no logs
+        args.push(path.join(paths.LOG_DIR, appId, 'apptask.log'));
+        args.push(path.join(paths.LOG_DIR, appId, 'app.log'));
+
+        var cp = spawn('/usr/bin/tail', args);
 
         var transformStream = split(function mapper(line) {
             if (format !== 'json') return line + '\n';
 
-            var obj = safe.JSON.parse(line);
-            if (!obj) return undefined;
+            var data = line.split(' '); // logs are <ISOtimestamp> <msg>
+            var timestamp = (new Date(data[0])).getTime();
+            if (isNaN(timestamp)) timestamp = 0;
+            var message = line.slice(data[0].length+1);
+
+            // ignore faulty empty logs
+            if (!timestamp && !message) return;
 
-            var source = obj.CONTAINER_NAME.slice(app.id.length + 1);
             return JSON.stringify({
-                realtimeTimestamp: obj.__REALTIME_TIMESTAMP,
-                monotonicTimestamp: obj.__MONOTONIC_TIMESTAMP,
-                message: obj.MESSAGE,
-                source: source || 'main'
+                realtimeTimestamp: timestamp * 1000,
+                message: message,
+                source: appId
             }) + '\n';
         });
 
@@ -867,12 +927,14 @@ function clone(appId, data, auditSource, callback) {
     var location = data.location.toLowerCase(),
         domain = data.domain.toLowerCase(),
         portBindings = data.portBindings || null,
-        backupId = data.backupId;
+        backupId = data.backupId,
+        ownerId = data.ownerId;
 
     assert.strictEqual(typeof backupId, 'string');
     assert.strictEqual(typeof location, 'string');
     assert.strictEqual(typeof domain, 'string');
     assert.strictEqual(typeof portBindings, 'object');
+    assert(ownerId === null || typeof ownerId === 'string');
 
     get(appId, function (error, app) {
         if (error) return callback(error);
@@ -892,7 +954,7 @@ function clone(appId, data, auditSource, callback) {
             if (error) return callback(error);
 
             domains.get(domain, function (error, domainObject) {
-                if (error && error.reason === DomainError.NOT_FOUND) return callback(new AppsError(AppsError.EXTERNAL_ERROR, 'No such domain'));
+                if (error && error.reason === DomainsError.NOT_FOUND) return callback(new AppsError(AppsError.EXTERNAL_ERROR, '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));
@@ -900,27 +962,37 @@ function clone(appId, data, auditSource, callback) {
 
                 var newAppId = uuid.v4(), manifest = backupInfo.manifest;
 
-                appstore.purchase(newAppId, app.appStoreId, function (error) {
-                    if (error && error.reason === AppstoreError.NOT_FOUND) return callback(new AppsError(AppsError.NOT_FOUND, error.message));
-                    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));
+                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, ownerId, 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));
 
-                    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
-                    };
+                    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);
 
-                    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));
+                                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;
+                        }
 
                         taskmanager.restartAppTask(newAppId);
 
@@ -1066,7 +1138,11 @@ function exec(appId, options, callback) {
                 if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
 
                 if (options.rows && options.columns) {
-                    exec.resize({ h: options.rows, w: options.columns }, function (error) { if (error) debug('Error resizing console', error); });
+                    // there is a race where resizing too early results in a 404 "no such exec"
+                    // https://git.cloudron.io/cloudron/box/issues/549
+                    setTimeout(function () {
+                        exec.resize({ h: options.rows, w: options.columns }, function (error) { if (error) debug('Error resizing console', error); });
+                    }, 2000);
                 }
 
                 return callback(null, stream);
@@ -1174,7 +1250,7 @@ function restoreInstalledApps(callback) {
 
                 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) {
+                appdb.setInstallationCommand(app.id, appdb.ISTATE_PENDING_RESTORE, { restoreConfig: restoreConfig, oldConfig: getAppConfig(app) }, function (error) {
                     if (error) debug(`Error marking ${app.fqdn} for restore: ${JSON.stringify(error)}`);
 
                     iteratorDone(); // always succeed
@@ -1283,3 +1359,28 @@ function uploadFile(appId, sourceFilePath, destFilePath, callback) {
         callback(null);
     });
 }
+
+function setOwner(appId, ownerId, callback) {
+    assert.strictEqual(typeof appId, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    appdb.setOwner(appId, ownerId, function (error) {
+        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new AppsError(AppsError.NOT_FOUND, error.message));
+        if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
+
+        callback();
+    });
+}
+
+function transferOwnership(oldOwnerId, newOwnerId, callback) {
+    assert.strictEqual(typeof oldOwnerId, 'string');
+    assert.strictEqual(typeof newOwnerId, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    appdb.transferOwnership(oldOwnerId, newOwnerId, function (error) {
+        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new AppsError(AppsError.NOT_FOUND, error.message));
+        if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
+
+        callback();
+    });
+}

src/appstore.js

@@ -5,6 +5,7 @@ exports = module.exports = {
     unpurchase: unpurchase,
 
     getSubscription: getSubscription,
+    isFreePlan: isFreePlan,
 
     sendAliveStatus: sendAliveStatus,
 
@@ -18,7 +19,8 @@ exports = module.exports = {
     AppstoreError: AppstoreError
 };
 
-var apps = require('./apps.js'),
+var appdb = require('./appdb.js'),
+    apps = require('./apps.js'),
     assert = require('assert'),
     async = require('async'),
     config = require('./config.js'),
@@ -89,6 +91,10 @@ function getSubscription(callback) {
     });
 }
 
+function isFreePlan(subscription) {
+    return !subscription || subscription.plan.id === 'free';
+}
+
 function purchase(appId, appstoreId, callback) {
     assert.strictEqual(typeof appId, 'string');
     assert.strictEqual(typeof appstoreId, 'string');
@@ -96,20 +102,41 @@ function purchase(appId, appstoreId, callback) {
 
     if (appstoreId === '') return callback(null);
 
-    getAppstoreConfig(function (error, appstoreConfig) {
+    function doThePurchase() {
+        getAppstoreConfig(function (error, appstoreConfig) {
+            if (error) return callback(error);
+
+            var url = config.apiServerOrigin() + '/api/v1/users/' + appstoreConfig.userId + '/cloudrons/' + appstoreConfig.cloudronId + '/apps/' + appId;
+            var data = { appstoreId: appstoreId };
+
+            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.message));
+                if (result.statusCode === 404) return callback(new AppstoreError(AppstoreError.NOT_FOUND));
+                if (result.statusCode === 403 || result.statusCode === 401) return callback(new AppstoreError(AppstoreError.BILLING_REQUIRED));
+                if (result.statusCode === 402) return callback(new AppstoreError(AppstoreError.BILLING_REQUIRED, result.body.message));
+                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)));
+
+                callback(null);
+            });
+        });
+    }
+
+    getSubscription(function (error, result) {
         if (error) return callback(error);
 
-        var url = config.apiServerOrigin() + '/api/v1/users/' + appstoreConfig.userId + '/cloudrons/' + appstoreConfig.cloudronId + '/apps/' + appId;
-        var data = { appstoreId: appstoreId };
+        // only check for app install count if on the free plan
+        if (result.id !== 'free') return doThePurchase();
 
-        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.message));
-            if (result.statusCode === 404) return callback(new AppstoreError(AppstoreError.NOT_FOUND));
-            if (result.statusCode === 403 || result.statusCode === 401) return callback(new AppstoreError(AppstoreError.BILLING_REQUIRED));
-            if (result.statusCode === 402) return callback(new AppstoreError(AppstoreError.BILLING_REQUIRED, result.body.message));
-            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)));
+        appdb.getAppStoreIds(function (error, result) {
+            if (error) return callback(new AppstoreError(AppstoreError.INTERNAL_ERROR, error));
 
-            callback(null);
+            var count = result.filter(function (a) { return !!a.appStoreId; }).length;
+
+            // we only allow max of 2 app installations without a subscription
+            // WARNING install and clone in apps.js will first add the db record and then call purchase() so we test for more than 2 here
+            if (count > 2) return callback(new AppstoreError(AppstoreError.BILLING_REQUIRED, 'Too many apps installed'));
+
+            doThePurchase();
         });
     });
 }
@@ -238,17 +265,17 @@ function getBoxUpdate(callback) {
         var url = config.apiServerOrigin() + '/api/v1/users/' + appstoreConfig.userId + '/cloudrons/' + appstoreConfig.cloudronId + '/boxupdate';
 
         superagent.get(url).query({ accessToken: appstoreConfig.token, boxVersion: config.version() }).timeout(10 * 1000).end(function (error, result) {
-            if (error && !error.response) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, error));
+            if (error && !error.response) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, error.message));
             if (result.statusCode === 204) return callback(null); // no update
             if (result.statusCode !== 200 || !result.body) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, util.format('Bad response: %s %s', result.statusCode, result.text)));
 
             var updateInfo = result.body;
 
             if (!semver.valid(updateInfo.version) || semver.gt(config.version(), updateInfo.version)) {
-                return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, util.format('Bad response: %s %s', result.statusCode, result.text)));
+                return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, util.format('Invalid update version: %s %s', result.statusCode, result.text)));
             }
 
-            // { version, changelog, upgrade, sourceTarballUrl}
+            // updateInfo: { version, changelog, upgrade, sourceTarballUrl, sourceTarballSigUrl, boxVersionsUrl, boxVersionsSigUrl }
             callback(null, updateInfo);
         });
     });

src/apptask.js

@@ -20,11 +20,6 @@ exports = module.exports = {
 
 require('supererror')({ splatchError: true });
 
-// remove timestamp from debug() based output
-require('debug').formatArgs = function formatArgs(args) {
-    args[0] = this.namespace + ' ' + args[0];
-};
-
 var addons = require('./addons.js'),
     appdb = require('./appdb.js'),
     apps = require('./apps.js'),
@@ -37,7 +32,7 @@ var addons = require('./addons.js'),
     debug = require('debug')('box:apptask'),
     docker = require('./docker.js'),
     domains = require('./domains.js'),
-    DomainError = domains.DomainError,
+    DomainsError = domains.DomainsError,
     ejs = require('ejs'),
     fs = require('fs'),
     manifestFormat = require('cloudron-manifestformat'),
@@ -46,6 +41,7 @@ var addons = require('./addons.js'),
     path = require('path'),
     paths = require('./paths.js'),
     reverseProxy = require('./reverseproxy.js'),
+    rimraf = require('rimraf'),
     safe = require('safetydance'),
     shell = require('./shell.js'),
     superagent = require('superagent'),
@@ -273,17 +269,15 @@ function registerSubdomain(app, overwrite, callback) {
                 // 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 === DomainError.STILL_BUSY || error.reason === DomainError.EXTERNAL_ERROR)) return retryCallback(error); // try again
+                domains.upsertDnsRecords(app.location, app.domain, 'A', [ ip ], function (error) {
+                    if (error && (error.reason === DomainsError.STILL_BUSY || error.reason === DomainsError.EXTERNAL_ERROR)) return retryCallback(error); // try again
 
-                    retryCallback(null, error || changeId);
+                    retryCallback(null, error);
                 });
             });
         }, function (error, result) {
             if (error || result instanceof Error) return callback(error || result);
-
-            // dnsRecordId tracks whether we created this DNS record so that we can unregister later
-            updateApp(app, { dnsRecordId: result }, callback);
+            callback(null);
         });
     });
 }
@@ -294,11 +288,6 @@ function unregisterSubdomain(app, location, domain, callback) {
     assert.strictEqual(typeof domain, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    if (!app.dnsRecordId) {
-        debugApp(app, 'Skip unregister of record not created by cloudron');
-        return callback(null);
-    }
-
     sysinfo.getPublicIp(function (error, ip) {
         if (error) return callback(error);
 
@@ -306,19 +295,83 @@ function unregisterSubdomain(app, location, domain, callback) {
             debugApp(app, 'Unregistering subdomain: %s', app.fqdn);
 
             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
+                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
 
                 retryCallback(null, error);
             });
         }, function (error, result) {
             if (error || result instanceof Error) return callback(error || result);
-
-            updateApp(app, { dnsRecordId: null }, callback);
+            callback(null);
         });
     });
 }
 
+function registerAlternateDomains(app, overwrite, callback) {
+    assert.strictEqual(typeof app, 'object');
+    assert.strictEqual(typeof overwrite, 'boolean');
+    assert.strictEqual(typeof callback, 'function');
+
+    sysinfo.getPublicIp(function (error, ip) {
+        if (error) return callback(error);
+
+        async.eachSeries(app.alternateDomains, function (domain, callback) {
+            async.retry({ times: 200, interval: 5000 }, function (retryCallback) {
+                debugApp(app, 'Registering alternate subdomain [%s] overwrite: %s', (domain.subdomain ? (domain.subdomain + '.') : '') + domain.domain, overwrite);
+
+                // get the current record before updating it
+                domains.getDnsRecords(domain.subdomain, domain.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(domain.subdomain, domain.domain, 'A', [ ip ], function (error) {
+                        if (error && (error.reason === DomainsError.STILL_BUSY || error.reason === DomainsError.EXTERNAL_ERROR)) return retryCallback(error); // try again
+
+                        retryCallback(null, error);
+                    });
+                });
+            }, function (error, result) {
+                if (error || result instanceof Error) return callback(error || result);
+                callback();
+            });
+        }, callback);
+    });
+}
+
+function unregisterAlternateDomains(app, all, callback) {
+    assert.strictEqual(typeof app, 'object');
+    assert.strictEqual(typeof all, 'boolean');
+    assert.strictEqual(typeof callback, 'function');
+
+    var obsoleteDomains
+    if (all) obsoleteDomains = app.alternateDomains;
+    else obsoleteDomains = app.oldConfig.alternateDomains.filter(function (o) { return !app.alternateDomains.some(function (n) { return n.subdomain === o.subdomain && n.domain === o.domain; }); });
+
+    if (obsoleteDomains.length === 0) return callback();
+
+    sysinfo.getPublicIp(function (error, ip) {
+        if (error) return callback(error);
+
+        async.eachSeries(obsoleteDomains, function (domain, callback) {
+            async.retry({ times: 30, interval: 5000 }, function (retryCallback) {
+                debugApp(app, 'Unregistering subdomain: %s%s', domain.subdomain ? (domain.subdomain + '.') : '', domain.domain);
+
+                domains.removeDnsRecords(domain.subdomain, domain.domain, 'A', [ ip ], function (error) {
+                    if (error && error.reason === DomainsError.NOT_FOUND) return retryCallback(null, null);
+                    if (error && (error.reason === DomainsError.STILL_BUSY || error.reason === DomainsError.EXTERNAL_ERROR)) return retryCallback(error); // try again
+
+                    retryCallback(null, error);
+                });
+            }, function (error, result) {
+                if (error || result instanceof Error) return callback(error || result);
+                callback();
+            });
+        }, callback);
+    });
+}
+
 function removeIcon(app, callback) {
     assert.strictEqual(typeof app, 'object');
     assert.strictEqual(typeof callback, 'function');
@@ -329,6 +382,16 @@ function removeIcon(app, callback) {
     });
 }
 
+function cleanupLogs(app, callback) {
+    assert.strictEqual(typeof app, 'object');
+    assert.strictEqual(typeof callback, 'function');
+
+    rimraf(path.join(paths.LOG_DIR, app.id), function (error) {
+        if (error) debugApp(app, 'cannot cleanup logs: %s', error);
+        callback(null);
+    });
+}
+
 function waitForDnsPropagation(app, callback) {
     assert.strictEqual(typeof app, 'object');
     assert.strictEqual(typeof callback, 'function');
@@ -341,7 +404,15 @@ 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.fqdn, app.domain, ip, { interval: 5000, times: 240 }, function (error) {
+            if (error) return callback(error);
+
+            // now wait for alternateDomains, if any
+            async.eachSeries(app.alternateDomains, function (domain, callback) {
+                var fqdn = (domain.subdomain ? (domain.subdomain + '.') : '') + domain.domain;
+                domains.waitForDnsRecord(fqdn, domain.domain, ip, { interval: 5000, times: 240 }, callback);
+            }, callback);
+        });
     });
 }
 
@@ -374,8 +445,14 @@ function install(app, callback) {
         removeLogrotateConfig.bind(null, app),
         stopApp.bind(null, app),
         deleteContainers.bind(null, app),
-        // oldConfig can be null during upgrades
-        addons.teardownAddons.bind(null, app, app.oldConfig ? app.oldConfig.manifest.addons : app.manifest.addons),
+        function teardownAddons(next) {
+            // when restoring, app does not require these addons anymore. remove carefully to preserve the db passwords
+            var addonsToRemove = !isRestoring
+                ? app.manifest.addons
+                : _.omit(app.oldConfig.manifest.addons, Object.keys(app.manifest.addons));
+
+            addons.teardownAddons(app, addonsToRemove, next);
+        },
         deleteVolume.bind(null, app, { removeDirectory: false }), // do not remove any symlinked volume
 
         // for restore case
@@ -481,20 +558,25 @@ function configure(app, callback) {
         removeLogrotateConfig.bind(null, app),
         stopApp.bind(null, app),
         deleteContainers.bind(null, app),
+        unregisterAlternateDomains.bind(null, app, false /* all */),
         function (next) {
             if (!locationChanged) return next();
 
             unregisterSubdomain(app, app.oldConfig.location, app.oldConfig.domain, next);
         },
 
+
         reserveHttpPort.bind(null, app),
 
         updateApp.bind(null, app, { installationProgress: '20, Downloading icon' }),
         downloadIcon.bind(null, app),
 
-        updateApp.bind(null, app, { installationProgress: '35, Registering subdomain' }),
+        updateApp.bind(null, app, { installationProgress: '30, Registering subdomain' }),
         registerSubdomain.bind(null, app, !locationChanged /* overwrite */), // if location changed, do not overwrite to detect conflicts
 
+        updateApp.bind(null, app, { installationProgress: '35, Registering alternate domains'}),
+        registerAlternateDomains.bind(null, app, true /* overwrite */), // figure out when to overwrite
+
         updateApp.bind(null, app, { installationProgress: '40, Downloading image' }),
         docker.downloadImage.bind(null, app.manifest),
 
@@ -673,15 +755,19 @@ function uninstall(app, callback) {
         updateApp.bind(null, app, { installationProgress: '50, Deleting image' }),
         docker.deleteImage.bind(null, app.manifest),
 
-        updateApp.bind(null, app, { installationProgress: '60, Unregistering subdomain' }),
+        updateApp.bind(null, app, { installationProgress: '60, Unregistering domains' }),
+        unregisterAlternateDomains.bind(null, app, true /* all */),
         unregisterSubdomain.bind(null, app, app.location, app.domain),
 
-        updateApp.bind(null, app, { installationProgress: '80, Cleanup icon' }),
+        updateApp.bind(null, app, { installationProgress: '70, Cleanup icon' }),
         removeIcon.bind(null, app),
 
-        updateApp.bind(null, app, { installationProgress: '90, Unconfiguring reverse proxy' }),
+        updateApp.bind(null, app, { installationProgress: '80, Unconfiguring reverse proxy' }),
         unconfigureReverseProxy.bind(null, app),
 
+        updateApp.bind(null, app, { installationProgress: '90, Cleanup logs' }),
+        cleanupLogs.bind(null, app),
+
         updateApp.bind(null, app, { installationProgress: '95, Remove app from database' }),
         appdb.del.bind(null, app.id)
     ], function seriesDone(error) {
@@ -770,6 +856,8 @@ function startTask(appId, callback) {
 if (require.main === module) {
     assert.strictEqual(process.argv.length, 3, 'Pass the appid as argument');
 
+    // add a separator for the log file
+    debug('------------------------------------------------------------');
     debug('Apptask for %s', process.argv[2]);
 
     process.on('SIGTERM', function () {

src/auth.js

@@ -1,125 +0,0 @@
-'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

@@ -58,6 +58,7 @@ var addons = require('./addons.js'),
     safe = require('safetydance'),
     shell = require('./shell.js'),
     settings = require('./settings.js'),
+    superagent = require('superagent'),
     syncer = require('./syncer.js'),
     tar = require('tar-fs'),
     util = require('util'),
@@ -157,7 +158,7 @@ function get(backupId, callback) {
     assert.strictEqual(typeof callback, 'function');
 
     backupdb.get(backupId, function (error, result) {
-        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new BackupsError(BackupsError.NOT_FOUND, error));
+        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new BackupsError(BackupsError.NOT_FOUND));
         if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error));
 
         callback(null, result);
@@ -182,6 +183,92 @@ function log(detail) {
     progress.setDetail(progress.BACKUP, detail);
 }
 
+function encryptFilePath(filePath, key) {
+    assert.strictEqual(typeof filePath, 'string');
+    assert.strictEqual(typeof key, 'string');
+
+    var encryptedParts = filePath.split('/').map(function (part) {
+        const cipher = crypto.createCipher('aes-256-cbc', key);
+        let crypt = cipher.update(part);
+        crypt = Buffer.concat([ crypt, cipher.final() ]);
+
+        return crypt.toString('base64')     // ensures path is valid
+            .replace(/\//g, '-')            // replace '/' of base64 since it conflicts with path separator
+            .replace(/=/g,'');              // strip trailing = padding. this is only needed if we concat base64 strings, which we don't
+    });
+
+    return encryptedParts.join('/');
+}
+
+function decryptFilePath(filePath, key) {
+    assert.strictEqual(typeof filePath, 'string');
+    assert.strictEqual(typeof key, 'string');
+
+    let decryptedParts = [];
+    for (let part of filePath.split('/')) {
+        part = part + Array(part.length % 4).join('='); // add back = padding
+        part = part.replace(/-/g, '/');                 // replace with '/'
+
+        try {
+            let decrypt = crypto.createDecipher('aes-256-cbc', key);
+            let text = decrypt.update(Buffer.from(part, 'base64'));
+            text = Buffer.concat([ text, decrypt.final() ]);
+            decryptedParts.push(text.toString('utf8'));
+        } catch (error) {
+            debug(`Error decrypting file ${filePath} part ${part}:`, error);
+            return null;
+        }
+    }
+
+    return decryptedParts.join('/');
+}
+
+function createReadStream(sourceFile, key) {
+    assert.strictEqual(typeof sourceFile, 'string');
+    assert(key === null || typeof key === 'string');
+
+    var stream = fs.createReadStream(sourceFile);
+    var ps = progressStream({ time: 10000 }); // display a progress every 10 seconds
+
+    stream.on('error', function (error) {
+        debug('createReadStream: tar stream error.', error);
+        ps.emit('error', new BackupsError(BackupsError.EXTERNAL_ERROR, error.message));
+    });
+
+    ps.on('progress', function(progress) {
+        debug('createReadStream: %s@%s (%s)', Math.round(progress.transferred/1024/1024) + 'M', Math.round(progress.speed/1024/1024) + 'Mbps', sourceFile);
+    });
+
+    if (key !== null) {
+        var encrypt = crypto.createCipher('aes-256-cbc', key);
+        encrypt.on('error', function (error) {
+            debug('createReadStream: encrypt stream error.', error);
+            ps.emit('error', new BackupsError(BackupsError.EXTERNAL_ERROR, error.message));
+        });
+        return stream.pipe(encrypt).pipe(ps);
+    } else {
+        return stream.pipe(ps);
+    }
+}
+
+function createWriteStream(destFile, key) {
+    assert.strictEqual(typeof destFile, 'string');
+    assert(key === null || typeof key === 'string');
+
+    var stream = fs.createWriteStream(destFile);
+
+    if (key !== null) {
+        var decrypt = crypto.createDecipher('aes-256-cbc', key);
+        decrypt.on('error', function (error) {
+            debug('createWriteStream: decrypt stream error.', error);
+        });
+        decrypt.pipe(stream);
+        return decrypt;
+    } else {
+        return stream;
+    }
+}
+
 function createTarPackStream(sourceDir, key) {
     assert.strictEqual(typeof sourceDir, 'string');
     assert(key === null || typeof key === 'string');
@@ -232,21 +319,23 @@ function sync(backupConfig, backupId, dataDir, callback) {
     assert.strictEqual(typeof callback, 'function');
 
     function setBackupProgress(message) {
-        debug('%s: %s', (new Date()).toISOString(), message);
+        debug('%s', 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);
+        // the empty task.path is special to signify the directory
+        const destPath = task.path && backupConfig.key ? encryptFilePath(task.path, backupConfig.key) : task.path;
+        const backupFilePath = path.join(getBackupFilePath(backupConfig, backupId, backupConfig.format), destPath);
 
         if (task.operation === 'removedir') {
-            safe.fs.writeFileSync(paths.BACKUP_RESULT_FILE, `Removing directory ${task.path}`);
+            setBackupProgress(`Removing directory ${backupFilePath}`);
             return api(backupConfig.provider).removeDir(backupConfig, backupFilePath)
                 .on('progress', setBackupProgress)
                 .on('done', iteratorCallback);
         } else if (task.operation === 'remove') {
-            setBackupProgress(`Removing ${task.path}`);
+            setBackupProgress(`Removing ${backupFilePath}`);
             return api(backupConfig.provider).remove(backupConfig, backupFilePath, iteratorCallback);
         }
 
@@ -258,7 +347,7 @@ function sync(backupConfig, backupId, dataDir, callback) {
             debug(`${task.operation} ${task.path} try ${retryCount}`);
             if (task.operation === 'add') {
                 setBackupProgress(`Adding ${task.path} position ${task.position} try ${retryCount}`);
-                var stream = fs.createReadStream(path.join(dataDir, task.path));
+                var stream = createReadStream(path.join(dataDir, task.path), backupConfig.key || null);
                 stream.on('error', function (error) {
                     setBackupProgress(`read stream error for ${task.path}: ${error.message}`);
                     retryCallback();
@@ -366,7 +455,7 @@ function tarExtract(inStream, destination, key, callback) {
         var decrypt = crypto.createDecipher('aes-256-cbc', key);
         decrypt.on('error', function (error) {
             debug('tarExtract: decrypt stream error.', error);
-            callback(new BackupsError(BackupsError.EXTERNAL_ERROR, error.message));
+            callback(new BackupsError(BackupsError.EXTERNAL_ERROR, `Failed to decrypt: ${error.message}`));
         });
         inStream.pipe(ps).pipe(decrypt).pipe(gunzip).pipe(extract);
     } else {
@@ -400,6 +489,45 @@ function restoreFsMetadata(appDataDir, callback) {
     });
 }
 
+function downloadDir(backupConfig, backupFilePath, destDir, callback) {
+    assert.strictEqual(typeof backupConfig, 'object');
+    assert.strictEqual(typeof backupFilePath, 'string');
+    assert.strictEqual(typeof destDir, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    debug(`downloadDir: ${backupFilePath} to ${destDir}`);
+
+    function downloadFile(entry, callback) {
+        let relativePath = path.relative(backupFilePath, entry.fullPath);
+        if (backupConfig.key) {
+            relativePath = decryptFilePath(relativePath, backupConfig.key);
+            if (!relativePath) return callback(new BackupsError(BackupsError.BAD_STATE, 'Unable to decrypt file'));
+        }
+        const destFilePath = path.join(destDir, relativePath);
+
+        mkdirp(path.dirname(destFilePath), function (error) {
+            if (error) return callback(new BackupsError(BackupsError.EXTERNAL_ERROR, error.message));
+
+            api(backupConfig.provider).download(backupConfig, entry.fullPath, function (error, sourceStream) {
+                if (error) return callback(error);
+
+                sourceStream.on('error', callback);
+
+                let destStream = createWriteStream(destFilePath, backupConfig.key || null);
+                destStream.on('error', callback);
+
+                debug(`downloadDir: Copying ${entry.fullPath} to ${destFilePath}`);
+
+                sourceStream.pipe(destStream, { end: true }).on('finish', callback);
+            });
+        });
+    }
+
+    api(backupConfig.provider).listDir(backupConfig, backupFilePath, 1000, function (entries, done) {
+        async.each(entries, downloadFile, done);
+    }, callback);
+}
+
 function download(backupConfig, backupId, format, dataDir, callback) {
     assert.strictEqual(typeof backupConfig, 'object');
     assert.strictEqual(typeof backupId, 'string');
@@ -418,9 +546,7 @@ function download(backupConfig, backupId, format, dataDir, callback) {
             tarExtract(sourceStream, dataDir, backupConfig.key || null, callback);
         });
     } else {
-        var events = api(backupConfig.provider).downloadDir(backupConfig, getBackupFilePath(backupConfig, backupId, format), dataDir);
-        events.on('progress', log);
-        events.on('done', function (error) {
+        downloadDir(backupConfig, getBackupFilePath(backupConfig, backupId, format), dataDir, function (error) {
             if (error) return callback(error);
 
             restoreFsMetadata(dataDir, callback);
@@ -562,6 +688,34 @@ function uploadBoxSnapshot(backupConfig, callback) {
     });
 }
 
+
+function backupDone(apiConfig, backupId, appBackupIds, callback) {
+    assert.strictEqual(typeof apiConfig, 'object');
+    assert.strictEqual(typeof backupId, 'string');
+    assert(Array.isArray(appBackupIds));
+    assert.strictEqual(typeof callback, 'function');
+
+    if (apiConfig.provider !== 'caas') return callback();
+
+    debug('[%s] backupDone: %s apps %j', backupId, backupId, appBackupIds);
+
+    var url = config.apiServerOrigin() + '/api/v1/boxes/' + apiConfig.fqdn + '/backupDone';
+    var data = {
+        boxVersion: config.version(),
+        backupId: backupId,
+        appId: null,        // now unused
+        appVersion: null,   // now unused
+        appBackupIds: appBackupIds
+    };
+
+    superagent.post(url).send(data).query({ token: apiConfig.token }).timeout(30 * 1000).end(function (error, result) {
+        if (error && !error.response) return callback(new BackupsError(BackupsError.EXTERNAL_ERROR, error));
+        if (result.statusCode !== 200) return callback(new BackupsError(BackupsError.EXTERNAL_ERROR, result.text));
+
+        return callback(null);
+    });
+}
+
 function rotateBoxBackup(backupConfig, timestamp, appBackupIds, callback) {
     assert.strictEqual(typeof backupConfig, 'object');
     assert.strictEqual(typeof timestamp, 'string');
@@ -591,8 +745,7 @@ function rotateBoxBackup(backupConfig, timestamp, appBackupIds, callback) {
 
                 log(`Rotated box backup successfully as id ${backupId}`);
 
-                // FIXME this is only needed for caas, hopefully we can remove that in the future
-                api(backupConfig.provider).backupDone(backupConfig, backupId, appBackupIds, function (error) {
+                backupDone(backupConfig, backupId, appBackupIds, function (error) {
                     if (error) return callback(error);
 
                     callback(null, backupId);

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', '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')
+        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', '*')
     ], callback);
 }

src/clients.js

@@ -8,26 +8,16 @@ exports = module.exports = {
     del: del,
     getAll: getAll,
     getByAppIdAndType: getByAppIdAndType,
-    getClientTokensByUserId: getClientTokensByUserId,
-    delClientTokensByUserId: delClientTokensByUserId,
+    getTokensByUserId: getTokensByUserId,
+    delTokensByUserId: delTokensByUserId,
     delByAppIdAndType: delByAppIdAndType,
-    addClientTokenByUserId: addClientTokenByUserId,
+    addTokenByUserId: addTokenByUserId,
     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',
@@ -39,10 +29,15 @@ 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'),
-    hat = require('hat'),
+    eventlog = require('./eventlog.js'),
+    hat = require('./hat.js'),
+    accesscontrol = require('./accesscontrol.js'),
     tokendb = require('./tokendb.js'),
+    users = require('./users.js'),
+    UsersError = users.UsersError,
     util = require('util'),
     uuid = require('uuid');
 
@@ -84,28 +79,6 @@ 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');
@@ -113,13 +86,9 @@ function add(appId, type, redirectURI, scope, callback) {
     assert.strictEqual(typeof scope, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    // allow whitespace
-    scope = scope.split(',').map(function (s) { return s.trim(); }).join(',');
+    var error = accesscontrol.validateScopeString(scope);
+    if (error) return callback(new ClientsError(ClientsError.INVALID_SCOPE, error.message));
 
-    var error = validateScope(scope);
-    if (error) return callback(error);
-
-    // appId is also client name
     error = validateName(appId);
     if (error) return callback(error);
 
@@ -216,7 +185,7 @@ function getByAppIdAndType(appId, type, callback) {
     });
 }
 
-function getClientTokensByUserId(clientId, userId, callback) {
+function getTokensByUserId(clientId, userId, callback) {
     assert.strictEqual(typeof clientId, 'string');
     assert.strictEqual(typeof userId, 'string');
     assert.strictEqual(typeof callback, 'function');
@@ -235,7 +204,7 @@ function getClientTokensByUserId(clientId, userId, callback) {
     });
 }
 
-function delClientTokensByUserId(clientId, userId, callback) {
+function delTokensByUserId(clientId, userId, callback) {
     assert.strictEqual(typeof clientId, 'string');
     assert.strictEqual(typeof userId, 'string');
     assert.strictEqual(typeof callback, 'function');
@@ -275,7 +244,7 @@ function delByAppIdAndType(appId, type, callback) {
     });
 }
 
-function addClientTokenByUserId(clientId, userId, expiresAt, callback) {
+function addTokenByUserId(clientId, userId, expiresAt, callback) {
     assert.strictEqual(typeof clientId, 'string');
     assert.strictEqual(typeof userId, 'string');
     assert.strictEqual(typeof expiresAt, 'number');
@@ -284,22 +253,51 @@ function addClientTokenByUserId(clientId, userId, expiresAt, callback) {
     get(clientId, function (error, result) {
         if (error) return callback(error);
 
-        var token = tokendb.generateToken();
-
-        tokendb.add(token, userId, result.id, expiresAt, result.scope, function (error) {
+        users.get(userId, function (error, user) {
+            if (error && error.reason === UsersError.NOT_FOUND) return callback(new ClientsError(ClientsError.NOT_FOUND, 'No such user'));
             if (error) return callback(new ClientsError(ClientsError.INTERNAL_ERROR, error));
 
-            callback(null, {
-                accessToken: token,
-                identifier: userId,
-                clientId: result.id,
-                scope: result.id,
-                expires: expiresAt
+            accesscontrol.scopesForUser(user, function (error, userScopes) {
+                if (error) return callback(new ClientsError(ClientsError.INTERNAL_ERROR, error));
+
+                var scope = accesscontrol.canonicalScopeString(result.scope);
+                var authorizedScopes = accesscontrol.intersectScopes(userScopes, scope.split(','));
+
+                var token = tokendb.generateToken();
+
+                tokendb.add(token, userId, result.id, expiresAt, authorizedScopes.join(','), function (error) {
+                    if (error) return callback(new ClientsError(ClientsError.INTERNAL_ERROR, error));
+
+                    callback(null, {
+                        accessToken: token,
+                        tokenScopes: authorizedScopes,
+                        identifier: userId,
+                        clientId: 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');
@@ -324,13 +322,10 @@ 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, 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')
+        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, '*')
     ], callback);
 }

src/cloudron.js

@@ -9,7 +9,6 @@ exports = module.exports = {
     getDisks: getDisks,
     getLogs: getLogs,
 
-    updateToLatest: updateToLatest,
     reboot: reboot,
 
     onActivated: onActivated,
@@ -19,14 +18,10 @@ exports = module.exports = {
 
 var assert = require('assert'),
     async = require('async'),
-    backups = require('./backups.js'),
-    caas = require('./caas.js'),
     config = require('./config.js'),
     cron = require('./cron.js'),
     debug = require('debug')('box:cloudron'),
     df = require('@sindresorhus/df'),
-    eventlog = require('./eventlog.js'),
-    locker = require('./locker.js'),
     mailer = require('./mailer.js'),
     os = require('os'),
     path = require('path'),
@@ -39,13 +34,10 @@ var assert = require('assert'),
     shell = require('./shell.js'),
     spawn = require('child_process').spawn,
     split = require('split'),
-    updateChecker = require('./updatechecker.js'),
-    user = require('./user.js'),
-    util = require('util'),
-    _ = require('underscore');
+    users = require('./users.js'),
+    util = require('util');
 
-var REBOOT_CMD = path.join(__dirname, 'scripts/reboot.sh'),
-    UPDATE_CMD = path.join(__dirname, 'scripts/update.sh');
+var REBOOT_CMD = path.join(__dirname, 'scripts/reboot.sh');
 
 var NOOP_CALLBACK = function (error) { if (error) debug(error); };
 
@@ -103,7 +95,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)
-    user.count(function (error, count) {
+    users.count(function (error, count) {
         if (error) return callback(new CloudronError(CloudronError.INTERNAL_ERROR, error));
         if (!count) return callback(); // not activated
 
@@ -140,47 +132,23 @@ function getDisks(callback) {
 function getConfig(callback) {
     assert.strictEqual(typeof callback, 'function');
 
-    // result to not depend on the appstore
-    const BOX_AND_USER_TEMPLATE = {
-        box: {
-            region: null,
-            size: null,
-            plan: 'Custom Plan'
-        },
-        user: {
-            billing: false,
-            currency: ''
-        }
-    };
+    settings.getAll(function (error, allSettings) {
+        if (error) return callback(new CloudronError(CloudronError.INTERNAL_ERROR, error));
 
-    caas.getBoxAndUserDetails(function (error, result) {
-        if (error) debug('Failed to fetch cloudron details.', error.reason, error.message);
-
-        result = _.extend(BOX_AND_USER_TEMPLATE, result || {});
-
-        settings.getCloudronName(function (error, cloudronName) {
-            if (error) return callback(new CloudronError(CloudronError.INTERNAL_ERROR, error));
-
-            callback(null, {
-                apiServerOrigin: config.apiServerOrigin(),
-                webServerOrigin: config.webServerOrigin(),
-                adminDomain: config.adminDomain(),
-                adminLocation: config.adminLocation(),
-                adminFqdn: config.adminFqdn(),
-                mailFqdn: config.mailFqdn(),
-                version: config.version(),
-                update: updateChecker.getUpdateInfo(),
-                progress: progress.getAll(),
-                isDemo: config.isDemo(),
-                region: result.box.region,
-                size: result.box.size,
-                billing: !!result.user.billing,
-                plan: result.box.plan,
-                currency: result.user.currency,
-                memory: os.totalmem(),
-                provider: config.provider(),
-                cloudronName: cloudronName
-            });
+        // be picky about what we send out here since this is sent for 'normal' users as well
+        callback(null, {
+            apiServerOrigin: config.apiServerOrigin(),
+            webServerOrigin: config.webServerOrigin(),
+            adminDomain: config.adminDomain(),
+            adminFqdn: config.adminFqdn(),
+            mailFqdn: config.mailFqdn(),
+            version: config.version(),
+            progress: progress.getAll(),
+            isDemo: config.isDemo(),
+            memory: os.totalmem(),
+            provider: config.provider(),
+            cloudronName: allSettings[settings.CLOUDRON_NAME_KEY],
+            spaces: allSettings[settings.SPACES_CONFIG_KEY] // here because settings route cannot be accessed by spaces users
         });
     });
 }
@@ -189,102 +157,6 @@ function reboot(callback) {
     shell.sudo('reboot', [ REBOOT_CMD ], callback);
 }
 
-function update(boxUpdateInfo, auditSource, callback) {
-    assert.strictEqual(typeof boxUpdateInfo, 'object');
-    assert.strictEqual(typeof auditSource, 'object');
-    assert.strictEqual(typeof callback, 'function');
-
-    if (!boxUpdateInfo) return callback(null);
-
-    var error = locker.lock(locker.OP_BOX_UPDATE);
-    if (error) return callback(new CloudronError(CloudronError.BAD_STATE, error.message));
-
-    eventlog.add(eventlog.ACTION_UPDATE, auditSource, { boxUpdateInfo: boxUpdateInfo });
-
-    // ensure tools can 'wait' on progress
-    progress.set(progress.UPDATE, 0, 'Starting');
-
-    // initiate the update/upgrade but do not wait for it
-    if (boxUpdateInfo.upgrade) {
-        debug('Starting upgrade');
-        caas.upgrade(boxUpdateInfo, function (error) {
-            if (error) {
-                debug('Upgrade failed with error:', error);
-                locker.unlock(locker.OP_BOX_UPDATE);
-            }
-        });
-    } else {
-        debug('Starting update');
-        doUpdate(boxUpdateInfo, function (error) {
-            if (error) {
-                debug('Update failed with error:', error);
-                locker.unlock(locker.OP_BOX_UPDATE);
-            }
-        });
-    }
-
-    callback(null);
-}
-
-function updateToLatest(auditSource, callback) {
-    assert.strictEqual(typeof auditSource, 'object');
-    assert.strictEqual(typeof callback, 'function');
-
-    var boxUpdateInfo = updateChecker.getUpdateInfo().box;
-    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'));
-
-    if (boxUpdateInfo.upgrade && config.provider() !== 'caas') return callback(new CloudronError(CloudronError.SELF_UPGRADE_NOT_SUPPORTED));
-
-    update(boxUpdateInfo, auditSource, callback);
-}
-
-function doUpdate(boxUpdateInfo, callback) {
-    assert(boxUpdateInfo && typeof boxUpdateInfo === 'object');
-
-    function updateError(e) {
-        progress.set(progress.UPDATE, -1, e.message);
-        callback(e);
-    }
-
-    progress.set(progress.UPDATE, 5, 'Backing up for update');
-
-    backups.backupBoxAndApps({ userId: null, username: 'updater' }, function (error) {
-        if (error) return updateError(error);
-
-        // NOTE: this data is opaque and will be passed through the installer.sh
-        var data= {
-            provider: config.provider(),
-            apiServerOrigin: config.apiServerOrigin(),
-            webServerOrigin: config.webServerOrigin(),
-            adminDomain: config.adminDomain(),
-            adminFqdn: config.adminFqdn(),
-            adminLocation: config.adminLocation(),
-            isDemo: config.isDemo(),
-
-            appstore: {
-                apiServerOrigin: config.apiServerOrigin()
-            },
-            caas: {
-                apiServerOrigin: config.apiServerOrigin(),
-                webServerOrigin: config.webServerOrigin()
-            },
-
-            version: boxUpdateInfo.version
-        };
-
-        debug('updating box %s %j', boxUpdateInfo.sourceTarballUrl, _.omit(data, 'tlsCert', 'tlsKey', 'token', 'appstore', 'caas'));
-
-        progress.set(progress.UPDATE, 5, 'Downloading and installing new version');
-
-        shell.sudo('update', [ UPDATE_CMD, boxUpdateInfo.sourceTarballUrl, JSON.stringify(data) ], function (error) {
-            if (error) return updateError(error);
-
-            // Do not add any code here. The installer script will stop the box code any instant
-        });
-    });
-}
-
 function checkDiskSpace(callback) {
     callback = callback || NOOP_CALLBACK;
 
@@ -327,44 +199,66 @@ function checkDiskSpace(callback) {
     });
 }
 
-function getLogs(options, callback) {
+function getLogs(unit, options, callback) {
+    assert.strictEqual(typeof unit, 'string');
     assert(options && typeof options === 'object');
     assert.strictEqual(typeof callback, 'function');
 
-    var units = options.units || [],
-        lines = options.lines || 100,
+    var lines = options.lines || 100,
         format = options.format || 'json',
         follow = !!options.follow;
 
-    assert(Array.isArray(units));
     assert.strictEqual(typeof lines, 'number');
     assert.strictEqual(typeof format, 'string');
 
-    debug('Getting logs for %j', units);
+    assert.strictEqual(typeof lines, 'number');
+    assert.strictEqual(typeof format, 'string');
 
-    var args = [ '--no-pager', '--lines=' + lines ];
-    units.forEach(function (u) {
-        if (u === 'box') args.push('--unit=box');
-        else if (u === 'mail') args.push('CONTAINER_NAME=mail');
-    });
-    if (format === 'short') args.push('--output=short', '-a'); else args.push('--output=json');
-    if (follow) args.push('--follow');
+    debug('Getting logs for %s as %s', unit, format);
 
-    var cp = spawn('/bin/journalctl', args);
+    var cp, transformStream;
+    if (unit === 'box') {
+        let args = [ '--no-pager', `--lines=${lines}` ];
+        if (format === 'short') args.push('--output=short', '-a'); else args.push('--output=json');
+        if (follow) args.push('--follow');
+        args.push('--unit=box');
+        args.push('--unit=cloudron-updater');
+        cp = spawn('/bin/journalctl', args);
 
-    var transformStream = split(function mapper(line) {
-        if (format !== 'json') return line + '\n';
+        transformStream = split(function mapper(line) {
+            if (format !== 'json') return line + '\n';
 
-        var obj = safe.JSON.parse(line);
-        if (!obj) return undefined;
+            var obj = safe.JSON.parse(line);
+            if (!obj) return undefined;
 
-        return JSON.stringify({
-            realtimeTimestamp: obj.__REALTIME_TIMESTAMP,
-            monotonicTimestamp: obj.__MONOTONIC_TIMESTAMP,
-            message: obj.MESSAGE,
-            source: obj.SYSLOG_IDENTIFIER || ''
-        }) + '\n';
-    });
+            return JSON.stringify({
+                realtimeTimestamp: obj.__REALTIME_TIMESTAMP,
+                monotonicTimestamp: obj.__MONOTONIC_TIMESTAMP,
+                message: obj.MESSAGE,
+                source: obj.SYSLOG_IDENTIFIER || ''
+            }) + '\n';
+        });
+    } else { // mail, mongodb, mysql, postgresql, backup
+        let args = [ '--lines=' + lines ];
+        if (follow) args.push('--follow');
+        args.push(path.join(paths.LOG_DIR, unit, 'app.log'));
+
+        cp = spawn('/usr/bin/tail', args);
+
+        transformStream = split(function mapper(line) {
+            if (format !== 'json') return line + '\n';
+
+            var data = line.split(' '); // logs are <ISOtimestamp> <msg>
+            var timestamp = (new Date(data[0])).getTime();
+            if (isNaN(timestamp)) timestamp = 0;
+
+            return JSON.stringify({
+                realtimeTimestamp: timestamp * 1000,
+                message: line.slice(data[0].length+1),
+                source: unit
+            }) + '\n';
+        });
+    }
 
     transformStream.close = cp.kill.bind(cp, 'SIGKILL'); // closing stream kills the child process
 

src/constants.js

@@ -21,9 +21,6 @@ exports = module.exports = {
 
     ADMIN_CLIENT_ID: 'webadmin', // oauth client id
 
-    ADMIN_GROUP_NAME: 'admin',
-    ADMIN_GROUP_ID: 'admin',
-
     NGINX_ADMIN_CONFIG_FILE_NAME: 'admin.conf',
 
     GHOST_USER_FILE: '/tmp/cloudron_ghost.json',

src/cron.js

@@ -22,6 +22,7 @@ var apps = require('./apps.js'),
     reverseProxy = require('./reverseproxy.js'),
     scheduler = require('./scheduler.js'),
     settings = require('./settings.js'),
+    updater = require('./updater.js'),
     updateChecker = require('./updatechecker.js');
 
 var gJobs = {
@@ -207,7 +208,7 @@ function boxAutoupdatePatternChanged(pattern) {
             var updateInfo = updateChecker.getUpdateInfo();
             if (updateInfo.box) {
                 debug('Starting autoupdate to %j', updateInfo.box);
-                cloudron.updateToLatest(AUDIT_SOURCE, NOOP_CALLBACK);
+                updater.updateToLatest(AUDIT_SOURCE, NOOP_CALLBACK);
             } else {
                 debug('No box auto updates available');
             }

src/database.js

@@ -91,8 +91,7 @@ function clear(callback) {
 
     async.series([
         child_process.exec.bind(null, cmd),
-        require('./clientdb.js')._addDefaultClients,
-        require('./groupdb.js')._addDefaultGroups
+        require('./clientdb.js')._addDefaultClients
     ], callback);
 }
 

src/developer.js

@@ -1,57 +0,0 @@
-/* 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'),
-    user = require('./user.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(userObject, ip, callback) {
-    assert.strictEqual(typeof userObject, 'object');
-    assert.strictEqual(typeof ip, 'string');
-    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, userObject.id, 'cid-cli', expiresAt, scopes, function (error) {
-        if (error) return callback(new DeveloperError(DeveloperError.INTERNAL_ERROR, error));
-
-        eventlog.add(eventlog.ACTION_USER_LOGIN, { authType: 'cli', ip: ip }, { userId: userObject.id, user: user.removePrivateFields(userObject) });
-
-        callback(null, { token: token, expiresAt: new Date(expiresAt).toISOString() });
-    });
-}

src/digest.js

@@ -28,44 +28,36 @@ function maybeSend(callback) {
         var pendingAppUpdates = updateInfo.apps || {};
         pendingAppUpdates = Object.keys(pendingAppUpdates).map(function (key) { return pendingAppUpdates[key]; });
 
-        appstore.getSubscription(function (error, result) {
-            if (error) debug('Error getting subscription:', error);
+        eventlog.getByCreationTime(new Date(new Date() - 7*86400000), function (error, events) {
+            if (error) return callback(error);
 
-            var hasSubscription = result && result.plan.id !== 'free' && result.plan.id !== 'undecided';
+            var appUpdates = events.filter(function (e) { return e.action === eventlog.ACTION_APP_UPDATE; }).map(function (e) { return e.data; });
+            var boxUpdates = events.filter(function (e) { return e.action === eventlog.ACTION_UPDATE; }).map(function (e) { return e.data; });
+            var certRenewals = events.filter(function (e) { return e.action === eventlog.ACTION_CERTIFICATE_RENEWAL; }).map(function (e) { return e.data; });
+            var usersAdded = events.filter(function (e) { return e.action === eventlog.ACTION_USER_ADD; }).map(function (e) { return e.data; });
+            var usersRemoved = events.filter(function (e) { return e.action === eventlog.ACTION_USER_REMOVE; }).map(function (e) { return e.data; });
+            var finishedBackups = events.filter(function (e) { return e.action === eventlog.ACTION_BACKUP_FINISH && !e.errorMessage; }).map(function (e) { return e.data; });
 
-            eventlog.getByCreationTime(new Date(new Date() - 7*86400000), function (error, events) {
-                if (error) return callback(error);
+            if (error) return callback(error);
 
-                var appUpdates = events.filter(function (e) { return e.action === eventlog.ACTION_APP_UPDATE; }).map(function (e) { return e.data; });
-                var boxUpdates = events.filter(function (e) { return e.action === eventlog.ACTION_UPDATE; }).map(function (e) { return e.data; });
-                var certRenewals = events.filter(function (e) { return e.action === eventlog.ACTION_CERTIFICATE_RENEWAL; }).map(function (e) { return e.data; });
-                var usersAdded = events.filter(function (e) { return e.action === eventlog.ACTION_USER_ADD; }).map(function (e) { return e.data; });
-                var usersRemoved = events.filter(function (e) { return e.action === eventlog.ACTION_USER_REMOVE; }).map(function (e) { return e.data; });
-                var finishedBackups = events.filter(function (e) { return e.action === eventlog.ACTION_BACKUP_FINISH && !e.errorMessage; }).map(function (e) { return e.data; });
+            var info = {
+                pendingAppUpdates: pendingAppUpdates,
+                pendingBoxUpdate: updateInfo.box || null,
 
-                if (error) return callback(error);
+                finishedAppUpdates: appUpdates,
+                finishedBoxUpdates: boxUpdates,
 
-                var info = {
-                    hasSubscription: hasSubscription,
+                certRenewals: certRenewals,
+                finishedBackups: finishedBackups, // only the successful backups
+                usersAdded: usersAdded,
+                usersRemoved: usersRemoved // unused because we don't have username to work with
+            };
 
-                    pendingAppUpdates: pendingAppUpdates,
-                    pendingBoxUpdate: updateInfo.box || null,
+            // always send digest for backup failure notification
+            debug('maybeSend: sending digest email', info);
+            mailer.sendDigest(info);
 
-                    finishedAppUpdates: appUpdates,
-                    finishedBoxUpdates: boxUpdates,
-
-                    certRenewals: certRenewals,
-                    finishedBackups: finishedBackups, // only the successful backups
-                    usersAdded: usersAdded,
-                    usersRemoved: usersRemoved // unused because we don't have username to work with
-                };
-
-                // always send digest for backup failure notification
-                debug('maybeSend: sending digest email', info);
-                mailer.sendDigest(info);
-
-                callback();
-            });
+            callback();
         });
     });
 }

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'),
-    DomainError = require('../domains.js').DomainError,
+    DomainsError = require('../domains.js').DomainsError,
     superagent = require('superagent'),
     util = require('util');
 
@@ -45,12 +45,12 @@ function add(dnsConfig, zoneName, subdomain, type, values, callback) {
         .send(data)
         .timeout(30 * 1000)
         .end(function (error, result) {
-            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)));
+            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)));
 
-            return callback(null, result.body.changeId);
+            return callback(null);
         });
 }
 
@@ -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 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)));
+            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)));
 
             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 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)));
+            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)));
 
             return callback(null);
         });
@@ -126,10 +126,26 @@ function verifyDnsConfig(dnsConfig, domain, 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'));
+
     var credentials = {
         token: dnsConfig.token,
         fqdn: domain
     };
 
-    return callback(null, credentials);
+    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(credentials, zoneName, testSubdomain, 'A', [ ip ], function (error) {
+            if (error) return callback(error);
+
+            debug('verifyDnsConfig: Test A record removed again');
+
+            callback(null, credentials);
+        });
+    });
 }

src/dns/cloudflare.js

@@ -12,7 +12,7 @@ var assert = require('assert'),
     async = require('async'),
     debug = require('debug')('box:dns/cloudflare'),
     dns = require('../native-dns.js'),
-    DomainError = require('../domains.js').DomainError,
+    DomainsError = require('../domains.js').DomainsError,
     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 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 === 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 === 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 DomainError(DomainError.ACCESS_DENIED, message));
+        return callback(new DomainsError(DomainsError.ACCESS_DENIED, message));
     }
 
-    callback(new DomainError(DomainError.EXTERNAL_ERROR, util.format('%s %j', result.statusCode, result.body)));
+    callback(new DomainsError(DomainsError.EXTERNAL_ERROR, util.format('%s %j', result.statusCode, result.body)));
 }
 
 function getZoneByName(dnsConfig, zoneName, callback) {
@@ -52,7 +52,7 @@ function getZoneByName(dnsConfig, zoneName, callback) {
         .end(function (error, result) {
             if (error && !error.response) return callback(error);
             if (result.statusCode !== 200 || result.body.success !== true) return translateRequestError(result, callback);
-            if (!result.body.result.length) return callback(new DomainError(DomainError.NOT_FOUND, util.format('%s %j', result.statusCode, result.body)));
+            if (!result.body.result.length) return callback(new DomainsError(DomainsError.NOT_FOUND, util.format('%s %j', result.statusCode, result.body)));
 
             callback(null, result.body.result[0]);
         });
@@ -152,11 +152,7 @@ function upsert(dnsConfig, zoneName, subdomain, type, values, callback) {
                             callback(null);
                         });
                 }
-            }, function (error) {
-                if (error) return callback(error);
-
-                callback(null, 'unused');
-            });
+            }, callback);
         });
     });
 }
@@ -233,8 +229,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 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'));
+    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'));
 
     var credentials = {
         token: dnsConfig.token,
@@ -244,15 +240,15 @@ 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 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 (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'));
 
         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 DomainError(DomainError.BAD_FIELD, 'Domain nameservers are not set to Cloudflare'));
+                return callback(new DomainsError(DomainsError.BAD_FIELD, 'Domain nameservers are not set to Cloudflare'));
             }
 
             const testSubdomain = 'cloudrontestdns';

src/dns/digitalocean.js

@@ -12,7 +12,7 @@ var assert = require('assert'),
     async = require('async'),
     debug = require('debug')('box:dns/digitalocean'),
     dns = require('../native-dns.js'),
-    DomainError = require('../domains.js').DomainError,
+    DomainsError = require('../domains.js').DomainsError,
     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 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)));
+                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)));
 
                 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 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)));
+                        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)));
 
                         recordIds.push(safe.query(result.body, 'domain_record.id'));
 
@@ -119,21 +119,17 @@ function upsert(dnsConfig, zoneName, subdomain, type, values, callback) {
                     // increment, as we have consumed the record
                         ++i;
 
-                        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)));
+                        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)));
 
                         recordIds.push(safe.query(result.body, 'domain_record.id'));
 
                         return iteratorCallback(null);
                     });
             }
-        }, function (error) {
-            if (error) return callback(error);
-
-            callback(null, '' + recordIds[0]); // DO ids are integers
-        });
+        }, callback);
     });
 }
 
@@ -185,10 +181,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 DomainError(DomainError.EXTERNAL_ERROR, util.format('Network error %s', error.message)));
+                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 DomainError(DomainError.ACCESS_DENIED, formatError(result)));
-                if (result.statusCode !== 204) return callback(new DomainError(DomainError.EXTERNAL_ERROR, formatError(result)));
+                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');
 
@@ -204,6 +200,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'));
+
     var credentials = {
         token: dnsConfig.token
     };
@@ -211,12 +209,12 @@ 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 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 (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.map(function (n) { return n.toLowerCase(); }).indexOf('ns1.digitalocean.com') === -1) {
             debug('verifyDnsConfig: %j does not contains DO NS', nameservers);
-            return callback(new DomainError(DomainError.BAD_FIELD, 'Domain nameservers are not set to Digital Ocean'));
+            return callback(new DomainsError(DomainsError.BAD_FIELD, 'Domain nameservers are not set to Digital Ocean'));
         }
 
         const testSubdomain = 'cloudrontestdns';

src/dns/gandi.js

@@ -0,0 +1,148 @@
+'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);
+        });
+}
+
+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');
+
+    if (!dnsConfig.token || typeof dnsConfig.token !== 'string') return callback(new DomainsError(DomainsError.BAD_FIELD, 'token must be a non-empty string'));
+
+    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

@@ -11,7 +11,7 @@ exports = module.exports = {
 var assert = require('assert'),
     debug = require('debug')('box:dns/gcdns'),
     dns = require('../native-dns.js'),
-    DomainError = require('../domains.js').DomainError,
+    DomainsError = require('../domains.js').DomainsError,
     GCDNS = require('@google-cloud/dns'),
     util = require('util'),
     _ = require('underscore');
@@ -19,19 +19,13 @@ var assert = require('assert'),
 function getDnsCredentials(dnsConfig) {
     assert.strictEqual(typeof dnsConfig, 'object');
 
-    var config = {
+    return {
         projectId: dnsConfig.projectId,
-        keyFilename: dnsConfig.keyFilename,
-        email: dnsConfig.email
-    };
-
-    if (dnsConfig.credentials) {
-        config.credentials = {
+        credentials: {
             client_email: dnsConfig.credentials.client_email,
             private_key: dnsConfig.credentials.private_key
-        };
-    }
-    return config;
+        }
+    };
 }
 
 function getZoneByName(dnsConfig, zoneName, callback) {
@@ -42,20 +36,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 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 && 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) {
             debug('gcdns.getZones', error);
-            return callback(new DomainError(DomainError.EXTERNAL_ERROR, error));
+            return callback(new DomainsError(DomainsError.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 DomainError(DomainError.NOT_FOUND, 'no such zone'));
+        if (!zone) return callback(new DomainsError(DomainsError.NOT_FOUND, 'no such zone'));
 
         callback(null, zone); //zone.metadata ~= {name="", dnsName="", nameServers:[]}
     });
@@ -77,10 +71,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 DomainError(DomainError.ACCESS_DENIED, error.message));
+            if (error && error.code === 403) return callback(new DomainsError(DomainsError.ACCESS_DENIED, error.message));
             if (error) {
                 debug('upsert->zone.getRecords', error);
-                return callback(new DomainError(DomainError.EXTERNAL_ERROR, error.message));
+                return callback(new DomainsError(DomainsError.EXTERNAL_ERROR, error.message));
             }
 
             var newRecord = zone.record(type, {
@@ -90,14 +84,14 @@ 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 DomainError(DomainError.ACCESS_DENIED, error.message));
-                if (error && error.code === 412) return callback(new DomainError(DomainError.STILL_BUSY, error.message));
+                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) {
                     debug('upsert->zone.createChange', error);
-                    return callback(new DomainError(DomainError.EXTERNAL_ERROR, error.message));
+                    return callback(new DomainsError(DomainsError.EXTERNAL_ERROR, error.message));
                 }
 
-                callback(null, change.id);
+                callback(null);
             });
         });
     });
@@ -119,8 +113,8 @@ function get(dnsConfig, zoneName, subdomain, type, callback) {
         };
 
         zone.getRecords(params, function (error, records) {
-            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 (error && error.code === 403) return callback(new DomainsError(DomainsError.ACCESS_DENIED, error.message));
+            if (error) return callback(new DomainsError(DomainsError.EXTERNAL_ERROR, error));
             if (records.length === 0) return callback(null, [ ]);
 
             return callback(null, records[0].data);
@@ -142,18 +136,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 DomainError(DomainError.ACCESS_DENIED, error.message));
+            if (error && error.code === 403) return callback(new DomainsError(DomainsError.ACCESS_DENIED, error.message));
             if (error) {
                 debug('del->zone.getRecords', error);
-                return callback(new DomainError(DomainError.EXTERNAL_ERROR, error.message));
+                return callback(new DomainsError(DomainsError.EXTERNAL_ERROR, error.message));
             }
 
             zone.deleteRecords(oldRecords, function (error, change) {
-                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 && 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) {
                     debug('del->zone.createChange', error);
-                    return callback(new DomainError(DomainError.EXTERNAL_ERROR, error.message));
+                    return callback(new DomainsError(DomainsError.EXTERNAL_ERROR, error.message));
                 }
 
                 callback(null, change.id);
@@ -169,20 +163,25 @@ function verifyDnsConfig(dnsConfig, fqdn, zoneName, ip, callback) {
     assert.strictEqual(typeof ip, 'string');
     assert.strictEqual(typeof callback, 'function');
 
+    if (typeof dnsConfig.projectId !== 'string') return callback(new DomainsError(DomainsError.BAD_FIELD, 'projectId must be a string'));
+    if (!dnsConfig.credentials || typeof dnsConfig.credentials !== 'object') return callback(new DomainsError(DomainsError.BAD_FIELD, 'credentials must be an object'));
+    if (typeof dnsConfig.credentials.client_email !== 'string') return callback(new DomainsError(DomainsError.BAD_FIELD, 'credentials.client_email must be a string'));
+    if (typeof dnsConfig.credentials.private_key !== 'string') return callback(new DomainsError(DomainsError.BAD_FIELD, 'credentials.private_key must be a string'));
+
     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 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'));
+        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'));
 
         getZoneByName(credentials, zoneName, function (error, zone) {
             if (error) return callback(error);
 
             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 DomainError(DomainError.BAD_FIELD, 'Domain nameservers are not set to Google Cloud DNS'));
+            if (!_.isEqual(definedNS, nameservers.sort())) {
+                debug('verifyDnsConfig: %j and %j do not match', nameservers, definedNS);
+                return callback(new DomainsError(DomainsError.BAD_FIELD, 'Domain nameservers are not set to Google Cloud DNS'));
             }
 
             const testSubdomain = 'cloudrontestdns';

src/dns/godaddy.js

@@ -0,0 +1,184 @@
+'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);
+        });
+}
+
+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');
+
+    if (!dnsConfig.apiKey || typeof dnsConfig.apiKey !== 'string') return callback(new DomainsError(DomainsError.BAD_FIELD, 'apiKey must be a non-empty string'));
+    if (!dnsConfig.apiSecret || typeof dnsConfig.apiSecret !== 'string') return callback(new DomainsError(DomainsError.BAD_FIELD, 'apiSecret must be a non-empty string'));
+
+    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'),
-    DomainError = require('../domains.js').DomainError,
+    DomainsError = require('../domains.js').DomainsError,
     util = require('util');
 
 function upsert(dnsConfig, zoneName, subdomain, type, values, callback) {
@@ -26,7 +26,7 @@ function upsert(dnsConfig, zoneName, subdomain, type, values, callback) {
     assert(util.isArray(values));
     assert.strictEqual(typeof callback, 'function');
 
-    // Result: backend specific change id, to be passed into getChangeStatus()
+    // Result: none
 
     callback(new Error('not implemented'));
 }

src/dns/manual.js

@@ -11,7 +11,7 @@ exports = module.exports = {
 var assert = require('assert'),
     debug = require('debug')('box:dns/manual'),
     dns = require('../native-dns.js'),
-    DomainError = require('../domains.js').DomainError,
+    DomainsError = require('../domains.js').DomainsError,
     util = require('util');
 
 function upsert(dnsConfig, zoneName, subdomain, type, values, callback) {
@@ -24,7 +24,7 @@ function upsert(dnsConfig, zoneName, subdomain, type, values, callback) {
 
     debug('upsert: %s for zone %s of type %s with values %j', subdomain, zoneName, type, values);
 
-    return callback(null, 'noop-record-id');
+    return callback(null);
 }
 
 function get(dnsConfig, zoneName, subdomain, type, callback) {
@@ -57,7 +57,8 @@ function verifyDnsConfig(dnsConfig, domain, zoneName, ip, callback) {
 
     // Very basic check if the nameservers can be fetched
     dns.resolve(zoneName, 'NS', { timeout: 5000 }, function (error, nameservers) {
-        if (error || !nameservers) return callback(new DomainError(DomainError.BAD_FIELD, 'Unable to get 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'));
 
         callback(null, { wildcard: !!dnsConfig.wildcard });
     });

src/dns/namecom.js

@@ -0,0 +1,243 @@
+'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/namecom'),
+    dns = require('../native-dns.js'),
+    safe = require('safetydance'),
+    DomainsError = require('../domains.js').DomainsError,
+    superagent = require('superagent');
+
+const NAMECOM_API = 'https://api.name.com/v4';
+
+function formatError(response) {
+    return `Name.com DNS error [${response.statusCode}] ${response.text}`;
+}
+
+function addRecord(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(Array.isArray(values));
+    assert.strictEqual(typeof callback, 'function');
+
+    debug(`add: ${subdomain} in zone ${zoneName} of type ${type} with values ${JSON.stringify(values)}`);
+
+    var data = {
+        host: subdomain,
+        type: type,
+        ttl: 300    // 300 is the lowest
+    };
+
+    if (type === 'MX') {
+        data.priority = parseInt(values[0].split(' ')[0], 10);
+        data.answer = values[0].split(' ')[1];
+    } else {
+        data.answer = values[0];
+    }
+
+    superagent.post(`${NAMECOM_API}/domains/${zoneName}/records`)
+        .auth(dnsConfig.username, dnsConfig.token)
+        .timeout(30 * 1000)
+        .send(data)
+        .end(function (error, result) {
+            if (error && !error.response) return callback(new DomainsError(DomainsError.EXTERNAL_ERROR, `Network error ${error.message}`));
+            if (result.statusCode === 403) return callback(new DomainsError(DomainsError.ACCESS_DENIED, formatError(result)));
+            if (result.statusCode !== 200) return callback(new DomainsError(DomainsError.EXTERNAL_ERROR, formatError(result)));
+
+            return callback(null, 'unused-id');
+        });
+}
+
+function updateRecord(dnsConfig, zoneName, recordId, subdomain, type, values, callback) {
+    assert.strictEqual(typeof dnsConfig, 'object');
+    assert.strictEqual(typeof zoneName, 'string');
+    assert.strictEqual(typeof recordId, 'number');
+    assert.strictEqual(typeof subdomain, 'string');
+    assert.strictEqual(typeof type, 'string');
+    assert(Array.isArray(values));
+    assert.strictEqual(typeof callback, 'function');
+
+    debug(`update:${recordId} on ${subdomain} in zone ${zoneName} of type ${type} with values ${JSON.stringify(values)}`);
+
+    var data = {
+        host: subdomain,
+        type: type,
+        ttl: 300    // 300 is the lowest
+    };
+
+    if (type === 'MX') {
+        data.priority = parseInt(values[0].split(' ')[0], 10);
+        data.answer = values[0].split(' ')[1];
+    } else {
+        data.answer = values[0];
+    }
+
+    superagent.put(`${NAMECOM_API}/domains/${zoneName}/records/${recordId}`)
+        .auth(dnsConfig.username, dnsConfig.token)
+        .timeout(30 * 1000)
+        .send(data)
+        .end(function (error, result) {
+            if (error && !error.response) return callback(new DomainsError(DomainsError.EXTERNAL_ERROR, `Network error ${error.message}`));
+            if (result.statusCode === 403) return callback(new DomainsError(DomainsError.ACCESS_DENIED, formatError(result)));
+            if (result.statusCode !== 200) return callback(new DomainsError(DomainsError.EXTERNAL_ERROR, formatError(result)));
+
+            return callback(null);
+        });
+}
+
+function getInternal(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(`getInternal: ${subdomain} in zone ${zoneName} of type ${type}`);
+
+    superagent.get(`${NAMECOM_API}/domains/${zoneName}/records`)
+        .auth(dnsConfig.username, dnsConfig.token)
+        .timeout(30 * 1000)
+        .end(function (error, result) {
+            if (error && !error.response) return callback(new DomainsError(DomainsError.EXTERNAL_ERROR, `Network error ${error.message}`));
+            if (result.statusCode === 403) return callback(new DomainsError(DomainsError.ACCESS_DENIED, formatError(result)));
+            if (result.statusCode !== 200) return callback(new DomainsError(DomainsError.EXTERNAL_ERROR, formatError(result)));
+
+            // name.com does not return the correct content-type
+            result.body = safe.JSON.parse(result.text);
+            if (!result.body.records) result.body.records = [];
+
+            result.body.records.forEach(function (r) {
+                // name.com api simply strips empty properties
+                r.host = r.host || '@';
+            });
+
+            var results = result.body.records.filter(function (r) {
+                return (r.host === subdomain && r.type === type);
+            });
+
+            debug('getInternal: %j', results);
+
+            return callback(null, results);
+        });
+}
+
+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(Array.isArray(values));
+    assert.strictEqual(typeof callback, 'function');
+
+    subdomain = subdomain || '@';
+
+    debug(`upsert: ${subdomain} in zone ${zoneName} of type ${type} with values ${JSON.stringify(values)}`);
+
+    getInternal(dnsConfig, zoneName, subdomain, type, function (error, result) {
+        if (error) return callback(error);
+
+        if (result.length === 0) return addRecord(dnsConfig, zoneName, subdomain, type, values, callback);
+
+        return updateRecord(dnsConfig, zoneName, result[0].id, subdomain, type, values, callback);
+    });
+}
+
+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');
+
+    getInternal(dnsConfig, zoneName, subdomain, type, function (error, result) {
+        if (error) return callback(error);
+
+        var tmp = result.map(function (record) { return record.answer; });
+
+        debug('get: %j', tmp);
+
+        return callback(null, tmp);
+    });
+}
+
+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(Array.isArray(values));
+    assert.strictEqual(typeof callback, 'function');
+
+    subdomain = subdomain || '@';
+
+    debug(`del: ${subdomain} in zone ${zoneName} of type ${type} with values ${JSON.stringify(values)}`);
+
+    getInternal(dnsConfig, zoneName, subdomain, type, function (error, result) {
+        if (error) return callback(error);
+
+        if (result.length === 0) return callback();
+
+        superagent.del(`${NAMECOM_API}/domains/${zoneName}/records/${result[0].id}`)
+            .auth(dnsConfig.username, dnsConfig.token)
+            .timeout(30 * 1000)
+            .end(function (error, result) {
+                if (error && !error.response) return callback(new DomainsError(DomainsError.EXTERNAL_ERROR, `Network error ${error.message}`));
+                if (result.statusCode === 403) return callback(new DomainsError(DomainsError.ACCESS_DENIED, formatError(result)));
+                if (result.statusCode !== 200) return callback(new DomainsError(DomainsError.EXTERNAL_ERROR, formatError(result)));
+
+                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 = {
+        username: dnsConfig.username,
+        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('.name.com') !== -1; })) {
+            debug('verifyDnsConfig: %j does not contain Name.com NS', nameservers);
+            return callback(new DomainsError(DomainsError.BAD_FIELD, 'Domain nameservers are not set to Name.com'));
+        }
+
+        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/noop.js

@@ -22,7 +22,7 @@ function upsert(dnsConfig, zoneName, subdomain, type, values, callback) {
 
     debug('upsert: %s for zone %s of type %s with values %j', subdomain, zoneName, type, values);
 
-    return callback(null, 'noop-record-id');
+    return callback(null);
 }
 
 function get(dnsConfig, zoneName, subdomain, type, callback) {

src/dns/route53.js

@@ -15,7 +15,7 @@ var assert = require('assert'),
     AWS = require('aws-sdk'),
     debug = require('debug')('box:dns/route53'),
     dns = require('../native-dns.js'),
-    DomainError = require('../domains.js').DomainError,
+    DomainsError = require('../domains.js').DomainsError,
     util = require('util'),
     _ = require('underscore');
 
@@ -39,16 +39,25 @@ function getZoneByName(dnsConfig, zoneName, callback) {
     assert.strictEqual(typeof callback, 'function');
 
     var route53 = new AWS.Route53(getDnsCredentials(dnsConfig));
-    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));
+
+    // 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));
 
         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 DomainError(DomainError.NOT_FOUND, 'no such zone'));
+        if (!zone) return callback(new DomainsError(DomainsError.NOT_FOUND, 'no such zone'));
 
         callback(null, zone);
     });
@@ -64,9 +73,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 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 (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));
 
             callback(null, result);
         });
@@ -87,7 +96,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 }; });
+        var records = values.map(function (v) { return { Value: v }; });  // for mx records, value is already of the '<priority> <server>' format
 
         var params = {
             ChangeBatch: {
@@ -106,13 +115,13 @@ 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 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));
+            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));
 
-            callback(null, result.ChangeInfo.Id);
+            callback(null);
         });
     });
 }
@@ -147,9 +156,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 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 (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 (result.ResourceRecordSets.length === 0) return callback(null, [ ]);
             if (result.ResourceRecordSets[0].Name !== params.StartRecordName || result.ResourceRecordSets[0].Type !== params.StartRecordType) return callback(null, [ ]);
 
@@ -193,23 +202,23 @@ 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 DomainError(DomainError.ACCESS_DENIED, error.message));
-            if (error && error.code === 'InvalidClientTokenId') return callback(new DomainError(DomainError.ACCESS_DENIED, error.message));
+            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.message && error.message.indexOf('it was not found') !== -1) {
                 debug('del: resource record set not found.', error);
-                return callback(new DomainError(DomainError.NOT_FOUND, error.message));
+                return callback(new DomainsError(DomainsError.NOT_FOUND, error.message));
             } else if (error && error.code === 'NoSuchHostedZone') {
                 debug('del: hosted zone not found.', error);
-                return callback(new DomainError(DomainError.NOT_FOUND, error.message));
+                return callback(new DomainsError(DomainsError.NOT_FOUND, error.message));
             } else if (error && error.code === 'PriorRequestNotComplete') {
                 debug('del: resource is still busy', error);
-                return callback(new DomainError(DomainError.STILL_BUSY, error.message));
+                return callback(new DomainsError(DomainsError.STILL_BUSY, error.message));
             } else if (error && error.code === 'InvalidChangeBatch') {
                 debug('del: invalid change batch. No such record to be deleted.');
-                return callback(new DomainError(DomainError.NOT_FOUND, error.message));
+                return callback(new DomainsError(DomainsError.NOT_FOUND, error.message));
             } else if (error) {
                 debug('del: error', error);
-                return callback(new DomainError(DomainError.EXTERNAL_ERROR, error.message));
+                return callback(new DomainsError(DomainsError.EXTERNAL_ERROR, error.message));
             }
 
             callback(null);
@@ -224,25 +233,29 @@ function verifyDnsConfig(dnsConfig, fqdn, zoneName, ip, callback) {
     assert.strictEqual(typeof ip, 'string');
     assert.strictEqual(typeof callback, 'function');
 
+    if (!dnsConfig.accessKeyId || typeof dnsConfig.accessKeyId !== 'string') return callback(new DomainsError(DomainsError.BAD_FIELD, 'accessKeyId must be a non-empty string'));
+    if (!dnsConfig.secretAccessKey || typeof dnsConfig.secretAccessKey !== 'string') return callback(new DomainsError(DomainsError.BAD_FIELD, 'secretAccessKey must be a non-empty string'));
+
     var credentials = {
         accessKeyId: dnsConfig.accessKeyId,
         secretAccessKey: dnsConfig.secretAccessKey,
         region: dnsConfig.region || 'us-east-1',
-        endpoint: dnsConfig.endpoint || null
+        endpoint: dnsConfig.endpoint || null,
+        listHostedZonesByName: true // new/updated creds require this perm
     };
 
     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 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 (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'));
 
         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 DomainError(DomainError.BAD_FIELD, 'Domain nameservers are not set to Route53'));
+                return callback(new DomainsError(DomainsError.BAD_FIELD, 'Domain nameservers are not set to Route53'));
             }
 
             const testSubdomain = 'cloudrontestdns';
@@ -252,7 +265,7 @@ function verifyDnsConfig(dnsConfig, fqdn, zoneName, ip, callback) {
 
                 debug('verifyDnsConfig: Test A record added with change id %s', changeId);
 
-                del(dnsConfig, zoneName, testSubdomain, 'A', [ ip ], function (error) {
+                del(credentials, zoneName, testSubdomain, 'A', [ ip ], function (error) {
                     if (error) return callback(error);
 
                     debug('verifyDnsConfig: Test A record removed again');

src/dns/waitfordns.js

@@ -6,7 +6,7 @@ var assert = require('assert'),
     async = require('async'),
     debug = require('debug')('box:dns/waitfordns'),
     dns = require('../native-dns.js'),
-    DomainError = require('../domains.js').DomainError;
+    DomainsError = require('../domains.js').DomainsError;
 
 function resolveIp(hostname, options, callback) {
     assert.strictEqual(typeof hostname, 'string');
@@ -80,12 +80,12 @@ function waitForDns(domain, zoneName, value, options, callback) {
         debug(`waitForDns (try ${attempt}): ${domain} to be ${value} in zone ${zoneName}`);
 
         dns.resolve(zoneName, 'NS', { timeout: 5000 }, function (error, nameservers) {
-            if (error || !nameservers) return retryCallback(error || new DomainError(DomainError.EXTERNAL_ERROR, 'Unable to get nameservers'));
+            if (error || !nameservers) return retryCallback(error || new DomainsError(DomainsError.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);
 
-                retryCallback(synced ? null : new DomainError(DomainError.EXTERNAL_ERROR, 'ETRYAGAIN'));
+                retryCallback(synced ? null : new DomainsError(DomainsError.EXTERNAL_ERROR, 'ETRYAGAIN'));
             });
         });
     }, function retryDone(error) {

src/docker.js

@@ -179,6 +179,14 @@ function createSubcontainer(app, name, cmd, options, callback) {
             },
             HostConfig: {
                 Binds: addons.getBindsSync(app, app.manifest.addons),
+                LogConfig: {
+                    Type: 'syslog',
+                    Config: {
+                        'tag': app.id,
+                        'syslog-address': 'udp://127.0.0.1:2514', // see apps.js:validatePortBindings()
+                        'syslog-format': 'rfc5424'
+                    }
+                },
                 Memory: memoryLimit / 2,
                 MemorySwap: memoryLimit, // Memory + Swap
                 PortBindings: isAppContainer ? dockerPortBindings : { },

src/domains.js

@@ -16,7 +16,10 @@ module.exports = exports = {
 
     waitForDnsRecord: waitForDnsRecord,
 
-    DomainError: DomainError
+    removePrivateFields: removePrivateFields,
+    removeRestrictedFields: removeRestrictedFields,
+
+    DomainsError: DomainsError
 };
 
 var assert = require('assert'),
@@ -32,12 +35,13 @@ var assert = require('assert'),
     shell = require('./shell.js'),
     sysinfo = require('./sysinfo.js'),
     tld = require('tldjs'),
-    util = require('util');
+    util = require('util'),
+    _ = require('underscore');
 
 var RESTART_CMD = path.join(__dirname, 'scripts/restart.sh');
 var NOOP_CALLBACK = function (error) { if (error) debug(error); };
 
-function DomainError(reason, errorOrMessage) {
+function DomainsError(reason, errorOrMessage) {
     assert.strictEqual(typeof reason, 'string');
     assert(errorOrMessage instanceof Error || typeof errorOrMessage === 'string' || typeof errorOrMessage === 'undefined');
 
@@ -55,17 +59,17 @@ function DomainError(reason, errorOrMessage) {
         this.nestedError = errorOrMessage;
     }
 }
-util.inherits(DomainError, Error);
+util.inherits(DomainsError, Error);
 
-DomainError.NOT_FOUND = 'No such domain';
-DomainError.ALREADY_EXISTS = 'Domain already exists';
-DomainError.EXTERNAL_ERROR = 'External error';
-DomainError.BAD_FIELD = 'Bad Field';
-DomainError.STILL_BUSY = 'Still busy';
-DomainError.IN_USE = 'In Use';
-DomainError.INTERNAL_ERROR = 'Internal error';
-DomainError.ACCESS_DENIED = 'Access denied';
-DomainError.INVALID_PROVIDER = 'provider must be route53, gcdns, digitalocean, cloudflare, noop, manual or caas';
+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, namecom, noop, manual or caas';
 
 // choose which subdomain backend we use for test purpose we use route53
 function api(provider) {
@@ -77,6 +81,9 @@ 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 'namecom': return require('./dns/namecom.js');
     case 'noop': return require('./dns/noop.js');
     case 'manual': return require('./dns/manual.js');
     default: return null;
@@ -92,7 +99,7 @@ function verifyDnsConfig(config, domain, zoneName, provider, ip, callback) {
     assert.strictEqual(typeof callback, 'function');
 
     var backend = api(provider);
-    if (!backend) return callback(new DomainError(DomainError.INVALID_PROVIDER));
+    if (!backend) return callback(new DomainsError(DomainsError.INVALID_PROVIDER));
 
     api(provider).verifyDnsConfig(config, domain, zoneName, ip, callback);
 }
@@ -107,40 +114,42 @@ 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 DomainError(DomainError.BAD_FIELD, 'Invalid domain'));
+    if (!tld.isValid(domain)) return callback(new DomainsError(DomainsError.BAD_FIELD, 'Invalid domain'));
+    if (domain.endsWith('.')) return callback(new DomainsError(DomainsError.BAD_FIELD, 'Invalid domain'));
 
     if (zoneName) {
-        if (!tld.isValid(zoneName)) return callback(new DomainError(DomainError.BAD_FIELD, 'Invalid zoneName'));
+        if (!tld.isValid(zoneName)) return callback(new DomainsError(DomainsError.BAD_FIELD, 'Invalid zoneName'));
+        if (zoneName.endsWith('.')) return callback(new DomainsError(DomainsError.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 DomainError(DomainError.BAD_FIELD, error.message));
+        if (error) return callback(new DomainsError(DomainsError.BAD_FIELD, error.message));
     }
 
     if (tlsConfig.provider !== 'fallback' && tlsConfig.provider !== 'caas' && tlsConfig.provider.indexOf('letsencrypt-') !== 0) {
-        return callback(new DomainError(DomainError.BAD_FIELD, 'tlsConfig.provider must be caas, fallback or le-*'));
+        return callback(new DomainsError(DomainsError.BAD_FIELD, 'tlsConfig.provider must be caas, fallback or le-*'));
     }
 
     sysinfo.getPublicIp(function (error, ip) {
-        if (error) return callback(new DomainError(DomainError.INTERNAL_ERROR, 'Error getting IP:' + error.message));
+        if (error) return callback(new DomainsError(DomainsError.INTERNAL_ERROR, 'Error getting IP:' + error.message));
 
         verifyDnsConfig(config, domain, zoneName, provider, ip, function (error, result) {
-            if (error && error.reason === DomainError.ACCESS_DENIED) return callback(new DomainError(DomainError.BAD_FIELD, 'Error adding A record. Access denied'));
-            if (error && error.reason === DomainError.NOT_FOUND) return callback(new DomainError(DomainError.BAD_FIELD, 'Zone not found'));
-            if (error && error.reason === DomainError.EXTERNAL_ERROR) return callback(new DomainError(DomainError.BAD_FIELD, 'Error adding A record:' + error.message));
-            if (error && error.reason === DomainError.BAD_FIELD) return callback(new DomainError(DomainError.BAD_FIELD, error.message));
-            if (error && error.reason === DomainError.INVALID_PROVIDER) return callback(new DomainError(DomainError.BAD_FIELD, error.message));
-            if (error) return callback(new DomainError(DomainError.INTERNAL_ERROR, error));
+            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));
 
             domaindb.add(domain, { zoneName: zoneName, provider: provider, config: result, tlsConfig: tlsConfig }, function (error) {
-                if (error && error.reason === DatabaseError.ALREADY_EXISTS) return callback(new DomainError(DomainError.ALREADY_EXISTS));
-                if (error) return callback(new DomainError(DomainError.INTERNAL_ERROR, error));
+                if (error && error.reason === DatabaseError.ALREADY_EXISTS) return callback(new DomainsError(DomainsError.ALREADY_EXISTS));
+                if (error) return callback(new DomainsError(DomainsError.INTERNAL_ERROR, error));
 
                 reverseProxy.setFallbackCertificate(domain, fallbackCertificate, function (error) {
-                    if (error) return callback(new DomainError(DomainError.INTERNAL_ERROR, error));
+                    if (error) return callback(new DomainsError(DomainsError.INTERNAL_ERROR, error));
 
                     callback();
                 });
@@ -155,16 +164,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 DomainError(DomainError.NOT_FOUND));
-        if (error) return callback(new DomainError(DomainError.INTERNAL_ERROR, 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));
 
         reverseProxy.getFallbackCertificate(domain, function (error, bundle) {
-            if (error && error.reason !== ReverseProxyError.NOT_FOUND) return callback(new DomainError(DomainError.INTERNAL_ERROR, error));
+            if (error && error.reason !== ReverseProxyError.NOT_FOUND) return callback(new DomainsError(DomainsError.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 DomainError(DomainError.INTERNAL_ERROR, 'unable to read certificates from disk'));
+            if (!cert || !key) return callback(new DomainsError(DomainsError.INTERNAL_ERROR, 'unable to read certificates from disk'));
 
             result.fallbackCertificate = { cert: cert, key: key };
 
@@ -177,14 +186,15 @@ function getAll(callback) {
     assert.strictEqual(typeof callback, 'function');
 
     domaindb.getAll(function (error, result) {
-        if (error) return callback(new DomainError(DomainError.INTERNAL_ERROR, error));
+        if (error) return callback(new DomainsError(DomainsError.INTERNAL_ERROR, error));
 
         return callback(null, result);
     });
 }
 
-function update(domain, provider, config, fallbackCertificate, tlsConfig, callback) {
+function update(domain, zoneName, provider, config, fallbackCertificate, tlsConfig, callback) {
     assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof zoneName, 'string');
     assert.strictEqual(typeof provider, 'string');
     assert.strictEqual(typeof config, 'object');
     assert.strictEqual(typeof fallbackCertificate, 'object');
@@ -192,37 +202,43 @@ 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 DomainError(DomainError.NOT_FOUND));
-        if (error) return callback(new DomainError(DomainError.INTERNAL_ERROR, 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 (zoneName) {
+            if (!tld.isValid(zoneName)) return callback(new DomainsError(DomainsError.BAD_FIELD, 'Invalid zoneName'));
+        } else {
+            zoneName = result.zoneName;
+        }
 
         if (fallbackCertificate) {
             let error = reverseProxy.validateCertificate(`test.${domain}`, fallbackCertificate.cert, fallbackCertificate.key);
-            if (error) return callback(new DomainError(DomainError.BAD_FIELD, error.message));
+            if (error) return callback(new DomainsError(DomainsError.BAD_FIELD, error.message));
         }
 
         if (tlsConfig.provider !== 'fallback' && tlsConfig.provider !== 'caas' && tlsConfig.provider.indexOf('letsencrypt-') !== 0) {
-            return callback(new DomainError(DomainError.BAD_FIELD, 'tlsConfig.provider must be caas, fallback or letsencrypt-*'));
+            return callback(new DomainsError(DomainsError.BAD_FIELD, 'tlsConfig.provider must be caas, fallback or letsencrypt-*'));
         }
 
         sysinfo.getPublicIp(function (error, ip) {
-            if (error) return callback(new DomainError(DomainError.INTERNAL_ERROR, 'Error getting IP:' + error.message));
+            if (error) return callback(new DomainsError(DomainsError.INTERNAL_ERROR, 'Error getting IP:' + error.message));
 
-            verifyDnsConfig(config, domain, result.zoneName, provider, ip, function (error, result) {
-                if (error && error.reason === DomainError.ACCESS_DENIED) return callback(new DomainError(DomainError.BAD_FIELD, 'Error adding A record. Access denied'));
-                if (error && error.reason === DomainError.NOT_FOUND) return callback(new DomainError(DomainError.BAD_FIELD, 'Zone not found'));
-                if (error && error.reason === DomainError.EXTERNAL_ERROR) return callback(new DomainError(DomainError.BAD_FIELD, 'Error adding A record:' + error.message));
-                if (error && error.reason === DomainError.BAD_FIELD) return callback(new DomainError(DomainError.BAD_FIELD, error.message));
-                if (error && error.reason === DomainError.INVALID_PROVIDER) return callback(new DomainError(DomainError.BAD_FIELD, error.message));
-                if (error) return callback(new DomainError(DomainError.INTERNAL_ERROR, error));
+            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));
 
-                domaindb.update(domain, { provider: provider, config: result, tlsConfig: tlsConfig }, function (error) {
-                    if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new DomainError(DomainError.NOT_FOUND));
-                    if (error) return callback(new DomainError(DomainError.INTERNAL_ERROR, error));
+                domaindb.update(domain, { zoneName: zoneName, 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 (!fallbackCertificate) return callback();
 
                     reverseProxy.setFallbackCertificate(domain, fallbackCertificate, function (error) {
-                        if (error) return callback(new DomainError(DomainError.INTERNAL_ERROR, error));
+                        if (error) return callback(new DomainsError(DomainsError.INTERNAL_ERROR, error));
 
                         callback();
                     });
@@ -237,9 +253,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 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));
+        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));
 
         return callback(null);
     });
@@ -263,7 +279,7 @@ function getDnsRecords(subdomain, domain, type, callback) {
     assert.strictEqual(typeof callback, 'function');
 
     get(domain, function (error, result) {
-        if (error) return callback(new DomainError(DomainError.INTERNAL_ERROR, error));
+        if (error) return callback(new DomainsError(DomainsError.INTERNAL_ERROR, error));
 
         api(result.provider).get(result.config, result.zoneName, getName(result, subdomain), type, function (error, values) {
             if (error) return callback(error);
@@ -283,12 +299,12 @@ 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 DomainError(DomainError.INTERNAL_ERROR, error));
+        if (error) return callback(new DomainsError(DomainsError.INTERNAL_ERROR, error));
 
-        api(result.provider).upsert(result.config, result.zoneName, getName(result, subdomain), type, values, function (error, changeId) {
+        api(result.provider).upsert(result.config, result.zoneName, getName(result, subdomain), type, values, function (error) {
             if (error) return callback(error);
 
-            callback(null, changeId);
+            callback(null);
         });
     });
 }
@@ -306,7 +322,7 @@ 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 !== DomainError.NOT_FOUND) return callback(error);
+            if (error && error.reason !== DomainsError.NOT_FOUND) return callback(error);
 
             callback(null);
         });
@@ -340,7 +356,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 DomainError(DomainError.EXTERNAL_ERROR, 'Error setting PTR record:' + error.message));
+            if (error) return callback(new DomainsError(DomainsError.EXTERNAL_ERROR, 'Error setting PTR record:' + error.message));
 
             config.setAdminDomain(result.domain);
             config.setAdminLocation('my');
@@ -357,3 +373,15 @@ function fqdn(location, domain, provider) {
     return location + (location ? (provider !== 'caas' ? '.' : '-') : '') + domain;
 }
 
+// removes all fields that are strictly private and should never be returned by API calls
+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;
+}
+
+// removes all fields that are not accessible by a normal user
+function removeRestrictedFields(domain) {
+    var result = _.pick(domain, 'domain', 'zoneName', 'provider');
+    return result;
+}

src/eventlog.js

@@ -27,7 +27,8 @@ exports = module.exports = {
     ACTION_USER_ADD: 'user.add',
     ACTION_USER_LOGIN: 'user.login',
     ACTION_USER_REMOVE: 'user.remove',
-    ACTION_USER_UPDATE: 'user.update'
+    ACTION_USER_UPDATE: 'user.update',
+    ACTION_USER_TRANSFER: 'user.transfer',
 };
 
 var assert = require('assert'),

src/groupdb.js

@@ -6,6 +6,7 @@ exports = module.exports = {
     getAll: getAll,
     getAllWithMembers: getAllWithMembers,
     add: add,
+    update: update,
     del: del,
     count: count,
 
@@ -15,15 +16,15 @@ exports = module.exports = {
     setMembers: setMembers,
     isMember: isMember,
 
-    getGroups: getGroups,
-    setGroups: setGroups,
+    getMembership: getMembership,
+    setMembership: setMembership,
 
-    _clear: clear,
-    _addDefaultGroups: addDefaultGroups
+    getGroups: getGroups,
+
+    _clear: clear
 };
 
 var assert = require('assert'),
-    constants = require('./constants.js'),
     database = require('./database.js'),
     DatabaseError = require('./databaseerror');
 
@@ -62,10 +63,10 @@ function getWithMembers(groupId, callback) {
 function getAll(callback) {
     assert.strictEqual(typeof callback, 'function');
 
-    database.query('SELECT ' + GROUPS_FIELDS + ' FROM groups', function (error, result) {
+    database.query('SELECT ' + GROUPS_FIELDS + ' FROM groups', function (error, results) {
         if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
 
-        callback(null, result);
+        callback(null, results);
     });
 }
 
@@ -95,6 +96,31 @@ function add(id, name, callback) {
     });
 }
 
+function update(id, data, callback) {
+    assert.strictEqual(typeof id, 'string');
+    assert(data && typeof data === 'object');
+    assert.strictEqual(typeof callback, 'function');
+
+    var args = [ ];
+    var fields = [ ];
+    for (var k in data) {
+        if (k === 'name') {
+            assert.strictEqual(typeof data.name, 'string');
+            fields.push(k + ' = ?');
+            args.push(data.name);
+        }
+    }
+    args.push(id);
+
+    database.query('UPDATE groups SET ' + fields.join(', ') + ' WHERE id = ?', args, function (error, result) {
+        if (error && error.code === 'ER_DUP_ENTRY' && error.sqlMessage.indexOf('groups_name') !== -1) return callback(new DatabaseError(DatabaseError.ALREADY_EXISTS, 'name already exists'));
+        if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
+        if (result.affectedRows !== 1) return callback(new DatabaseError(DatabaseError.NOT_FOUND));
+
+        return callback(null);
+    });
+}
+
 function del(id, callback) {
     assert.strictEqual(typeof id, 'string');
     assert.strictEqual(typeof callback, 'function');
@@ -126,7 +152,7 @@ function clear(callback) {
     database.query('DELETE FROM groupMembers', function (error) {
         if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
 
-        database.query('DELETE FROM groups WHERE id != ?', [ 'admin' ], function (error) {
+        database.query('DELETE FROM groups', function (error) {
             if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
 
             callback(error);
@@ -165,7 +191,7 @@ function setMembers(groupId, userIds, callback) {
     });
 }
 
-function getGroups(userId, callback) {
+function getMembership(userId, callback) {
     assert.strictEqual(typeof userId, 'string');
     assert.strictEqual(typeof callback, 'function');
 
@@ -177,7 +203,7 @@ function getGroups(userId, callback) {
     });
 }
 
-function setGroups(userId, groupIds, callback) {
+function setMembership(userId, groupIds, callback) {
     assert.strictEqual(typeof userId, 'string');
     assert(Array.isArray(groupIds));
     assert.strictEqual(typeof callback, 'function');
@@ -235,6 +261,14 @@ function isMember(groupId, userId, callback) {
     });
 }
 
-function addDefaultGroups(callback) {
-    add(constants.ADMIN_GROUP_ID, 'admin', callback);
+function getGroups(userId, callback) {
+    assert.strictEqual(typeof userId, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    database.query('SELECT ' + GROUPS_FIELDS + ' ' +
+        ' FROM groups INNER JOIN groupMembers ON groups.id = groupMembers.groupId AND groupMembers.userId = ?', [ userId ], function (error, results) {
+        if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
+
+        callback(null, results);
+    });
 }

src/groups.js

@@ -1,11 +1,12 @@
 'use strict';
 
 exports = module.exports = {
-    GroupError: GroupError,
+    GroupsError: GroupsError,
 
     create: create,
     remove: remove,
     get: get,
+    update: update,
     getWithMembers: getWithMembers,
     getAll: getAll,
     getAllWithMembers: getAllWithMembers,
@@ -17,7 +18,9 @@ exports = module.exports = {
     isMember: isMember,
 
     getGroups: getGroups,
-    setGroups: setGroups
+
+    setMembership: setMembership,
+    getMembership: getMembership
 };
 
 var assert = require('assert'),
@@ -25,11 +28,12 @@ var assert = require('assert'),
     DatabaseError = require('./databaseerror.js'),
     groupdb = require('./groupdb.js'),
     util = require('util'),
-    uuid = require('uuid');
+    uuid = require('uuid'),
+    _ = require('underscore');
 
 // http://dustinsenos.com/articles/customErrorsInNode
 // http://code.google.com/p/v8/wiki/JavaScriptStackTraceApi
-function GroupError(reason, errorOrMessage) {
+function GroupsError(reason, errorOrMessage) {
     assert.strictEqual(typeof reason, 'string');
     assert(errorOrMessage instanceof Error || typeof errorOrMessage === 'string' || typeof errorOrMessage === 'undefined');
 
@@ -47,28 +51,25 @@ function GroupError(reason, errorOrMessage) {
         this.nestedError = errorOrMessage;
     }
 }
-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';
+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';
 
 // keep this in sync with validateUsername
 function validateGroupname(name) {
     assert.strictEqual(typeof name, 'string');
 
-    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 (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 (constants.RESERVED_NAMES.indexOf(name) !== -1) return new GroupError(GroupError.BAD_FIELD, 'name is reserved');
+    if (constants.RESERVED_NAMES.indexOf(name) !== -1) return new GroupsError(GroupsError.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 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 GroupError(GroupError.BAD_FIELD, 'name pattern is reserved for apps');
+    // 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, hyphen and dot');
 
     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 GroupError(GroupError.ALREADY_EXISTS));
-        if (error) return callback(new GroupError(GroupError.INTERNAL_ERROR, 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));
 
         callback(null, { id: id, name: name });
     });
@@ -96,12 +97,9 @@ function remove(id, callback) {
     assert.strictEqual(typeof id, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    // never allow admin group to be deleted
-    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 GroupError(GroupError.NOT_FOUND));
-        if (error) return callback(new GroupError(GroupError.INTERNAL_ERROR, 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));
 
         callback(null);
     });
@@ -112,8 +110,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 GroupError(GroupError.NOT_FOUND));
-        if (error) return callback(new GroupError(GroupError.INTERNAL_ERROR, 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));
 
         return callback(null, result);
     });
@@ -124,8 +122,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 GroupError(GroupError.NOT_FOUND));
-        if (error) return callback(new GroupError(GroupError.INTERNAL_ERROR, 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));
 
         return callback(null, result);
     });
@@ -135,7 +133,7 @@ function getAll(callback) {
     assert.strictEqual(typeof callback, 'function');
 
     groupdb.getAll(function (error, result) {
-        if (error) return callback(new GroupError(GroupError.INTERNAL_ERROR, error));
+        if (error) return callback(new GroupsError(GroupsError.INTERNAL_ERROR, error));
 
         return callback(null, result);
     });
@@ -145,7 +143,7 @@ function getAllWithMembers(callback) {
     assert.strictEqual(typeof callback, 'function');
 
     groupdb.getAllWithMembers(function (error, result) {
-        if (error) return callback(new GroupError(GroupError.INTERNAL_ERROR, error));
+        if (error) return callback(new GroupsError(GroupsError.INTERNAL_ERROR, error));
 
         return callback(null, result);
     });
@@ -156,33 +154,33 @@ 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 GroupError(GroupError.NOT_FOUND));
-        if (error) return callback(new GroupError(GroupError.INTERNAL_ERROR, 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));
 
         return callback(null, result);
     });
 }
 
-function getGroups(userId, callback) {
+function getMembership(userId, callback) {
     assert.strictEqual(typeof userId, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    groupdb.getGroups(userId, function (error, result) {
-        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new GroupError(GroupError.NOT_FOUND));
-        if (error) return callback(new GroupError(GroupError.INTERNAL_ERROR, error));
+    groupdb.getMembership(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));
 
         return callback(null, result);
     });
 }
 
-function setGroups(userId, groupIds, callback) {
+function setMembership(userId, groupIds, callback) {
     assert.strictEqual(typeof userId, 'string');
     assert(Array.isArray(groupIds));
     assert.strictEqual(typeof callback, 'function');
 
-    groupdb.setGroups(userId, groupIds, 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));
+    groupdb.setMembership(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));
 
         return callback(null);
     });
@@ -194,8 +192,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 GroupError(GroupError.NOT_FOUND));
-        if (error) return callback(new GroupError(GroupError.INTERNAL_ERROR, 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));
 
         return callback(null);
     });
@@ -207,8 +205,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 GroupError(GroupError.NOT_FOUND, 'Invalid group or user id'));
-        if (error) return callback(new GroupError(GroupError.INTERNAL_ERROR, 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));
 
         return callback(null);
     });
@@ -220,8 +218,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 GroupError(GroupError.NOT_FOUND));
-        if (error) return callback(new GroupError(GroupError.INTERNAL_ERROR, 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));
 
         return callback(null);
     });
@@ -233,9 +231,40 @@ 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 GroupError(GroupError.NOT_FOUND));
-        if (error) return callback(new GroupError(GroupError.INTERNAL_ERROR, 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));
 
         return callback(null, result);
     });
 }
+
+function update(groupId, data, callback) {
+    assert.strictEqual(typeof groupId, 'string');
+    assert(data && typeof data === 'object');
+    assert.strictEqual(typeof callback, 'function');
+
+    let error;
+    if ('name' in data) {
+        assert.strictEqual(typeof data.name, 'string');
+        error = validateGroupname(data.name);
+        if (error) return callback(error);
+    }
+
+    groupdb.update(groupId, _.pick(data, 'name'), 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));
+
+        callback(null);
+    });
+}
+
+function getGroups(userId, callback) {
+    assert.strictEqual(typeof userId, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    groupdb.getGroups(userId, function (error, results) {
+        if (error) return callback(new GroupsError(GroupsError.INTERNAL_ERROR, error));
+
+        callback(null, results);
+    });
+}

src/hat.js

@@ -0,0 +1,9 @@
+'use strict';
+
+exports = module.exports = hat;
+
+var crypto = require('crypto');
+
+function hat (bits) {
+    return crypto.randomBytes(bits / 8).toString('hex');
+}

src/infra_version.js

@@ -7,18 +7,18 @@
 exports = module.exports = {
     // a major version makes all apps restore from backup. #451 must be fixed before we do this.
     // a minor version makes all apps re-configure themselves
-    'version': '48.9.0',
+    'version': '48.11.0',
 
     'baseImages': [ 'cloudron/base:0.10.0' ],
 
     // Note that if any of the databases include an upgrade, bump the infra version above
     // This is because we upgrade using dumps instead of mysql_upgrade, pg_upgrade etc
     'images': {
-        'mysql': { repo: 'cloudron/mysql', tag: 'cloudron/mysql:1.0.0' },
-        'postgresql': { repo: 'cloudron/postgresql', tag: 'cloudron/postgresql:1.0.0' },
-        'mongodb': { repo: 'cloudron/mongodb', tag: 'cloudron/mongodb:1.0.1' },
+        'mysql': { repo: 'cloudron/mysql', tag: 'cloudron/mysql:1.1.0' },
+        'postgresql': { repo: 'cloudron/postgresql', tag: 'cloudron/postgresql:1.1.0' },
+        'mongodb': { repo: 'cloudron/mongodb', tag: 'cloudron/mongodb:1.1.0' },
         'redis': { repo: 'cloudron/redis', tag: 'cloudron/redis:1.0.0' },
-        'mail': { repo: 'cloudron/mail', tag: 'cloudron/mail:1.2.2' },
+        'mail': { repo: 'cloudron/mail', tag: 'cloudron/mail:1.4.0' },
         'graphite': { repo: 'cloudron/graphite', tag: 'cloudron/graphite:1.0.0' }
     }
 };

src/ldap.js

@@ -10,11 +10,12 @@ var assert = require('assert'),
     apps = require('./apps.js'),
     async = require('async'),
     config = require('./config.js'),
+    constants = require('./constants.js'),
     DatabaseError = require('./databaseerror.js'),
     debug = require('debug')('box:ldap'),
     eventlog = require('./eventlog.js'),
-    user = require('./user.js'),
-    UserError = user.UserError,
+    users = require('./users.js'),
+    UsersError = users.UsersError,
     ldap = require('ldapjs'),
     mail = require('./mail.js'),
     MailError = mail.MailError,
@@ -51,13 +52,13 @@ function getUsersWithAccessToApp(req, callback) {
     getAppByRequest(req, function (error, app) {
         if (error) return callback(error);
 
-        user.list(function (error, result){
+        users.list(function (error, result) {
             if (error) return callback(new ldap.OperationsError(error.toString()));
 
-            async.filter(result, apps.hasAccessTo.bind(null, app), function (error, result) {
+            async.filter(result, apps.hasAccessTo.bind(null, app), function (error, allowedUsers) {
                 if (error) return callback(new ldap.OperationsError(error.toString()));
 
-                callback(null, result);
+                callback(null, allowedUsers);
             });
         });
     });
@@ -258,38 +259,83 @@ 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 (!req.dn.rdns[0].attrs.cn) return next(new ldap.NoSuchObjectError(req.dn.toString()));
+    // 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()));
 
-    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()));
+        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()));
 
-    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 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'
+                }
+            };
 
-        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
+            // 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();
             }
-        };
+        });
+    } else if (req.dn.rdns[0].attrs.domain) {
+        var domain = req.dn.rdns[0].attrs.domain.value.toLowerCase();
 
-        // 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()));
+        mailboxdb.listMailboxes(domain, function (error, result) {
+            if (error) return next(new ldap.OperationsError(error.toString()));
 
-        if (lowerCaseFilter.matches(obj.attributes)) {
-            finalSend([ obj ], req, res, next);
-        } else {
-            res.end();
-        }
-    });
+            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()));
+    }
 }
 
 function mailAliasSearch(req, res, next) {
@@ -378,18 +424,18 @@ function authenticateUser(req, res, next) {
 
     var api;
     if (attributeName === 'mail') {
-        api = user.verifyWithEmail;
+        api = users.verifyWithEmail;
     } else if (commonName.indexOf('@') !== -1) { // if mail is specified, enforce mail check
-        api = user.verifyWithEmail;
+        api = users.verifyWithEmail;
     } else if (commonName.indexOf('uid-') === 0) {
-        api = user.verify;
+        api = users.verify;
     } else {
-        api = user.verifyWithUsername;
+        api = users.verifyWithUsername;
     }
 
     api(commonName, 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 && 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) return next(new ldap.OperationsError(error.message));
 
         req.user = user;
@@ -410,7 +456,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: user.removePrivateFields(req.user) });
+            eventlog.add(eventlog.ACTION_USER_LOGIN, { authType: 'ldap', appId: app.id, app: app }, { userId: req.user.id, user: users.removePrivateFields(req.user) });
 
             res.end();
         });
@@ -451,12 +497,12 @@ function authenticateMailbox(req, res, next) {
             } else if (mailbox.ownerType === mailboxdb.OWNER_TYPE_USER) {
                 if (!domain.enabled) return next(new ldap.NoSuchObjectError(req.dn.toString()));
 
-                user.verify(mailbox.ownerId, req.credentials || '', function (error, result) {
-                    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()));
+                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()));
                     if (error) return next(new ldap.OperationsError(error.message));
 
-                    eventlog.add(eventlog.ACTION_USER_LOGIN, { authType: 'ldap', mailboxId: email }, { userId: result.id, user: user.removePrivateFields(result) });
+                    eventlog.add(eventlog.ACTION_USER_LOGIN, { authType: 'ldap', mailboxId: email }, { userId: result.id, user: users.removePrivateFields(result) });
                     res.end();
                 });
             } else {
@@ -489,6 +535,7 @@ 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

@@ -8,9 +8,10 @@ exports = module.exports = {
     getDomain: getDomain,
     addDomain: addDomain,
     removeDomain: removeDomain,
-    updateDomain: updateDomain,
 
-    addDnsRecords: addDnsRecords,
+    setDnsRecords: setDnsRecords,
+
+    validateName: validateName,
 
     setMailFromValidation: setMailFromValidation,
     setCatchAllAddress: setCatchAllAddress,
@@ -46,7 +47,6 @@ exports = module.exports = {
 var assert = require('assert'),
     async = require('async'),
     config = require('./config.js'),
-    constants = require('./constants.js'),
     DatabaseError = require('./databaseerror.js'),
     debug = require('debug')('box:mail'),
     dns = require('./native-dns.js'),
@@ -65,7 +65,7 @@ var assert = require('assert'),
     shell = require('./shell.js'),
     smtpTransport = require('nodemailer-smtp-transport'),
     sysinfo = require('./sysinfo.js'),
-    user = require('./user.js'),
+    users = require('./users.js'),
     util = require('util'),
     _ = require('underscore');
 
@@ -92,10 +92,12 @@ function MailError(reason, errorOrMessage) {
 }
 util.inherits(MailError, Error);
 MailError.INTERNAL_ERROR = 'Internal Error';
+MailError.EXTERNAL_ERROR = 'External Error';
 MailError.BAD_FIELD = 'Bad Field';
 MailError.ALREADY_EXISTS = 'Already Exists';
 MailError.NOT_FOUND = 'Not Found';
 MailError.IN_USE = 'In Use';
+MailError.BILLING_REQUIRED = 'Billing Required';
 
 function validateName(name) {
     assert.strictEqual(typeof name, 'string');
@@ -103,10 +105,8 @@ function validateName(name) {
     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 (constants.RESERVED_NAMES.indexOf(name) !== -1) return new MailError(MailError.BAD_FIELD, `mailbox name ${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 MailError(MailError.BAD_FIELD, 'mailbox name can only contain alphanumerals and dot');
+    // 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');
 
     // 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');
@@ -161,6 +161,8 @@ function checkSmtpRelay(relay, callback) {
     };
 
     var transporter = nodemailer.createTransport(smtpTransport({
+        connectionTimeout: 5000,
+        greetingTimeout: 5000,
         host: relay.host,
         port: relay.port,
         auth: {
@@ -198,6 +200,7 @@ function verifyRelay(relay, callback) {
 function checkDkim(domain, callback) {
     var dkim = {
         domain: config.dkimSelector() + '._domainkey.' + domain,
+        name: config.dkimSelector() + '._domainkey',
         type: 'TXT',
         expected: null,
         value: null,
@@ -224,6 +227,7 @@ function checkDkim(domain, callback) {
 function checkSpf(domain, callback) {
     var spf = {
         domain: domain,
+        name: '@',
         type: 'TXT',
         value: null,
         expected: 'v=spf1 a:' + config.mailFqdn() + ' ~all',
@@ -255,6 +259,7 @@ function checkSpf(domain, callback) {
 function checkMx(domain, callback) {
     var mx = {
         domain: domain,
+        name: '@',
         type: 'MX',
         value: null,
         expected: '10 ' + config.mailFqdn() + '.',
@@ -276,6 +281,7 @@ function checkMx(domain, callback) {
 function checkDmarc(domain, callback) {
     var dmarc = {
         domain: '_dmarc.' + domain,
+        name: '_dmarc',
         type: 'TXT',
         value: null,
         expected: 'v=DMARC1; p=reject; pct=100',
@@ -359,11 +365,6 @@ const RBL_LIST = [
         'dns': 'spam.dnsbl.sorbs.net',
         'site': 'http://sorbs.net'
     },
-    {
-        'name': 'Spam Cannibal',
-        'dns': 'bl.spamcannibal.org',
-        'site': 'http://www.spamcannibal.org/cannibal.cgi'
-    },
     {
         'name': 'SpamCop',
         'dns': 'bl.spamcop.net',
@@ -480,7 +481,7 @@ function createMailConfig(callback) {
     getDomains(function (error, mailDomains) {
         if (error) return callback(error);
 
-        user.getOwner(function (error, owner) {
+        users.getOwner(function (error, owner) {
             const mailFqdn = config.mailFqdn();
             const defaultDomain = config.adminDomain();
             const alertsFrom = `no-reply@${defaultDomain}`;
@@ -564,6 +565,10 @@ function restartMail(callback) {
             const cmd = `docker run --restart=always -d --name="mail" \
                         --net cloudron \
                         --net-alias mail \
+                        --log-driver syslog \
+                        --log-opt syslog-address=udp://127.0.0.1:2514 \
+                        --log-opt syslog-format=rfc5424 \
+                        --log-opt tag=mail \
                         -m ${memoryLimit}m \
                         --memory-swap ${memoryLimit * 2}m \
                         --dns 172.18.0.1 \
@@ -687,40 +692,49 @@ function readDkimPublicKeySync(domain) {
     return publicKey;
 }
 
-function addDnsRecords(domain, callback) {
+function setDnsRecords(domain, callback) {
     assert.strictEqual(typeof domain, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    var error = ensureDkimKeySync(domain);
-    if (error) return callback(error);
+    maildb.get(domain, function (error, result) {
+        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new MailError(MailError.NOT_FOUND));
+        if (error) return callback(new MailError(MailError.INTERNAL_ERROR, error));
 
-    if (process.env.BOX_ENV === 'test') return callback();
-
-    var dkimKey = readDkimPublicKeySync(domain);
-    if (!dkimKey) return callback(new MailError(MailError.INTERNAL_ERROR, new Error('Failed to read dkim public key')));
-
-    // t=s limits the domainkey to this domain and not it's subdomains
-    var dkimRecord = { subdomain: config.dkimSelector() + '._domainkey', domain: domain, type: 'TXT', values: [ '"v=DKIM1; t=s; p=' + dkimKey + '"' ] };
-
-    var records = [ ];
-    records.push(dkimRecord);
-
-    debug('addDnsRecords: %j', records);
-
-    txtRecordsWithSpf(domain, function (error, txtRecords) {
+        error = ensureDkimKeySync(domain);
         if (error) return callback(error);
 
-        if (txtRecords) records.push({ subdomain: '', domain: domain, type: 'TXT', values: txtRecords });
+        if (process.env.BOX_ENV === 'test') return callback();
 
-        debug('addDnsRecords: will update %j', records);
+        var dkimKey = readDkimPublicKeySync(domain);
+        if (!dkimKey) return callback(new MailError(MailError.INTERNAL_ERROR, new Error('Failed to read dkim public key')));
 
-        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);
+        // t=s limits the domainkey to this domain and not it's subdomains
+        var dkimRecord = { subdomain: config.dkimSelector() + '._domainkey', domain: domain, type: 'TXT', values: [ '"v=DKIM1; t=s; p=' + dkimKey + '"' ] };
 
-            callback(error);
+        var records = [ ];
+        records.push(dkimRecord);
+        if (result.enabled) {
+            records.push({ subdomain: '_dmarc', domain: domain, type: 'TXT', values: [ '"v=DMARC1; p=reject; pct=100"' ] });
+            records.push({ subdomain: '', domain: domain, type: 'MX', values: [ '10 ' + config.mailFqdn() + '.' ] });
+        }
+
+        debug('addDnsRecords: %j', records);
+
+        txtRecordsWithSpf(domain, function (error, txtRecords) {
+            if (error) return callback(error);
+
+            if (txtRecords) records.push({ subdomain: '', domain: domain, type: 'TXT', values: txtRecords });
+
+            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);
+
+                callback(error);
+            });
         });
     });
 }
@@ -735,7 +749,7 @@ function addDomain(domain, callback) {
         if (error) return callback(new MailError(MailError.INTERNAL_ERROR, error));
 
         async.series([
-            addDnsRecords.bind(null, domain), // do this first to ensure DKIM keys
+            setDnsRecords.bind(null, domain), // do this first to ensure DKIM keys
             restartMail
         ], NOOP_CALLBACK); // do these asynchronously
 
@@ -743,20 +757,6 @@ function addDomain(domain, 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) {
     assert.strictEqual(typeof domain, 'string');
     assert.strictEqual(typeof callback, 'function');
@@ -811,6 +811,7 @@ function setMailRelay(domain, relay, callback) {
         if (error) return callback(error);
 
         maildb.update(domain, { relay: relay }, 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);
@@ -826,23 +827,11 @@ function setMailEnabled(domain, enabled, callback) {
     assert.strictEqual(typeof callback, 'function');
 
     maildb.update(domain, { enabled: enabled }, 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);
 
-        if (!enabled || process.env.BOX_ENV === 'test') return callback(null);
-
-        // Add MX and DMARC record. Note that DMARC policy depends on DKIM signing and thus works
-        // only if we use our internal mail server.
-        var records = [
-            { subdomain: '_dmarc', type: 'TXT', values: [ '"v=DMARC1; p=reject; pct=100"' ] },
-            { subdomain: '', type: 'MX', values: [ '10 ' + config.mailFqdn() + '.' ] }
-        ];
-
-        async.mapSeries(records, function (record, iteratorCallback) {
-            domains.upsertDnsRecords(record.subdomain, domain, record.type, record.values, iteratorCallback);
-        }, NOOP_CALLBACK);
-
         callback(null);
     });
 }
@@ -991,7 +980,7 @@ function setAliases(name, domain, aliases, callback) {
 
     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'$`))
+            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`));
         }

src/mail_templates/app_update_available.ejs

@@ -46,6 +46,4 @@ 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,7 +52,5 @@ 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

@@ -53,11 +53,6 @@ Last successful backup: <%- info.finishedBackups[0].backupId || info.finishedBac
 This Cloudron did **not** backup successfully in the last week!
 <% } -%>
 
-<% if (!info.hasSubscription) { -%>
-
-*Keep your Cloudron automatically up-to-date and secure by upgrading to a paid plan at* <%= webadminUrl %>/#/settings
-<% } -%>
-
 Powered by https://cloudron.io
 
 Sent at: <%= new Date().toUTCString() %>
@@ -156,12 +151,6 @@ Sent at: <%= new Date().toUTCString() %>
     <% } %>
 
         <br/>
-
-    <% if (!info.hasSubscription) { %>
-        Keep your Cloudron automatically up-to-date and secure by upgrading to a <a href="<%= webadminUrl %>/#/settings">paid plan</a>.
-    <% } %>
-
-        <br/>
         <br/>
         <br/>
 
@@ -174,5 +163,4 @@ 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,6 +38,4 @@ 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,6 +44,4 @@ 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,6 +43,4 @@ 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/mailer.js

@@ -39,7 +39,7 @@ var assert = require('assert'),
     settings = require('./settings.js'),
     showdown = require('showdown'),
     smtpTransport = require('nodemailer-smtp-transport'),
-    users = require('./user.js'),
+    users = require('./users.js'),
     util = require('util'),
     _ = require('underscore');
 
@@ -60,6 +60,19 @@ function splatchError(error) {
     return util.inspect(result, { depth: null, showHidden: true });
 }
 
+function getAdminEmails(callback) {
+    users.getAllAdmins(function (error, admins) {
+        if (error) return callback(error);
+
+        if (admins.length === 0) return callback(new Error('No admins on this cloudron')); // box not activated yet
+
+        var adminEmails = [ ];
+        admins.forEach(function (admin) { adminEmails.push(admin.email); });
+
+        callback(null, adminEmails);
+    });
+}
+
 // This will collect the most common details required for notification emails
 function getMailConfig(callback) {
     assert.strictEqual(typeof callback, 'function');
@@ -157,20 +170,6 @@ function render(templateFile, params) {
     return content;
 }
 
-function getAdminEmails(callback) {
-    users.getAllAdmins(function (error, admins) {
-        if (error) return callback(error);
-
-        if (admins.length === 0) return callback(new Error('No admins on this cloudron')); // box not activated yet
-
-        var adminEmails = [ ];
-        adminEmails.push(admins[0].fallbackEmail);
-        admins.forEach(function (admin) { adminEmails.push(admin.email); });
-
-        callback(null, adminEmails);
-    });
-}
-
 function mailUserEventToAdmins(user, event) {
     assert.strictEqual(typeof user, 'object');
     assert.strictEqual(typeof event, 'string');
@@ -203,7 +202,7 @@ function sendInvite(user, invitor) {
         var templateData = {
             user: user,
             webadminUrl: config.adminOrigin(),
-            setupLink: config.adminOrigin() + '/api/v1/session/account/setup.html?reset_token=' + user.resetToken,
+            setupLink: `${config.adminOrigin()}/api/v1/session/account/setup.html?reset_token=${user.resetToken}&email=${encodeURIComponent(user.email)}`,
             invitor: invitor,
             cloudronName: mailConfig.cloudronName,
             cloudronAvatarUrl: config.adminOrigin() + '/api/v1/cloudron/avatar'
@@ -240,7 +239,7 @@ function userAdded(user, inviteSent) {
 
         var templateData = {
             user: user,
-            inviteLink: inviteSent ? null : config.adminOrigin() + '/api/v1/session/account/setup.html?reset_token=' + user.resetToken,
+            inviteLink: inviteSent ? null : `${config.adminOrigin()}/api/v1/session/account/setup.html?reset_token=${user.resetToken}&email=${encodeURIComponent(user.email)}`,
             cloudronName: mailConfig.cloudronName,
             cloudronAvatarUrl: config.adminOrigin() + '/api/v1/cloudron/avatar'
         };
@@ -290,7 +289,7 @@ function passwordReset(user) {
 
         var templateData = {
             user: user,
-            resetLink: config.adminOrigin() + '/api/v1/session/password/reset.html?reset_token=' + user.resetToken,
+            resetLink: `${config.adminOrigin()}/api/v1/session/password/reset.html?reset_token=${user.resetToken}&email=${encodeURIComponent(user.email)}`,
             cloudronName: mailConfig.cloudronName,
             cloudronAvatarUrl: config.adminOrigin() + '/api/v1/cloudron/avatar'
         };
@@ -430,7 +429,7 @@ function sendDigest(info) {
         var mailOptions = {
             from: mailConfig.notificationFrom,
             to: mailConfig.adminEmails.join(', '),
-            subject: util.format('[%s] Cloudron - Weekly activity digest', mailConfig.cloudronName),
+            subject: util.format('[%s] Weekly activity digest', mailConfig.cloudronName),
             text: render('digest.ejs', templateDataText),
             html: render('digest.ejs', templateDataHTML)
         };

src/oauth2views/account_setup.ejs

@@ -19,8 +19,8 @@ app.controller('Controller', ['$scope', function ($scope) {
 
   <center>
     <br/>
-    <h4>Hello <%= (user && user.email) ? user.email : '' %>, welcome to <%= cloudronName %>.</h4>
-    <h2>Setup your account and password.</h2>
+    <h4>Hello <%= (user && user.email) ? user.email : '' %>, welcome to <%= cloudronName %>!</h4>
+    <h2>Setup your account and password</h2>
   </center>
 
   <div class="container" ng-app="Application" ng-controller="Controller">
@@ -29,6 +29,7 @@ app.controller('Controller', ['$scope', function ($scope) {
         <form action="/api/v1/session/account/setup" method="post" name="setupForm" autocomplete="off" role="form" novalidate>
           <input type="password" style="display: none;">
           <input type="hidden" name="_csrf" value="<%= csrf %>"/>
+          <input type="hidden" name="email" value="<%= email %>"/>
           <input type="hidden" name="resetToken" value="<%= resetToken %>"/>
 
           <center><p class="has-error"><%= error %></p></center>
@@ -51,16 +52,16 @@ app.controller('Controller', ['$scope', function ($scope) {
 <% } %>
 
           <div class="form-group">
-            <label class="control-label">Display Name</label>
+            <label class="control-label">Full Name</label>
             <input type="displayName" class="form-control" ng-model="displayName" name="displayName" required>
           </div>
 
           <div class="form-group" ng-class="{ 'has-error': (setupForm.password.$dirty && setupForm.password.$invalid) }">
             <label class="control-label">New Password</label>
             <div class="control-label" ng-show="setupForm.password.$dirty && setupForm.password.$invalid">
-              <small ng-show="setupForm.password.$dirty && setupForm.password.$invalid">Password must be 8-30 character with at least one uppercase, one numeric and one special character</small>
+              <small ng-show="setupForm.password.$dirty && setupForm.password.$invalid">Password must be atleast 8 characters</small>
             </div>
-            <input type="password" class="form-control" ng-model="password" name="password" ng-pattern="/^(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[^a-zA-Z0-9])(?!.*\s).{8,30}$/" required>
+            <input type="password" class="form-control" ng-model="password" name="password" ng-pattern="/^.{8,30}$/" required>
           </div>
 
           <div class="form-group" ng-class="{ 'has-error': (setupForm.passwordRepeat.$dirty && (password !== passwordRepeat)) }">
@@ -71,7 +72,7 @@ app.controller('Controller', ['$scope', function ($scope) {
             <input type="password" class="form-control" ng-model="passwordRepeat" name="passwordRepeat" required>
           </div>
 
-          <input class="btn btn-primary btn-outline pull-right" type="submit" value="Create" ng-disabled="setupForm.$invalid || password !== passwordRepeat"/>
+          <center><input class="btn btn-primary btn-outline" type="submit" value="Setup" ng-disabled="setupForm.$invalid || password !== passwordRepeat"/></center>
         </form>
       </div>
     </div>

src/oauth2views/footer.ejs

@@ -1,6 +1,6 @@
 
     <footer class="text-center">
-      <span class="text-muted">&copy; 2017 <a href="https://cloudron.io" target="_blank">Cloudron</a></span>
+      <span class="text-muted">&copy; 2016-18 <a href="https://cloudron.io" target="_blank">Cloudron</a></span>
       <span class="text-muted"><a href="https://twitter.com/cloudron_io" target="_blank">Twitter <i class="fa fa-twitter"></i></a></span>
       <span class="text-muted"><a href="https://chat.cloudron.io" target="_blank">Chat <i class="fa fa-comments"></i></a></span>
     </footer>

src/oauth2views/login.ejs

@@ -24,13 +24,17 @@
         <form id="loginForm" action="" method="post">
           <input type="hidden" name="_csrf" value="<%= csrf %>"/>
           <div class="form-group">
-            <label class="control-label" for="inputUsername">Username or Email</label>
+            <label class="control-label" for="inputUsername">Username</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>

src/oauth2views/password_reset.ejs

@@ -26,14 +26,15 @@ app.controller('Controller', [function () {}]);
         <form action="/api/v1/session/password/reset" method="post" name="resetForm" autocomplete="off" role="form" novalidate>
           <input type="password" style="display: none;">
           <input type="hidden" name="_csrf" value="<%= csrf %>"/>
+          <input type="hidden" name="email" value="<%= email %>"/>
           <input type="hidden" name="resetToken" value="<%= resetToken %>"/>
 
           <div class="form-group" ng-class="{ 'has-error': resetForm.password.$dirty && resetForm.password.$invalid }">
             <label class="control-label" for="inputPassword">New Password</label>
             <div class="control-label" ng-show="resetForm.password.$dirty && resetForm.password.$invalid">
-              <small ng-show="resetForm.password.$dirty && resetForm.password.$invalid">Password must be 8-30 character with at least one uppercase, one numeric and one special character</small>
+              <small ng-show="resetForm.password.$dirty && resetForm.password.$invalid">Password must be atleast 8 characters</small>
             </div>
-            <input type="password" class="form-control" id="inputPassword" ng-model="password" name="password" ng-pattern="/^(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[^a-zA-Z0-9])(?!.*\s).{8,30}$/" autofocus required>
+            <input type="password" class="form-control" id="inputPassword" ng-model="password" name="password" ng-pattern="/^.{8,30}$/" autofocus required>
           </div>
           <div class="form-group" ng-class="{ 'has-error': resetForm.passwordRepeat.$dirty && (password !== passwordRepeat) }">
             <label class="control-label" for="inputPasswordRepeat">Repeat Password</label>
@@ -42,7 +43,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="Create" ng-disabled="resetForm.$invalid || password !== passwordRepeat"/>
+          <input class="btn btn-primary btn-outline pull-right" type="submit" value="Set New Password" ng-disabled="resetForm.$invalid || password !== passwordRepeat"/>
         </form>
       </div>
     </div>

src/oauth2views/password_reset_request.ejs

@@ -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 or Email</label>
+            <label class="control-label" for="inputIdentifier">Username</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/password.js

@@ -1,47 +0,0 @@
-/* jslint node:true */
-
-'use strict';
-
-// From https://www.npmjs.com/package/password-generator
-
-exports = module.exports = {
-    generate: generate,
-    validate: validate
-};
-
-var assert = require('assert'),
-    generatePassword = require('password-generator');
-
-// http://www.w3resource.com/javascript/form/example4-javascript-form-validation-password.html
-// WARNING!!! if this is changed, the UI parts in the setup and account view have to be adjusted!
-var gPasswordTestRegExp = /^(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[^a-zA-Z0-9])(?!.*\s).{8,30}$/;
-
-var UPPERCASE_RE = /([A-Z])/g;
-var LOWERCASE_RE = /([a-z])/g;
-var NUMBER_RE = /([\d])/g;
-var SPECIAL_CHAR_RE = /([\?\-])/g;
-
-function isStrongEnough(password) {
-    var uc = password.match(UPPERCASE_RE);
-    var lc = password.match(LOWERCASE_RE);
-    var n = password.match(NUMBER_RE);
-    var sc = password.match(SPECIAL_CHAR_RE);
-
-    return uc && lc && n && sc;
-}
-
-function generate() {
-    var password = '';
-
-    while (!isStrongEnough(password)) password = generatePassword(8, false, /[\w\d\?\-]/);
-
-    return password;
-}
-
-function validate(password) {
-    assert.strictEqual(typeof password, 'string');
-
-    if (!password.match(gPasswordTestRegExp)) return new Error('Password must be 8-30 character with at least one uppercase, one numeric and one special character');
-
-    return null;
-}

src/paths.js

@@ -8,7 +8,6 @@ exports = module.exports = {
     CLOUDRON_DEFAULT_AVATAR_FILE: path.join(__dirname + '/../assets/avatar.png'),
     INFRA_VERSION_FILE: path.join(config.baseDir(), 'platformdata/INFRA_VERSION'),
     BACKUP_RESULT_FILE: path.join(config.baseDir(), 'platformdata/backup/result.txt'),
-    BACKUP_LOG_FILE: path.join(config.baseDir(), 'platformdata/backup/logs.txt'),
 
     OLD_DATA_DIR: path.join(config.baseDir(), 'data'),
     PLATFORM_DATA_DIR: path.join(config.baseDir(), 'platformdata'),
@@ -23,6 +22,7 @@ exports = module.exports = {
     NGINX_APPCONFIG_DIR: path.join(config.baseDir(), 'platformdata/nginx/applications'),
     NGINX_CERT_DIR: path.join(config.baseDir(), 'platformdata/nginx/cert'),
     BACKUP_INFO_DIR: path.join(config.baseDir(), 'platformdata/backup'),
+    UPDATE_DIR: path.join(config.baseDir(), 'platformdata/update'),
     SNAPSHOT_INFO_FILE: path.join(config.baseDir(), 'platformdata/backup/snapshot-info.json'),
 
     // this is not part of appdata because an icon may be set before install
@@ -33,5 +33,9 @@ exports = module.exports = {
     CLOUDRON_AVATAR_FILE: path.join(config.baseDir(), 'boxdata/avatar.png'),
     UPDATE_CHECKER_FILE: path.join(config.baseDir(), 'boxdata/updatechecker.json'),
 
-    AUTO_PROVISION_FILE: path.join(config.baseDir(), 'configs/autoprovision.json')
+    AUTO_PROVISION_FILE: path.join(config.baseDir(), 'configs/autoprovision.json'),
+
+    LOG_DIR: path.join(config.baseDir(), 'platformdata/logs'),
+    // this pattern is for the cloudron logs API route to work
+    BACKUP_LOG_FILE: path.join(config.baseDir(), 'platformdata/logs/backup/app.log'),
 };

src/platform.js

@@ -13,7 +13,7 @@ var apps = require('./apps.js'),
     config = require('./config.js'),
     debug = require('debug')('box:platform'),
     fs = require('fs'),
-    hat = require('hat'),
+    hat = require('./hat.js'),
     infra = require('./infra_version.js'),
     locker = require('./locker.js'),
     mail = require('./mail.js'),
@@ -22,6 +22,7 @@ var apps = require('./apps.js'),
     reverseProxy = require('./reverseproxy.js'),
     safe = require('safetydance'),
     semver = require('semver'),
+    settings = require('./settings.js'),
     shell = require('./shell.js'),
     taskmanager = require('./taskmanager.js'),
     util = require('util'),
@@ -44,10 +45,14 @@ function start(callback) {
         if (!existingInfra) existingInfra = { version: 'corrupt' };
     }
 
+    settings.events.on(settings.PLATFORM_CONFIG_KEY, updateAddons);
+
     // short-circuit for the restart case
     if (_.isEqual(infra, existingInfra)) {
         debug('platform is uptodate at version %s', infra.version);
+
         emitPlatformReady();
+
         return callback();
     }
 
@@ -61,7 +66,7 @@ function start(callback) {
         startAddons.bind(null, existingInfra),
         removeOldImages,
         startApps.bind(null, existingInfra),
-        fs.writeFile.bind(fs, paths.INFRA_VERSION_FILE, JSON.stringify(infra))
+        fs.writeFile.bind(fs, paths.INFRA_VERSION_FILE, JSON.stringify(infra, null, 4))
     ], function (error) {
         if (error) return callback(error);
 
@@ -80,6 +85,21 @@ function stop(callback) {
     taskmanager.pauseTasks(callback);
 }
 
+function updateAddons(platformConfig, callback) {
+    callback = callback || NOOP_CALLBACK;
+
+    // TODO: this should possibly also rollback memory to default
+    async.eachSeries([ 'mysql', 'postgresql', 'mail', 'mongodb' ], function iterator(containerName, iteratorCallback) {
+        const containerConfig = platformConfig[containerName];
+        if (!containerConfig) return iteratorCallback();
+
+        if (!containerConfig.memory || !containerConfig.memorySwap) return iteratorCallback();
+
+        const args = `update --memory ${containerConfig.memory} --memory-swap ${containerConfig.memorySwap} ${containerName}`.split(' ');
+        shell.exec(`update${containerName}`, '/usr/bin/docker', args, { }, iteratorCallback);
+    }, callback);
+}
+
 function emitPlatformReady() {
     // give some time for the platform to "settle". For example, mysql might still be initing the
     // database dir and we cannot call service scripts until that's done.
@@ -135,6 +155,10 @@ function startGraphite(callback) {
     const cmd = `docker run --restart=always -d --name="graphite" \
                 --net cloudron \
                 --net-alias graphite \
+                --log-driver syslog \
+                --log-opt syslog-address=udp://127.0.0.1:2514 \
+                --log-opt syslog-format=rfc5424 \
+                --log-opt tag=graphite \
                 -m 75m \
                 --memory-swap 150m \
                 --dns 172.18.0.1 \
@@ -164,6 +188,10 @@ function startMysql(callback) {
     const cmd = `docker run --restart=always -d --name="mysql" \
                 --net cloudron \
                 --net-alias mysql \
+                --log-driver syslog \
+                --log-opt syslog-address=udp://127.0.0.1:2514 \
+                --log-opt syslog-format=rfc5424 \
+                --log-opt tag=mysql \
                 -m ${memoryLimit}m \
                 --memory-swap ${memoryLimit * 2}m \
                 --dns 172.18.0.1 \
@@ -190,6 +218,10 @@ function startPostgresql(callback) {
     const cmd = `docker run --restart=always -d --name="postgresql" \
                 --net cloudron \
                 --net-alias postgresql \
+                --log-driver syslog \
+                --log-opt syslog-address=udp://127.0.0.1:2514 \
+                --log-opt syslog-format=rfc5424 \
+                --log-opt tag=postgresql \
                 -m ${memoryLimit}m \
                 --memory-swap ${memoryLimit * 2}m \
                 --dns 172.18.0.1 \
@@ -216,6 +248,10 @@ function startMongodb(callback) {
     const cmd = `docker run --restart=always -d --name="mongodb" \
                 --net cloudron \
                 --net-alias mongodb \
+                --log-driver syslog \
+                --log-opt syslog-address=udp://127.0.0.1:2514 \
+                --log-opt syslog-format=rfc5424 \
+                --log-opt tag=mongodb \
                 -m ${memoryLimit}m \
                 --memory-swap ${memoryLimit * 2}m \
                 --dns 172.18.0.1 \
@@ -248,7 +284,15 @@ function startAddons(existingInfra, callback) {
         debug('startAddons: existing infra. incremental addon create %j', startFuncs.map(function (f) { return f.name; }));
     }
 
-    async.series(startFuncs, callback);
+    async.series(startFuncs, function (error) {
+        if (error) return callback(error);
+
+        settings.getPlatformConfig(function (error, platformConfig) {
+            if (error) return callback(error);
+
+            updateAddons(platformConfig, callback);
+        });
+    });
 }
 
 function startApps(existingInfra, callback) {

src/reverseproxy.js

@@ -44,9 +44,10 @@ var acme = require('./cert/acme.js'),
     path = require('path'),
     paths = require('./paths.js'),
     platform = require('./platform.js'),
+    rimraf = require('rimraf'),
     safe = require('safetydance'),
     shell = require('./shell.js'),
-    user = require('./user.js'),
+    users = require('./users.js'),
     util = require('util');
 
 var NGINX_APPCONFIG_EJS = fs.readFileSync(__dirname + '/../setup/start/nginx/appconfig.ejs', { encoding: 'utf8' }),
@@ -98,7 +99,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
-        user.getOwner(function (error, owner) {
+        users.getOwner(function (error, owner) {
             options.email = error ? 'support@cloudron.io' : (owner.fallbackEmail || owner.email); // can error if not activated yet
 
             callback(null, api, options);
@@ -348,15 +349,59 @@ function configureAppInternal(app, bundle, callback) {
     reload(callback);
 }
 
+function configureAppRedirect(app, fqdn, bundle, callback) {
+    assert.strictEqual(typeof app, 'object');
+    assert.strictEqual(typeof fqdn, 'string');
+    assert.strictEqual(typeof bundle, 'object');
+    assert.strictEqual(typeof callback, 'function');
+
+    var data = {
+        sourceDir: path.resolve(__dirname, '..'),
+        vhost: fqdn,
+        redirectTo: app.fqdn,
+        hasIPv6: config.hasIPv6(),
+        endpoint: 'redirect',
+        certFilePath: bundle.certFilePath,
+        keyFilePath: bundle.keyFilePath,
+        robotsTxtQuoted: null,
+        xFrameOptions: 'SAMEORIGIN'
+    };
+    var nginxConf = ejs.render(NGINX_APPCONFIG_EJS, data);
+
+    // if we change the filename, also change it in unconfigureApp()
+    var nginxConfigFilename = path.join(paths.NGINX_APPCONFIG_DIR, `${app.id}-redirect-${fqdn}.conf`);
+    debug('writing config for "%s" redirecting to "%s" to %s with options %j', app.fqdn, fqdn, nginxConfigFilename, data);
+
+    if (!safe.fs.writeFileSync(nginxConfigFilename, nginxConf)) {
+        debug('Error creating nginx redirect config for "%s" : %s', app.fqdn, safe.error.message);
+        return callback(safe.error);
+    }
+
+    reload(callback);
+}
+
 function configureApp(app, auditSource, callback) {
     assert.strictEqual(typeof app, 'object');
     assert.strictEqual(typeof auditSource, 'object');
     assert.strictEqual(typeof callback, 'function');
 
-    ensureCertificate(app, auditSource, function (error, bundle) {
+    ensureCertificate({ fqdn: app.fqdn, domain: app.domain }, auditSource, function (error, bundle) {
         if (error) return callback(error);
 
-        configureAppInternal(app, bundle, callback);
+        configureAppInternal(app, bundle, function (error) {
+            if (error) return callback(error);
+
+            // now setup alternateDomain redirects if any
+            async.eachSeries(app.alternateDomains, function (domain, callback) {
+                var fqdn = (domain.subdomain ? (domain.subdomain + '.') : '') + domain.domain;
+
+                ensureCertificate({ fqdn: fqdn, domain: domain.domain }, auditSource, function (error, bundle) {
+                    if (error) return callback(error);
+
+                    configureAppRedirect(app, fqdn, bundle, callback);
+                });
+            }, callback);
+        });
     });
 }
 
@@ -364,13 +409,12 @@ function unconfigureApp(app, callback) {
     assert.strictEqual(typeof app, 'object');
     assert.strictEqual(typeof callback, 'function');
 
-    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);
-        return callback(null);
-    }
+    // we use globbing to find all nginx configs for an app
+    rimraf(path.join(paths.NGINX_APPCONFIG_DIR, `${app.id}*.conf`), function (error) {
+        if (error) debug('Error removing nginx configurations of "%s":', app.fqdn, error);
 
-    reload(callback);
+        reload(callback);
+    });
 }
 
 function renewAll(auditSource, callback) {
@@ -386,6 +430,7 @@ function renewAll(auditSource, callback) {
 
         async.eachSeries(allApps, function (app, iteratorCallback) {
             ensureCertificate(app, auditSource, function (error, bundle) {
+                if (error) return iteratorCallback(error); // this can happen if cloudron is not setup yet
                 if (bundle.reason !== 'new-le' && bundle.reason !== 'fallback') return iteratorCallback();
 
                 // reconfigure for the case where we got a renewed cert after fallback

src/routes/accesscontrol.js

@@ -0,0 +1,166 @@
+'use strict';
+
+exports = module.exports = {
+    initialize: initialize,
+    uninitialize: uninitialize,
+
+    scope: scope,
+    websocketAuth: websocketAuth,
+    verifyAppOwnership: verifyAppOwnership
+};
+
+var accesscontrol = require('../accesscontrol.js'),
+    apps = require('../apps.js'),
+    AppsError = apps.AppsError,
+    assert = require('assert'),
+    BasicStrategy = require('passport-http').BasicStrategy,
+    BearerStrategy = require('passport-http-bearer').Strategy,
+    clients = require('../clients.js'),
+    ClientPasswordStrategy = require('passport-oauth2-client-password').Strategy,
+    ClientsError = clients.ClientsError,
+    HttpError = require('connect-lastmile').HttpError,
+    LocalStrategy = require('passport-local').Strategy,
+    passport = require('passport'),
+    settings = require('../settings.js'),
+    users = require('../users.js'),
+    UsersError = users.UsersError;
+
+function initialize(callback) {
+    assert.strictEqual(typeof callback, 'function');
+
+    // serialize user into session
+    passport.serializeUser(function (user, callback) {
+        callback(null, user.id);
+    });
+
+    // deserialize user from session
+    passport.deserializeUser(function(userId, callback) {
+        users.get(userId, function (error, result) {
+            if (error) return callback(error);
+
+            callback(null, result);
+        });
+    });
+
+    // used when username/password is sent in request body. used in CLI tool login route
+    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);
+            });
+        }
+    }));
+
+    // Used to authenticate a OAuth2 client which uses clientId and clientSecret in the Authorization header
+    passport.use(new BasicStrategy(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);
+            callback(null, client);
+        });
+    }));
+
+    // Used to authenticate a OAuth2 client which uses clientId and clientSecret in the request body (client_id, client_secret)
+    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); }
+            callback(null, client);
+        });
+    }));
+
+    // used for "Authorization: Bearer token" or access_token query param authentication
+    passport.use(new BearerStrategy(function (token, callback) {
+        accesscontrol.validateToken(token, callback);
+    }));
+
+    callback(null);
+}
+
+function uninitialize(callback) {
+    assert.strictEqual(typeof callback, 'function');
+
+    callback(null);
+}
+
+//  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(requiredScope) {
+    assert.strictEqual(typeof requiredScope, 'string');
+
+    var requiredScopes = requiredScope.split(',');
+
+    return [
+        passport.authenticate(['bearer'], { session: false }),
+
+        function (req, res, next) {
+            assert(req.authInfo && typeof req.authInfo === 'object');
+
+            var error = accesscontrol.hasScopes(req.authInfo.authorizedScopes, requiredScopes);
+            if (error) return next(new HttpError(403, error.message));
+
+            next();
+        }
+    ];
+}
+
+function websocketAuth(requiredScopes, req, res, next) {
+    assert(Array.isArray(requiredScopes));
+
+    if (typeof req.query.access_token !== 'string') return next(new HttpError(401, 'Unauthorized'));
+
+    accesscontrol.validateToken(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;
+
+        var e = accesscontrol.hasScopes(info.authorizedScopes, requiredScopes);
+        if (e) return next(new HttpError(403, e.message));
+
+        next();
+    });
+}
+
+function verifyAppOwnership(req, res, next) {
+    if (req.user.admin) return next();
+
+    const appCreate = !('id' in req.params);
+
+    settings.getSpacesConfig(function (error, spaces) {
+        if (error) return next(new HttpError(500, error));
+        if (!spaces.enabled) return next();
+
+        if (appCreate) return next(); // ok to install app
+
+        apps.get(req.params.id, function (error, app) {
+            if (error && error.reason === AppsError.NOT_FOUND) return next(new HttpError(404, 'No such app'));
+            if (error) return next(new HttpError(500, error));
+
+            if (app.ownerId !== req.user.id) return next(new HttpError(401, 'Unauthorized'));
+
+            next();
+        });
+    });
+}

src/routes/apps.js

@@ -21,6 +21,8 @@ exports = module.exports = {
 
     cloneApp: cloneApp,
 
+    setOwner: setOwner,
+
     uploadFile: uploadFile,
     downloadFile: downloadFile
 };
@@ -42,32 +44,6 @@ 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,
-        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');
 
@@ -75,18 +51,17 @@ 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, removeInternalAppFields(app)));
+        next(new HttpSuccess(200, apps.removeInternalFields(app)));
     });
 }
 
 function getApps(req, res, next) {
     assert.strictEqual(typeof req.user, 'object');
 
-    var func = req.user.admin ? apps.getAll : apps.getAllByUser.bind(null, req.user);
-    func(function (error, allApps) {
+    apps.getAllByUser(req.user, function (error, allApps) {
         if (error) return next(new HttpError(500, error));
 
-        allApps = allApps.map(removeInternalAppFields);
+        allApps = allApps.map(apps.removeRestrictedFields);
 
         next(new HttpSuccess(200, { apps: allApps }));
     });
@@ -106,6 +81,7 @@ function installApp(req, res, next) {
     assert.strictEqual(typeof req.body, 'object');
 
     var data = req.body;
+    data.ownerId = req.user.id;
 
     // atleast one
     if ('manifest' in data && typeof data.manifest !== 'object') return next(new HttpError(400, 'manifest must be an object'));
@@ -184,6 +160,13 @@ function configureApp(req, res, next) {
 
     if (data.robotsTxt && typeof data.robotsTxt !== 'string') return next(new HttpError(400, 'robotsTxt must be a string'));
 
+    if ('mailboxName' in data && typeof data.mailboxName !== 'string') return next(new HttpError(400, 'mailboxName must be a string'));
+
+    if ('alternateDomains' in data) {
+        if (!Array.isArray(data.alternateDomains)) return next(new HttpError(400, 'alternateDomains must be an array'));
+        if (data.alternateDomains.some(function (d) { return (typeof d.domain !== 'string' || typeof d.subdomain !== 'string'); })) return next(new HttpError(400, 'alternateDomains array must contain objects with domain and subdomain strings'));
+    }
+
     debug('Configuring app id:%s data:%j', req.params.id, data);
 
     apps.configure(req.params.id, data, auditSource(req), function (error) {
@@ -227,6 +210,7 @@ function cloneApp(req, res, next) {
     assert.strictEqual(typeof req.params.id, 'string');
 
     var data = req.body;
+    data.ownerId = req.user.id;
 
     debug('Clone app id:%s', req.params.id);
 
@@ -577,3 +561,17 @@ function downloadFile(req, res, next) {
         stream.pipe(res);
     });
 }
+
+function setOwner(req, res, next) {
+    assert.strictEqual(typeof req.params.id, 'string');
+    assert.strictEqual(typeof req.body, 'object');
+
+    if (typeof req.body.ownerId !== 'string') return next(new HttpError(400, 'ownerId must be a string'));
+
+    apps.setOwner(req.params.id, req.body.ownerId, function (error) {
+        if (error && error.reason === AppsError.NOT_FOUND) return next(new HttpError(404, error.message));
+        if (error) return next(new HttpError(500, error));
+
+        next(new HttpSuccess(200, { }));
+    });
+}

src/routes/caas.js

@@ -1,6 +1,7 @@
 'use strict';
 
 exports = module.exports = {
+    getConfig: getConfig,
     changePlan: changePlan
 };
 
@@ -12,8 +13,25 @@ var caas = require('../caas.js'),
     HttpSuccess = require('connect-lastmile').HttpSuccess,
     _ = require('underscore');
 
+function getConfig(req, res, next) {
+    if (config.provider() !== 'caas') return next(new HttpError(422, 'Cannot use this API with this provider'));
+
+    caas.getBoxAndUserDetails(function (error, result) {
+        if (error) return next(new HttpError(500, error));
+
+        // the result is { box: { region, size, plan }, user: { billing, currency } }
+        next(new HttpSuccess(200, {
+            region: result.box.region,
+            size: result.box.size,
+            billing: !!result.user.billing,
+            plan: result.box.plan,
+            currency: result.user.currency
+        }));
+    });
+}
+
 function changePlan(req, res, next) {
-    if (config.provider() !== 'caas') return next(new HttpError(422, 'Cannot use migrate API with this provider'));
+    if (config.provider() !== 'caas') return next(new HttpError(422, 'Cannot use this API with this provider'));
 
     if ('size' in req.body && typeof req.body.size !== 'string') return next(new HttpError(400, 'size must be string'));
     if ('region' in req.body && typeof req.body.region !== 'string') return next(new HttpError(400, 'region must be string'));

src/routes/clients.js

@@ -5,9 +5,9 @@ exports = module.exports = {
     get: get,
     del: del,
     getAll: getAll,
-    addClientToken: addClientToken,
-    getClientTokens: getClientTokens,
-    delClientTokens: delClientTokens,
+    addToken: addToken,
+    getTokens: getTokens,
+    delTokens: delTokens,
     delToken: delToken
 };
 
@@ -72,36 +72,38 @@ function getAll(req, res, next) {
     });
 }
 
-function addClientToken(req, res, next) {
+function addToken(req, res, next) {
     assert.strictEqual(typeof req.params.clientId, 'string');
     assert.strictEqual(typeof req.user, 'object');
+    assert.strictEqual(typeof req.body, 'object');
 
-    var expiresAt = req.query.expiresAt ? parseInt(req.query.expiresAt, 10) : Date.now() + constants.DEFAULT_TOKEN_EXPIRATION;
+    var data = req.body;
+    var expiresAt = data.expiresAt ? parseInt(data.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.addClientTokenByUserId(req.params.clientId, req.user.id, expiresAt, function (error, result) {
+    clients.addTokenByUserId(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 getClientTokens(req, res, next) {
+function getTokens(req, res, next) {
     assert.strictEqual(typeof req.params.clientId, 'string');
     assert.strictEqual(typeof req.user, 'object');
 
-    clients.getClientTokensByUserId(req.params.clientId, req.user.id, function (error, result) {
+    clients.getTokensByUserId(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 delClientTokens(req, res, next) {
+function delTokens(req, res, next) {
     assert.strictEqual(typeof req.params.clientId, 'string');
     assert.strictEqual(typeof req.user, 'object');
 
-    clients.delClientTokensByUserId(req.params.clientId, req.user.id, function (error) {
+    clients.delTokensByUserId(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

@@ -5,6 +5,7 @@ exports = module.exports = {
     getProgress: getProgress,
     getConfig: getConfig,
     getDisks: getDisks,
+    getUpdateInfo: getUpdateInfo,
     update: update,
     feedback: feedback,
     checkForUpdates: checkForUpdates,
@@ -21,7 +22,9 @@ var appstore = require('../appstore.js'),
     HttpError = require('connect-lastmile').HttpError,
     HttpSuccess = require('connect-lastmile').HttpSuccess,
     progress = require('../progress.js'),
+    updater = require('../updater.js'),
     updateChecker = require('../updatechecker.js'),
+    UpdaterError = require('../updater.js').UpdaterError,
     _ = require('underscore');
 
 function auditSource(req) {
@@ -44,10 +47,6 @@ 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));
     });
 }
@@ -61,16 +60,20 @@ function getDisks(req, res, next) {
 
 function update(req, res, next) {
     // this only initiates the update, progress can be checked via the progress route
-    cloudron.updateToLatest(auditSource(req), function (error) {
-        if (error && error.reason === CloudronError.ALREADY_UPTODATE) return next(new HttpError(422, error.message));
-        if (error && error.reason === CloudronError.BAD_STATE) return next(new HttpError(409, error.message));
-        if (error && error.reason === CloudronError.SELF_UPGRADE_NOT_SUPPORTED) return next(new HttpError(412, error.message));
+    updater.updateToLatest(auditSource(req), function (error) {
+        if (error && error.reason === UpdaterError.ALREADY_UPTODATE) return next(new HttpError(422, error.message));
+        if (error && error.reason === UpdaterError.BAD_STATE) return next(new HttpError(409, error.message));
+        if (error && error.reason === UpdaterError.SELF_UPGRADE_NOT_SUPPORTED) return next(new HttpError(412, error.message));
         if (error) return next(new HttpError(500, error));
 
         next(new HttpSuccess(202, {}));
     });
 }
 
+function getUpdateInfo(req, res, next) {
+    next(new HttpSuccess(200, { update: updateChecker.getUpdateInfo() }));
+}
+
 function checkForUpdates(req, res, next) {
     async.series([
         updateChecker.checkAppUpdates,
@@ -101,19 +104,18 @@ function feedback(req, res, next) {
 }
 
 function getLogs(req, res, next) {
+    assert.strictEqual(typeof req.params.unit, 'string');
+
     var lines = req.query.lines ? parseInt(req.query.lines, 10) : 100;
     if (isNaN(lines)) return next(new HttpError(400, 'lines must be a number'));
 
-    var units = req.query.units || 'all';
-
     var options = {
         lines: lines,
         follow: false,
-        units: units.split(','),
         format: req.query.format
     };
 
-    cloudron.getLogs(options, function (error, logStream) {
+    cloudron.getLogs(req.params.unit, options, function (error, logStream) {
         if (error && error.reason === CloudronError.BAD_FIELD) return next(new HttpError(404, 'Invalid type'));
         if (error) return next(new HttpError(500, error));
 
@@ -128,11 +130,11 @@ function getLogs(req, res, next) {
 }
 
 function getLogStream(req, res, next) {
+    assert.strictEqual(typeof req.params.unit, 'string');
+
     var lines = req.query.lines ? parseInt(req.query.lines, 10) : -10; // we ignore last-event-id
     if (isNaN(lines)) return next(new HttpError(400, 'lines must be a valid number'));
 
-    var units = req.query.units || 'all';
-
     function sse(id, data) { return 'id: ' + id + '\ndata: ' + data + '\n\n'; }
 
     if (req.headers.accept !== 'text/event-stream') return next(new HttpError(400, 'This API call requires EventStream'));
@@ -140,11 +142,10 @@ function getLogStream(req, res, next) {
     var options = {
         lines: lines,
         follow: true,
-        units: units.split(','),
         format: req.query.format
     };
 
-    cloudron.getLogs(options, function (error, logStream) {
+    cloudron.getLogs(req.params.unit, options, function (error, logStream) {
         if (error && error.reason === CloudronError.BAD_FIELD) return next(new HttpError(404, 'Invalid type'));
         if (error) return next(new HttpError(500, error));
 

src/routes/developer.js

@@ -4,10 +4,11 @@ exports = module.exports = {
     login: login
 };
 
-var developer = require('../developer.js'),
+var clients = require('../clients.js'),
     passport = require('passport'),
     HttpError = require('connect-lastmile').HttpError,
-    HttpSuccess = require('connect-lastmile').HttpSuccess;
+    HttpSuccess = require('connect-lastmile').HttpSuccess,
+    speakeasy = require('speakeasy');
 
 function login(req, res, next) {
     passport.authenticate('local', function (error, user) {
@@ -16,11 +17,18 @@ function login(req, res, next) {
 
         var ip = req.headers['x-forwarded-for'] || req.connection.remoteAddress || null;
 
-        developer.issueDeveloperToken(user, ip, function (error, result) {
+        if (!user.ghost && 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) {
             if (error) return next(new HttpError(500, error));
 
-            next(new HttpSuccess(200, { token: result.token, expiresAt: result.expiresAt }));
+            next(new HttpSuccess(200, result));
         });
-  })(req, res, next);
+    })(req, res, next);
 }
 

src/routes/domains.js

@@ -5,14 +5,12 @@ exports = module.exports = {
     get: get,
     getAll: getAll,
     update: update,
-    del: del,
-
-    setAdmin: setAdmin
+    del: del
 };
 
 var assert = require('assert'),
     domains = require('../domains.js'),
-    DomainError = domains.DomainError,
+    DomainsError = domains.DomainsError,
     HttpError = require('connect-lastmile').HttpError,
     HttpSuccess = require('connect-lastmile').HttpSuccess;
 
@@ -33,9 +31,9 @@ function add(req, res, next) {
     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 === 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 && 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) return next(new HttpError(500, error));
 
         next(new HttpSuccess(201, { domain: req.body.domain, config: req.body.config }));
@@ -46,12 +44,10 @@ function get(req, res, next) {
     assert.strictEqual(typeof req.params.domain, 'string');
 
     domains.get(req.params.domain, function (error, result) {
-        if (error && error.reason === DomainError.NOT_FOUND) return next(new HttpError(404, error.message));
+        if (error && error.reason === DomainsError.NOT_FOUND) return next(new HttpError(404, error.message));
         if (error) return next(new HttpError(500, error));
 
-        delete result.fallbackCertificate.key; // do not return the 'key'. in caas, this is private
-
-        next(new HttpSuccess(200, result));
+        next(new HttpSuccess(200, domains.removePrivateFields(result)));
     });
 }
 
@@ -59,6 +55,8 @@ function getAll(req, res, next) {
     domains.getAll(function (error, result) {
         if (error) return next(new HttpError(500, error));
 
+        result = result.map(domains.removeRestrictedFields);
+
         next(new HttpSuccess(200, { domains: result }));
     });
 }
@@ -69,6 +67,7 @@ function update(req, res, next) {
 
     if (typeof req.body.provider !== 'string') return next(new HttpError(400, 'provider must be an object'));
     if (typeof req.body.config !== 'object') return next(new HttpError(400, 'config must be an object'));
+    if ('zoneName' in req.body && typeof req.body.zoneName !== 'string') return next(new HttpError(400, 'zoneName must be a string'));
     if ('fallbackCertificate' in req.body && typeof req.body.fallbackCertificate !== 'object') return next(new HttpError(400, 'fallbackCertificate must be a object with cert and key strings'));
     if (req.body.fallbackCertificate && (!req.body.fallbackCertificate.cert || typeof req.body.fallbackCertificate.cert !== 'string')) return next(new HttpError(400, 'fallbackCertificate.cert must be a string'));
     if (req.body.fallbackCertificate && (!req.body.fallbackCertificate.key || typeof req.body.fallbackCertificate.key !== 'string')) return next(new HttpError(400, 'fallbackCertificate.key must be a string'));
@@ -78,10 +77,10 @@ function update(req, res, next) {
     // 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 === 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));
+    domains.update(req.params.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.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) return next(new HttpError(500, error));
 
         next(new HttpSuccess(204, {}));
@@ -92,21 +91,10 @@ function del(req, res, next) {
     assert.strictEqual(typeof req.params.domain, 'string');
 
     domains.del(req.params.domain, function (error) {
-        if (error && error.reason === DomainError.NOT_FOUND) return next(new HttpError(404, error.message));
-        if (error && error.reason === DomainError.IN_USE) return next(new HttpError(409, 'Domain is still in use. Remove all apps and mailboxes using this domain'));
+        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) 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/groups.js

@@ -4,6 +4,7 @@ exports = module.exports = {
     get: get,
     list: list,
     create: create,
+    update: update,
     remove: remove,
     updateMembers: updateMembers
 };
@@ -12,8 +13,7 @@ var assert = require('assert'),
     groups = require('../groups.js'),
     HttpError = require('connect-lastmile').HttpError,
     HttpSuccess = require('connect-lastmile').HttpSuccess,
-    groups = require('../groups.js'),
-    GroupError = groups.GroupError;
+    GroupsError = groups.GroupsError;
 
 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 === 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 && 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) return next(new HttpError(500, error));
 
         var groupInfo = {
@@ -38,13 +38,27 @@ function get(req, res, next) {
     assert.strictEqual(typeof req.params.groupId, 'string');
 
     groups.getWithMembers(req.params.groupId, function (error, result) {
-        if (error && error.reason === GroupError.NOT_FOUND) return next(new HttpError(404, 'No such group'));
+        if (error && error.reason === GroupsError.NOT_FOUND) return next(new HttpError(404, 'No such group'));
         if (error) return next(new HttpError(500, error));
 
         next(new HttpSuccess(200, result));
     });
 }
 
+function update(req, res, next) {
+    assert.strictEqual(typeof req.params.groupId, 'string');
+    assert.strictEqual(typeof req.body, 'object');
+
+    if ('name' in req.body && typeof req.body.name !== 'string') return next(new HttpError(400, 'name must be a string'));
+
+    groups.update(req.params.groupId, req.body, function (error) {
+        if (error && error.reason === GroupsError.BAD_FIELD) return next(new HttpError(400, error.message));
+        if (error) return next(new HttpError(500, error));
+
+        next(new HttpSuccess(200, { }));
+    });
+}
+
 function updateMembers(req, res, next) {
     assert.strictEqual(typeof req.params.groupId, 'string');
 
@@ -52,15 +66,15 @@ 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 === GroupError.NOT_FOUND) return next(new HttpError(404, 'Invalid group or user id'));
+        if (error && error.reason === GroupsError.NOT_FOUND) return next(new HttpError(404, 'Invalid group or user id'));
         if (error) return next(new HttpError(500, error));
 
-        next(new HttpSuccess(200));
+        next(new HttpSuccess(200, { }));
     });
 }
 
 function list(req, res, next) {
-    groups.getAllWithMembers(function (error, result) {
+    groups.getAll(function (error, result) {
         if (error) return next(new HttpError(500, error));
 
         next(new HttpSuccess(200, { groups: result }));
@@ -71,8 +85,8 @@ function remove(req, res, next) {
     assert.strictEqual(typeof req.params.groupId, 'string');
 
     groups.remove(req.params.groupId, function (error) {
-        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 && 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) return next(new HttpError(500, error));
 
         next(new HttpSuccess(204));

src/routes/index.js

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

src/routes/mail.js

@@ -4,9 +4,10 @@ exports = module.exports = {
     getDomain: getDomain,
     addDomain: addDomain,
     getDomainStats: getDomainStats,
-    updateDomain: updateDomain,
     removeDomain: removeDomain,
 
+    setDnsRecords: setDnsRecords,
+
     getStatus: getStatus,
 
     setMailFromValidation: setMailFromValidation,
@@ -81,15 +82,15 @@ function getDomainStats(req, res, next) {
     mailProxy(req, res, next);
 }
 
-function updateDomain(req, res, next) {
+function setDnsRecords(req, res, next) {
     assert.strictEqual(typeof req.body, 'object');
     assert.strictEqual(typeof req.params.domain, 'string');
 
-    mail.updateDomain(req.params.domain, function (error) {
+    mail.setDnsRecords(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));
+        next(new HttpSuccess(201));
     });
 }
 
@@ -182,6 +183,7 @@ function setMailEnabled(req, res, next) {
     mail.setMailEnabled(req.params.domain, !!req.body.enabled, 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 && error.reason === MailError.BILLING_REQUIRED) return next(new HttpError(402, error.message));
         if (error) return next(new HttpError(500, error));
 
         next(new HttpSuccess(202));

src/routes/oauth2.js

@@ -1,28 +1,46 @@
 'use strict';
 
-var apps = require('../apps'),
+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 apps = require('../apps.js'),
     assert = require('assert'),
-    auth = require('../auth.js'),
-    authcodedb = require('../authcodedb'),
+    authcodedb = require('../authcodedb.js'),
     clients = require('../clients'),
     ClientsError = clients.ClientsError,
     config = require('../config.js'),
-    constants = require('../constants'),
-    DatabaseError = require('../databaseerror'),
+    constants = require('../constants.js'),
+    DatabaseError = require('../databaseerror.js'),
     debug = require('debug')('box:routes/oauth2'),
     eventlog = require('../eventlog.js'),
-    hat = require('hat'),
+    hat = require('../hat.js'),
     HttpError = require('connect-lastmile').HttpError,
     middleware = require('../middleware/index.js'),
     oauth2orize = require('oauth2orize'),
     passport = require('passport'),
     querystring = require('querystring'),
     session = require('connect-ensure-login'),
-    settings = require('../settings'),
-    tokendb = require('../tokendb'),
+    settings = require('../settings.js'),
+    speakeasy = require('speakeasy'),
     url = require('url'),
-    user = require('../user.js'),
-    UserError = user.UserError,
+    users = require('../users.js'),
+    UsersError = users.UsersError,
     util = require('util'),
     _ = require('underscore');
 
@@ -32,111 +50,90 @@ function auditSource(req, appId, appObject) {
     return { authType: 'oauth', ip: ip, appId: appId, app: appObject };
 }
 
-// create OAuth 2.0 server
-var gServer = oauth2orize.createServer();
+var 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.
+function initialize() {
+    assert.strictEqual(gServer, null);
 
-gServer.serializeClient(function (client, callback) {
-    return callback(null, client.id);
-});
+    gServer = oauth2orize.createServer();
 
-gServer.deserializeClient(function (id, callback) {
-    clients.get(id, callback);
-});
-
-
-// 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.serializeClient(function (client, callback) {
+        return callback(null, client.id);
     });
-}));
 
-
-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);
+    gServer.deserializeClient(function (id, callback) {
+        clients.get(id, callback);
     });
-}));
 
+    // grant authorization code that can be exchanged for access tokens. this is used by external oauth clients
+    gServer.grant(oauth2orize.grant.code({ scopeSeparator: ',' }, function (client, redirectURI, user, ares, callback) {
+        debug('grant code:', client.id, redirectURI, user.id, ares);
 
-// 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.
+        var code = hat(256);
+        var expiresAt = Date.now() + 60 * 60000; // 1 hour
 
-gServer.exchange(oauth2orize.exchange.code(function (client, code, redirectURI, callback) {
-    debug('exchange:', client, code, redirectURI);
+        authcodedb.add(code, client.id, user.id, expiresAt, function (error) {
+            if (error) return callback(error);
 
-    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);
+            debug('grant code: new auth code for client %s code %s', client.id, code);
 
-        authcodedb.del(code, function (error) {
-            if(error) return callback(error);
+            callback(null, code);
+        });
+    }));
 
-            var token = tokendb.generateToken();
-            var expires = Date.now() + constants.DEFAULT_TOKEN_EXPIRATION;
+    // exchange authorization codes for access tokens. this is used by external oauth clients
+    gServer.exchange(oauth2orize.exchange.code(function (client, code, redirectURI, callback) {
+        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);
 
-            tokendb.add(token, authCode.userId, authCode.clientId, expires, client.scope, function (error) {
-                if (error) return callback(error);
+            authcodedb.del(code, function (error) {
+                if(error) return callback(error);
 
-                debug('exchange: new access token for client %s token %s', client.id, token);
+                clients.addTokenByUserId(client.id, authCode.userId, Date.now() + constants.DEFAULT_TOKEN_EXPIRATION, function (error, result) {
+                    if (error) return callback(error);
 
-                callback(null, token);
+                    debug('exchange: new access token for client %s user %s token %s', client.id, authCode.userId, result.accessToken.slice(0, 6)); // partial token for security
+
+                    callback(null, result.accessToken);
+                });
             });
         });
-    });
-}));
+    }));
 
-// 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');
+    // implicit token grant that skips issuing auth codes. this is used by our webadmin
+    gServer.grant(oauth2orize.grant.token({ scopeSeparator: ',' }, function (client, user, ares, callback) {
+        clients.addTokenByUserId(client.id, user.id, Date.now() + constants.DEFAULT_TOKEN_EXPIRATION, function (error, result) {
+            if (error) return callback(error);
 
-    return function (req, res, next) {
-        if (!req.isAuthenticated || !req.isAuthenticated()) {
-            if (req.session) {
-                req.session.returnTo = req.originalUrl || req.url;
+            debug('grant token: new access token for client %s user %s token %s', client.id, user.id, result.accessToken.slice(0, 6)); // partial token for security
+
+            callback(null, result.accessToken);
+        });
+    }));
+
+    // 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();
             }
-
-            res.status(200).send(util.format('<script>window.location.href = "%s";</script>', redirectTo));
-        } else {
-            next();
-        }
+        };
     };
-};
+}
+
+function uninitialize() {
+    gServer = null;
+}
 
 function renderTemplate(res, template, data) {
     assert.strictEqual(typeof res, 'object');
@@ -232,9 +229,9 @@ 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) {
@@ -254,6 +251,19 @@ function login(req, res) {
     passport.authenticate('local', {
         failureRedirect: '/api/v1/session/login?' + failureQuery
     })(req, res, function () {
+        if (!req.user.ghost && 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);
     });
 }
@@ -282,12 +292,12 @@ function passwordResetRequestSite(req, res) {
 function passwordResetRequest(req, res, next) {
     assert.strictEqual(typeof req.body, 'object');
 
-    if (typeof req.body.identifier !== 'string') return next(new HttpError(400, 'Missing identifier'));
+    if (typeof req.body.identifier !== 'string') return next(new HttpError(400, 'Missing identifier')); // email or username
 
     debug('passwordResetRequest: email or username %s.', req.body.identifier);
 
-    user.resetPasswordByIdentifier(req.body.identifier, function (error) {
-        if (error && error.reason !== UserError.NOT_FOUND) {
+    users.resetPasswordByIdentifier(req.body.identifier, function (error) {
+        if (error && error.reason !== UsersError.NOT_FOUND) {
             console.error(error);
             return sendErrorPageOrRedirect(req, res, 'User not found');
         }
@@ -307,16 +317,18 @@ function renderAccountSetupSite(res, req, userObject, error) {
         error: error,
         csrf: req.csrfToken(),
         resetToken: req.query.reset_token || req.body.resetToken,
-        title: 'Password Setup'
+        email: req.query.email || req.body.email,
+        title: 'Account Setup'
     });
 }
 
 // -> GET /api/v1/session/account/setup.html
 function accountSetupSite(req, res) {
     if (!req.query.reset_token) return sendError(req, res, 'Missing Reset Token');
+    if (!req.query.email) return sendError(req, res, 'Missing Email');
 
-    user.getByResetToken(req.query.reset_token, function (error, userObject) {
-        if (error) return sendError(req, res, 'Invalid Reset Token');
+    users.getByResetToken(req.query.email, req.query.reset_token, function (error, userObject) {
+        if (error) return sendError(req, res, 'Invalid Email or Reset Token');
 
         renderAccountSetupSite(res, req, userObject, '');
     });
@@ -326,33 +338,34 @@ function accountSetupSite(req, res) {
 function accountSetup(req, res, next) {
     assert.strictEqual(typeof req.body, 'object');
 
+    if (typeof req.body.email !== 'string') return next(new HttpError(400, 'Missing email'));
     if (typeof req.body.resetToken !== 'string') return next(new HttpError(400, 'Missing resetToken'));
     if (typeof req.body.password !== 'string') return next(new HttpError(400, 'Missing password'));
     if (typeof req.body.username !== 'string') return next(new HttpError(400, 'Missing username'));
     if (typeof req.body.displayName !== 'string') return next(new HttpError(400, 'Missing displayName'));
 
-    debug('acountSetup: with token %s.', req.body.resetToken);
+    debug(`acountSetup: for email ${req.body.email} with token ${req.body.resetToken}`);
 
-    user.getByResetToken(req.body.resetToken, function (error, userObject) {
+    users.getByResetToken(req.body.email, req.body.resetToken, function (error, userObject) {
         if (error) return sendError(req, res, 'Invalid Reset Token');
 
         var data = _.pick(req.body, 'username', 'displayName');
-        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');
+        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');
             if (error) return next(new HttpError(500, error));
 
             userObject.username = req.body.username;
             userObject.displayName = req.body.displayName;
 
             // setPassword clears the resetToken
-            user.setPassword(userObject.id, req.body.password, function (error, result) {
-                if (error && error.reason === UserError.BAD_FIELD) return renderAccountSetupSite(res, req, userObject, error.message);
+            users.setPassword(userObject.id, req.body.password, function (error) {
+                if (error && error.reason === UsersError.BAD_FIELD) return renderAccountSetupSite(res, req, userObject, error.message);
 
                 if (error) return next(new HttpError(500, error));
 
-                res.redirect(util.format('%s?accessToken=%s&expiresAt=%s', config.adminOrigin(), result.token, result.expiresAt));
+                res.redirect(config.adminOrigin());
             });
         });
     });
@@ -360,15 +373,17 @@ function accountSetup(req, res, next) {
 
 // -> GET /api/v1/session/password/reset.html
 function passwordResetSite(req, res, next) {
+    if (!req.query.email) return next(new HttpError(400, 'Missing email'));
     if (!req.query.reset_token) return next(new HttpError(400, 'Missing reset_token'));
 
-    user.getByResetToken(req.query.reset_token, function (error, user) {
-        if (error) return next(new HttpError(401, 'Invalid reset_token'));
+    users.getByResetToken(req.query.email, req.query.reset_token, function (error, user) {
+        if (error) return next(new HttpError(401, 'Invalid email or reset token'));
 
         renderTemplate(res, 'password_reset', {
             user: user,
             csrf: req.csrfToken(),
             resetToken: req.query.reset_token,
+            email: req.query.email,
             title: 'Password Reset'
         });
     });
@@ -378,22 +393,23 @@ function passwordResetSite(req, res, next) {
 function passwordReset(req, res, next) {
     assert.strictEqual(typeof req.body, 'object');
 
+    if (typeof req.body.email !== 'string') return next(new HttpError(400, 'Missing email'));
     if (typeof req.body.resetToken !== 'string') return next(new HttpError(400, 'Missing resetToken'));
     if (typeof req.body.password !== 'string') return next(new HttpError(400, 'Missing password'));
 
-    debug('passwordReset: with token %s.', req.body.resetToken);
+    debug(`passwordReset: for ${req.body.email} with token ${req.body.resetToken}`);
 
-    user.getByResetToken(req.body.resetToken, function (error, userObject) {
-        if (error) return next(new HttpError(401, 'Invalid resetToken'));
+    users.getByResetToken(req.body.email, req.body.resetToken, function (error, userObject) {
+        if (error) return next(new HttpError(401, 'Invalid email or resetToken'));
 
         if (!userObject.username) return next(new HttpError(401, 'No username set'));
 
         // setPassword clears the resetToken
-        user.setPassword(userObject.id, req.body.password, function (error, result) {
-            if (error && error.reason === UserError.BAD_FIELD) return next(new HttpError(406, error.message));
+        users.setPassword(userObject.id, req.body.password, function (error) {
+            if (error && error.reason === UsersError.BAD_FIELD) return next(new HttpError(406, error.message));
             if (error) return next(new HttpError(500, error));
 
-            res.redirect(util.format('%s?accessToken=%s&expiresAt=%s', config.adminOrigin(), result.token, result.expiresAt));
+            res.redirect(config.adminOrigin());
         });
     });
 }
@@ -402,13 +418,14 @@ function passwordReset(req, res, next) {
 // The callback page takes the redirectURI and the authCode and redirects the browser accordingly
 //
 // -> GET /api/v1/session/callback
-var callback = [
-    session.ensureLoggedIn('/api/v1/session/login'),
-    function (req, res) {
-        renderTemplate(res, 'callback', { callbackServer: req.query.redirectURI });
-    }
-];
-
+function sessionCallback() {
+    return [
+        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.
 //
@@ -420,54 +437,55 @@ var callback = [
 //  - Then it will redirect the browser to the given <callbackURL> containing the authcode in the query
 //
 // -> GET /api/v1/oauth/dialog/authorize
-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.');
+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.');
 
-        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)));
-        });
-    }),
-    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, user: user.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: user.removePrivateFields(req.oauth2.user) });
-
-                next();
+                callback(null, client, '/api/v1/session/callback?redirectURI=' + encodeURIComponent(url.resolve(redirectOrigin, redirectPath)));
             });
-        });
-    },
-    gServer.decision({ loadTransaction: false })
-];
+        }),
+        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, 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.
 //
@@ -476,109 +494,22 @@ var authorization = [
 //  An authcode is only good for one such exchange to an accesstoken.
 //
 // -> POST /api/v1/oauth/token
-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;
-}
-
-//  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(',');
-    debug('scope: add routes with requested scopes', requestedScopes);
-
+function token() {
     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();
-        }
+        passport.authenticate(['basic', 'oauth2-client-password'], { session: false }),
+        gServer.token(), // will call the token grant callback registered in initialize()
+        gServer.errorHandler()
     ];
 }
 
-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);
+function csrf() {
+    return [
+        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
-};
+            sendErrorPageOrRedirect(req, res, 'Form expired');
+        }
+    ];
+}

src/routes/profile.js

@@ -3,14 +3,17 @@
 exports = module.exports = {
     get: get,
     update: update,
-    changePassword: changePassword
+    changePassword: changePassword,
+    setTwoFactorAuthenticationSecret: setTwoFactorAuthenticationSecret,
+    enableTwoFactorAuthentication: enableTwoFactorAuthentication,
+    disableTwoFactorAuthentication: disableTwoFactorAuthentication
 };
 
 var assert = require('assert'),
     HttpError = require('connect-lastmile').HttpError,
     HttpSuccess = require('connect-lastmile').HttpSuccess,
-    user = require('../user.js'),
-    UserError = user.UserError,
+    users = require('../users.js'),
+    UsersError = users.UsersError,
     _ = require('underscore');
 
 function auditSource(req) {
@@ -26,8 +29,9 @@ function get(req, res, next) {
         username: req.user.username,
         email: req.user.email,
         fallbackEmail: req.user.fallbackEmail,
-        admin: req.user.admin,
-        displayName: req.user.displayName
+        displayName: req.user.displayName,
+        twoFactorAuthenticationEnabled: req.user.twoFactorAuthenticationEnabled,
+        admin: req.user.admin
     }));
 }
 
@@ -41,10 +45,10 @@ function update(req, res, next) {
 
     var data = _.pick(req.body, 'email', 'fallbackEmail', 'displayName');
 
-    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'));
+    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'));
         if (error) return next(new HttpError(500, error));
 
         next(new HttpSuccess(204));
@@ -57,11 +61,48 @@ function changePassword(req, res, next) {
 
     if (typeof req.body.newPassword !== 'string') return next(new HttpError(400, 'newPassword must be a string'));
 
-    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'));
+    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(404, 'User not found'));
         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(401, '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

@@ -20,7 +20,13 @@ exports = module.exports = {
     setTimeZone: setTimeZone,
 
     getAppstoreConfig: getAppstoreConfig,
-    setAppstoreConfig: setAppstoreConfig
+    setAppstoreConfig: setAppstoreConfig,
+
+    getPlatformConfig: getPlatformConfig,
+    setPlatformConfig: setPlatformConfig,
+
+    setSpacesConfig: setSpacesConfig,
+    getSpacesConfig: getSpacesConfig
 };
 
 var assert = require('assert'),
@@ -47,7 +53,7 @@ function setAppAutoupdatePattern(req, res, next) {
         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));
+        next(new HttpSuccess(200, {}));
     });
 }
 
@@ -68,7 +74,7 @@ function setBoxAutoupdatePattern(req, res, next) {
         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));
+        next(new HttpSuccess(200, {}));
     });
 }
 
@@ -81,7 +87,7 @@ function setCloudronName(req, res, next) {
         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(202));
+        next(new HttpSuccess(202, {}));
     });
 }
 
@@ -110,7 +116,7 @@ function setTimeZone(req, res, next) {
         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));
+        next(new HttpSuccess(200, {}));
     });
 }
 
@@ -123,7 +129,7 @@ function setCloudronAvatar(req, res, next) {
     settings.setCloudronAvatar(avatar, function (error) {
         if (error) return next(new HttpError(500, error));
 
-        next(new HttpSuccess(202));
+        next(new HttpSuccess(202, {}));
     });
 }
 
@@ -160,12 +166,63 @@ function setBackupConfig(req, res, next) {
     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'));
 
+    // testing the backup using put/del takes a bit of time at times
+    req.clearTimeout();
+
     settings.setBackupConfig(req.body, function (error) {
         if (error && error.reason === SettingsError.BAD_FIELD) return next(new HttpError(400, error.message));
         if (error && error.reason === SettingsError.EXTERNAL_ERROR) return next(new HttpError(402, error.message));
         if (error) return next(new HttpError(500, error));
 
-        next(new HttpSuccess(200));
+        next(new HttpSuccess(200, {}));
+    });
+}
+
+function getPlatformConfig(req, res, next) {
+    settings.getPlatformConfig(function (error, config) {
+        if (error) return next(new HttpError(500, error));
+
+        next(new HttpSuccess(200, config));
+    });
+}
+
+function setPlatformConfig(req, res, next) {
+    assert.strictEqual(typeof req.body, 'object');
+
+    for (let addon of [ 'mysql', 'postgresql', 'mail', 'mongodb' ]) {
+        if (!(addon in req.body)) continue;
+        if (typeof req.body[addon] !== 'object') return next(new HttpError(400, 'addon config must be an object'));
+
+        if (typeof req.body[addon].memory !== 'number') return next(new HttpError(400, 'memory must be a number'));
+        if (typeof req.body[addon].memorySwap !== 'number') return next(new HttpError(400, 'memorySwap must be a number'));
+    }
+
+    settings.setPlatformConfig(req.body, function (error) {
+        if (error && error.reason === SettingsError.BAD_FIELD) return next(new HttpError(400, error.message));
+        if (error && error.reason === SettingsError.EXTERNAL_ERROR) return next(new HttpError(402, error.message));
+        if (error) return next(new HttpError(500, error));
+
+        next(new HttpSuccess(200, {}));
+    });
+}
+
+function getSpacesConfig(req, res, next) {
+    settings.getSpacesConfig(function (error, config) {
+        if (error) return next(new HttpError(500, error));
+
+        next(new HttpSuccess(200, config));
+    });
+}
+
+function setSpacesConfig(req, res, next) {
+    assert.strictEqual(typeof req.body, 'object');
+
+    settings.setSpacesConfig(req.body, function (error) {
+        if (error && error.reason === SettingsError.BAD_FIELD) return next(new HttpError(400, error.message));
+        if (error && error.reason === SettingsError.EXTERNAL_ERROR) return next(new HttpError(402, error.message));
+        if (error) return next(new HttpError(500, error));
+
+        next(new HttpSuccess(200, {}));
     });
 }
 

src/routes/setup.js

@@ -35,7 +35,7 @@ function providerTokenAuth(req, res, next) {
             if (error && !error.response) return next(new HttpError(500, error));
             if (result.statusCode !== 200) return next(new HttpError(500, 'Unable to get meta data'));
 
-            if (result.text !== req.body.providerToken) return next(new HttpError(403, 'Invalid providerToken'));
+            if (result.text !== req.body.providerToken) return next(new HttpError(401, 'Invalid providerToken'));
 
             next();
         });
@@ -53,7 +53,7 @@ function setupTokenAuth(req, res, next) {
 
     caas.verifySetupToken(req.query.setupToken, function (error) {
         if (error && error.reason === CaasError.BAD_STATE) return next(new HttpError(409, 'Already setup'));
-        if (error && error.reason === CaasError.INVALID_TOKEN) return next(new HttpError(403, 'Invalid token'));
+        if (error && error.reason === CaasError.INVALID_TOKEN) return next(new HttpError(401, 'Invalid token'));
         if (error && error.reason === CaasError.EXTERNAL_ERROR) return next(new HttpError(503, error.message));
 
         if (error) return next(new HttpError(500, error));
@@ -78,6 +78,7 @@ function dnsSetup(req, res, next) {
     setup.dnsSetup(req.body.adminFqdn.toLowerCase(), req.body.domain.toLowerCase(), req.body.zoneName || '', req.body.provider, req.body.config, req.body.tlsConfig || { provider: 'letsencrypt-prod' }, function (error) {
         if (error && error.reason === SetupError.ALREADY_SETUP) return next(new HttpError(409, error.message));
         if (error && error.reason === SetupError.BAD_FIELD) return next(new HttpError(400, error.message));
+        if (error && error.reason === SetupError.BAD_STATE) return next(new HttpError(409, error.message));
         if (error) return next(new HttpError(500, error));
 
         next(new HttpSuccess(200));
@@ -118,7 +119,7 @@ function activate(req, res, next) {
 
         caas.setupDone(req.query.setupToken, function (error) {
             if (error && error.reason === CaasError.BAD_STATE) return next(new HttpError(409, 'Already setup'));
-            if (error && error.reason === CaasError.INVALID_TOKEN) return next(new HttpError(403, 'Invalid token'));
+            if (error && error.reason === CaasError.INVALID_TOKEN) return next(new HttpError(401, 'Invalid token'));
             if (error && error.reason === CaasError.EXTERNAL_ERROR) return next(new HttpError(503, error.message));
 
             if (error) return next(new HttpError(500, error));

src/routes/sysadmin.js

@@ -9,10 +9,11 @@ exports = module.exports = {
 var backups = require('../backups.js'),
     BackupsError = require('../backups.js').BackupsError,
     cloudron = require('../cloudron.js'),
-    CloudronError = require('../cloudron.js').CloudronError,
     debug = require('debug')('box:routes/sysadmin'),
     HttpError = require('connect-lastmile').HttpError,
-    HttpSuccess = require('connect-lastmile').HttpSuccess;
+    HttpSuccess = require('connect-lastmile').HttpSuccess,
+    updater = require('../updater.js'),
+    UpdaterError = require('../updater.js').UpdaterError;
 
 function backup(req, res, next) {
     debug('triggering backup');
@@ -33,10 +34,10 @@ function update(req, res, next) {
 
     // this only initiates the update, progress can be checked via the progress route
     var auditSource = { userId: null, username: 'sysadmin' };
-    cloudron.updateToLatest(auditSource, function (error) {
-        if (error && error.reason === CloudronError.ALREADY_UPTODATE) return next(new HttpError(422, error.message));
-        if (error && error.reason === CloudronError.BAD_STATE) return next(new HttpError(409, error.message));
-        if (error && error.reason === CloudronError.SELF_UPGRADE_NOT_SUPPORTED) return next(new HttpError(412, error.message));
+    updater.updateToLatest(auditSource, function (error) {
+        if (error && error.reason === UpdaterError.ALREADY_UPTODATE) return next(new HttpError(422, error.message));
+        if (error && error.reason === UpdaterError.BAD_STATE) return next(new HttpError(409, error.message));
+        if (error && error.reason === UpdaterError.SELF_UPGRADE_NOT_SUPPORTED) return next(new HttpError(412, error.message));
         if (error) return next(new HttpError(500, error));
 
         next(new HttpSuccess(202, {}));

src/routes/test/accesscontrol-test.js

@@ -0,0 +1,97 @@
+/* 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 empty scope in request', function (done) {
+        var mw = accesscontrol.scope('admin')[1];
+        var req = { authInfo: { authorizedScopes: [ ] } };
+
+        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: { authorizedScopes: [ '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: { authorizedScopes: [ '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: { authorizedScopes: [ '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: { authorizedScopes: [ '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: { authorizedScopes: [ '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: { authorizedScopes: [ '*' ] } };
+
+        mw(req, null, function (error) {
+            expect(error).to.not.be.ok();
+            done();
+        });
+    });
+});

src/routes/test/apps-test.js

@@ -6,7 +6,8 @@
 /* global before:false */
 /* global after:false */
 
-var appdb = require('../../appdb.js'),
+var accesscontrol = require('../../accesscontrol.js'),
+    appdb = require('../../appdb.js'),
     apps = require('../../apps.js'),
     assert = require('assert'),
     async = require('async'),
@@ -175,47 +176,47 @@ function startBox(done) {
 
         function (callback) {
             superagent.post(SERVER_URL + '/api/v1/cloudron/dns_setup')
-                   .send({ provider: 'noop', domain: DOMAIN_0.domain, adminFqdn: 'my.' + DOMAIN_0.domain, config: DOMAIN_0.config, tlsConfig: DOMAIN_0.tlsConfig })
-                   .end(function (error, result) {
-                expect(result).to.be.ok();
-                expect(result.statusCode).to.eql(200);
+                .send({ provider: 'noop', domain: DOMAIN_0.domain, adminFqdn: 'my.' + DOMAIN_0.domain, config: DOMAIN_0.config, tlsConfig: DOMAIN_0.tlsConfig })
+                .end(function (error, result) {
+                    expect(result).to.be.ok();
+                    expect(result.statusCode).to.eql(200);
 
-                callback();
-            });
+                    callback();
+                });
         },
 
         function (callback) {
             superagent.post(SERVER_URL + '/api/v1/cloudron/activate')
-                   .send({ username: USERNAME, password: PASSWORD, email: EMAIL })
-                   .end(function (error, result) {
-                expect(result).to.be.ok();
-                expect(result.statusCode).to.eql(201);
+                .send({ username: USERNAME, password: PASSWORD, email: EMAIL })
+                .end(function (error, result) {
+                    expect(result).to.be.ok();
+                    expect(result.statusCode).to.eql(201);
 
-                // stash for further use
-                token = result.body.token;
+                    // stash for further use
+                    token = result.body.token;
 
-                callback();
-            });
+                    callback();
+                });
         },
 
         function (callback) {
             superagent.post(SERVER_URL + '/api/v1/users')
-                   .query({ access_token: token })
-                   .send({ username: USERNAME_1, email: EMAIL_1, invite: false })
-                   .end(function (err, res) {
-                expect(res.statusCode).to.equal(201);
+                .query({ access_token: token })
+                .send({ username: USERNAME_1, email: EMAIL_1, invite: false })
+                .end(function (err, res) {
+                    expect(res.statusCode).to.equal(201);
 
-                user_1_id = res.body.id;
+                    user_1_id = res.body.id;
 
-                callback(null);
-            });
+                    callback(null);
+                });
         },
 
         function (callback) {
             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() + 1000000, '*', callback);
+            tokendb.add(token_1, user_1_id, 'test-client-id',  Date.now() + 1000000, accesscontrol.SCOPE_ANY, callback);
         },
 
         function (callback) {
@@ -268,179 +269,179 @@ describe('App API', function () {
 
     it('app install fails - missing manifest', function (done) {
         superagent.post(SERVER_URL + '/api/v1/apps/install')
-               .query({ access_token: token })
-               .end(function (err, res) {
-            expect(res.statusCode).to.equal(400);
-            expect(res.body.message).to.eql('appStoreId or manifest is required');
-            done();
-        });
+            .query({ access_token: token })
+            .end(function (err, res) {
+                expect(res.statusCode).to.equal(400);
+                expect(res.body.message).to.eql('appStoreId or manifest is required');
+                done();
+            });
     });
 
     it('app install fails - null manifest', function (done) {
         superagent.post(SERVER_URL + '/api/v1/apps/install')
-               .query({ access_token: token })
-               .send({ manifest: null })
-               .end(function (err, res) {
-            expect(res.statusCode).to.equal(400);
-            expect(res.body.message).to.eql('appStoreId or manifest is required');
-            done();
-        });
+            .query({ access_token: token })
+            .send({ manifest: null })
+            .end(function (err, res) {
+                expect(res.statusCode).to.equal(400);
+                expect(res.body.message).to.eql('appStoreId or manifest is required');
+                done();
+            });
     });
 
     it('app install fails - bad manifest format', function (done) {
         superagent.post(SERVER_URL + '/api/v1/apps/install')
-               .query({ access_token: token })
-               .send({ manifest: 'epic' })
-               .end(function (err, res) {
-            expect(res.statusCode).to.equal(400);
-            expect(res.body.message).to.eql('manifest must be an object');
-            done();
-        });
+            .query({ access_token: token })
+            .send({ manifest: 'epic' })
+            .end(function (err, res) {
+                expect(res.statusCode).to.equal(400);
+                expect(res.body.message).to.eql('manifest must be an object');
+                done();
+            });
     });
 
     it('app install fails - empty appStoreId format', function (done) {
         superagent.post(SERVER_URL + '/api/v1/apps/install')
-               .query({ access_token: token })
-               .send({ manifest: null, appStoreId: '' })
-               .end(function (err, res) {
-            expect(res.statusCode).to.equal(400);
-            expect(res.body.message).to.eql('appStoreId or manifest is required');
-            done();
-        });
+            .query({ access_token: token })
+            .send({ manifest: null, appStoreId: '' })
+            .end(function (err, res) {
+                expect(res.statusCode).to.equal(400);
+                expect(res.body.message).to.eql('appStoreId or manifest is required');
+                done();
+            });
     });
 
-   it('app install fails - invalid json', function (done) {
+    it('app install fails - invalid json', function (done) {
         superagent.post(SERVER_URL + '/api/v1/apps/install')
-               .query({ access_token: token })
-               .send('garbage')
-               .end(function (err, res) {
-            expect(res.statusCode).to.equal(400);
-            done();
-        });
+            .query({ access_token: token })
+            .send('garbage')
+            .end(function (err, res) {
+                expect(res.statusCode).to.equal(400);
+                done();
+            });
     });
 
     it('app install fails - missing domain', function (done) {
         superagent.post(SERVER_URL + '/api/v1/apps/install')
-               .query({ access_token: token })
-               .send({ manifest: APP_MANIFEST, location: 'some', accessRestriction: null })
-               .end(function (err, res) {
-            expect(res.statusCode).to.equal(400);
-            expect(res.body.message).to.eql('domain is required');
-            done();
-        });
+            .query({ access_token: token })
+            .send({ manifest: APP_MANIFEST, location: 'some', accessRestriction: null })
+            .end(function (err, res) {
+                expect(res.statusCode).to.equal(400);
+                expect(res.body.message).to.eql('domain is required');
+                done();
+            });
     });
 
     it('app install fails - non-existing domain', function (done) {
         superagent.post(SERVER_URL + '/api/v1/apps/install')
-               .query({ access_token: token })
-               .send({ manifest: APP_MANIFEST, location: 'some', accessRestriction: null, domain: 'doesnotexist.com' })
-               .end(function (err, res) {
-            expect(res.statusCode).to.equal(404);
-            expect(res.body.message).to.eql('No such domain');
-            done();
-        });
+            .query({ access_token: token })
+            .send({ manifest: APP_MANIFEST, location: 'some', accessRestriction: null, domain: 'doesnotexist.com' })
+            .end(function (err, res) {
+                expect(res.statusCode).to.equal(404);
+                expect(res.body.message).to.eql('No such domain');
+                done();
+            });
     });
 
     it('app install fails - invalid location type', function (done) {
         superagent.post(SERVER_URL + '/api/v1/apps/install')
-               .query({ access_token: token })
-               .send({ manifest: APP_MANIFEST, location: 42, accessRestriction: null, domain: DOMAIN_0.domain })
-               .end(function (err, res) {
-            expect(res.statusCode).to.equal(400);
-            expect(res.body.message).to.eql('location is required');
-            done();
-        });
+            .query({ access_token: token })
+            .send({ manifest: APP_MANIFEST, location: 42, accessRestriction: null, domain: DOMAIN_0.domain })
+            .end(function (err, res) {
+                expect(res.statusCode).to.equal(400);
+                expect(res.body.message).to.eql('location is required');
+                done();
+            });
     });
 
     it('app install fails - reserved admin location', function (done) {
         superagent.post(SERVER_URL + '/api/v1/apps/install')
-               .query({ access_token: token })
-               .send({ manifest: APP_MANIFEST, location: 'my', accessRestriction: null, domain: DOMAIN_0.domain })
-               .end(function (err, res) {
-            expect(res.statusCode).to.equal(400);
-            expect(res.body.message).to.eql('my is reserved');
-            done();
-        });
+            .query({ access_token: token })
+            .send({ manifest: APP_MANIFEST, location: 'my', accessRestriction: null, domain: DOMAIN_0.domain })
+            .end(function (err, res) {
+                expect(res.statusCode).to.equal(400);
+                expect(res.body.message).to.eql('my is reserved');
+                done();
+            });
     });
 
     it('app install fails - reserved api location', function (done) {
         superagent.post(SERVER_URL + '/api/v1/apps/install')
-               .query({ access_token: token })
-               .send({ manifest: APP_MANIFEST, location: constants.API_LOCATION, accessRestriction: null, domain: DOMAIN_0.domain })
-               .end(function (err, res) {
-            expect(res.statusCode).to.equal(400);
-            expect(res.body.message).to.eql(constants.API_LOCATION + ' is reserved');
-            done();
-        });
+            .query({ access_token: token })
+            .send({ manifest: APP_MANIFEST, location: constants.API_LOCATION, accessRestriction: null, domain: DOMAIN_0.domain })
+            .end(function (err, res) {
+                expect(res.statusCode).to.equal(400);
+                expect(res.body.message).to.eql(constants.API_LOCATION + ' is reserved');
+                done();
+            });
     });
 
     it('app install fails - portBindings must be object', function (done) {
         superagent.post(SERVER_URL + '/api/v1/apps/install')
-               .query({ access_token: token })
-               .send({ manifest: APP_MANIFEST, location: APP_LOCATION, portBindings: 23, accessRestriction: null, domain: DOMAIN_0.domain })
-               .end(function (err, res) {
-            expect(res.statusCode).to.equal(400);
-            expect(res.body.message).to.eql('portBindings must be an object');
-            done();
-        });
+            .query({ access_token: token })
+            .send({ manifest: APP_MANIFEST, location: APP_LOCATION, portBindings: 23, accessRestriction: null, domain: DOMAIN_0.domain })
+            .end(function (err, res) {
+                expect(res.statusCode).to.equal(400);
+                expect(res.body.message).to.eql('portBindings must be an object');
+                done();
+            });
     });
 
     it('app install fails - accessRestriction is required', function (done) {
         superagent.post(SERVER_URL + '/api/v1/apps/install')
-               .query({ access_token: token })
-               .send({ manifest: APP_MANIFEST, location: APP_LOCATION, portBindings: {}, domain: DOMAIN_0.domain })
-               .end(function (err, res) {
-            expect(res.statusCode).to.equal(400);
-            expect(res.body.message).to.eql('accessRestriction is required');
-            done();
-        });
+            .query({ access_token: token })
+            .send({ manifest: APP_MANIFEST, location: APP_LOCATION, portBindings: {}, domain: DOMAIN_0.domain })
+            .end(function (err, res) {
+                expect(res.statusCode).to.equal(400);
+                expect(res.body.message).to.eql('accessRestriction is required');
+                done();
+            });
     });
 
     it('app install fails - accessRestriction type is wrong', function (done) {
         superagent.post(SERVER_URL + '/api/v1/apps/install')
-               .query({ access_token: token })
-               .send({ manifest: APP_MANIFEST, location: APP_LOCATION, portBindings: {}, accessRestriction: '', domain: DOMAIN_0.domain })
-               .end(function (err, res) {
-            expect(res.statusCode).to.equal(400);
-            expect(res.body.message).to.eql('accessRestriction is required');
-            done();
-        });
+            .query({ access_token: token })
+            .send({ manifest: APP_MANIFEST, location: APP_LOCATION, portBindings: {}, accessRestriction: '', domain: DOMAIN_0.domain })
+            .end(function (err, res) {
+                expect(res.statusCode).to.equal(400);
+                expect(res.body.message).to.eql('accessRestriction is required');
+                done();
+            });
     });
 
     it('app install fails for non admin', function (done) {
         superagent.post(SERVER_URL + '/api/v1/apps/install')
-               .query({ access_token: token_1 })
-               .send({ manifest: APP_MANIFEST, location: APP_LOCATION, portBindings: null, accessRestriction: null, domain: DOMAIN_0.domain })
-               .end(function (err, res) {
-            expect(res.statusCode).to.equal(403);
-            done();
-        });
+            .query({ access_token: token_1 })
+            .send({ manifest: APP_MANIFEST, location: APP_LOCATION, portBindings: null, accessRestriction: null, domain: DOMAIN_0.domain })
+            .end(function (err, res) {
+                expect(res.statusCode).to.equal(403);
+                done();
+            });
     });
 
     it('app install fails because manifest download fails', function (done) {
         var fake = nock(config.apiServerOrigin()).get('/api/v1/apps/test').reply(404, {});
 
         superagent.post(SERVER_URL + '/api/v1/apps/install')
-               .query({ access_token: token })
-               .send({ appStoreId: APP_STORE_ID, location: APP_LOCATION, portBindings: null, domain: DOMAIN_0.domain, accessRestriction: { users: [ 'someuser' ], groups: [] } })
-               .end(function (err, res) {
-            expect(res.statusCode).to.equal(404);
-            expect(fake.isDone()).to.be.ok();
-            done();
-        });
+            .query({ access_token: token })
+            .send({ appStoreId: APP_STORE_ID, location: APP_LOCATION, portBindings: null, domain: DOMAIN_0.domain, accessRestriction: { users: [ 'someuser' ], groups: [] } })
+            .end(function (err, res) {
+                expect(res.statusCode).to.equal(404);
+                expect(fake.isDone()).to.be.ok();
+                done();
+            });
     });
 
     it('app install fails due to purchase failure', function (done) {
         var fake1 = nock(config.apiServerOrigin()).get('/api/v1/apps/test').reply(200, { manifest: APP_MANIFEST });
 
         superagent.post(SERVER_URL + '/api/v1/apps/install')
-               .query({ access_token: token })
-               .send({ appStoreId: APP_STORE_ID, location: APP_LOCATION, domain: DOMAIN_0.domain, portBindings: null, accessRestriction: null })
-               .end(function (err, res) {
-            expect(res.statusCode).to.equal(402);
-            expect(fake1.isDone()).to.be.ok();
-            done();
-        });
+            .query({ access_token: token })
+            .send({ appStoreId: APP_STORE_ID, location: APP_LOCATION, domain: DOMAIN_0.domain, portBindings: null, accessRestriction: null })
+            .end(function (err, res) {
+                expect(res.statusCode).to.equal(402);
+                expect(fake1.isDone()).to.be.ok();
+                done();
+            });
     });
 
     it('app install succeeds with purchase', function (done) {
@@ -454,70 +455,70 @@ describe('App API', function () {
             expect(fake1.isDone()).to.be.ok();
 
             superagent.post(SERVER_URL + '/api/v1/apps/install')
-                   .query({ access_token: token })
-                   .send({ appStoreId: APP_STORE_ID, location: APP_LOCATION, domain: DOMAIN_0.domain, portBindings: null, accessRestriction: { users: [ 'someuser' ], groups: [] } })
-                   .end(function (err, res) {
-                expect(res.statusCode).to.equal(202);
-                expect(res.body.id).to.be.a('string');
-                APP_ID = res.body.id;
-                expect(fake2.isDone()).to.be.ok();
-                expect(fake3.isDone()).to.be.ok();
-                done();
-            });
+                .query({ access_token: token })
+                .send({ appStoreId: APP_STORE_ID, location: APP_LOCATION, domain: DOMAIN_0.domain, portBindings: null, accessRestriction: { users: [ 'someuser' ], groups: [] } })
+                .end(function (err, res) {
+                    expect(res.statusCode).to.equal(202);
+                    expect(res.body.id).to.be.a('string');
+                    APP_ID = res.body.id;
+                    expect(fake2.isDone()).to.be.ok();
+                    expect(fake3.isDone()).to.be.ok();
+                    done();
+                });
         });
     });
 
     it('app install fails because of conflicting location', function (done) {
         superagent.post(SERVER_URL + '/api/v1/apps/install')
-               .query({ access_token: token })
-               .send({ manifest: APP_MANIFEST, location: APP_LOCATION, domain: DOMAIN_0.domain, portBindings: null, accessRestriction: null })
-               .end(function (err, res) {
-            expect(res.statusCode).to.equal(409);
-            done();
-        });
+            .query({ access_token: token })
+            .send({ manifest: APP_MANIFEST, location: APP_LOCATION, domain: DOMAIN_0.domain, portBindings: null, accessRestriction: null })
+            .end(function (err, res) {
+                expect(res.statusCode).to.equal(409);
+                done();
+            });
     });
 
     it('can get app status', function (done) {
         superagent.get(SERVER_URL + '/api/v1/apps/' + APP_ID)
-               .query({ access_token: token })
-               .end(function (err, res) {
-            expect(res.statusCode).to.equal(200);
-            expect(res.body.id).to.eql(APP_ID);
-            expect(res.body.installationState).to.be.ok();
-            done();
-         });
+            .query({ access_token: token })
+            .end(function (err, res) {
+                expect(res.statusCode).to.equal(200);
+                expect(res.body.id).to.eql(APP_ID);
+                expect(res.body.installationState).to.be.ok();
+                done();
+            });
     });
 
     it('cannot get invalid app status', function (done) {
         superagent.get(SERVER_URL + '/api/v1/apps/kubachi')
-               .query({ access_token: token })
-               .end(function (err, res) {
-            expect(res.statusCode).to.equal(404);
-            done();
-         });
+            .query({ access_token: token })
+            .end(function (err, res) {
+                expect(res.statusCode).to.equal(404);
+                done();
+            });
     });
 
     it('can get all apps', function (done) {
         superagent.get(SERVER_URL + '/api/v1/apps')
-               .query({ access_token: token })
-               .end(function (err, res) {
-            expect(res.statusCode).to.equal(200);
-            expect(res.body.apps).to.be.an('array');
-            expect(res.body.apps[0].id).to.eql(APP_ID);
-            expect(res.body.apps[0].installationState).to.be.ok();
-            done();
-         });
+            .query({ access_token: token })
+            .end(function (err, res) {
+                expect(res.statusCode).to.equal(200);
+                expect(res.body.apps).to.be.an('array');
+                expect(res.body.apps[0].id).to.eql(APP_ID);
+                expect(res.body.apps[0].installationState).to.be.ok();
+                done();
+            });
     });
 
     it('non admin cannot see the app due to accessRestriction', function (done) {
         superagent.get(SERVER_URL + '/api/v1/apps')
-               .query({ access_token: token_1 })
-               .end(function (err, res) {
-            expect(res.statusCode).to.equal(200);
-            expect(res.body.apps).to.be.an('array');
-            expect(res.body.apps.length).to.equal(0);
-            done();
-         });
+            .query({ access_token: token_1 })
+            .end(function (err, res) {
+                expect(res.statusCode).to.equal(200);
+                expect(res.body.apps).to.be.an('array');
+                expect(res.body.apps.length).to.equal(0);
+                done();
+            });
     });
 
     it('cannot uninstall invalid app', function (done) {
@@ -525,18 +526,18 @@ describe('App API', function () {
             .send({ password: PASSWORD })
             .query({ access_token: token })
             .end(function (err, res) {
-            expect(res.statusCode).to.equal(404);
-            done();
-        });
+                expect(res.statusCode).to.equal(404);
+                done();
+            });
     });
 
     it('cannot uninstall app without password', function (done) {
         superagent.post(SERVER_URL + '/api/v1/apps/' + APP_ID + '/uninstall')
             .query({ access_token: token })
             .end(function (err, res) {
-            expect(res.statusCode).to.equal(400);
-            done();
-        });
+                expect(res.statusCode).to.equal(400);
+                done();
+            });
     });
 
     it('cannot uninstall app with wrong password', function (done) {
@@ -544,9 +545,9 @@ describe('App API', function () {
             .send({ password: PASSWORD+PASSWORD })
             .query({ access_token: token })
             .end(function (err, res) {
-            expect(res.statusCode).to.equal(403);
-            done();
-        });
+                expect(res.statusCode).to.equal(403);
+                done();
+            });
     });
 
     it('non admin cannot uninstall app', function (done) {
@@ -554,9 +555,9 @@ describe('App API', function () {
             .send({ password: PASSWORD })
             .query({ access_token: token_1 })
             .end(function (err, res) {
-            expect(res.statusCode).to.equal(403);
-            done();
-        });
+                expect(res.statusCode).to.equal(403);
+                done();
+            });
     });
 
     it('can uninstall app', function (done) {
@@ -567,11 +568,11 @@ describe('App API', function () {
             .send({ password: PASSWORD })
             .query({ access_token: token })
             .end(function (err, res) {
-            expect(res.statusCode).to.equal(202);
-            expect(fake1.isDone()).to.be.ok();
-            expect(fake2.isDone()).to.be.ok();
-            done();
-        });
+                expect(res.statusCode).to.equal(202);
+                expect(fake1.isDone()).to.be.ok();
+                expect(fake2.isDone()).to.be.ok();
+                done();
+            });
     });
 
     it('app install succeeds again', function (done) {
@@ -579,56 +580,56 @@ describe('App API', function () {
         var fake2 = nock(config.apiServerOrigin()).post(function (uri) { return uri.indexOf('/api/v1/users/' + user_1_id + '/cloudrons/' + CLOUDRON_ID + '/apps/') >= 0; }, { 'appstoreId': APP_STORE_ID }).reply(201, { });
 
         superagent.post(SERVER_URL + '/api/v1/apps/install')
-               .query({ access_token: token })
-               .send({ appStoreId: APP_STORE_ID, location: APP_LOCATION_2, domain: DOMAIN_0.domain, portBindings: null, accessRestriction: null })
-               .end(function (err, res) {
-            expect(res.statusCode).to.equal(202);
-            expect(res.body.id).to.be.a('string');
-            APP_ID = res.body.id;
-            expect(fake1.isDone()).to.be.ok();
-            expect(fake2.isDone()).to.be.ok();
-            done();
-        });
+            .query({ access_token: token })
+            .send({ appStoreId: APP_STORE_ID, location: APP_LOCATION_2, domain: DOMAIN_0.domain, portBindings: null, accessRestriction: null })
+            .end(function (err, res) {
+                expect(res.statusCode).to.equal(202);
+                expect(res.body.id).to.be.a('string');
+                APP_ID = res.body.id;
+                expect(fake1.isDone()).to.be.ok();
+                expect(fake2.isDone()).to.be.ok();
+                done();
+            });
     });
 
     it('app install succeeds without password but developer token', function (done) {
         superagent.post(SERVER_URL + '/api/v1/developer/login')
-                .send({ username: USERNAME, password: PASSWORD })
-                .end(function (error, result) {
-            expect(error).to.not.be.ok();
-            expect(result.statusCode).to.equal(200);
-            expect(new Date(result.body.expiresAt).toString()).to.not.be('Invalid Date');
-            expect(result.body.token).to.be.a('string');
+            .send({ username: USERNAME, password: PASSWORD })
+            .end(function (error, result) {
+                expect(error).to.not.be.ok();
+                expect(result.statusCode).to.equal(200);
+                expect(new Date(result.body.expiresAt).toString()).to.not.be('Invalid Date');
+                expect(result.body.token).to.be.a('string');
 
-            // overwrite non dev token
-            token = result.body.token;
+                // overwrite non dev token
+                token = result.body.token;
 
-            superagent.post(SERVER_URL + '/api/v1/apps/install')
+                superagent.post(SERVER_URL + '/api/v1/apps/install')
                     .query({ access_token: token })
                     .send({ manifest: APP_MANIFEST, location: APP_LOCATION+APP_LOCATION, domain: DOMAIN_0.domain, portBindings: null, accessRestriction: null })
                     .end(function (err, res) {
-                expect(res.statusCode).to.equal(202);
-                expect(res.body.id).to.be.a('string');
-                APP_ID = res.body.id;
-                done();
+                        expect(res.statusCode).to.equal(202);
+                        expect(res.body.id).to.be.a('string');
+                        APP_ID = res.body.id;
+                        done();
+                    });
             });
-        });
     });
 
     it('can uninstall app without password but developer token', function (done) {
         superagent.post(SERVER_URL + '/api/v1/apps/' + APP_ID + '/uninstall')
             .query({ access_token: token })
             .end(function (err, res) {
-            expect(res.statusCode).to.equal(202);
-            done();
-        });
+                expect(res.statusCode).to.equal(202);
+                done();
+            });
     });
 });
 
 describe('App installation', function () {
     this.timeout(100000);
 
-    var apiHockInstance = hock.createHock({ throwOnUnmatched: false }), apiHockServer;
+    var apiHockInstance = hock.createHock({ throwOnUnmatched: false });
 
     var validCert1, validKey1;
 
@@ -676,26 +677,26 @@ describe('App installation', function () {
         var count = 0;
         function checkInstallStatus() {
             superagent.get(SERVER_URL + '/api/v1/apps/' + APP_ID)
-               .query({ access_token: token })
-               .end(function (err, res) {
-                expect(res.statusCode).to.equal(200);
-                if (res.body.installationState === appdb.ISTATE_INSTALLED) { appResult = res.body; return done(null); }
-                if (res.body.installationState === appdb.ISTATE_ERROR) return done(new Error('Install error'));
-                if (++count > 50) return done(new Error('Timedout'));
-                setTimeout(checkInstallStatus, 1000);
-            });
+                .query({ access_token: token })
+                .end(function (err, res) {
+                    expect(res.statusCode).to.equal(200);
+                    if (res.body.installationState === appdb.ISTATE_INSTALLED) { appResult = res.body; return done(null); }
+                    if (res.body.installationState === appdb.ISTATE_ERROR) return done(new Error('Install error'));
+                    if (++count > 50) return done(new Error('Timedout'));
+                    setTimeout(checkInstallStatus, 1000);
+                });
         }
 
         superagent.post(SERVER_URL + '/api/v1/apps/install')
-              .query({ access_token: token })
-              .send({ appStoreId: APP_STORE_ID, location: APP_LOCATION, domain: DOMAIN_0.domain, portBindings: { ECHO_SERVER_PORT: 7171 }, accessRestriction: null })
-              .end(function (err, res) {
-            expect(res.statusCode).to.equal(202);
-            expect(fake1.isDone()).to.be.ok();
-            expect(fake2.isDone()).to.be.ok();
-            APP_ID = res.body.id;
-            checkInstallStatus();
-        });
+            .query({ access_token: token })
+            .send({ appStoreId: APP_STORE_ID, location: APP_LOCATION, domain: DOMAIN_0.domain, portBindings: { ECHO_SERVER_PORT: 7171 }, accessRestriction: null })
+            .end(function (err, res) {
+                expect(res.statusCode).to.equal(202);
+                expect(fake1.isDone()).to.be.ok();
+                expect(fake2.isDone()).to.be.ok();
+                APP_ID = res.body.id;
+                checkInstallStatus();
+            });
     });
 
     it('installation - image created', function (done) {
@@ -752,18 +753,18 @@ describe('App installation', function () {
         (function healthCheck() {
             superagent.get('http://localhost:' + appEntry.httpPort + appResult.manifest.healthCheckPath)
                 .end(function (err, res) {
-                if (err || res.statusCode !== 200) {
-                    if (--tryCount === 0) {
-                        console.log('Unable to curl http://localhost:' + appEntry.httpPort + appResult.manifest.healthCheckPath);
-                        return done(new Error('Timedout'));
+                    if (err || res.statusCode !== 200) {
+                        if (--tryCount === 0) {
+                            console.log('Unable to curl http://localhost:' + appEntry.httpPort + appResult.manifest.healthCheckPath);
+                            return done(new Error('Timedout'));
+                        }
+                        return setTimeout(healthCheck, 2000);
                     }
-                    return setTimeout(healthCheck, 2000);
-                }
 
-                expect(!err).to.be.ok();
-                expect(res.statusCode).to.equal(200);
-                done();
-            });
+                    expect(!err).to.be.ok();
+                    expect(res.statusCode).to.equal(200);
+                    done();
+                });
         })();
     });
 
@@ -841,23 +842,23 @@ describe('App installation', function () {
         superagent.get(SERVER_URL + '/api/v1/apps/' + APP_ID + '/logs')
             .query({ access_token: token })
             .end(function (err, res) {
-            var data = '';
-            res.on('data', function (d) { data += d.toString('utf8'); });
-            res.on('end', function () {
-                expect(data.length).to.not.be(0);
-                done();
+                var data = '';
+                res.on('data', function (d) { data += d.toString('utf8'); });
+                res.on('end', function () {
+                    expect(data.length).to.not.be(0);
+                    done();
+                });
+                res.on('error', done);
             });
-            res.on('error', done);
-        });
     });
 
     xit('logStream - requires event-stream accept header', function (done) {
         superagent.get(SERVER_URL + '/api/v1/apps/' + APP_ID + '/logstream')
             .query({ access_token: token, fromLine: 0 })
             .end(function (err, res) {
-            expect(res.statusCode).to.be(400);
-            done();
-        });
+                expect(res.statusCode).to.be(400);
+                done();
+            });
     });
 
 
@@ -894,18 +895,18 @@ describe('App installation', function () {
         superagent.post(SERVER_URL + '/api/v1/apps/' + APP_ID + '/stop')
             .query({ access_token: token_1 })
             .end(function (err, res) {
-            expect(res.statusCode).to.equal(403);
-            done();
-        });
+                expect(res.statusCode).to.equal(403);
+                done();
+            });
     });
 
     it('can stop app', function (done) {
         superagent.post(SERVER_URL + '/api/v1/apps/' + APP_ID + '/stop')
             .query({ access_token: token })
             .end(function (err, res) {
-            expect(res.statusCode).to.equal(202);
-            done();
-        });
+                expect(res.statusCode).to.equal(202);
+                done();
+            });
     });
 
     it('did stop the app', function (done) {
@@ -928,18 +929,18 @@ describe('App installation', function () {
         superagent.post(SERVER_URL + '/api/v1/apps/' + APP_ID + '/start')
             .query({ access_token: token_1 })
             .end(function (err, res) {
-            expect(res.statusCode).to.equal(403);
-            done();
-        });
+                expect(res.statusCode).to.equal(403);
+                done();
+            });
     });
 
     it('can start app', function (done) {
         superagent.post(SERVER_URL + '/api/v1/apps/' + APP_ID + '/start')
             .query({ access_token: token })
             .end(function (err, res) {
-            expect(res.statusCode).to.equal(202);
-            done();
-        });
+                expect(res.statusCode).to.equal(202);
+                done();
+            });
     });
 
     it('did start the app', function (done) {
@@ -947,10 +948,10 @@ describe('App installation', function () {
         function checkStartState() {
             superagent.get('http://localhost:' + appEntry.httpPort + appResult.manifest.healthCheckPath)
                 .end(function (err, res) {
-                if (res && res.statusCode === 200) return done();
-                if (++count > 50) return done(new Error('Timedout'));
-                setTimeout(checkStartState, 500);
-            });
+                    if (res && res.statusCode === 200) return done();
+                    if (++count > 50) return done(new Error('Timedout'));
+                    setTimeout(checkStartState, 500);
+                });
         }
 
         checkStartState();
@@ -967,94 +968,94 @@ describe('App installation', function () {
         assert.strictEqual(typeof done, 'function');
 
         superagent.get(SERVER_URL + '/api/v1/apps/' + APP_ID)
-           .query({ access_token: token })
-           .end(function (err, res) {
-            expect(res.statusCode).to.equal(200);
-            if (res.body.installationState === appdb.ISTATE_INSTALLED) { appResult = res.body; expect(appResult).to.be.ok(); return done(null); }
-            if (res.body.installationState === appdb.ISTATE_ERROR) return done(new Error('Install error'));
-            if (++count > 50) return done(new Error('Timedout'));
-            setTimeout(checkConfigureStatus.bind(null, count, done), 1000);
-        });
+            .query({ access_token: token })
+            .end(function (err, res) {
+                expect(res.statusCode).to.equal(200);
+                if (res.body.installationState === appdb.ISTATE_INSTALLED) { appResult = res.body; expect(appResult).to.be.ok(); return done(null); }
+                if (res.body.installationState === appdb.ISTATE_ERROR) return done(new Error('Install error'));
+                if (++count > 50) return done(new Error('Timedout'));
+                setTimeout(checkConfigureStatus.bind(null, count, done), 1000);
+            });
     }
 
     it('cannot reconfigure app with bad location', function (done) {
         superagent.post(SERVER_URL + '/api/v1/apps/' + APP_ID + '/configure')
-              .query({ access_token: token })
-              .send({ location: 1234, portBindings: { ECHO_SERVER_PORT: 7172 }, accessRestriction: null })
-              .end(function (err, res) {
-            expect(res.statusCode).to.equal(400);
-            done();
-        });
+            .query({ access_token: token })
+            .send({ location: 1234, portBindings: { ECHO_SERVER_PORT: 7172 }, accessRestriction: null })
+            .end(function (err, res) {
+                expect(res.statusCode).to.equal(400);
+                done();
+            });
     });
 
     it('cannot reconfigure app with bad accessRestriction', function (done) {
         superagent.post(SERVER_URL + '/api/v1/apps/' + APP_ID + '/configure')
-              .query({ access_token: token })
-              .send({ portBindings: { ECHO_SERVER_PORT: 7172 }, accessRestriction: false })
-              .end(function (err, res) {
-            expect(res.statusCode).to.equal(400);
-            done();
-        });
+            .query({ access_token: token })
+            .send({ portBindings: { ECHO_SERVER_PORT: 7172 }, accessRestriction: false })
+            .end(function (err, res) {
+                expect(res.statusCode).to.equal(400);
+                done();
+            });
     });
 
     it('cannot reconfigure app with only the cert, no key', function (done) {
         superagent.post(SERVER_URL + '/api/v1/apps/' + APP_ID + '/configure')
-              .query({ access_token: token })
-              .send({ location: APP_LOCATION_NEW, portBindings: { ECHO_SERVER_PORT: 7172 }, accessRestriction: null, cert: validCert1 })
-              .end(function (err, res) {
-            expect(res.statusCode).to.equal(400);
-            done();
-        });
+            .query({ access_token: token })
+            .send({ location: APP_LOCATION_NEW, portBindings: { ECHO_SERVER_PORT: 7172 }, accessRestriction: null, cert: validCert1 })
+            .end(function (err, res) {
+                expect(res.statusCode).to.equal(400);
+                done();
+            });
     });
 
     it('cannot reconfigure app with only the key, no cert', function (done) {
         superagent.post(SERVER_URL + '/api/v1/apps/' + APP_ID + '/configure')
-              .query({ access_token: token })
-              .send({ location: APP_LOCATION_NEW, portBindings: { ECHO_SERVER_PORT: 7172 }, key: validKey1 })
-              .end(function (err, res) {
-            expect(res.statusCode).to.equal(400);
-            done();
-        });
+            .query({ access_token: token })
+            .send({ location: APP_LOCATION_NEW, portBindings: { ECHO_SERVER_PORT: 7172 }, key: validKey1 })
+            .end(function (err, res) {
+                expect(res.statusCode).to.equal(400);
+                done();
+            });
     });
 
     it('cannot reconfigure app with cert not being a string', function (done) {
         superagent.post(SERVER_URL + '/api/v1/apps/' + APP_ID + '/configure')
-              .query({ access_token: token })
-              .send({ location: APP_LOCATION_NEW, portBindings: { ECHO_SERVER_PORT: 7172 }, accessRestriction: null, cert: 1234, key: validKey1 })
-              .end(function (err, res) {
-            expect(res.statusCode).to.equal(400);
-            done();
-        });
+            .query({ access_token: token })
+            .send({ location: APP_LOCATION_NEW, portBindings: { ECHO_SERVER_PORT: 7172 }, accessRestriction: null, cert: 1234, key: validKey1 })
+            .end(function (err, res) {
+                expect(res.statusCode).to.equal(400);
+                done();
+            });
     });
 
     it('cannot reconfigure app with key not being a string', function (done) {
         superagent.post(SERVER_URL + '/api/v1/apps/' + APP_ID + '/configure')
-              .query({ access_token: token })
-              .send({ location: APP_LOCATION_NEW, portBindings: { ECHO_SERVER_PORT: 7172 }, cert: validCert1, key: 1234 })
-              .end(function (err, res) {
-            expect(res.statusCode).to.equal(400);
-            done();
-        });
+            .query({ access_token: token })
+            .send({ location: APP_LOCATION_NEW, portBindings: { ECHO_SERVER_PORT: 7172 }, cert: validCert1, key: 1234 })
+            .end(function (err, res) {
+                expect(res.statusCode).to.equal(400);
+                done();
+            });
     });
 
     it('non admin cannot reconfigure app', function (done) {
         superagent.post(SERVER_URL + '/api/v1/apps/' + APP_ID + '/configure')
-              .query({ access_token: token_1 })
-              .send({ location: APP_LOCATION_NEW, portBindings: { ECHO_SERVER_PORT: 7172 }, accessRestriction: null })
-              .end(function (err, res) {
-            expect(res.statusCode).to.equal(403);
-            done();
-        });
+            .query({ access_token: token_1 })
+            .send({ location: APP_LOCATION_NEW, portBindings: { ECHO_SERVER_PORT: 7172 }, accessRestriction: null })
+            .end(function (err, res) {
+                expect(res.statusCode).to.equal(403);
+                done();
+            });
     });
 
     it('can reconfigure app', function (done) {
         superagent.post(SERVER_URL + '/api/v1/apps/' + APP_ID + '/configure')
-              .query({ access_token: token })
-              .send({ location: APP_LOCATION_NEW, portBindings: { ECHO_SERVER_PORT: 7172 } })
-              .end(function (err, res) {
-            expect(res.statusCode).to.equal(202);
-            checkConfigureStatus(0, done);
-        });
+            .query({ access_token: token })
+            .send({ location: APP_LOCATION_NEW, portBindings: { ECHO_SERVER_PORT: 7172 } })
+            .end(function (err, res) {
+                expect(res.statusCode).to.equal(202);
+                checkConfigureStatus(0, done);
+            });
     });
 
     it('changed container id after reconfigure', function (done) {
@@ -1091,12 +1092,12 @@ describe('App installation', function () {
 
     it('can reconfigure app with custom certificate', function (done) {
         superagent.post(SERVER_URL + '/api/v1/apps/' + APP_ID + '/configure')
-              .query({ access_token: token })
-              .send({ location: APP_LOCATION_NEW, portBindings: { ECHO_SERVER_PORT: 7172 }, accessRestriction: null, cert: validCert1, key: validKey1 })
-              .end(function (err, res) {
-            expect(res.statusCode).to.equal(202);
-            checkConfigureStatus(0, done);
-        });
+            .query({ access_token: token })
+            .send({ location: APP_LOCATION_NEW, portBindings: { ECHO_SERVER_PORT: 7172 }, accessRestriction: null, cert: validCert1, key: validKey1 })
+            .end(function (err, res) {
+                expect(res.statusCode).to.equal(202);
+                checkConfigureStatus(0, done);
+            });
     });
 
     it('can uninstall app', function (done) {
@@ -1106,25 +1107,25 @@ describe('App installation', function () {
         var count = 0;
         function checkUninstallStatus() {
             superagent.get(SERVER_URL + '/api/v1/apps/' + APP_ID)
-               .query({ access_token: token })
-               .end(function (err, res) {
-                if (res.statusCode === 404) return done(null);
-                if (++count > 50) return done(new Error('Timedout'));
-                setTimeout(checkUninstallStatus, 1000);
-            });
+                .query({ access_token: token })
+                .end(function (err, res) {
+                    if (res.statusCode === 404) return done(null);
+                    if (++count > 50) return done(new Error('Timedout'));
+                    setTimeout(checkUninstallStatus, 1000);
+                });
         }
 
         superagent.post(SERVER_URL + '/api/v1/apps/' + APP_ID + '/uninstall')
             .send({ password: PASSWORD })
             .query({ access_token: token })
             .end(function (err, res) {
-            expect(res.statusCode).to.equal(202);
+                expect(res.statusCode).to.equal(202);
 
-            expect(fake1.isDone()).to.be.ok();
-            expect(fake2.isDone()).to.be.ok();
+                expect(fake1.isDone()).to.be.ok();
+                expect(fake2.isDone()).to.be.ok();
 
-            checkUninstallStatus();
-        });
+                checkUninstallStatus();
+            });
     });
 
     it('uninstalled - container destroyed', function (done) {

src/routes/test/backups-test.js

@@ -29,7 +29,7 @@ const DOMAIN_0 = {
     tlsConfig: { provider: 'fallback' }
 };
 
-var token = null;
+var token = null, ownerId = null;
 
 function setup(done) {
     nock.cleanAll();
@@ -49,6 +49,7 @@ function setup(done) {
                     expect(result.statusCode).to.eql(201);
 
                     // stash token for further use
+                    ownerId = result.body.userId;
                     token = result.body.token;
 
                     callback();
@@ -57,7 +58,7 @@ function setup(done) {
 
         function addApp(callback) {
             var manifest = { version: '0.0.1', manifestVersion: 1, dockerImage: 'foo', healthCheckPath: '/', httpPort: 3, title: 'ok', addons: { } };
-            appdb.add('appid', 'appStoreId', manifest, 'location', DOMAIN_0.domain, [ ] /* portBindings */, { }, callback);
+            appdb.add('appid', 'appStoreId', manifest, 'location', DOMAIN_0.domain, ownerId, [ ] /* portBindings */, { }, callback);
         },
 
         function createSettings(callback) {

src/routes/test/caas-test.js

@@ -35,7 +35,7 @@ const DOMAIN_0 = {
     tlsConfig: { provider: 'fallback' }
 };
 
-var token = null;
+var token = null, ownerId = null;
 var gSudoOriginal = null;
 function injectShellMock() {
     gSudoOriginal = shell.sudo;
@@ -74,6 +74,7 @@ function setup(done) {
                     expect(scope2.isDone()).to.be.ok();
 
                     // stash token for further use
+                    ownerId = result.body.userId;
                     token = result.body.token;
 
                     callback();
@@ -82,7 +83,7 @@ function setup(done) {
 
         function addApp(callback) {
             var manifest = { version: '0.0.1', manifestVersion: 1, dockerImage: 'foo', healthCheckPath: '/', httpPort: 3, title: 'ok', addons: { } };
-            appdb.add('appid', 'appStoreId', manifest, 'location', DOMAIN_0.domain, [ ] /* portBindings */, { }, callback);
+            appdb.add('appid', 'appStoreId', manifest, 'location', DOMAIN_0.domain, ownerId, [ ] /* portBindings */, { }, callback);
         },
 
         function createSettings(callback) {
@@ -153,21 +154,12 @@ describe('Caas', function () {
                 .get('/api/v1/boxes/BOX_ID?token=ACCESS_TOKEN2')
                 .reply(200, { box: { region: 'sfo', size: '1gb' }, user: { }});
 
-            superagent.get(SERVER_URL + '/api/v1/cloudron/config')
+            superagent.get(SERVER_URL + '/api/v1/caas/config')
                 .query({ access_token: token })
                 .end(function (error, result) {
                     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.update).to.be.an('object');
-                    expect(result.body.version).to.eql(config.version());
                     expect(result.body.size).to.eql('1gb');
                     expect(result.body.region).to.eql('sfo');
-                    expect(result.body.memory).to.eql(os.totalmem());
-                    expect(result.body.cloudronName).to.be.a('string');
-                    expect(result.body.provider).to.be.a('string');
 
                     expect(scope.isDone()).to.be.ok();
 

src/routes/test/clients-test.js

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

src/routes/test/cloudron-test.js

@@ -5,7 +5,8 @@
 /* global before:false */
 /* global after:false */
 
-var async = require('async'),
+var accesscontrol = require('../../accesscontrol.js'),
+    async = require('async'),
     config = require('../../config.js'),
     database = require('../../database.js'),
     expect = require('expect.js'),
@@ -166,7 +167,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, '*', callback);
+                            tokendb.add(token_1, userId_1, 'test-client-id',  Date.now() + 100000, 'cloudron', callback);
                         });
                 }
             ], done);
@@ -175,7 +176,7 @@ describe('Cloudron', function () {
         after(cleanup);
 
         it('cannot get without token', function (done) {
-            superagent.get(SERVER_URL + '/api/v1/cloudron/config')
+            superagent.get(SERVER_URL + '/api/v1/config')
                 .end(function (error, result) {
                     expect(result.statusCode).to.equal(401);
                     done();
@@ -183,7 +184,7 @@ describe('Cloudron', function () {
         });
 
         it('succeeds (admin)', function (done) {
-            superagent.get(SERVER_URL + '/api/v1/cloudron/config')
+            superagent.get(SERVER_URL + '/api/v1/config')
                 .query({ access_token: token })
                 .end(function (error, result) {
                     expect(result.statusCode).to.equal(200);
@@ -191,10 +192,7 @@ describe('Cloudron', function () {
                     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.update).to.be.an('object');
                     expect(result.body.version).to.eql(config.version());
-                    expect(result.body.size).to.eql(null);
-                    expect(result.body.region).to.eql(null);
                     expect(result.body.memory).to.eql(os.totalmem());
                     expect(result.body.cloudronName).to.be.a('string');
 
@@ -202,25 +200,11 @@ describe('Cloudron', function () {
                 });
         });
 
-        it('succeeds (non-admin)', function (done) {
-            superagent.get(SERVER_URL + '/api/v1/cloudron/config')
+        it('fails (non-admin)', function (done) {
+            superagent.get(SERVER_URL + '/api/v1/config')
                 .query({ access_token: token_1 })
                 .end(function (error, result) {
-                    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);
-
+                    expect(result.statusCode).to.equal(403);
                     done();
                 });
         });
@@ -385,7 +369,7 @@ describe('Cloudron', function () {
         after(cleanup);
 
         it('logStream - requires event-stream accept header', function (done) {
-            superagent.get(SERVER_URL + '/api/v1/cloudron/logstream')
+            superagent.get(SERVER_URL + '/api/v1/cloudron/logstream/box')
                 .query({ access_token: token, fromLine: 0 })
                 .end(function (err, res) {
                     expect(res.statusCode).to.be(400);
@@ -395,7 +379,9 @@ describe('Cloudron', function () {
 
         it('logStream - stream logs', function (done) {
             var options = {
-                port: config.get('port'), host: 'localhost', path: '/api/v1/cloudron/logstream?units=all&lines=10&access_token=' + token,
+                host: 'localhost',
+                port: config.get('port'),
+                path: '/api/v1/cloudron/logstream/mail?units=all&lines=10&access_token=' + token,
                 headers: { 'Accept': 'text/event-stream', 'Connection': 'keep-alive' }
             };