Fix crash in setUpdateSuccess

also, merge unregisterSubdomain and unregisterAlternateDomains
also, fix crash where app.oldConfig is used

CHANGES

@@ -1593,3 +1593,75 @@
 * Make it easier to import email
 * Give SFTP access only to admins
 
+[4.0.2]
+* Fix GCDNS crash
+* Add option to update without backing up
+
+[4.0.3]
+* Fix dashboard issue for non-admins
+
+[4.1.0]
+* Remove password requirement for uninstalling apps and users
+* Hosting provider edition
+* Enforce limits in mail container
+* Fix crash when using unauthenticated relay
+* Fix domain and tag filtering
+* Customizable app icons
+* Remove obsolete X-Frame-Options from nginx configs
+* Give SFTP access based on access restriction
+
+[4.1.1]
+* Add UI hint about SFTP access restriction
+
+[4.1.2]
+* Accept incoming mail from a private relay
+* Fix issue where unused addon images were not pruned
+* Add UI for redirect from multiple domains
+* Allow apps to be relocated to custom data directory
+* Make all cloudron env vars have CLOUDRON_ prefix
+* Update manifest version to 2
+* Fix issue where DKIM keys were inaccessible
+* Fix DKIM selector conflict when adding same domain across multiple cloudrons
+* Fix name.com DNS backend issue for naked domains
+* Add DigitalOcean Frankfurt (fra1) region for backup storage
+
+[4.1.3]
+* Update manifest format package
+
+[4.1.4]
+* Add CLOUDRON_ prefix to MySQL addon variables
+
+[4.1.5]
+* Make the terminal addon button inject variables based on manifest version
+* Preserve addon passwords correctly when using v2 manifest
+* Show error message instead of logging out user when invalid 2FA token is provided
+* Ensure redis vars are renamed with manifest v2
+* Add missing Scaleway Object Storage to restore UI
+* Fix Exoscale endpoints in restore UI
+* Reset the app icon when showing the configure UI
+
+[4.1.6]
+* Fix issue where CLOUDRON_APP_HOSTNAME was incorrectly set
+* Remove chat link from the footer of login screen
+* Add support for oplog tailing in mongodb
+* Fix LDAP not accessible via scheduler containers
+
+[4.1.7]
+* Fix issue where login looped when admin bit was removed
+
+[4.2.0]
+* Fix issue where tar backups with files > 8GB was corrupt
+* Add SparkPost as mail relay backend
+* Add Wasabi storage backend
+* TOTP tokens are now checked for with +- 60 seconds
+* IP based restore
+* Fix issue where task logs were not getting rotated correctly
+* Add notification for box update
+* User enable/disable flag
+* Check disk space before various operations like install, update, backup etc
+* Collect per app du information
+* Set Cloudron specific UA for healthchecks
+* Show message why an app task is 'pending'
+* Rework app task system so that we can now pass dynamic arguments
+* Add external LDAP server integration
+

README.md

@@ -41,12 +41,7 @@ Try our demo at https://my.demo.cloudron.io (username: cloudron password: cloudr
 
 ## Installing
 
-You can install the Cloudron platform on your own server or get a managed server
-from cloudron.io. In either case, the Cloudron platform will keep your server and
-apps up-to-date and secure.
-
-* [Selfhosting](https://cloudron.io/documentation/installation/) - [Pricing](https://cloudron.io/pricing.html)
-* [Managed Hosting](https://cloudron.io/managed.html)
+[Install script](https://cloudron.io/documentation/installation/) - [Pricing](https://cloudron.io/pricing.html)
 
 **Note:** This repo is a small part of what gets installed on your server - there is
 the dashboard, database addons, graph container, base image etc. Cloudron also relies

baseimage/initializeBaseUbuntuImage.sh

@@ -46,12 +46,15 @@ apt-get -y install \
     openssh-server \
     pwgen \
     resolvconf \
-    sudo \
     swaks \
+    tzdata \
     unattended-upgrades \
     unbound \
     xfsprogs
 
+# on some providers like scaleway the sudo file is changed and we want to keep the old one
+apt-get -o Dpkg::Options::="--force-confold" install -y sudo
+
 # this ensures that unattended upgades are enabled, if it was disabled during ubuntu install time (see #346)
 # debconf-set-selection of unattended-upgrades/enable_auto_updates + dpkg-reconfigure does not work
 cp /usr/share/unattended-upgrades/20auto-upgrades /etc/apt/apt.conf.d/20auto-upgrades

box.js

@@ -14,25 +14,14 @@
 require('supererror')({ splatchError: true });
 
 let async = require('async'),
-    config = require('./src/config.js'),
-    ldap = require('./src/ldap.js'),
+    constants = require('./src/constants.js'),
     dockerProxy = require('./src/dockerproxy.js'),
+    ldap = require('./src/ldap.js'),
     server = require('./src/server.js');
 
 console.log();
 console.log('==========================================');
-console.log(' Cloudron will use the following settings ');
-console.log('==========================================');
-console.log();
-console.log(' Environment:                    ', config.CLOUDRON ? 'CLOUDRON' : 'TEST');
-console.log(' Version:                        ', config.version());
-console.log(' Admin Origin:                   ', config.adminOrigin());
-console.log(' Appstore API server origin:     ', config.apiServerOrigin());
-console.log(' Appstore Web server origin:     ', config.webServerOrigin());
-console.log(' SysAdmin Port:                  ', config.get('sysadminPort'));
-console.log(' LDAP Server Port:               ', config.get('ldapPort'));
-console.log(' Docker Proxy Port:              ', config.get('dockerProxyPort'));
-console.log();
+console.log(`           Cloudron ${constants.VERSION}  `);
 console.log('==========================================');
 console.log();
 

migrations/20190610195323-mail-add-dkimSelector.js

@@ -0,0 +1,15 @@
+'use strict';
+
+exports.up = function(db, callback) {
+    db.runSql('ALTER TABLE mail ADD COLUMN dkimSelector VARCHAR(128) NOT NULL DEFAULT "cloudron"', function (error) {
+        if (error) console.error(error);
+        callback(error);
+    });
+};
+
+exports.down = function(db, callback) {
+    db.runSql('ALTER TABLE mail DROP COLUMN dkimSelector', function (error) {
+        if (error) console.error(error);
+        callback(error);
+    });
+};

migrations/20190703031708-apps-remove-ownerId.js

@@ -0,0 +1,14 @@
+'use strict';
+
+var async = require('async');
+
+exports.up = function(db, callback) {
+    async.series([
+        db.runSql.bind(db, 'ALTER TABLE apps DROP FOREIGN KEY apps_owner_constraint'),
+        db.runSql.bind(db, 'ALTER TABLE apps DROP COLUMN ownerId')
+    ], callback);
+};
+
+exports.down = function(db, callback) {
+    callback();
+};

migrations/20190725172940-settings-migrate-cloudron-conf.js

@@ -0,0 +1,29 @@
+'use strict';
+
+var async = require('async'),
+    fs = require('fs'),
+    superagent = require('superagent');
+
+exports.up = function(db, callback) {
+    if (!fs.existsSync('/etc/cloudron/cloudron.conf')) {
+        console.log('Unable to locate cloudron.conf');
+        return callback();
+    }
+
+    const config = JSON.parse(fs.readFileSync('/etc/cloudron/cloudron.conf', 'utf8'));
+
+    async.series([
+        db.runSql.bind(db, 'START TRANSACTION;'),
+        // we use replace instead of insert because the cloudron-setup adds api/web_server_origin even for legacy setups
+        db.runSql.bind(db, 'REPLACE INTO settings (name, value) VALUES(?, ?)', [ 'api_server_origin', config.apiServerOrigin ]),
+        db.runSql.bind(db, 'REPLACE INTO settings (name, value) VALUES(?, ?)', [ 'web_server_origin', config.webServerOrigin ]),
+        db.runSql.bind(db, 'REPLACE INTO settings (name, value) VALUES(?, ?)', [ 'admin_domain', config.adminDomain ]),
+        db.runSql.bind(db, 'REPLACE INTO settings (name, value) VALUES(?, ?)', [ 'admin_fqdn', config.adminFqdn ]),
+        db.runSql.bind(db, 'REPLACE INTO settings (name, value) VALUES(?, ?)', [ 'demo', config.isDemo ]),
+        db.runSql.bind(db, 'COMMIT')
+    ], callback);
+};
+
+exports.down = function(db, callback) {
+    callback();
+};

migrations/20190808123531-users-add-active.js

@@ -0,0 +1,17 @@
+'use strict';
+
+exports.up = function(db, callback) {
+    db.runSql('ALTER TABLE users ADD COLUMN active BOOLEAN DEFAULT 1', function (error) {
+        if (error) return callback(error);
+
+        callback();
+    });
+};
+
+exports.down = function(db, callback) {
+    db.runSql('ALTER TABLE users DROP COLUMN active', function (error) {
+        if (error) console.error(error);
+        callback(error);
+    });
+};
+

migrations/20190826210725-apps-add-taskId.js

@@ -0,0 +1,17 @@
+'use strict';
+
+var async = require('async');
+
+exports.up = function(db, callback) {
+    async.series([
+        db.runSql.bind(db, 'ALTER TABLE apps ADD COLUMN taskId INTEGER'),
+        db.runSql.bind(db, 'ALTER TABLE apps ADD CONSTRAINT apps_task_constraint FOREIGN KEY(taskId) REFERENCES tasks(id)')
+    ], callback);
+};
+
+exports.down = function(db, callback) {
+    async.series([
+        db.runSql.bind(db, 'ALTER TABLE app DROP FOREIGN KEY apps_task_constraint'),
+        db.runSql.bind(db, 'ALTER TABLE apps DROP COLUMN taskId'),
+    ], callback);
+};

migrations/20190827221616-apps-drop-task-args.js

@@ -0,0 +1,12 @@
+'use strict';
+
+exports.up = function(db, callback) {
+    db.runSql('ALTER TABLE apps DROP updateConfigJson, DROP restoreConfigJson, DROP oldConfigJson', function (error) {
+        if (error) console.error(error);
+        callback(error);
+    });
+};
+
+exports.down = function(db, callback) {
+    callback();
+};

migrations/20190828030723-apps-rename-installationProgress-errorJson.js

@@ -0,0 +1,15 @@
+'use strict';
+
+exports.up = function(db, callback) {
+    db.runSql('ALTER TABLE apps CHANGE installationProgress errorJson TEXT', [], function (error) {
+        if (error) console.error(error);
+        callback(error);
+    });
+};
+
+exports.down = function(db, callback) {
+    db.runSql('ALTER TABLE apps CHANGE errorJson installationProgress TEXT', [], function (error) {
+        if (error) console.error(error);
+        callback(error);
+    });
+};

migrations/20190829153300-users-add-source.js

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

migrations/20190830204531-tasks-rename-errorMessage-errorJson.js

@@ -0,0 +1,15 @@
+'use strict';
+
+exports.up = function(db, callback) {
+    db.runSql('ALTER TABLE tasks CHANGE errorMessage errorJson TEXT', [], function (error) {
+        if (error) console.error(error);
+        callback(error);
+    });
+};
+
+exports.down = function(db, callback) {
+    db.runSql('ALTER TABLE tasks CHANGE errorJson errorMessage TEXT', [], function (error) {
+        if (error) console.error(error);
+        callback(error);
+    });
+};

migrations/schema.sql

@@ -27,6 +27,7 @@ CREATE TABLE IF NOT EXISTS users(
     twoFactorAuthenticationSecret VARCHAR(128) DEFAULT "",
     twoFactorAuthenticationEnabled BOOLEAN DEFAULT false,
     admin BOOLEAN DEFAULT false,
+    source VARCHAR(128) DEFAULT "",
 
     PRIMARY KEY(id));
 
@@ -64,7 +65,6 @@ CREATE TABLE IF NOT EXISTS apps(
     id VARCHAR(128) NOT NULL UNIQUE,
     appStoreId VARCHAR(128) NOT NULL,
     installationState VARCHAR(512) NOT NULL,
-    installationProgress TEXT,
     runState VARCHAR(512),
     health VARCHAR(128),
     healthTime TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, // when the app last responded
@@ -87,15 +87,11 @@ CREATE TABLE IF NOT EXISTS apps(
     mailboxName VARCHAR(128), // mailbox of this app. default allocated as '.app'
     label VARCHAR(128),     // display name
     tagsJson VARCHAR(2048), // array of tags
+    dataDir VARCHAR(256) UNIQUE,
+    taskId INTEGER, // current task
+    errorJson TEXT,
 
-    // the following fields do not belong here, they can be removed when we use a queue for apptask
-    restoreConfigJson VARCHAR(256), // used to pass backupId to restore from to apptask
-    oldConfigJson TEXT, // used to pass old config to apptask (configure, restore)
-    updateConfigJson TEXT, // used to pass new config to apptask (update)
-
-    ownerId VARCHAR(128),
-
-    FOREIGN KEY(ownerId) REFERENCES users(id),
+    FOREIGN KEY(taskId) REFERENCES tasks(id),
     PRIMARY KEY(id));
 
 CREATE TABLE IF NOT EXISTS appPortBindings(
@@ -174,6 +170,8 @@ CREATE TABLE IF NOT EXISTS mail(
     catchAllJson TEXT,
     relayJson TEXT,
 
+    dkimSelector VARCHAR(128) NOT NULL DEFAULT "cloudron",
+
     FOREIGN KEY(domain) REFERENCES domains(domain),
     PRIMARY KEY(domain))
 
@@ -202,7 +200,7 @@ 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,
+    type VARCHAR(128) NOT NULL, /* primary or redirect */
 
     FOREIGN KEY(domain) REFERENCES domains(domain),
     FOREIGN KEY(appId) REFERENCES apps(id),
@@ -213,8 +211,8 @@ CREATE TABLE IF NOT EXISTS tasks(
     type VARCHAR(32) NOT NULL,
     percent INTEGER DEFAULT 0,
     message TEXT,
-    errorMessage TEXT,
-    result TEXT,
+    errorJson TEXT,
+    resultJson TEXT,
     creationTime TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
     ts TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     PRIMARY KEY (id));

package.json

@@ -14,40 +14,40 @@
     "node": ">=4.0.0 <=4.1.1"
   },
   "dependencies": {
-    "@google-cloud/dns": "^0.9.2",
+    "@google-cloud/dns": "^1.1.0",
     "@google-cloud/storage": "^2.5.0",
-    "@sindresorhus/df": "^3.1.0",
+    "@sindresorhus/df": "git+https://github.com/cloudron-io/df.git#type",
     "async": "^2.6.2",
-    "aws-sdk": "^2.441.0",
-    "body-parser": "^1.18.3",
-    "cloudron-manifestformat": "^2.14.2",
-    "connect": "^3.6.6",
+    "aws-sdk": "^2.476.0",
+    "body-parser": "^1.19.0",
+    "cloudron-manifestformat": "^2.15.0",
+    "connect": "^3.7.0",
     "connect-ensure-login": "^0.1.1",
-    "connect-lastmile": "^1.0.2",
+    "connect-lastmile": "^1.2.1",
     "connect-timeout": "^1.9.0",
     "cookie-parser": "^1.4.4",
     "cookie-session": "^1.3.3",
-    "cron": "^1.7.0",
-    "csurf": "^1.9.0",
-    "db-migrate": "^0.11.5",
+    "cron": "^1.7.1",
+    "csurf": "^1.10.0",
+    "db-migrate": "^0.11.6",
     "db-migrate-mysql": "^1.1.10",
     "debug": "^4.1.1",
     "dockerode": "^2.5.8",
     "ejs": "^2.6.1",
     "ejs-cli": "^2.0.1",
-    "express": "^4.16.4",
-    "express-session": "^1.16.1",
+    "express": "^4.17.1",
+    "express-session": "^1.16.2",
     "js-yaml": "^3.13.1",
     "json": "^9.0.6",
     "ldapjs": "^1.0.2",
+    "lodash": "^4.17.11",
     "lodash.chunk": "^4.2.0",
-    "mime": "^2.4.2",
+    "mime": "^2.4.4",
     "moment-timezone": "^0.5.25",
     "morgan": "^1.9.1",
     "multiparty": "^4.2.1",
     "mysql": "^2.17.1",
-    "namecheap": "github:joshuakarjala/node-namecheap#464a952",
-    "nodemailer": "^6.1.1",
+    "nodemailer": "^6.2.1",
     "nodemailer-smtp-transport": "^2.7.4",
     "oauth2orize": "^1.11.0",
     "once": "^1.4.0",
@@ -57,28 +57,30 @@
     "passport-http-bearer": "^1.0.1",
     "passport-local": "^1.0.0",
     "passport-oauth2-client-password": "^0.1.2",
+    "pretty-bytes": "^5.3.0",
     "progress-stream": "^2.0.0",
     "proxy-middleware": "^0.15.0",
     "qrcode": "^1.3.3",
-    "readdirp": "^3.0.0",
+    "readdirp": "^3.0.2",
     "request": "^2.88.0",
     "rimraf": "^2.6.3",
     "s3-block-read-stream": "^0.5.0",
     "safetydance": "^0.7.1",
-    "semver": "^6.0.0",
+    "semver": "^6.1.1",
     "showdown": "^1.9.0",
     "speakeasy": "^2.0.0",
     "split": "^1.0.1",
-    "superagent": "^5.0.2",
+    "superagent": "^5.0.9",
     "supererror": "^0.7.2",
     "tar-fs": "github:cloudron-io/tar-fs#ignore_stat_error",
-    "tar-stream": "^2.0.1",
+    "tar-stream": "^2.1.0",
     "tldjs": "^2.3.1",
     "underscore": "^1.9.1",
     "uuid": "^3.3.2",
     "valid-url": "^1.0.9",
-    "validator": "^10.11.0",
-    "ws": "^6.2.1"
+    "validator": "^11.0.0",
+    "ws": "^7.0.0",
+    "xml2js": "^0.4.19"
   },
   "devDependencies": {
     "expect.js": "*",
@@ -87,9 +89,8 @@
     "mocha": "^6.1.4",
     "mock-aws-s3": "git+https://github.com/cloudron-io/mock-aws-s3.git",
     "nock": "^10.0.6",
-    "node-sass": "^4.11.0",
-    "recursive-readdir": "^2.2.2",
-    "sinon": "^7.3.2"
+    "node-sass": "^4.12.0",
+    "recursive-readdir": "^2.2.2"
   },
   "scripts": {
     "test": "./runTests",

scripts/cloudron-provision

@@ -1,106 +0,0 @@
-#!/bin/bash
-
-set -eu -o pipefail
-
-readonly curl="curl --fail --connect-timeout 20 --retry 10 --retry-delay 2 --max-time 2400 --http1.1"
-
-ip=""
-dns_config=""
-tls_cert_file=""
-tls_key_file=""
-license_file=""
-backup_config=""
-
-args=$(getopt -o "" -l "ip:,backup-config:,license:,dns-config:,tls-cert:,tls-key:" -n "$0" -- "$@")
-eval set -- "${args}"
-
-while true; do
-    case "$1" in
-    --ip) ip="$2"; shift 2;;
-    --dns-config) dns_config="$2"; shift 2;;
-    --tls-cert) tls_cert_file="$2"; shift 2;;
-    --tls-key) tls_key_file="$2"; shift 2;;
-    --license) license_file="$2"; shift 2;;
-    --backup-config) backup_config="$2"; shift 2;;
-    --) break;;
-    *) echo "Unknown option $1"; exit 1;;
-    esac
-done
-
-# validate arguments in the absence of data
-if [[ -z "${ip}" ]]; then
-    echo "--ip is required"
-    exit 1
-fi
-
-if [[ -z "${dns_config}" ]]; then
-    echo "--dns-config is required"
-    exit 1
-fi
-
-if [[ ! -f "${license_file}" ]]; then
-    echo "--license must be a valid license file"
-    exit 1
-fi
-
-function get_status() {
-    key="$1"
-    if status=$($curl -q -f -k "https://${ip}/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
-}
-
-echo "=> Waiting for cloudron to be ready"
-wait_for_status "version" '*'
-
-domain=$(echo "${dns_config}" | python3 -c 'import json,sys;obj=json.load(sys.stdin);print(obj["domain"])')
-
-echo "Provisioning Cloudron ${domain}"
-if [[ -n "${tls_cert_file}" && -n "${tls_key_file}" ]]; then
-    tls_cert=$(cat "${tls_cert_file}" | awk '{printf "%s\\n", $0}')
-    tls_key=$(cat "${tls_key_file}" | awk '{printf "%s\\n", $0}')
-    fallback_cert=$(printf '{ "cert": "%s", "key": "%s", "provider": "fallback", "restricted": true }' "${tls_cert}" "${tls_key}")
-else
-    fallback_cert=None
-fi
-
-tls_config='{ "provider": "fallback" }'
-dns_config=$(echo "${dns_config}" | python3 -c "import json,sys;obj=json.load(sys.stdin);obj.update(tlsConfig=${tls_config});obj.update(fallbackCertficate=${fallback_cert});print(json.dumps(obj))")
-
-license=$(cat "${license_file}")
-
-if [[ -z "${backup_config:-}" ]]; then
-    backup_config='{ "provider": "filesystem", "backupFolder": "/var/backups", "format": "tgz" }'
-fi
-
-setupData=$(printf '{ "dnsConfig": %s, "autoconf": { "appstoreConfig": %s, "backupConfig": %s } }' "${dns_config}" "${license}" "${backup_config}")
-
-if ! setupResult=$($curl -kq -X POST -H "Content-Type: application/json" -d "${setupData}" https://${ip}/api/v1/cloudron/setup); then
-    echo "Failed to setup with ${setupData} ${setupResult}"
-    exit 1
-fi
-
-wait_for_status "webadminStatus" '*"tls": true*'
-
-echo "Cloudron is ready at https://my-${domain}"
-

scripts/cloudron-setup

@@ -92,8 +92,9 @@ fi
 echo "Running cloudron-setup with args : $@" > "${LOG_FILE}"
 
 # validate arguments in the absence of data
+readonly AVAILABLE_PROVIDERS="azure, caas, cloudscale, contabo, digitalocean, ec2, exoscale, galaxygate, gce, hetzner, interox, lightsail, linode, netcup, ovh, rosehosting, scaleway, time4vps, upcloud, vultr or generic"
 if [[ -z "${provider}" ]]; then
-    echo "--provider is required (azure, contabo, digitalocean, ec2, exoscale, galaxygate, gce, hetzner, lightsail, linode, netcup, ovh, rosehosting, scaleway, upcloud, vultr or generic)"
+    echo "--provider is required ($AVAILABLE_PROVIDERS)"
     exit 1
 elif [[  \
             "${provider}" != "ami" && \
@@ -106,9 +107,10 @@ elif [[  \
             "${provider}" != "ec2" && \
             "${provider}" != "exoscale" && \
             "${provider}" != "galaxygate" && \
-            "${provider}" != "digitalocean" && \
             "${provider}" != "gce" && \
             "${provider}" != "hetzner" && \
+            "${provider}" != "interox" && \
+            "${provider}" != "interox-image" && \
             "${provider}" != "lightsail" && \
             "${provider}" != "linode" && \
             "${provider}" != "linode-stackscript" && \
@@ -117,12 +119,14 @@ elif [[  \
             "${provider}" != "ovh" && \
             "${provider}" != "rosehosting" && \
             "${provider}" != "scaleway" && \
+            "${provider}" != "time4vps" && \
+            "${provider}" != "time4vps-image" && \
             "${provider}" != "upcloud" && \
             "${provider}" != "upcloud-image" && \
             "${provider}" != "vultr" && \
             "${provider}" != "generic" \
         ]]; then
-    echo "--provider must be one of: azure, cloudscale.ch, contabo, digitalocean, ec2, exoscale, galaxygate, gce, hetzner, lightsail, linode, netcup, ovh, rosehosting, scaleway, upcloud, vultr or generic"
+    echo "--provider must be one of: $AVAILABLE_PROVIDERS"
     exit 1
 fi
 
@@ -199,6 +203,10 @@ fi
 # NOTE: this install script only supports 3.x and above
 echo "=> Installing version ${version} (this takes some time) ..."
 mkdir -p /etc/cloudron
+# this file is used >= 4.2
+echo "${provider}" > /etc/cloudron/PROVIDER
+
+# this file is unused <= 4.2 and exists to make legacy installations work. the start script will remove this file anyway
 cat > "/etc/cloudron/cloudron.conf" <<CONF_END
 {
     "apiServerOrigin": "${apiServerOrigin}",
@@ -214,6 +222,10 @@ if ! /bin/bash "${box_src_tmp_dir}/scripts/installer.sh" &>> "${LOG_FILE}"; then
     exit 1
 fi
 
+# only needed for >= 4.2
+mysql -uroot -ppassword -e "REPLACE INTO box.settings (name, value) VALUES ('api_server_origin', '${apiServerOrigin}');" 2>/dev/null
+mysql -uroot -ppassword -e "REPLACE INTO box.settings (name, value) VALUES ('web_server_origin', '${webServerOrigin}');" 2>/dev/null
+
 echo -n "=> Waiting for cloudron to be ready (this takes some time) ..."
 while true; do
     echo -n "."

scripts/cloudron-support

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -eu -o pipefail
+
 # This script collects diagnostic information to help debug server related issues
 # It also enables SSH access for the cloudron support team
 
@@ -11,25 +13,33 @@ HELP_MESSAGE="
 This script collects diagnostic information to help debug server related issues
 
  Options:
+   --admin-login   Login as administrator
    --enable-ssh    Enable SSH access for the Cloudron support team
    --help          Show this message
 "
 
 # We require root
 if [[ ${EUID} -ne 0 ]]; then
-    echo "This script should be run as root." > /dev/stderr
+    echo "This script should be run as root. Run with sudo"
     exit 1
 fi
 
 enableSSH="false"
 
-args=$(getopt -o "" -l "help,enable-ssh" -n "$0" -- "$@")
+args=$(getopt -o "" -l "help,enable-ssh,admin-login" -n "$0" -- "$@")
 eval set -- "${args}"
 
 while true; do
     case "$1" in
     --help) echo -e "${HELP_MESSAGE}"; exit 0;;
     --enable-ssh) enableSSH="true"; shift;;
+    --admin-login)
+        admin_username=$(mysql -NB -uroot -ppassword -e "SELECT username FROM box.users WHERE admin=1 LIMIT 1" 2>/dev/null)
+        admin_password=$(pwgen -1s 12)
+        printf '{"%s":"%s"}\n' "${admin_username}" "${admin_password}" > /tmp/cloudron_ghost.json
+        echo "Login as ${admin_username} / ${admin_password} . Remove /tmp/cloudron_ghost.json when done."
+        exit 0
+        ;;
     --) break;;
     *) echo "Unknown option $1"; exit 1;;
     esac
@@ -42,7 +52,7 @@ if [[ "`df --output="avail" / | sed -n 2p`" -lt "10240" ]]; then
     echo ""
     df -h
     echo ""
-    echo "To recover from a full disk, follow the guide at https://cloudron.io/documentation/server/#recovery-after-disk-full"
+    echo "To recover from a full disk, follow the guide at https://cloudron.io/documentation/troubleshooting/#recovery-after-disk-full"
     exit 1
 fi
 
@@ -58,23 +68,8 @@ echo -n "Generating Cloudron Support stats..."
 # clear file
 rm -rf $OUT
 
-ssh_port=$(cat /etc/ssh/sshd_config | grep "Port " | sed -e "s/.*Port //")
-if [[ $SUDO_USER == "" ]]; then
-    ssh_user="root"
-    ssh_folder="/root/.ssh/"
-    authorized_key_file="${ssh_folder}/authorized_keys"
-else
-    ssh_user="$SUDO_USER"
-    ssh_folder="/home/$SUDO_USER/.ssh/"
-    authorized_key_file="${ssh_folder}/authorized_keys"
-fi
-
-echo -e $LINE"SSH"$LINE >> $OUT
-echo "Username: ${ssh_user}" >> $OUT
-echo "Port:     ${ssh_port}" >> $OUT
-
-echo -e $LINE"cloudron.conf"$LINE >> $OUT
-cat /etc/cloudron/cloudron.conf &>> $OUT
+echo -e $LINE"PROVIDER"$LINE >> $OUT
+cat /etc/cloudron/PROVIDER &>> $OUT || true
 
 echo -e $LINE"Docker container"$LINE >> $OUT
 if ! timeout --kill-after 10s 15s docker ps -a &>> $OUT 2>&1; then
@@ -99,25 +94,50 @@ systemctl status --lines=100 cloudron.target box mysql unbound cloudron-syslog n
 echo -e $LINE"Box logs"$LINE >> $OUT
 tail -n 100 /home/yellowtent/platformdata/logs/box.log &>> $OUT
 
+echo -e $LINE"Firewall chains"$LINE >> $OUT
+ip addr &>> $OUT
+
 echo -e $LINE"Firewall chains"$LINE >> $OUT
 iptables -L &>> $OUT
 
 echo "Done"
 
+if [[ "${enableSSH}" == "true" ]]; then
+    ssh_port=$(cat /etc/ssh/sshd_config | grep "Port " | sed -e "s/.*Port //")
+    permit_root_login=$(grep -q ^PermitRootLogin.*yes /etc/ssh/sshd_config && echo "yes" || echo "no")
+
+    # support.js uses similar logic
+    if $(grep -q "ec2\|lightsail\|ami" /etc/cloudron/PROVIDER); then
+        ssh_user="ubuntu"
+        keys_file="/home/ubuntu/.ssh/authorized_keys"
+    else
+        ssh_user="root"
+        keys_file="/root/.ssh/authorized_keys"
+    fi
+
+    echo -e $LINE"SSH"$LINE >> $OUT
+    echo "Username: ${ssh_user}" >> $OUT
+    echo "Port:     ${ssh_port}" >> $OUT
+    echo "PermitRootLogin: ${permit_root_login}" >> $OUT
+    echo "Key file: ${keys_file}" >> $OUT
+
+    echo -n "Enabling ssh access for the Cloudron support team..."
+    mkdir -p $(dirname "${keys_file}")       # .ssh does not exist sometimes
+    touch "${keys_file}"                # required for concat to work
+    if ! grep -q "${CLOUDRON_SUPPORT_PUBLIC_KEY}" "${keys_file}"; then
+        echo -e "\n${CLOUDRON_SUPPORT_PUBLIC_KEY}" >> "${keys_file}"
+        chmod 600 "${keys_file}"
+        chown "${ssh_user}" "${keys_file}"
+    fi
+
+    echo "Done"
+fi
+
 echo -n "Uploading information..."
 # for some reason not using $(cat $OUT) will not contain newlines!?
 paste_key=$(curl -X POST ${PASTEBIN}/documents --silent -d "$(cat $OUT)" | python3 -c "import sys, json; print(json.load(sys.stdin)['key'])")
 echo "Done"
 
-if [[ "${enableSSH}" == "true" ]]; then
-    echo -n "Enabling ssh access for the Cloudron support team..."
-    mkdir -p "${ssh_folder}"
-    echo -e "\n${CLOUDRON_SUPPORT_PUBLIC_KEY}" >> ${authorized_key_file}
-    chown -R ${ssh_user} "${ssh_folder}"
-    chmod 600 "${authorized_key_file}"
-    echo "Done"
-fi
-
 echo ""
 echo "Please email the following link to support@cloudron.io"
 echo ""

setup/start.sh

@@ -108,11 +108,6 @@ systemctl restart unbound
 # ensure cloudron-syslog runs
 systemctl restart cloudron-syslog
 
-$json -f /etc/cloudron/cloudron.conf -I -e "delete this.edition" # can be removed after 4.0
-
-echo "==> Clearing custom.yml"
-rm -f /etc/cloudron/custom.yml
-
 echo "==> Configuring sudoers"
 rm -f /etc/sudoers.d/${USER}
 cp "${script_dir}/start/sudoers" /etc/sudoers.d/${USER}
@@ -127,8 +122,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
+rm -f "${PLATFORM_DATA_DIR}/logrotate.d/"*
 cp "${script_dir}/start/logrotate/"* "${PLATFORM_DATA_DIR}/logrotate.d/"
-rm -f "${PLATFORM_DATA_DIR}/logrotate.d/box-logrotate" "${PLATFORM_DATA_DIR}/logrotate.d/app-logrotate" # remove pre 3.6 config files
 
 # 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 "${PLATFORM_DATA_DIR}/logrotate.d/"
@@ -176,6 +171,8 @@ mysql -u root -p${mysql_root_password} -e 'CREATE DATABASE IF NOT EXISTS box'
 echo "==> Migrating data"
 (cd "${BOX_SRC_DIR}" && BOX_ENV=cloudron DATABASE_URL=mysql://root:${mysql_root_password}@127.0.0.1/box "${BOX_SRC_DIR}/node_modules/.bin/db-migrate" up)
 
+rm -f /etc/cloudron/cloudron.conf
+
 if [[ ! -f "${BOX_DATA_DIR}/dhparams.pem" ]]; then
     echo "==> Generating dhparams (takes forever)"
     openssl dhparam -out "${BOX_DATA_DIR}/dhparams.pem" 2048

setup/start/collectd/collectd.conf

@@ -240,8 +240,23 @@ LoadPlugin write_graphite
     Interactive false
 
     Import "df"
-    # <Module df>
-    # </Module>
+
+    Import "du"
+    <Module du>
+        <Path>
+            Instance maildata
+            Dir "/home/yellowtent/boxdata/mail"
+        </Path>
+        <Path>
+            Instance boxdata
+            Dir "/home/yellowtent/boxdata"
+            Exclude "mail"
+        </Path>
+        <Path>
+            Instance platformdata
+            Dir "/home/yellowtent/platformdata"
+        </Path>
+    </Module>
 </Plugin>
 
 <Plugin write_graphite>

setup/start/collectd/df.py

@@ -21,6 +21,7 @@ def read():
         except:
             continue
 
+        # type comes from https://github.com/collectd/collectd/blob/master/src/types.db
         val = collectd.Values(type='df_complex', plugin='df', plugin_instance=instance)
 
         free = st.f_bavail * st.f_frsize # bavail is for non-root user. bfree is total

setup/start/collectd/du.py

@@ -0,0 +1,79 @@
+import collectd,os,subprocess,sys,re,time
+
+# https://www.programcreek.com/python/example/106897/collectd.register_read
+
+PATHS = [] # { name, dir, exclude }
+INTERVAL = 60 * 60 * 12 # twice a day. change values in docker-graphite if you change this
+
+def du(pathinfo):
+    cmd = 'timeout 1800 du -Dsb "{}"'.format(pathinfo['dir'])
+    if pathinfo['exclude'] != '':
+        cmd += ' --exclude "{}"'.format(pathinfo['exclude'])
+
+    collectd.info('computing size with command: %s' % cmd);
+    try:
+        size = subprocess.check_output(cmd, shell=True).split()[0].decode('utf-8')
+        collectd.info('\tsize of %s is %s (time: %i)' % (pathinfo['dir'], size, int(time.time())))
+        return size
+    except Exception as e:
+        collectd.info('\terror getting the size of %s: %s' % (pathinfo['dir'], str(e)))
+        return 0
+
+def parseSize(size):
+    units = {"B": 1, "KB": 10**3, "MB": 10**6, "GB": 10**9, "TB": 10**12}
+    number, unit, _ = re.split('([a-zA-Z]+)', size.upper())
+    return int(float(number)*units[unit])
+
+def dockerSize():
+    # use --format '{{json .}}' to dump the string. '{{if eq .Type "Images"}}{{.Size}}{{end}}' still creates newlines
+    cmd = 'timeout 1800 docker system df --format "{{.Size}}" | head -n1'
+    try:
+        size = subprocess.check_output(cmd, shell=True).strip().decode('utf-8')
+        collectd.info('size of docker images is %s (%s) (time: %i)' % (size, parseSize(size), int(time.time())))
+        return parseSize(size)
+    except Exception as e:
+        collectd.info('error getting docker images size : %s' % str(e))
+        return 0
+
+# configure is called for each module block. this is called before init
+def configure(config):
+    global PATHS
+
+    for child in config.children:
+        if child.key != 'Path':
+            collectd.info('du plugin: Unknown config key "%s"' % key)
+            continue
+
+        pathinfo = { 'name': '', 'dir': '', 'exclude': '' }
+        for node in child.children:
+            if node.key == 'Instance':
+                pathinfo['name'] = node.values[0]
+            elif node.key == 'Dir':
+                pathinfo['dir'] = node.values[0]
+            elif node.key == 'Exclude':
+                pathinfo['exclude'] = node.values[0]
+
+        PATHS.append(pathinfo);
+        collectd.info('du plugin: monitoring %s' % pathinfo['dir']);
+
+def init():
+    global PATHS
+    collectd.info('custom du plugin initialized with %s %s' % (PATHS, sys.version))
+
+def read():
+    for pathinfo in PATHS:
+        size = du(pathinfo)
+
+        # type comes from https://github.com/collectd/collectd/blob/master/src/types.db
+        val = collectd.Values(type='capacity', plugin='du', plugin_instance=pathinfo['name'])
+        val.dispatch(values=[size], type_instance='usage')
+
+    size = dockerSize()
+    val = collectd.Values(type='capacity', plugin='du', plugin_instance='docker')
+    val.dispatch(values=[size], type_instance='usage')
+
+
+
+collectd.register_init(init)
+collectd.register_config(configure)
+collectd.register_read(read, INTERVAL)

setup/start/custom.yml

@@ -1,16 +1,40 @@
 # add customizations here
 # after making changes run "sudo systemctl restart box"
 
-# features:
-#   configureBackup: true
+# appstore:
+#   blacklist:
+#     - io.wekan.cloudronapp
+#     - io.cloudron.openvpn
+#   whitelist:
+#     org.wordpress.cloudronapp: {}
+#     chat.rocket.cloudronapp: {}
+#     com.nextcloud.cloudronapp: {}
+#
+# backups:
+#   configurable: true
+#
+# domains:
 #   dynamicDns: true
-#   subscription: true
-#   remoteSupport: true
-# 
+#   changeDashboardDomain: true
+#
+# subscription:
+#   configurable: true
+#
 # support:
 #   email: support@cloudron.io
-# 
+#   remoteSupport: true
+#
+#   ticketFormBody: |
+#     Use this form to open support tickets. You can also write directly to [support@cloudron.io](mailto:support@cloudron.io).
+#       * [Knowledge Base & App Docs](https://cloudron.io/documentation/apps/?support_view)
+#       * [Custom App Packaging & API](https://cloudron.io/developer/packaging/?support_view)
+#       * [Forum](https://forum.cloudron.io/)
+#
+#   submitTickets: true
+#
 # alerts:
 #   email: support@cloudron.io
 #   notifyCloudronAdmins: false
-
+#
+# footer:
+#   body: '&copy; 2019 [Cloudron](https://cloudron.io) [Forum <i class="fa fa-comments"></i>](https://forum.cloudron.io)'

setup/start/logrotate/app

@@ -1,18 +0,0 @@
-# logrotate config for app, crash, addon and task logs
-
-# man 7 glob
-/home/yellowtent/platformdata/logs/[!t][!a][!s][!k][!s]/*.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
-}
-
-/home/yellowtent/platformdata/logs/tasks/*.log {
-    monthly
-    rotate 0
-    missingok
-}
-

setup/start/logrotate/box

@@ -1,7 +1,8 @@
 # logrotate config for box logs
 
+# keep upto 5 logs of size 10M each
 /home/yellowtent/platformdata/logs/box.log {
-    rotate 10
+    rotate 5
     size 10M
     # we never compress so we can simply tail the files
     nocompress

setup/start/logrotate/platform

@@ -0,0 +1,31 @@
+# logrotate config for app, crash, addon and task logs
+
+# man 7 glob
+/home/yellowtent/platformdata/logs/graphite/*.log
+/home/yellowtent/platformdata/logs/mail/*.log
+/home/yellowtent/platformdata/logs/mysql/*.log
+/home/yellowtent/platformdata/logs/mongodb/*.log
+/home/yellowtent/platformdata/logs/postgresql/*.log
+/home/yellowtent/platformdata/logs/sftp/*.log
+/home/yellowtent/platformdata/logs/redis-*/*.log
+/home/yellowtent/platformdata/logs/crash/*.log
+/home/yellowtent/platformdata/logs/updater/*.log {
+    # only keep one rotated file, we currently do not send that over the api
+    rotate 1
+    size 10M
+    missingok
+    # we never compress so we can simply tail the files
+    nocompress
+    copytruncate
+}
+
+# keep task logs for a week. the 'nocreate' option ensures empty log files are not
+# created post rotation
+/home/yellowtent/platformdata/logs/tasks/*.log {
+    minage 7
+    daily
+    rotate 0
+    missingok
+    nocreate
+}
+

src/accesscontrol.js

@@ -27,7 +27,6 @@ exports = module.exports = {
 };
 
 var assert = require('assert'),
-    config = require('./config.js'),
     DatabaseError = require('./databaseerror.js'),
     debug = require('debug')('box:accesscontrol'),
     tokendb = require('./tokendb.js'),
@@ -130,6 +129,8 @@ function validateToken(accessToken, callback) {
             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);
 
+            if (!user.active) return callback(null, null /* user */, 'Invalid Token'); // will end up as a 401
+
             scopesForUser(user, function (error, userScopes) {
                 if (error) return callback(error);
 

src/addons.js

@@ -37,7 +37,7 @@ var accesscontrol = require('./accesscontrol.js'),
     assert = require('assert'),
     async = require('async'),
     clients = require('./clients.js'),
-    config = require('./config.js'),
+    constants = require('./constants.js'),
     ClientsError = clients.ClientsError,
     crypto = require('crypto'),
     DatabaseError = require('./databaseerror.js'),
@@ -46,6 +46,7 @@ var accesscontrol = require('./accesscontrol.js'),
     dockerConnection = docker.connection,
     DockerError = docker.DockerError,
     fs = require('fs'),
+    graphs = require('./graphs.js'),
     hat = require('./hat.js'),
     infra = require('./infra_version.js'),
     mail = require('./mail.js'),
@@ -57,6 +58,7 @@ var accesscontrol = require('./accesscontrol.js'),
     safe = require('safetydance'),
     semver = require('semver'),
     settings = require('./settings.js'),
+    sftp = require('./sftp.js'),
     shell = require('./shell.js'),
     spawn = require('child_process').spawn,
     split = require('split'),
@@ -269,6 +271,10 @@ function restartContainer(serviceName, callback) {
         if (error) return callback(new AddonsError(AddonsError.INTERNAL_ERROR, error));
 
         docker.startContainer(serviceName, function (error) {
+            if (error && error.reason === DockerError.NOT_FOUND) {
+                callback(null); // callback early since rebuilding takes long
+                return rebuildService(serviceName, function (error) { if (error) console.error(`Unable to rebuild service ${serviceName}`, error); });
+            }
             if (error) return callback(new AddonsError(AddonsError.INTERNAL_ERROR, error));
 
             callback(null);
@@ -276,6 +282,24 @@ function restartContainer(serviceName, callback) {
     });
 }
 
+function rebuildService(serviceName, callback) {
+    assert.strictEqual(typeof serviceName, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    assert(KNOWN_SERVICES[serviceName], `Unknown service ${serviceName}`);
+
+    // this attempts to recreate the service docker container if they don't exist but platform infra version is unchanged
+    // passing an infra version of 'none' will not attempt to purge existing data, not sure if this is good or bad
+    if (serviceName === 'mongodb') return startMongodb({ version: 'none' }, callback);
+    if (serviceName === 'postgresql') return startPostgresql({ version: 'none' }, callback);
+    if (serviceName === 'mysql') return startMysql({ version: 'none' }, callback);
+    if (serviceName === 'sftp') return sftp.startSftp({ version: 'none' }, callback);
+    if (serviceName === 'graphite') return graphs.startGraphite({ version: 'none' }, callback);
+
+    // nothing to rebuild for now
+    callback();
+}
+
 function getServiceDetails(containerName, tokenEnvName, callback) {
     assert.strictEqual(typeof containerName, 'string');
     assert.strictEqual(typeof tokenEnvName, 'string');
@@ -364,7 +388,7 @@ function getService(serviceName, callback) {
         }
 
         KNOWN_SERVICES[serviceName].status(function (error, result) {
-            if (error) return callback(new AddonsError(AddonsError.INTERNAL_ERROR, error));
+            if (error) return callback(error);
 
             tmp.status = result.status;
             tmp.memoryUsed = result.memoryUsed;
@@ -620,7 +644,7 @@ function importDatabase(addon, callback) {
                 if (!error) return iteratorCallback();
 
                 debug(`importDatabase: Error importing ${addon} of app ${app.id}. Marking as errored`, error);
-                appdb.update(app.id, { installationState: appdb.ISTATE_ERROR, installationProgress: error.message }, iteratorCallback);
+                appdb.update(app.id, { installationState: apps.ISTATE_ERROR, error: { message: error.message } }, iteratorCallback);
             });
         }, callback);
     });
@@ -685,7 +709,7 @@ function getEnvironment(app, callback) {
     appdb.getAddonConfigByAppId(app.id, function (error, result) {
         if (error) return callback(error);
 
-        if (app.manifest.addons['docker']) result.push({ name: 'DOCKER_HOST', value: `tcp://172.18.0.1:${config.get('dockerProxyPort')}` });
+        if (app.manifest.addons['docker']) result.push({ name: 'DOCKER_HOST', value: `tcp://172.18.0.1:${constants.DOCKER_PROXY_PORT}` });
 
         return callback(null, result.map(function (e) { return e.name + '=' + e.value; }));
     });
@@ -795,10 +819,12 @@ function setupOauth(app, options, callback) {
         clients.add(appId, clients.TYPE_OAUTH, redirectURI, scope, function (error, result) {
             if (error) return callback(error);
 
+            const envPrefix = app.manifest.manifestVersion <= 1 ? '' : 'CLOUDRON_';
+
             var env = [
-                { name: 'OAUTH_CLIENT_ID', value: result.id },
-                { name: 'OAUTH_CLIENT_SECRET', value: result.clientSecret },
-                { name: 'OAUTH_ORIGIN', value: config.adminOrigin() }
+                { name: `${envPrefix}OAUTH_CLIENT_ID`, value: result.id },
+                { name: `${envPrefix}OAUTH_CLIENT_SECRET`, value: result.clientSecret },
+                { name: `${envPrefix}OAUTH_ORIGIN`, value: settings.adminOrigin() }
             ];
 
             debugApp(app, 'Setting oauth addon config to %j', env);
@@ -832,17 +858,19 @@ function setupEmail(app, options, callback) {
 
         const mailInDomains = mailDomains.filter(function (d) { return d.enabled; }).map(function (d) { return d.domain; }).join(',');
 
+        const envPrefix = app.manifest.manifestVersion <= 1 ? '' : 'CLOUDRON_';
+
         // note that "external" access info can be derived from MAIL_DOMAIN (since it's part of user documentation)
         var env = [
-            { name: 'MAIL_SMTP_SERVER', value: 'mail' },
-            { name: 'MAIL_SMTP_PORT', value: '2525' },
-            { name: 'MAIL_IMAP_SERVER', value: 'mail' },
-            { name: 'MAIL_IMAP_PORT', value: '9993' },
-            { name: 'MAIL_SIEVE_SERVER', value: 'mail' },
-            { name: 'MAIL_SIEVE_PORT', value: '4190' },
-            { name: 'MAIL_DOMAIN', value: app.domain },
-            { name: 'MAIL_DOMAINS', value: mailInDomains },
-            { name: 'LDAP_MAILBOXES_BASE_DN', value: 'ou=mailboxes,dc=cloudron' }
+            { name: `${envPrefix}MAIL_SMTP_SERVER`, value: 'mail' },
+            { name: `${envPrefix}MAIL_SMTP_PORT`, value: '2525' },
+            { name: `${envPrefix}MAIL_IMAP_SERVER`, value: 'mail' },
+            { name: `${envPrefix}MAIL_IMAP_PORT`, value: '9993' },
+            { name: `${envPrefix}MAIL_SIEVE_SERVER`, value: 'mail' },
+            { name: `${envPrefix}MAIL_SIEVE_PORT`, value: '4190' },
+            { name: `${envPrefix}MAIL_DOMAIN`, value: app.domain },
+            { name: `${envPrefix}MAIL_DOMAINS`, value: mailInDomains },
+            { name: `${envPrefix}LDAP_MAILBOXES_BASE_DN`, value: 'ou=mailboxes,dc=cloudron' }
         ];
 
         debugApp(app, 'Setting up Email');
@@ -868,14 +896,16 @@ function setupLdap(app, options, callback) {
 
     if (!app.sso) return callback(null);
 
+    const envPrefix = app.manifest.manifestVersion <= 1 ? '' : 'CLOUDRON_';
+
     var env = [
-        { name: 'LDAP_SERVER', value: '172.18.0.1' },
-        { name: 'LDAP_PORT', value: '' + config.get('ldapPort') },
-        { name: 'LDAP_URL', value: 'ldap://172.18.0.1:' + config.get('ldapPort') },
-        { name: 'LDAP_USERS_BASE_DN', value: 'ou=users,dc=cloudron' },
-        { name: 'LDAP_GROUPS_BASE_DN', value: 'ou=groups,dc=cloudron' },
-        { name: 'LDAP_BIND_DN', value: 'cn='+ app.id + ',ou=apps,dc=cloudron' },
-        { name: 'LDAP_BIND_PASSWORD', value: hat(4 * 128) } // this is ignored
+        { name: `${envPrefix}LDAP_SERVER`, value: '172.18.0.1' },
+        { name: `${envPrefix}LDAP_PORT`, value: '' + constants.LDAP_PORT },
+        { name: `${envPrefix}LDAP_URL`, value: 'ldap://172.18.0.1:' + constants.LDAP_PORT },
+        { name: `${envPrefix}LDAP_USERS_BASE_DN`, value: 'ou=users,dc=cloudron' },
+        { name: `${envPrefix}LDAP_GROUPS_BASE_DN`, value: 'ou=groups,dc=cloudron' },
+        { name: `${envPrefix}LDAP_BIND_DN`, value: 'cn='+ app.id + ',ou=apps,dc=cloudron' },
+        { name: `${envPrefix}LDAP_BIND_PASSWORD`, value: hat(4 * 128) } // this is ignored
     ];
 
     debugApp(app, 'Setting up LDAP');
@@ -900,19 +930,21 @@ function setupSendMail(app, options, callback) {
 
     debugApp(app, 'Setting up SendMail');
 
-    appdb.getAddonConfigByName(app.id, 'sendmail', 'MAIL_SMTP_PASSWORD', function (error, existingPassword) {
+    appdb.getAddonConfigByName(app.id, 'sendmail', '%MAIL_SMTP_PASSWORD', function (error, existingPassword) {
         if (error && error.reason !== DatabaseError.NOT_FOUND) return callback(error);
 
         var password = error ? hat(4 * 48) : existingPassword; // see box#565 for password length
 
+        const envPrefix = app.manifest.manifestVersion <= 1 ? '' : 'CLOUDRON_';
+
         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: app.mailboxName + '@' + app.domain },
-            { name: 'MAIL_SMTP_PASSWORD', value: password },
-            { name: 'MAIL_FROM', value: app.mailboxName + '@' + app.domain },
-            { name: 'MAIL_DOMAIN', value: app.domain }
+            { name: `${envPrefix}MAIL_SMTP_SERVER`, value: 'mail' },
+            { name: `${envPrefix}MAIL_SMTP_PORT`, value: '2525' },
+            { name: `${envPrefix}MAIL_SMTPS_PORT`, value: '2465' },
+            { name: `${envPrefix}MAIL_SMTP_USERNAME`, value: app.mailboxName + '@' + app.domain },
+            { name: `${envPrefix}MAIL_SMTP_PASSWORD`, value: password },
+            { name: `${envPrefix}MAIL_FROM`, value: app.mailboxName + '@' + app.domain },
+            { name: `${envPrefix}MAIL_DOMAIN`, value: app.domain }
         ];
         debugApp(app, 'Setting sendmail addon config to %j', env);
         appdb.setAddonConfig(app.id, 'sendmail', env, callback);
@@ -936,18 +968,20 @@ function setupRecvMail(app, options, callback) {
 
     debugApp(app, 'Setting up recvmail');
 
-    appdb.getAddonConfigByName(app.id, 'recvmail', 'MAIL_IMAP_PASSWORD', function (error, existingPassword) {
+    appdb.getAddonConfigByName(app.id, 'recvmail', '%MAIL_IMAP_PASSWORD', function (error, existingPassword) {
         if (error && error.reason !== DatabaseError.NOT_FOUND) return callback(error);
 
         var password = error ? hat(4 * 48) : existingPassword;  // see box#565 for password length
 
+        const envPrefix = app.manifest.manifestVersion <= 1 ? '' : 'CLOUDRON_';
+
         var env = [
-            { name: 'MAIL_IMAP_SERVER', value: 'mail' },
-            { name: 'MAIL_IMAP_PORT', value: '9993' },
-            { name: 'MAIL_IMAP_USERNAME', value: app.mailboxName + '@' + app.domain },
-            { name: 'MAIL_IMAP_PASSWORD', value: password },
-            { name: 'MAIL_TO', value: app.mailboxName + '@' + app.domain },
-            { name: 'MAIL_DOMAIN', value: app.domain }
+            { name: `${envPrefix}MAIL_IMAP_SERVER`, value: 'mail' },
+            { name: `${envPrefix}MAIL_IMAP_PORT`, value: '9993' },
+            { name: `${envPrefix}MAIL_IMAP_USERNAME`, value: app.mailboxName + '@' + app.domain },
+            { name: `${envPrefix}MAIL_IMAP_PASSWORD`, value: password },
+            { name: `${envPrefix}MAIL_TO`, value: app.mailboxName + '@' + app.domain },
+            { name: `${envPrefix}MAIL_DOMAIN`, value: app.domain }
         ];
 
         debugApp(app, 'Setting sendmail addon config to %j', env);
@@ -992,6 +1026,7 @@ function startMysql(existingInfra, callback) {
         if (error) return callback(error);
 
         const cmd = `docker run --restart=always -d --name="mysql" \
+                    --hostname mysql \
                     --net cloudron \
                     --net-alias mysql \
                     --log-driver syslog \
@@ -1029,7 +1064,7 @@ function setupMySql(app, options, callback) {
 
     debugApp(app, 'Setting up mysql');
 
-    appdb.getAddonConfigByName(app.id, 'mysql', 'MYSQL_PASSWORD', function (error, existingPassword) {
+    appdb.getAddonConfigByName(app.id, 'mysql', '%MYSQL_PASSWORD', function (error, existingPassword) {
         if (error && error.reason !== DatabaseError.NOT_FOUND) return callback(error);
 
         const tmp = mysqlDatabaseName(app.id);
@@ -1048,19 +1083,21 @@ function setupMySql(app, options, callback) {
                 if (error) return callback(new Error('Error setting up mysql: ' + error));
                 if (response.statusCode !== 201) return callback(new Error(`Error setting up mysql. Status code: ${response.statusCode} message: ${response.body.message}`));
 
+                const envPrefix = app.manifest.manifestVersion <= 1 ? '' : 'CLOUDRON_';
+
                 var env = [
-                    { name: 'MYSQL_USERNAME', value: data.username },
-                    { name: 'MYSQL_PASSWORD', value: data.password },
-                    { name: 'MYSQL_HOST', value: 'mysql' },
-                    { name: 'MYSQL_PORT', value: '3306' }
+                    { name: `${envPrefix}MYSQL_USERNAME`, value: data.username },
+                    { name: `${envPrefix}MYSQL_PASSWORD`, value: data.password },
+                    { name: `${envPrefix}MYSQL_HOST`, value: 'mysql' },
+                    { name: `${envPrefix}MYSQL_PORT`, value: '3306' }
                 ];
 
                 if (options.multipleDatabases) {
-                    env = env.concat({ name: 'MYSQL_DATABASE_PREFIX', value: `${data.prefix}_` });
+                    env = env.concat({ name: `${envPrefix}MYSQL_DATABASE_PREFIX`, value: `${data.prefix}_` });
                 } else {
                     env = env.concat(
-                        { name: 'MYSQL_URL', value: `mysql://${data.username}:${data.password}@mysql/${data.database}` },
-                        { name: 'MYSQL_DATABASE', value: data.database }
+                        { name: `${envPrefix}MYSQL_URL`, value: `mysql://${data.username}:${data.password}@mysql/${data.database}` },
+                        { name: `${envPrefix}MYSQL_DATABASE`, value: data.database }
                     );
                 }
 
@@ -1204,6 +1241,7 @@ function startPostgresql(existingInfra, callback) {
         if (error) return callback(error);
 
         const cmd = `docker run --restart=always -d --name="postgresql" \
+                    --hostname postgresql \
                     --net cloudron \
                     --net-alias postgresql \
                     --log-driver syslog \
@@ -1242,7 +1280,7 @@ function setupPostgreSql(app, options, callback) {
 
     const { database, username } = postgreSqlNames(app.id);
 
-    appdb.getAddonConfigByName(app.id, 'postgresql', 'POSTGRESQL_PASSWORD', function (error, existingPassword) {
+    appdb.getAddonConfigByName(app.id, 'postgresql', '%POSTGRESQL_PASSWORD', function (error, existingPassword) {
         if (error && error.reason !== DatabaseError.NOT_FOUND) return callback(error);
 
         const data = {
@@ -1258,13 +1296,15 @@ function setupPostgreSql(app, options, callback) {
                 if (error) return callback(new Error('Error setting up postgresql: ' + error));
                 if (response.statusCode !== 201) return callback(new Error(`Error setting up postgresql. Status code: ${response.statusCode} message: ${response.body.message}`));
 
+                const envPrefix = app.manifest.manifestVersion <= 1 ? '' : 'CLOUDRON_';
+
                 var env = [
-                    { name: 'POSTGRESQL_URL', value: `postgres://${data.username}:${data.password}@postgresql/${data.database}` },
-                    { name: 'POSTGRESQL_USERNAME', value: data.username },
-                    { name: 'POSTGRESQL_PASSWORD', value: data.password },
-                    { name: 'POSTGRESQL_HOST', value: 'postgresql' },
-                    { name: 'POSTGRESQL_PORT', value: '5432' },
-                    { name: 'POSTGRESQL_DATABASE', value: data.database }
+                    { name: `${envPrefix}POSTGRESQL_URL`, value: `postgres://${data.username}:${data.password}@postgresql/${data.database}` },
+                    { name: `${envPrefix}POSTGRESQL_USERNAME`, value: data.username },
+                    { name: `${envPrefix}POSTGRESQL_PASSWORD`, value: data.password },
+                    { name: `${envPrefix}POSTGRESQL_HOST`, value: 'postgresql' },
+                    { name: `${envPrefix}POSTGRESQL_PORT`, value: '5432' },
+                    { name: `${envPrefix}POSTGRESQL_DATABASE`, value: data.database }
                 ];
 
                 debugApp(app, 'Setting postgresql addon config to %j', env);
@@ -1378,6 +1418,7 @@ function startMongodb(existingInfra, callback) {
         if (error) return callback(error);
 
         const cmd = `docker run --restart=always -d --name="mongodb" \
+                    --hostname mongodb \
                     --net cloudron \
                     --net-alias mongodb \
                     --log-driver syslog \
@@ -1414,13 +1455,14 @@ function setupMongoDb(app, options, callback) {
 
     debugApp(app, 'Setting up mongodb');
 
-    appdb.getAddonConfigByName(app.id, 'mongodb', 'MONGODB_PASSWORD', function (error, existingPassword) {
+    appdb.getAddonConfigByName(app.id, 'mongodb', '%MONGODB_PASSWORD', function (error, existingPassword) {
         if (error && error.reason !== DatabaseError.NOT_FOUND) return callback(error);
 
         const data = {
             database: app.id,
             username: app.id,
-            password: error ? hat(4 * 128) : existingPassword
+            password: error ? hat(4 * 128) : existingPassword,
+            oplog: !!options.oplog
         };
 
         getServiceDetails('mongodb', 'CLOUDRON_MONGODB_TOKEN', function (error, result) {
@@ -1430,15 +1472,21 @@ function setupMongoDb(app, options, callback) {
                 if (error) return callback(new Error('Error setting up mongodb: ' + error));
                 if (response.statusCode !== 201) return callback(new Error(`Error setting up mongodb. Status code: ${response.statusCode}`));
 
+                const envPrefix = app.manifest.manifestVersion <= 1 ? '' : 'CLOUDRON_';
+
                 var env = [
-                    { name: 'MONGODB_URL', value : `mongodb://${data.username}:${data.password}@mongodb/${data.database}` },
-                    { name: 'MONGODB_USERNAME', value : data.username },
-                    { name: 'MONGODB_PASSWORD', value: data.password },
-                    { name: 'MONGODB_HOST', value : 'mongodb' },
-                    { name: 'MONGODB_PORT', value : '27017' },
-                    { name: 'MONGODB_DATABASE', value : data.database }
+                    { name: `${envPrefix}MONGODB_URL`, value : `mongodb://${data.username}:${data.password}@mongodb:27017/${data.database}` },
+                    { name: `${envPrefix}MONGODB_USERNAME`, value : data.username },
+                    { name: `${envPrefix}MONGODB_PASSWORD`, value: data.password },
+                    { name: `${envPrefix}MONGODB_HOST`, value : 'mongodb' },
+                    { name: `${envPrefix}MONGODB_PORT`, value : '27017' },
+                    { name: `${envPrefix}MONGODB_DATABASE`, value : data.database }
                 ];
 
+                if (options.oplog) {
+                    env.push({ name: `${envPrefix}MONGODB_OPLOG_URL`, value : `mongodb://${data.username}:${data.password}@mongodb:27017/local?authSource=${data.database}` });
+                }
+
                 debugApp(app, 'Setting mongodb addon config to %j', env);
                 appdb.setAddonConfig(app.id, 'mongodb', env, callback);
             });
@@ -1545,65 +1593,69 @@ function setupRedis(app, options, callback) {
 
     const redisName = 'redis-' + app.id;
 
-    docker.inspect(redisName, function (error, result) {
-        if (!error) {
-            debug(`Re-using existing redis container with state: ${result.State}`);
-            return callback();
+    appdb.getAddonConfigByName(app.id, 'redis', '%REDIS_PASSWORD', function (error, existingPassword) {
+        if (error && error.reason !== DatabaseError.NOT_FOUND) return callback(error);
+
+        const redisPassword = error ? hat(4 * 48) : existingPassword; // see box#362 for password length
+        const redisServiceToken = hat(4 * 48);
+
+        // Compute redis memory limit based on app's memory limit (this is arbitrary)
+        var memoryLimit = app.memoryLimit || app.manifest.memoryLimit || 0;
+
+        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
         }
 
-        appdb.getAddonConfigByName(app.id, 'redis', 'REDIS_PASSWORD', function (error, existingPassword) {
-            if (error && error.reason !== DatabaseError.NOT_FOUND) return callback(error);
+        const tag = infra.images.redis.tag;
+        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} \
+                    --hostname ${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=. \
+                    -e CLOUDRON_REDIS_PASSWORD="${redisPassword}" \
+                    -e CLOUDRON_REDIS_TOKEN="${redisServiceToken}" \
+                    -v "${paths.PLATFORM_DATA_DIR}/redis/${app.id}:/var/lib/redis" \
+                    --label isCloudronManaged=true \
+                    --read-only -v /tmp -v /run ${tag}`;
 
-            const redisPassword = error ? hat(4 * 48) : existingPassword; // see box#362 for password length
-            const redisServiceToken = hat(4 * 48);
+        const envPrefix = app.manifest.manifestVersion <= 1 ? '' : 'CLOUDRON_';
 
-            // Compute redis memory limit based on app's memory limit (this is arbitrary)
-            var memoryLimit = app.memoryLimit || app.manifest.memoryLimit || 0;
+        var env = [
+            { name: `${envPrefix}REDIS_URL`, value: 'redis://redisuser:' + redisPassword + '@redis-' + app.id },
+            { name: `${envPrefix}REDIS_PASSWORD`, value: redisPassword },
+            { name: `${envPrefix}REDIS_HOST`, value: redisName },
+            { name: `${envPrefix}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
-            }
-
-            const tag = infra.images.redis.tag;
-            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=. \
-                        -e CLOUDRON_REDIS_PASSWORD="${redisPassword}" \
-                        -e CLOUDRON_REDIS_TOKEN="${redisServiceToken}" \
-                        -v "${paths.PLATFORM_DATA_DIR}/redis/${app.id}:/var/lib/redis" \
-                        --label isCloudronManaged=true \
-                        --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([
-                shell.exec.bind(null, 'startRedis', cmd),
-                appdb.setAddonConfig.bind(null, app.id, 'redis', env),
-                waitForService.bind(null, 'redis-' + app.id, 'CLOUDRON_REDIS_TOKEN')
-            ], function (error) {
-                if (error) debug('Error setting up redis: ', error);
-                callback(error);
-            });
+        async.series([
+            (next) => {
+                docker.inspect(redisName, function (inspectError, result) {
+                    if (!inspectError) {
+                        debug(`Re-using existing redis container with state: ${JSON.stringify(result.State)}`);
+                        return next();
+                    }
+                    shell.exec('startRedis', cmd, next);
+                });
+            },
+            appdb.setAddonConfig.bind(null, app.id, 'redis', env),
+            waitForService.bind(null, 'redis-' + app.id, 'CLOUDRON_REDIS_TOKEN')
+        ], function (error) {
+            if (error) debug('Error setting up redis: ', error);
+            callback(error);
         });
     });
 }
@@ -1751,7 +1803,7 @@ function statusSftp(callback) {
     assert.strictEqual(typeof callback, 'function');
 
     docker.inspect('sftp', function (error, container) {
-        if (error && error.reason === DockerError.NOT_FOUND) return callback(new AddonsError(AddonsError.NOT_ACTIVE, error));
+        if (error && error.reason === DockerError.NOT_FOUND) return callback(null, { status: exports.SERVICE_STATUS_STOPPED });
         if (error) return callback(new AddonsError(AddonsError.INTERNAL_ERROR, error));
 
         docker.memoryUsage('sftp', function (error, result) {
@@ -1772,10 +1824,10 @@ function statusGraphite(callback) {
     assert.strictEqual(typeof callback, 'function');
 
     docker.inspect('graphite', function (error, container) {
-        if (error && error.reason === DockerError.NOT_FOUND) return callback(new AddonsError(AddonsError.NOT_ACTIVE, error));
+        if (error && error.reason === DockerError.NOT_FOUND) return callback(null, { status: exports.SERVICE_STATUS_STOPPED });
         if (error) return callback(new AddonsError(AddonsError.INTERNAL_ERROR, error));
 
-        request.get('http://127.0.0.1:8417', { timeout: 3000 }, function (error, response) {
+        request.get('http://127.0.0.1:8417/graphite-web/dashboard', { timeout: 3000 }, function (error, response) {
             if (error) return callback(null, { status: exports.SERVICE_STATUS_STARTING, error: `Error waiting for graphite: ${error.message}` });
             if (response.statusCode !== 200) return callback(null, { status: exports.SERVICE_STATUS_STARTING, error: `Error waiting for graphite. Status code: ${response.statusCode} message: ${response.body.message}` });
 

src/appconfig.ejs

@@ -72,10 +72,6 @@ server {
     ssl_dhparam /home/yellowtent/boxdata/dhparams.pem;
     add_header Strict-Transport-Security "max-age=15768000";
 
-    # https://developer.mozilla.org/en-US/docs/Web/HTTP/X-Frame-Options
-    add_header X-Frame-Options "<%= xFrameOptions %>";
-    proxy_hide_header X-Frame-Options;
-
     # https://github.com/twitter/secureheaders
     # https://www.owasp.org/index.php/OWASP_Secure_Headers_Project#tab=Compatibility_Matrix
     # https://wiki.mozilla.org/Security/Guidelines/Web_Security
@@ -100,7 +96,7 @@ server {
 
 <% if ( endpoint === 'admin' ) { -%>
     # CSP headers for the admin/dashboard resources
-    add_header Content-Security-Policy "default-src 'none'; connect-src wss: https: 'self' *.cloudron.io; script-src https: 'self' 'unsafe-inline' 'unsafe-eval'; img-src * data:; style-src https: 'unsafe-inline'; object-src 'none'; font-src https: 'self'; frame-ancestors 'none'; base-uri 'none'; form-action 'self';";
+    add_header Content-Security-Policy "default-src 'none'; frame-src 'self' cloudron.io *.cloudron.io; connect-src wss: https: 'self' *.cloudron.io; script-src https: 'self' 'unsafe-inline' 'unsafe-eval'; img-src * data:; style-src https: 'unsafe-inline'; object-src 'none'; font-src https: 'self'; frame-ancestors 'none'; base-uri 'none'; form-action 'self';";
 <% } -%>
 
     proxy_http_version 1.1;
@@ -167,9 +163,9 @@ server {
             client_max_body_size 0;
         }
 
-        # graphite paths (uncomment block below and visit /graphite/index.html)
+        # graphite paths (uncomment block below and visit /graphite-web/dashboard)
         # remember to comment out the CSP policy as well to access the graphite dashboard
-        # location ~ ^/(graphite|content|metrics|dashboard|render|browser|composer)/ {
+        # location ~ ^/graphite-web/ {
         #     proxy_pass   http://127.0.0.1:8417;
         #     client_max_body_size 1m;
         # }

src/appdb.js

@@ -21,36 +21,9 @@ exports = module.exports = {
     getAppIdByAddonConfigValue: getAppIdByAddonConfigValue,
 
     setHealth: setHealth,
-    setInstallationCommand: setInstallationCommand,
-    setRunCommand: setRunCommand,
+    setTask: setTask,
     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
-    ISTATE_PENDING_CONFIGURE: 'pending_configure', // config (location, port) changes and on infra update
-    ISTATE_PENDING_UNINSTALL: 'pending_uninstall', // uninstallation
-    ISTATE_PENDING_RESTORE: 'pending_restore', // restore to previous backup or on upgrade
-    ISTATE_PENDING_UPDATE: 'pending_update', // update from installed state preserving data
-    ISTATE_PENDING_FORCE_UPDATE: 'pending_force_update', // update from any state preserving data
-    ISTATE_PENDING_BACKUP: 'pending_backup', // backup the app
-    ISTATE_ERROR: 'error', // error executing last pending_* command
-    ISTATE_INSTALLED: 'installed', // app is installed
-
-    RSTATE_RUNNING: 'running',
-    RSTATE_PENDING_START: 'pending_start',
-    RSTATE_PENDING_STOP: 'pending_stop',
-    RSTATE_STOPPED: 'stopped', // app stopped by us
-
-    // run codes (keep in sync in UI)
-    HEALTH_HEALTHY: 'healthy',
-    HEALTH_UNHEALTHY: 'unhealthy',
-    HEALTH_ERROR: 'error',
-    HEALTH_DEAD: 'dead',
-
     // subdomain table types
     SUBDOMAIN_TYPE_PRIMARY: 'primary',
     SUBDOMAIN_TYPE_REDIRECT: 'redirect',
@@ -65,12 +38,12 @@ var assert = require('assert'),
     safe = require('safetydance'),
     util = require('util');
 
-var APPS_FIELDS_PREFIXED = [ 'apps.id', 'apps.appStoreId', 'apps.installationState', 'apps.installationProgress', 'apps.runState',
+var APPS_FIELDS_PREFIXED = [ 'apps.id', 'apps.appStoreId', 'apps.installationState', 'apps.errorJson', 'apps.runState',
     '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.label', 'apps.tagsJson',
-    'apps.xFrameOptions', 'apps.sso', 'apps.debugModeJson', 'apps.robotsTxt', 'apps.enableBackup',
-    'apps.creationTime', 'apps.updateTime', 'apps.ownerId', 'apps.mailboxName', 'apps.enableAutomaticUpdate',
+    'apps.accessRestrictionJson', 'apps.memoryLimit',
+    'apps.label', 'apps.tagsJson', 'apps.taskId',
+    'apps.sso', 'apps.debugModeJson', 'apps.robotsTxt', 'apps.enableBackup',
+    'apps.creationTime', 'apps.updateTime', 'apps.mailboxName', 'apps.enableAutomaticUpdate',
     'apps.dataDir', 'apps.ts', 'apps.healthTime' ].join(',');
 
 var PORT_BINDINGS_FIELDS = [ 'hostPort', 'type', 'environmentVariable', 'appId' ].join(',');
@@ -84,18 +57,6 @@ function postProcess(result) {
     result.manifest = safe.JSON.parse(result.manifestJson);
     delete result.manifestJson;
 
-    assert(result.oldConfigJson === null || typeof result.oldConfigJson === 'string');
-    result.oldConfig = safe.JSON.parse(result.oldConfigJson);
-    delete result.oldConfigJson;
-
-    assert(result.updateConfigJson === null || typeof result.updateConfigJson === 'string');
-    result.updateConfig = safe.JSON.parse(result.updateConfigJson);
-    delete result.updateConfigJson;
-
-    assert(result.restoreConfigJson === null || typeof result.restoreConfigJson === 'string');
-    result.restoreConfig = safe.JSON.parse(result.restoreConfigJson);
-    delete result.restoreConfigJson;
-
     assert(result.tagsJson === null || typeof result.tagsJson === 'string');
     result.tags = safe.JSON.parse(result.tagsJson) || [];
     delete result.tagsJson;
@@ -121,9 +82,6 @@ function postProcess(result) {
     if (result.accessRestriction && !result.accessRestriction.users) result.accessRestriction.users = [];
     delete result.accessRestrictionJson;
 
-    // TODO remove later once all apps have this attribute
-    result.xFrameOptions = result.xFrameOptions || 'SAMEORIGIN';
-
     result.sso = !!result.sso; // make it bool
     result.enableBackup = !!result.enableBackup; // make it bool
     result.enableAutomaticUpdate = !!result.enableAutomaticUpdate; // make it bool
@@ -148,6 +106,11 @@ function postProcess(result) {
 
     // in the db, we store dataDir as unique/nullable
     result.dataDir = result.dataDir || '';
+
+    result.error = safe.JSON.parse(result.errorJson);
+    delete result.errorJson;
+
+    result.taskId = result.taskId ? String(result.taskId) : null;
 }
 
 function get(id, callback) {
@@ -260,14 +223,13 @@ function getAll(callback) {
     });
 }
 
-function add(id, appStoreId, manifest, location, domain, ownerId, portBindings, data, callback) {
+function add(id, appStoreId, manifest, location, domain, portBindings, data, callback) {
     assert.strictEqual(typeof id, 'string');
     assert.strictEqual(typeof appStoreId, 'string');
     assert(manifest && typeof manifest === 'object');
     assert.strictEqual(typeof manifest.version, 'string');
     assert.strictEqual(typeof location, 'string');
     assert.strictEqual(typeof domain, 'string');
-    assert.strictEqual(typeof ownerId, 'string');
     assert.strictEqual(typeof portBindings, 'object');
     assert(data && typeof data === 'object');
     assert.strictEqual(typeof callback, 'function');
@@ -279,9 +241,7 @@ function add(id, appStoreId, manifest, location, domain, ownerId, portBindings,
     const accessRestriction = data.accessRestriction || null;
     const accessRestrictionJson = JSON.stringify(accessRestriction);
     const memoryLimit = data.memoryLimit || 0;
-    const xFrameOptions = data.xFrameOptions || '';
-    const installationState = data.installationState || exports.ISTATE_PENDING_INSTALL;
-    const restoreConfigJson = data.restoreConfig ? JSON.stringify(data.restoreConfig) : null; // used when cloning
+    const installationState = data.installationState || 'pending_install'; // FIXME
     const sso = 'sso' in data ? data.sso : null;
     const robotsTxt = 'robotsTxt' in data ? data.robotsTxt : null;
     const debugModeJson = data.debugMode ? JSON.stringify(data.debugMode) : null;
@@ -293,11 +253,11 @@ function add(id, appStoreId, manifest, location, domain, ownerId, portBindings,
     var queries = [];
 
     queries.push({
-        query: 'INSERT INTO apps (id, appStoreId, manifestJson, installationState, accessRestrictionJson, memoryLimit, xFrameOptions,'
-            + 'restoreConfigJson, sso, debugModeJson, robotsTxt, ownerId, mailboxName, label, tagsJson) '
-            + ' VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)',
-        args: [ id, appStoreId, manifestJson, installationState, accessRestrictionJson, memoryLimit, xFrameOptions, restoreConfigJson,
-            sso, debugModeJson, robotsTxt, ownerId, mailboxName, label, tagsJson ]
+        query: 'INSERT INTO apps (id, appStoreId, manifestJson, installationState, accessRestrictionJson, memoryLimit, '
+            + 'sso, debugModeJson, robotsTxt, mailboxName, label, tagsJson) '
+            + ' VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)',
+        args: [ id, appStoreId, manifestJson, installationState, accessRestrictionJson, memoryLimit,
+            sso, debugModeJson, robotsTxt, mailboxName, label, tagsJson ]
     });
 
     queries.push({
@@ -462,7 +422,7 @@ function updateWithConstraints(id, app, constraints, callback) {
 
     var fields = [ ], values = [ ];
     for (var p in app) {
-        if (p === 'manifest' || p === 'oldConfig' || p === 'updateConfig' || p === 'restoreConfig' || p === 'tags' || p === 'accessRestriction' || p === 'debugMode') {
+        if (p === 'manifest' || p === 'tags' || p === 'accessRestriction' || p === 'debugMode' || p === 'error') {
             fields.push(`${p}Json = ?`);
             values.push(JSON.stringify(app[p]));
         } else if (p !== 'portBindings' && p !== 'location' && p !== 'domain' && p !== 'alternateDomains' && p !== 'env') {
@@ -485,7 +445,6 @@ function updateWithConstraints(id, app, constraints, callback) {
     });
 }
 
-// not sure if health should influence runState
 function setHealth(appId, health, healthTime, callback) {
     assert.strictEqual(typeof appId, 'string');
     assert.strictEqual(typeof health, 'string');
@@ -494,53 +453,15 @@ function setHealth(appId, health, healthTime, callback) {
 
     var values = { health, healthTime };
 
-    var constraints = 'AND runState NOT LIKE "pending_%" AND installationState = "installed"';
-
-    updateWithConstraints(appId, values, constraints, callback);
+    updateWithConstraints(appId, values, '', callback);
 }
 
-function setInstallationCommand(appId, installationState, values, callback) {
+function setTask(appId, values, callback) {
     assert.strictEqual(typeof appId, 'string');
-    assert.strictEqual(typeof installationState, 'string');
-
-    if (typeof values === 'function') {
-        callback = values;
-        values = { };
-    } else {
-        assert.strictEqual(typeof values, 'object');
-        assert.strictEqual(typeof callback, 'function');
-    }
-
-    values.installationState = installationState;
-    values.installationProgress = '';
-
-    // Rules are:
-    // uninstall is allowed in any state
-    // force update is allowed in any state including pending_uninstall! (for better or worse)
-    // restore is allowed from installed or error state or currently restoring
-    // configure is allowed in installed state or currently configuring or in error state
-    // update and backup are allowed only in installed state
-
-    if (installationState === exports.ISTATE_PENDING_UNINSTALL || installationState === exports.ISTATE_PENDING_FORCE_UPDATE) {
-        updateWithConstraints(appId, values, '', callback);
-    } else if (installationState === exports.ISTATE_PENDING_RESTORE) {
-        updateWithConstraints(appId, values, 'AND (installationState = "installed" OR installationState = "error" OR installationState = "pending_restore")', callback);
-    } else if (installationState === exports.ISTATE_PENDING_UPDATE || installationState === exports.ISTATE_PENDING_BACKUP) {
-        updateWithConstraints(appId, values, 'AND installationState = "installed"', callback);
-    } else if (installationState === exports.ISTATE_PENDING_CONFIGURE) {
-        updateWithConstraints(appId, values, 'AND (installationState = "installed" OR installationState = "pending_configure" OR installationState = "error")', callback);
-    } else {
-        callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, 'invalid installationState'));
-    }
-}
-
-function setRunCommand(appId, runState, callback) {
-    assert.strictEqual(typeof appId, 'string');
-    assert.strictEqual(typeof runState, 'string');
+    assert.strictEqual(typeof values, 'object');
     assert.strictEqual(typeof callback, 'function');
 
-    var values = { runState: runState };
-    updateWithConstraints(appId, values, 'AND runState NOT LIKE "pending_%" AND installationState = "installed"', callback);
+    updateWithConstraints(appId, values, 'AND taskId IS NULL', callback);
 }
 
 function getAppStoreIds(callback) {
@@ -625,13 +546,13 @@ function getAddonConfigByAppId(appId, callback) {
     });
 }
 
-function getAppIdByAddonConfigValue(addonId, name, value, callback) {
+function getAppIdByAddonConfigValue(addonId, namePattern, value, callback) {
     assert.strictEqual(typeof addonId, 'string');
-    assert.strictEqual(typeof name, 'string');
+    assert.strictEqual(typeof namePattern, 'string');
     assert.strictEqual(typeof value, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    database.query('SELECT appId FROM appAddonConfigs WHERE addonId = ? AND name = ? AND value = ?', [ addonId, name, value ], function (error, results) {
+    database.query('SELECT appId FROM appAddonConfigs WHERE addonId = ? AND name LIKE ? AND value = ?', [ addonId, namePattern, value ], function (error, results) {
         if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
         if (results.length === 0) return callback(new DatabaseError(DatabaseError.NOT_FOUND));
 
@@ -639,44 +560,16 @@ function getAppIdByAddonConfigValue(addonId, name, value, callback) {
     });
 }
 
-function getAddonConfigByName(appId, addonId, name, callback) {
+function getAddonConfigByName(appId, addonId, namePattern, callback) {
     assert.strictEqual(typeof appId, 'string');
     assert.strictEqual(typeof addonId, 'string');
-    assert.strictEqual(typeof name, 'string');
+    assert.strictEqual(typeof namePattern, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    database.query('SELECT value FROM appAddonConfigs WHERE appId = ? AND addonId = ? AND name = ?', [ appId, addonId, name ], function (error, results) {
+    database.query('SELECT value FROM appAddonConfigs WHERE appId = ? AND addonId = ? AND name LIKE ?', [ appId, addonId, namePattern ], function (error, results) {
         if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
         if (results.length === 0) return callback(new DatabaseError(DatabaseError.NOT_FOUND));
 
         callback(null, 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) {
-        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/apphealthmonitor.js

@@ -36,16 +36,16 @@ function setHealth(app, health, callback) {
 
     let now = new Date(), healthTime = app.healthTime, curHealth = app.health;
 
-    if (health === appdb.HEALTH_HEALTHY) {
+    if (health === apps.HEALTH_HEALTHY) {
         healthTime = now;
-        if (curHealth && curHealth !== appdb.HEALTH_HEALTHY) { // app starts out with null health
+        if (curHealth && curHealth !== apps.HEALTH_HEALTHY) { // app starts out with null health
             debugApp(app, 'app switched from %s to healthy', curHealth);
 
             // do not send mails for dev apps
             if (!app.debugMode) eventlog.add(eventlog.ACTION_APP_UP, auditSource.HEALTH_MONITOR, { app: app });
         }
     } else if (Math.abs(now - healthTime) > UNHEALTHY_THRESHOLD) {
-        if (curHealth === appdb.HEALTH_HEALTHY) {
+        if (curHealth === apps.HEALTH_HEALTHY) {
             debugApp(app, 'marking as unhealthy since not seen for more than %s minutes', UNHEALTHY_THRESHOLD/(60 * 1000));
 
             // do not send mails for dev apps
@@ -72,7 +72,7 @@ function checkAppHealth(app, callback) {
     assert.strictEqual(typeof app, 'object');
     assert.strictEqual(typeof callback, 'function');
 
-    if (app.installationState !== appdb.ISTATE_INSTALLED || app.runState !== appdb.RSTATE_RUNNING) {
+    if (app.installationState !== apps.ISTATE_INSTALLED || app.runState !== apps.RSTATE_RUNNING) {
         debugApp(app, 'skipped. istate:%s rstate:%s', app.installationState, app.runState);
         return callback(null);
     }
@@ -82,34 +82,34 @@ function checkAppHealth(app, callback) {
     docker.inspect(app.containerId, function (error, data) {
         if (error || !data || !data.State) {
             debugApp(app, 'Error inspecting container');
-            return setHealth(app, appdb.HEALTH_ERROR, callback);
+            return setHealth(app, apps.HEALTH_ERROR, callback);
         }
 
         if (data.State.Running !== true) {
             debugApp(app, 'exited');
-            return setHealth(app, appdb.HEALTH_DEAD, callback);
+            return setHealth(app, apps.HEALTH_DEAD, callback);
         }
 
         // non-appstore apps may not have healthCheckPath
-        if (!manifest.healthCheckPath) return setHealth(app, appdb.HEALTH_HEALTHY, callback);
+        if (!manifest.healthCheckPath) return setHealth(app, apps.HEALTH_HEALTHY, callback);
 
         // poll through docker network instead of nginx to bypass any potential oauth proxy
         var healthCheckUrl = 'http://127.0.0.1:' + app.httpPort + manifest.healthCheckPath;
         superagent
             .get(healthCheckUrl)
             .set('Host', app.fqdn) // required for some apache configs with rewrite rules
-            .set('User-Agent', 'Mozilla') // required for some apps (e.g. minio)
+            .set('User-Agent', 'Mozilla (CloudronHealth)') // required for some apps (e.g. minio)
             .redirects(0)
             .timeout(HEALTHCHECK_INTERVAL)
             .end(function (error, res) {
                 if (error && !error.response) {
                     debugApp(app, 'not alive (network error): %s', error.message);
-                    setHealth(app, appdb.HEALTH_UNHEALTHY, callback);
+                    setHealth(app, apps.HEALTH_UNHEALTHY, callback);
                 } else if (res.statusCode >= 400) { // 2xx and 3xx are ok
                     debugApp(app, 'not alive : %s', error || res.status);
-                    setHealth(app, appdb.HEALTH_UNHEALTHY, callback);
+                    setHealth(app, apps.HEALTH_UNHEALTHY, callback);
                 } else {
-                    setHealth(app, appdb.HEALTH_HEALTHY, callback);
+                    setHealth(app, apps.HEALTH_HEALTHY, callback);
                 }
             });
     });
@@ -187,7 +187,7 @@ function processApp(callback) {
             if (error) console.error(error);
 
             var alive = result
-                .filter(function (a) { return a.installationState === appdb.ISTATE_INSTALLED && a.runState === appdb.RSTATE_RUNNING && a.health === appdb.HEALTH_HEALTHY; })
+                .filter(function (a) { return a.installationState === apps.ISTATE_INSTALLED && a.runState === apps.RSTATE_RUNNING && a.health === apps.HEALTH_HEALTHY; })
                 .map(function (a) { return (a.location || 'naked_domain') + '|' + a.manifest.id; }).join(', ');
 
             debug('apps alive: [%s]', alive);

src/apps.js

@@ -42,30 +42,56 @@ exports = module.exports = {
 
     getAppConfig: getAppConfig,
     getDataDir: getDataDir,
+    getIconPath: getIconPath,
 
     downloadFile: downloadFile,
     uploadFile: uploadFile,
 
-    setOwner: setOwner,
-    transferOwnership: transferOwnership,
-
     PORT_TYPE_TCP: 'tcp',
     PORT_TYPE_UDP: 'udp',
 
+    // error codes
+    ETASK_STOPPED: 'task_stopped', // user stopped a task
+    ETASK_CRASHED: 'task_crashed', // apptask crashed
+
+    // installation codes (keep in sync in UI)
+    ISTATE_PENDING_INSTALL: 'pending_install', // installs and fresh reinstalls
+    ISTATE_PENDING_CLONE: 'pending_clone', // clone
+    ISTATE_PENDING_CONFIGURE: 'pending_configure', // config (location, port) changes and on infra update
+    ISTATE_PENDING_UNINSTALL: 'pending_uninstall', // uninstallation
+    ISTATE_PENDING_RESTORE: 'pending_restore', // restore to previous backup or on upgrade
+    ISTATE_PENDING_UPDATE: 'pending_update', // update from installed state preserving data
+    ISTATE_PENDING_BACKUP: 'pending_backup', // backup the app. this is state because it blocks other operations
+    ISTATE_ERROR: 'error', // error executing last pending_* command
+    ISTATE_INSTALLED: 'installed', // app is installed
+
+    // run states
+    RSTATE_RUNNING: 'running',
+    RSTATE_PENDING_START: 'pending_start',
+    RSTATE_PENDING_STOP: 'pending_stop',
+    RSTATE_STOPPED: 'stopped', // app stopped by us
+
+    // health states (keep in sync in UI)
+    HEALTH_HEALTHY: 'healthy',
+    HEALTH_UNHEALTHY: 'unhealthy',
+    HEALTH_ERROR: 'error',
+    HEALTH_DEAD: 'dead',
+
     // exported for testing
     _validatePortBindings: validatePortBindings,
     _validateAccessRestriction: validateAccessRestriction,
-    _translatePortBindings: translatePortBindings
+    _translatePortBindings: translatePortBindings,
+    _MOCK_GET_BY_IP_APP_ID: ''
 };
 
 var appdb = require('./appdb.js'),
     appstore = require('./appstore.js'),
     AppstoreError = require('./appstore.js').AppstoreError,
+    appTaskManager = require('./apptaskmanager.js'),
     assert = require('assert'),
     async = require('async'),
     backups = require('./backups.js'),
     BackupsError = backups.BackupsError,
-    config = require('./config.js'),
     constants = require('./constants.js'),
     DatabaseError = require('./databaseerror.js'),
     debug = require('debug')('box:apps'),
@@ -84,13 +110,13 @@ var appdb = require('./appdb.js'),
     reverseProxy = require('./reverseproxy.js'),
     safe = require('safetydance'),
     semver = require('semver'),
+    settings = require('./settings.js'),
     spawn = require('child_process').spawn,
     split = require('split'),
     superagent = require('superagent'),
-    taskmanager = require('./taskmanager.js'),
+    tasks = require('./tasks.js'),
     TransformStream = require('stream').Transform,
     updateChecker = require('./updatechecker.js'),
-    url = require('url'),
     util = require('util'),
     uuid = require('uuid'),
     validator = require('validator'),
@@ -98,9 +124,10 @@ var appdb = require('./appdb.js'),
 
 // http://dustinsenos.com/articles/customErrorsInNode
 // http://code.google.com/p/v8/wiki/JavaScriptStackTraceApi
-function AppsError(reason, errorOrMessage) {
+function AppsError(reason, errorOrMessage, details) {
     assert.strictEqual(typeof reason, 'string');
     assert(errorOrMessage instanceof Error || typeof errorOrMessage === 'string' || typeof errorOrMessage === 'undefined');
+    assert(typeof details === 'object' || typeof details === 'undefined');
 
     Error.call(this);
     Error.captureStackTrace(this, this.constructor);
@@ -115,6 +142,8 @@ function AppsError(reason, errorOrMessage) {
         this.message = 'Internal error';
         this.nestedError = errorOrMessage;
     }
+
+    this.details = details || {};
 }
 util.inherits(AppsError, Error);
 AppsError.INTERNAL_ERROR = 'Internal Error';
@@ -123,11 +152,9 @@ AppsError.ALREADY_EXISTS = 'Already Exists';
 AppsError.NOT_FOUND = 'Not Found';
 AppsError.BAD_FIELD = 'Bad Field';
 AppsError.BAD_STATE = 'Bad State';
-AppsError.PORT_RESERVED = 'Port Reserved';
-AppsError.PORT_CONFLICT = 'Port Conflict';
 AppsError.PLAN_LIMIT = 'Plan Limit';
-AppsError.ACCESS_DENIED = 'Access denied';
-AppsError.BAD_CERTIFICATE = 'Invalid certificate';
+
+const NOOP_CALLBACK = function (error) { if (error) debug(error); };
 
 // validate the port bindings
 function validatePortBindings(portBindings, manifest) {
@@ -153,10 +180,10 @@ function validatePortBindings(portBindings, manifest) {
         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) */
-        config.get('ldapPort'), /* ldap server (lo) */
+        constants.PORT, /* app server (lo) */
+        constants.SYSADMIN_PORT, /* sysadmin app server (lo) */
+        constants.INTERNAL_SMTP_PORT, /* internal smtp port (lo) */
+        constants.LDAP_PORT,
         3306, /* mysql (lo) */
         4190, /* managesieve */
         8000, /* ESXi monitoring */
@@ -166,13 +193,12 @@ function validatePortBindings(portBindings, manifest) {
     if (!portBindings) return null;
 
     for (let portName in portBindings) {
-        if (!/^[a-zA-Z0-9_]+$/.test(portName)) return new AppsError(AppsError.BAD_FIELD, `${portName} is not a valid environment variable`);
+        if (!/^[a-zA-Z0-9_]+$/.test(portName)) return new AppsError(AppsError.BAD_FIELD, `${portName} is not a valid environment variable`, { field: 'portBindings', portName: portName });
 
         const hostPort = portBindings[portName];
-        if (!Number.isInteger(hostPort)) return new AppsError(AppsError.BAD_FIELD, `${hostPort} is not an integer`);
-        if (RESERVED_PORTS.indexOf(hostPort) !== -1) return new AppsError(AppsError.PORT_RESERVED, String(hostPort));
-        if (hostPort <= 1023 || hostPort > 65535) return new AppsError(AppsError.BAD_FIELD, `${hostPort} is not in permitted range`);
-
+        if (!Number.isInteger(hostPort)) return new AppsError(AppsError.BAD_FIELD, `${hostPort} is not an integer`, { field: 'portBindings', portName: portName });
+        if (RESERVED_PORTS.indexOf(hostPort) !== -1) return new AppsError(AppsError.BAD_FIELD, `Port ${hostPort} is reserved.`, { field: 'portBindings', portName: portName });
+        if (hostPort <= 1023 || hostPort > 65535) return new AppsError(AppsError.BAD_FIELD, `${hostPort} is not in permitted range`, { field: 'portBindings', portName: portName });
     }
 
     // it is OK if there is no 1-1 mapping between values in manifest.tcpPorts and portBindings. missing values implies
@@ -180,7 +206,7 @@ function validatePortBindings(portBindings, manifest) {
     const tcpPorts = manifest.tcpPorts || { };
     const udpPorts = manifest.udpPorts || { };
     for (let portName in portBindings) {
-        if (!(portName in tcpPorts) && !(portName in udpPorts)) return new AppsError(AppsError.BAD_FIELD, `Invalid portBindings ${portName}`);
+        if (!(portName in tcpPorts) && !(portName in udpPorts)) return new AppsError(AppsError.BAD_FIELD, `Invalid portBindings ${portName}`, { field: 'portBindings', portName: portName });
     }
 
     return null;
@@ -241,20 +267,6 @@ function validateMemoryLimit(manifest, memoryLimit) {
     return null;
 }
 
-// https://tools.ietf.org/html/rfc7034
-function validateXFrameOptions(xFrameOptions) {
-    assert.strictEqual(typeof xFrameOptions, 'string');
-
-    if (xFrameOptions === 'DENY') return null;
-    if (xFrameOptions === 'SAMEORIGIN') return null;
-
-    var parts = xFrameOptions.split(' ');
-    if (parts.length !== 2 || parts[0] !== 'ALLOW-FROM') return new AppsError(AppsError.BAD_FIELD, 'xFrameOptions must be "DENY", "SAMEORIGIN" or "ALLOW-FROM uri"' );
-
-    var uri = url.parse(parts[1]);
-    return (uri.protocol === 'http:' || uri.protocol === 'https:') ? null : new AppsError(AppsError.BAD_FIELD, 'xFrameOptions ALLOW-FROM uri must be a valid http[s] uri' );
-}
-
 function validateDebugMode(debugMode) {
     assert.strictEqual(typeof debugMode, 'object');
 
@@ -269,7 +281,7 @@ function validateRobotsTxt(robotsTxt) {
     if (robotsTxt === null) return null;
 
     // this is the nginx limit on inline strings. if we really hit this, we have to generate a file
-    if (robotsTxt.length > 4096) return new AppsError(AppsError.BAD_FIELD, 'robotsTxt must be less than 4096');
+    if (robotsTxt.length > 4096) return new AppsError(AppsError.BAD_FIELD, 'robotsTxt must be less than 4096', { field: 'robotsTxt' });
 
     // TODO: validate the robots file? we escape the string when templating the nginx config right now
 
@@ -287,26 +299,26 @@ function validateBackupFormat(format) {
 function validateLabel(label) {
     if (label === null) return null;
 
-    if (label.length > 128) return new AppsError(AppsError.BAD_FIELD, 'label must be less than 128');
+    if (label.length > 128) return new AppsError(AppsError.BAD_FIELD, 'label must be less than 128', { field: 'label' });
 
     return null;
 }
 
 function validateTags(tags) {
-    if (!Array.isArray(tags)) return new AppsError(AppsError.BAD_FIELD, 'tags must be an array of strings');
-    if (tags.length > 64) return new AppsError(AppsError.BAD_FIELD, 'Can only set up to 64 tags');
+    if (!Array.isArray(tags)) return new AppsError(AppsError.BAD_FIELD, 'tags must be an array of strings', { field: 'tags' });
+    if (tags.length > 64) return new AppsError(AppsError.BAD_FIELD, 'Can only set up to 64 tags', { field: 'tags' });
 
-    if (tags.some(tag => (!tag || typeof tag !== 'string'))) return new AppsError(AppsError.BAD_FIELD, 'tags must be an array of non-empty strings');
-    if (tags.some(tag => tag.length > 128)) return new AppsError(AppsError.BAD_FIELD, 'tag must be less than 128');
+    if (tags.some(tag => (!tag || typeof tag !== 'string'))) return new AppsError(AppsError.BAD_FIELD, 'tags must be an array of non-empty strings', { field: 'tags' });
+    if (tags.some(tag => tag.length > 128)) return new AppsError(AppsError.BAD_FIELD, 'tag must be less than 128', { field: 'tags' });
 
     return null;
 }
 
 function validateEnv(env) {
     for (let key in env) {
-        if (key.length > 512) return new AppsError(AppsError.BAD_FIELD, 'Max env var key length is 512');
+        if (key.length > 512) return new AppsError(AppsError.BAD_FIELD, 'Max env var key length is 512', { field: 'env', env: env });
         // http://pubs.opengroup.org/onlinepubs/000095399/basedefs/xbd_chap08.html
-        if (!/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(key)) return new AppsError(AppsError.BAD_FIELD, `"${key}" is not a valid environment variable`);
+        if (!/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(key)) return new AppsError(AppsError.BAD_FIELD, `"${key}" is not a valid environment variable`, { field: 'env', env: env });
     }
 
     return null;
@@ -315,48 +327,61 @@ function validateEnv(env) {
 function validateDataDir(dataDir) {
     if (dataDir === '') return null; // revert back to default dataDir
 
-    if (path.resolve(dataDir) !== dataDir) return new AppsError(AppsError.BAD_FIELD, 'dataDir must be an absolute path');
+    if (path.resolve(dataDir) !== dataDir) return new AppsError(AppsError.BAD_FIELD, 'dataDir must be an absolute path', { field: 'dataDir' });
 
     // nfs shares will have the directory mounted already
     let stat = safe.fs.lstatSync(dataDir);
     if (stat) {
-        if (!stat.isDirectory()) return new AppsError(AppsError.BAD_FIELD, `dataDir ${dataDir} is not a directory`);
+        if (!stat.isDirectory()) return new AppsError(AppsError.BAD_FIELD, `dataDir ${dataDir} is not a directory`, { field: 'dataDir' });
         let entries = safe.fs.readdirSync(dataDir);
-        if (!entries) return new AppsError(AppsError.BAD_FIELD, `dataDir ${dataDir} could not be listed`);
-        if (entries.length !== 0) return new AppsError(AppsError.BAD_FIELD, `dataDir ${dataDir} is not empty`);
+        if (!entries) return new AppsError(AppsError.BAD_FIELD, `dataDir ${dataDir} could not be listed`, { field: 'dataDir' });
+        if (entries.length !== 0) return new AppsError(AppsError.BAD_FIELD, `dataDir ${dataDir} is not empty`, { field: 'dataDir' });
     }
 
     // backup logic relies on paths not overlapping (because it recurses)
-    if (dataDir.startsWith(paths.APPS_DATA_DIR)) return new AppsError(AppsError.BAD_FIELD, `dataDir ${dataDir} cannot be inside apps data`);
+    if (dataDir.startsWith(paths.APPS_DATA_DIR)) return new AppsError(AppsError.BAD_FIELD, `dataDir ${dataDir} cannot be inside apps data`, { field: 'dataDir' });
 
     // if we made it this far, it cannot start with any of these realistically
     const fhs = [ '/bin', '/boot', '/etc', '/lib', '/lib32', '/lib64', '/proc', '/run', '/sbin', '/tmp', '/usr' ];
-    if (fhs.some((p) => dataDir.startsWith(p))) return new AppsError(AppsError.BAD_FIELD, `dataDir ${dataDir} cannot be placed inside this location`);
+    if (fhs.some((p) => dataDir.startsWith(p))) return new AppsError(AppsError.BAD_FIELD, `dataDir ${dataDir} cannot be placed inside this location`, { field: 'dataDir' });
 
     return null;
 }
 
-function getDuplicateErrorDetails(error, location, domainObject, portBindings) {
-    assert.strictEqual(error.reason, DatabaseError.ALREADY_EXISTS);
+function getDuplicateErrorDetails(errorMessage, location, domainObject, portBindings, alternateDomains) {
+    assert.strictEqual(typeof errorMessage, 'string');
     assert.strictEqual(typeof location, 'string');
     assert.strictEqual(typeof domainObject, 'object');
     assert.strictEqual(typeof portBindings, 'object');
+    assert(Array.isArray(alternateDomains));
 
-    var match = error.message.match(/ER_DUP_ENTRY: Duplicate entry '(.*)' for key '(.*)'/);
+    var match = errorMessage.match(/ER_DUP_ENTRY: Duplicate entry '(.*)' for key '(.*)'/);
     if (!match) {
-        debug('Unexpected SQL error message.', error);
-        return new AppsError(AppsError.INTERNAL_ERROR, error);
+        debug('Unexpected SQL error message.', errorMessage);
+        return new AppsError(AppsError.INTERNAL_ERROR, new Error(errorMessage));
     }
 
-    // check if the location conflicts
+    // check if the location or alternateDomains conflicts
     if (match[2] === 'subdomain') {
-        const fqdn = domains.fqdn(location, domainObject);
-        return new AppsError(AppsError.ALREADY_EXISTS, `subdomain '${fqdn}' is in use`);
+        // mysql reports a unique conflict with a dash: eg. domain:example.com subdomain:test => test-example.com
+        if (match[1] === `${location}-${domainObject.domain}`) {
+            return new AppsError(AppsError.ALREADY_EXISTS, `Domain '${domains.fqdn(location, domainObject)}' is in use`, { location: location, domain: domainObject.domain });
+        }
+
+        for (let d of alternateDomains) {
+            if  (match[1] !== `${d.subdomain}-${d.domain}`) continue;
+
+            return new AppsError(AppsError.ALREADY_EXISTS, `Alternate domain '${d.subdomain}.${d.domain}' is in use`, { location: d.subdomain, domain: d.domain });
+        }
     }
 
     // check if any of the port bindings conflict
     for (let portName in portBindings) {
-        if (portBindings[portName] === parseInt(match[1])) return new AppsError(AppsError.PORT_CONFLICT, match[1]);
+        if (portBindings[portName] === parseInt(match[1])) return new AppsError(AppsError.ALREADY_EXISTS, `Port ${match[1]} is reserved`, { portName });
+    }
+
+    if (match[2] === 'dataDir') {
+        return new AppsError(AppsError.BAD_FIELD, `Data directory ${match[1]} is in use`, { field: 'dataDir' });
     }
 
     return new AppsError(AppsError.ALREADY_EXISTS, `${match[2]} '${match[1]}' is in use`);
@@ -372,7 +397,7 @@ function getAppConfig(app) {
         accessRestriction: app.accessRestriction,
         portBindings: app.portBindings,
         memoryLimit: app.memoryLimit,
-        xFrameOptions: app.xFrameOptions || 'SAMEORIGIN',
+
         robotsTxt: app.robotsTxt,
         sso: app.sso,
         alternateDomains: app.alternateDomains || [],
@@ -387,23 +412,46 @@ function getDataDir(app, dataDir) {
 
 function removeInternalFields(app) {
     return _.pick(app,
-        'id', 'appStoreId', 'installationState', 'installationProgress', 'runState', 'health',
+        'id', 'appStoreId', 'installationState', 'error', 'runState', 'health', 'taskId',
         'location', 'domain', 'fqdn', 'mailboxName',
-        'accessRestriction', 'manifest', 'portBindings', 'iconUrl', 'memoryLimit', 'xFrameOptions',
+        'accessRestriction', 'manifest', 'portBindings', 'iconUrl', 'memoryLimit',
         'sso', 'debugMode', 'robotsTxt', 'enableBackup', 'creationTime', 'updateTime', 'ts', 'tags',
-        'label', 'alternateDomains', 'ownerId', 'env', 'enableAutomaticUpdate', 'dataDir');
+        'label', 'alternateDomains', 'env', 'enableAutomaticUpdate', 'dataDir');
 }
 
 // non-admins can only see these
 function removeRestrictedFields(app) {
     return _.pick(app,
-        'id', 'appStoreId', 'installationState', 'installationProgress', 'runState', 'health', 'ownerId',
+        'id', 'appStoreId', 'installationState', 'error', 'runState', 'health', 'taskId',
         'location', 'domain', 'fqdn', 'manifest', 'portBindings', 'iconUrl', 'creationTime', 'ts', 'tags', 'label');
 }
 
 function getIconUrlSync(app) {
-    var iconPath = paths.APP_ICONS_DIR + '/' + app.id + '.png';
-    return fs.existsSync(iconPath) ? '/api/v1/apps/' + app.id + '/icon' : null;
+    const iconUrl = '/api/v1/apps/' + app.id + '/icon';
+
+    const userIconPath = `${paths.APP_ICONS_DIR}/${app.id}.user.png`;
+    if (safe.fs.existsSync(userIconPath)) return iconUrl;
+
+    const appstoreIconPath = `${paths.APP_ICONS_DIR}/${app.id}.png`;
+    if (safe.fs.existsSync(appstoreIconPath)) return iconUrl;
+
+    return null;
+}
+
+function getIconPath(appId, options, callback) {
+    assert.strictEqual(typeof appId, 'string');
+    assert.strictEqual(typeof options, 'object');
+    assert.strictEqual(typeof callback, 'function');
+
+    if (!options.original) {
+        const userIconPath = `${paths.APP_ICONS_DIR}/${appId}.user.png`;
+        if (safe.fs.existsSync(userIconPath)) return callback(null, userIconPath);
+    }
+
+    const appstoreIconPath = `${paths.APP_ICONS_DIR}/${appId}.png`;
+    if (safe.fs.existsSync(appstoreIconPath)) return callback(null, appstoreIconPath);
+
+    callback(new AppsError(AppsError.NOT_FOUND, 'No icon'));
 }
 
 function postProcess(app, domainObjectMap) {
@@ -486,14 +534,25 @@ function getByContainerId(containerId, callback) {
     });
 }
 
+// returns the app associated with this IP (app or scheduler)
 function getByIpAddress(ip, callback) {
     assert.strictEqual(typeof ip, 'string');
     assert.strictEqual(typeof callback, 'function');
 
+    // this is only used by the ldap test. the apps tests still uses proper docker
+    if (constants.TEST && exports._MOCK_GET_BY_IP_APP_ID) return get(exports._MOCK_GET_BY_IP_APP_ID, callback);
+
     docker.getContainerIdByIp(ip, function (error, containerId) {
         if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
 
-        getByContainerId(containerId, callback);
+        docker.inspect(containerId, function (error, result) {
+            if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
+
+            const appId = safe.query(result, 'Config.Labels.appId', null);
+            if (!appId) return callback(new AppsError(AppsError.NOT_FOUND, 'No such app'));
+
+            get(appId, callback);
+        });
     });
 }
 
@@ -547,7 +606,7 @@ function downloadManifest(appStoreId, manifest, callback) {
 
     var parts = appStoreId.split('@');
 
-    var url = config.apiServerOrigin() + '/api/v1/apps/' + parts[0] + (parts[1] ? '/versions/' + parts[1] : '');
+    var url = settings.apiServerOrigin() + '/api/v1/apps/' + parts[0] + (parts[1] ? '/versions/' + parts[1] : '');
 
     debug('downloading manifest from %s', url);
 
@@ -564,6 +623,41 @@ function mailboxNameForLocation(location, manifest) {
     return (location ? location : manifest.title.toLowerCase().replace(/[^a-zA-Z0-9]/g, '')) + '.app';
 }
 
+function scheduleTask(appId, args, values, callback) {
+    assert.strictEqual(typeof appId, 'string');
+    assert.strictEqual(typeof args, 'object');
+    assert.strictEqual(typeof values, 'object');
+    assert.strictEqual(typeof callback, 'function');
+
+    assert(values.installationState || values.runState);
+
+    tasks.add(tasks.TASK_APP, [ appId, args ], function (error, taskId) {
+        if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
+
+        values.error = null;
+        values.taskId = taskId;
+
+        appdb.setTask(appId, values, function (error) {
+            if (error && error.reason === DatabaseError.ALREADY_EXISTS) return callback(new AppsError(AppsError.ALREADY_EXISTS, error.message));
+            if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new AppsError(AppsError.BAD_STATE, 'Another task is scheduled for this app')); // could be because app went away OR a taskId exists
+            if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
+
+            appTaskManager.scheduleTask(appId, taskId, function (error) {
+                debug(`scheduleTask: task ${taskId} of $${appId} completed`);
+                if (error && (error.code === tasks.ECRASHED || error.code === tasks.ESTOPPED)) { // if task crashed, update the error
+                    debug(`Apptask crashed/stopped: ${error.message}`);
+                    const code = error.crashed ? exports.ETASK_CRASHED : exports.ETASK_STOPPED;
+                    appdb.update(appId, { installationState: exports.ISTATE_ERROR, error: { code: code, message: error.message }, taskId: null }, NOOP_CALLBACK);
+                } else if (values.installationState !== exports.ISTATE_PENDING_UNINSTALL) { // clear out taskId since it's done
+                    appdb.update(appId, { taskId: null }, NOOP_CALLBACK);
+                }
+            });
+
+            callback(null, { taskId });
+        });
+    });
+}
+
 function install(data, user, auditSource, callback) {
     assert(data && typeof data === 'object');
     assert(user && typeof user === 'object');
@@ -578,7 +672,6 @@ function install(data, user, auditSource, callback) {
         cert = data.cert || null,
         key = data.key || null,
         memoryLimit = data.memoryLimit || 0,
-        xFrameOptions = data.xFrameOptions || 'SAMEORIGIN',
         sso = 'sso' in data ? data.sso : null,
         debugMode = data.debugMode || null,
         robotsTxt = data.robotsTxt || null,
@@ -586,7 +679,6 @@ function install(data, user, auditSource, callback) {
         enableAutomaticUpdate = 'enableAutomaticUpdate' in data ? data.enableAutomaticUpdate : true,
         backupId = data.backupId || null,
         backupFormat = data.backupFormat || 'tgz',
-        ownerId = data.ownerId,
         alternateDomains = data.alternateDomains || [],
         env = data.env || {},
         mailboxName = data.mailboxName || '',
@@ -613,9 +705,6 @@ function install(data, user, auditSource, callback) {
         error = validateMemoryLimit(manifest, memoryLimit);
         if (error) return callback(error);
 
-        error = validateXFrameOptions(xFrameOptions);
-        if (error) return callback(error);
-
         error = validateDebugMode(debugMode);
         if (error) return callback(error);
 
@@ -640,7 +729,7 @@ function install(data, user, auditSource, callback) {
 
         if (mailboxName) {
             error = mail.validateName(mailboxName);
-            if (error) return callback(error);
+            if (error) return callback(new AppsError(AppsError.BAD_FIELD, error.message, { field: 'mailboxName' }));
         } else {
             mailboxName = mailboxNameForLocation(location, manifest);
         }
@@ -648,7 +737,7 @@ function install(data, user, auditSource, callback) {
         var appId = uuid.v4();
 
         if (icon) {
-            if (!validator.isBase64(icon)) return callback(new AppsError(AppsError.BAD_FIELD, 'icon is not base64'));
+            if (!validator.isBase64(icon)) return callback(new AppsError(AppsError.BAD_FIELD, 'icon is not base64', { field: 'icon' }));
 
             if (!safe.fs.writeFileSync(path.join(paths.APP_ICONS_DIR, appId + '.png'), Buffer.from(icon, 'base64'))) {
                 return callback(new AppsError(AppsError.INTERNAL_ERROR, 'Error saving icon:' + safe.error.message));
@@ -660,11 +749,11 @@ function install(data, user, auditSource, callback) {
             if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, 'Could not get domain info:' + error.message));
 
             error = domains.validateHostname(location, domainObject);
-            if (error) return callback(new AppsError(AppsError.BAD_FIELD, 'Bad location: ' + error.message));
+            if (error) return callback(new AppsError(AppsError.BAD_FIELD, 'Bad location: ' + error.message, { field: 'location' }));
 
             if (cert && key) {
                 error = reverseProxy.validateCertificate(location, domainObject, { cert, key });
-                if (error) return callback(new AppsError(AppsError.BAD_CERTIFICATE, error.message));
+                if (error) return callback(new AppsError(AppsError.BAD_FIELD, error.message, { field: 'cert' }));
             }
 
             debug('Will install app with id : ' + appId);
@@ -672,11 +761,9 @@ function install(data, user, auditSource, callback) {
             var data = {
                 accessRestriction: accessRestriction,
                 memoryLimit: memoryLimit,
-                xFrameOptions: xFrameOptions,
                 sso: sso,
                 debugMode: debugMode,
                 mailboxName: mailboxName,
-                restoreConfig: backupId ? { backupId: backupId, backupFormat: backupFormat } : null,
                 enableBackup: enableBackup,
                 enableAutomaticUpdate: enableAutomaticUpdate,
                 robotsTxt: robotsTxt,
@@ -684,8 +771,8 @@ function install(data, user, auditSource, callback) {
                 env: env
             };
 
-            appdb.add(appId, appStoreId, manifest, location, domain, ownerId, translatePortBindings(portBindings, manifest), data, function (error) {
-                if (error && error.reason === DatabaseError.ALREADY_EXISTS) return callback(getDuplicateErrorDetails(error, location, domainObject, portBindings));
+            appdb.add(appId, appStoreId, manifest, location, domain, translatePortBindings(portBindings, manifest), data, function (error) {
+                if (error && error.reason === DatabaseError.ALREADY_EXISTS) return callback(getDuplicateErrorDetails(error.message, location, domainObject, portBindings, data.alternateDomains));
                 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));
 
@@ -698,15 +785,14 @@ function install(data, user, auditSource, callback) {
                         if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, 'Error setting cert: ' + error.message));
                     }
 
-                    taskmanager.restartAppTask(appId);
+                    const restoreConfig = backupId ? { backupId: backupId, backupFormat: backupFormat } : null;
 
-                    // fetch fresh app object for eventlog
-                    get(appId, function (error, result) {
+                    scheduleTask(appId, { restoreConfig }, { installationState: exports.ISTATE_PENDING_INSTALL }, function (error, result) {
                         if (error) return callback(error);
 
                         eventlog.add(eventlog.ACTION_APP_INSTALL, auditSource, { appId: appId, app: result });
 
-                        callback(null, { id : appId });
+                        callback(null, { id : appId, taskId: result.taskId });
                     });
                 });
             });
@@ -723,8 +809,10 @@ function configure(appId, data, user, auditSource, callback) {
 
     get(appId, function (error, app) {
         if (error) return callback(error);
+        if (app.taskId) return callback(new AppsError(AppsError.BAD_STATE, `Not allowed in this app state : ${app.installationState} / ${app.runState}`));
+
+        let domain, location, portBindings, values = { installationState: exports.ISTATE_PENDING_CONFIGURE };
 
-        let domain, location, portBindings, values = { };
         if ('location' in data && 'domain' in data) {
             location = values.location = data.location.toLowerCase();
             domain = values.domain = data.domain.toLowerCase();
@@ -754,12 +842,6 @@ function configure(appId, data, user, auditSource, callback) {
             if (error) return callback(error);
         }
 
-        if ('xFrameOptions' in data) {
-            values.xFrameOptions = data.xFrameOptions;
-            error = validateXFrameOptions(values.xFrameOptions);
-            if (error) return callback(error);
-        }
-
         if ('debugMode' in data) {
             values.debugMode = data.debugMode;
             error = validateDebugMode(values.debugMode);
@@ -775,7 +857,7 @@ function configure(appId, data, user, auditSource, callback) {
         if ('mailboxName' in data) {
             if (data.mailboxName) {
                 error = mail.validateName(data.mailboxName);
-                if (error) return callback(error);
+                if (error) return callback(new AppsError(AppsError.BAD_FIELD, error.message, { field: 'mailboxName' }));
                 values.mailboxName = data.mailboxName;
             } else {
                 values.mailboxName = mailboxNameForLocation(location, app.manifest);
@@ -813,18 +895,30 @@ function configure(appId, data, user, auditSource, callback) {
             values.tags = data.tags;
         }
 
+        if ('icon' in data) {
+            if (data.icon) {
+                if (!validator.isBase64(data.icon)) return callback(new AppsError(AppsError.BAD_FIELD, 'icon is not base64', { field: 'icon' }));
+
+                if (!safe.fs.writeFileSync(path.join(paths.APP_ICONS_DIR, appId + '.user.png'), Buffer.from(data.icon, 'base64'))) {
+                    return callback(new AppsError(AppsError.INTERNAL_ERROR, 'Error saving icon:' + safe.error.message));
+                }
+            } else {
+                safe.fs.unlinkSync(path.join(paths.APP_ICONS_DIR, appId + '.user.png'));
+            }
+        }
+
         domains.get(domain, function (error, domainObject) {
             if (error && error.reason === DomainsError.NOT_FOUND) return callback(new AppsError(AppsError.NOT_FOUND, 'No such domain'));
             if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, 'Could not get domain info:' + error.message));
 
             error = domains.validateHostname(location, domainObject);
-            if (error) return callback(new AppsError(AppsError.BAD_FIELD, 'Bad location: ' + error.message));
+            if (error) return callback(new AppsError(AppsError.BAD_FIELD, 'Bad location: ' + error.message, { field: 'location' }));
 
             // save cert to boxdata/certs. TODO: move this to apptask when we have a real task queue
             if ('cert' in data && 'key' in data) {
                 if (data.cert && data.key) {
                     error = reverseProxy.validateCertificate(location, domainObject, { cert: data.cert, key: data.key });
-                    if (error) return callback(new AppsError(AppsError.BAD_CERTIFICATE, error.message));
+                    if (error) return callback(new AppsError(AppsError.BAD_FIELD, error.message, { field: 'cert' }));
                 }
 
                 error = reverseProxy.setAppCertificateSync(location, domainObject, { cert: data.cert, key: data.key });
@@ -834,25 +928,15 @@ function configure(appId, data, user, auditSource, callback) {
             if ('enableBackup' in data) values.enableBackup = data.enableBackup;
             if ('enableAutomaticUpdate' in data) values.enableAutomaticUpdate = data.enableAutomaticUpdate;
 
-            values.oldConfig = getAppConfig(app);
+            debug(`configure: id:${appId}`);
 
-            debug('Will configure app with id:%s values:%j', appId, values);
+            scheduleTask(appId, { oldConfig: getAppConfig(app) }, values, function (error, result) {
+                if (error && error.reason === AppsError.ALREADY_EXISTS) error = getDuplicateErrorDetails(error.message, location, domainObject, portBindings, data.alternateDomains);
+                if (error) return callback(error);
 
-            appdb.setInstallationCommand(appId, appdb.ISTATE_PENDING_CONFIGURE, values, function (error) {
-                if (error && error.reason === DatabaseError.ALREADY_EXISTS) return callback(getDuplicateErrorDetails(error, location, domainObject, portBindings));
-                if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new AppsError(AppsError.BAD_STATE));
-                if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
+                eventlog.add(eventlog.ACTION_APP_CONFIGURE, auditSource, { appId: appId, app: result });
 
-                taskmanager.restartAppTask(appId);
-
-                // fetch fresh app object for eventlog
-                get(appId, function (error, result) {
-                    if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
-
-                    eventlog.add(eventlog.ACTION_APP_CONFIGURE, auditSource, { appId: appId, app: result });
-
-                    callback(null);
-                });
+                callback(null, { taskId: result.taskId });
             });
         });
     });
@@ -864,15 +948,19 @@ function update(appId, data, auditSource, callback) {
     assert.strictEqual(typeof auditSource, 'object');
     assert.strictEqual(typeof callback, 'function');
 
-    debug('Will update app with id:%s', appId);
+    debug(`update: id:${appId}`);
 
     get(appId, function (error, app) {
         if (error) return callback(error);
+        if (app.taskId) return callback(new AppsError(AppsError.BAD_STATE, `Not allowed in this app state : ${app.installationState} / ${app.runState}`));
 
         downloadManifest(data.appStoreId, data.manifest, function (error, appStoreId, manifest) {
             if (error) return callback(error);
 
-            var updateConfig = { };
+            var updateConfig = {
+                skipNotification: data.force,
+                skipBackup: data.force
+            };
 
             error = manifestFormat.parse(manifest);
             if (error) return callback(new AppsError(AppsError.BAD_FIELD, 'Manifest error:' + error.message));
@@ -899,13 +987,13 @@ function update(appId, data, auditSource, callback) {
 
             if ('icon' in data) {
                 if (data.icon) {
-                    if (!validator.isBase64(data.icon)) return callback(new AppsError(AppsError.BAD_FIELD, 'icon is not base64'));
+                    if (!validator.isBase64(data.icon)) return callback(new AppsError(AppsError.BAD_FIELD, 'icon is not base64', { field: 'icon' }));
 
-                    if (!safe.fs.writeFileSync(path.join(paths.APP_ICONS_DIR, appId + '.png'), Buffer.from(data.icon, 'base64'))) {
+                    if (!safe.fs.writeFileSync(path.join(paths.APP_ICONS_DIR, appId + '.user.png'), Buffer.from(data.icon, 'base64'))) {
                         return callback(new AppsError(AppsError.INTERNAL_ERROR, 'Error saving icon:' + safe.error.message));
                     }
                 } else {
-                    safe.fs.unlinkSync(path.join(paths.APP_ICONS_DIR, appId + '.png'));
+                    safe.fs.unlinkSync(path.join(paths.APP_ICONS_DIR, appId + '.user.png'));
                 }
             }
 
@@ -918,18 +1006,15 @@ function update(appId, data, auditSource, callback) {
                 updateConfig.memoryLimit = updateConfig.manifest.memoryLimit;
             }
 
-            appdb.setInstallationCommand(appId, data.force ? appdb.ISTATE_PENDING_FORCE_UPDATE : appdb.ISTATE_PENDING_UPDATE, { updateConfig: updateConfig }, function (error) {
-                if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new AppsError(AppsError.BAD_STATE)); // might be a bad guess
-                if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
-
-                taskmanager.restartAppTask(appId);
+            scheduleTask(appId, { updateConfig: updateConfig }, { installationState: exports.ISTATE_PENDING_UPDATE }, function (error, result) {
+                if (error) return callback(error);
 
                 eventlog.add(eventlog.ACTION_APP_UPDATE, auditSource, { appId: appId, toManifest: manifest, fromManifest: app.manifest, force: data.force, app: app });
 
                 // clear update indicator, if update fails, it will come back through the update checker
                 updateChecker.resetAppUpdateInfo(appId);
 
-                callback(null);
+                callback(null, { taskId: result.taskId });
             });
         });
     });
@@ -999,6 +1084,7 @@ function restore(appId, data, auditSource, callback) {
 
     get(appId, function (error, app) {
         if (error) return callback(error);
+        if (app.taskId) return callback(new AppsError(AppsError.BAD_STATE, `Not allowed in this app state : ${app.installationState} / ${app.runState}`));
 
         // for empty or null backupId, use existing manifest to mimic a reinstall
         var func = data.backupId ? backups.get.bind(null, data.backupId) : function (next) { return next(null, { manifest: app.manifest }); };
@@ -1014,22 +1100,18 @@ function restore(appId, data, auditSource, callback) {
             error = checkManifestConstraints(backupInfo.manifest);
             if (error) return callback(error);
 
-            var values = {
-                restoreConfig: data.backupId ? { backupId: data.backupId, backupFormat: backupInfo.format } : null, // when null, apptask simply reinstalls
-                manifest: backupInfo.manifest,
-
-                oldConfig: getAppConfig(app)
+            let values = {
+                installationState: exports.ISTATE_PENDING_RESTORE,
+                manifest: backupInfo.manifest
             };
 
-            appdb.setInstallationCommand(appId, appdb.ISTATE_PENDING_RESTORE, values, function (error) {
-                if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new AppsError(AppsError.BAD_STATE)); // might be a bad guess
-                if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
-
-                taskmanager.restartAppTask(appId);
+            const restoreConfig = data.backupId ? { backupId: data.backupId, backupFormat: backupInfo.format, oldManifest: app.manifest } : null; // when null, apptask simply reinstalls
+            scheduleTask(appId, { restoreConfig }, values, function (error, result) {
+                if (error) return callback(error);
 
                 eventlog.add(eventlog.ACTION_APP_RESTORE, auditSource, { app: app, backupId: backupInfo.id, fromManifest: app.manifest, toManifest: backupInfo.manifest });
 
-                callback(null);
+                callback(null, { taskId: result.taskId });
             });
         });
     });
@@ -1071,14 +1153,12 @@ function clone(appId, data, user, auditSource, callback) {
         domain = data.domain.toLowerCase(),
         portBindings = data.portBindings || null,
         backupId = data.backupId,
-        ownerId = data.ownerId,
         mailboxName = data.mailboxName || '';
 
     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);
@@ -1101,7 +1181,7 @@ function clone(appId, data, user, auditSource, callback) {
 
             if (mailboxName) {
                 error = mail.validateName(mailboxName);
-                if (error) return callback(error);
+                if (error) return callback(new AppsError(AppsError.BAD_FIELD, error.message, { field: 'mailboxName' }));
             } else {
                 mailboxName = mailboxNameForLocation(location, manifest);
             }
@@ -1116,11 +1196,9 @@ function clone(appId, data, user, auditSource, callback) {
                 var newAppId = uuid.v4();
 
                 var data = {
-                    installationState: appdb.ISTATE_PENDING_CLONE,
+                    installationState: exports.ISTATE_PENDING_CLONE,
                     memoryLimit: app.memoryLimit,
                     accessRestriction: app.accessRestriction,
-                    xFrameOptions: app.xFrameOptions,
-                    restoreConfig: { backupId: backupId, backupFormat: backupInfo.format },
                     sso: !!app.sso,
                     mailboxName: mailboxName,
                     enableBackup: app.enableBackup,
@@ -1128,22 +1206,21 @@ function clone(appId, data, user, auditSource, callback) {
                     env: app.env
                 };
 
-                appdb.add(newAppId, app.appStoreId, manifest, location, domain, ownerId, translatePortBindings(portBindings, manifest), data, function (error) {
-                    if (error && error.reason === DatabaseError.ALREADY_EXISTS) return callback(getDuplicateErrorDetails(error, location, domainObject, portBindings));
+                appdb.add(newAppId, app.appStoreId, manifest, location, domain, translatePortBindings(portBindings, manifest), data, function (error) {
+                    if (error && error.reason === DatabaseError.ALREADY_EXISTS) return callback(getDuplicateErrorDetails(error.message, location, domainObject, portBindings, []));
                     if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
 
                     purchaseApp({ appId: newAppId, appstoreId: app.appStoreId, manifestId: manifest.id }, function (error) {
                         if (error) return callback(error);
 
-                        taskmanager.restartAppTask(newAppId);
+                        const restoreConfig = { backupId: backupId, backupFormat: backupInfo.format };
 
-                        // fetch fresh app object for eventlog
-                        get(appId, function (error, result) {
-                            if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
+                        scheduleTask(newAppId, { restoreConfig }, { installationState: exports.ISTATE_PENDING_CLONE }, function (error, result) {
+                            if (error) return callback(error);
 
                             eventlog.add(eventlog.ACTION_APP_CLONE, auditSource, { appId: newAppId, oldAppId: appId, backupId: backupId, oldApp: app, newApp: result });
 
-                            callback(null, { id : newAppId });
+                            callback(null, { id: newAppId, taskId: result.taskId });
                         });
                     });
                 });
@@ -1157,10 +1234,11 @@ function uninstall(appId, auditSource, callback) {
     assert.strictEqual(typeof auditSource, 'object');
     assert.strictEqual(typeof callback, 'function');
 
-    debug('Will uninstall app with id:%s', appId);
+    debug(`Will uninstall app with id : ${appId}`);
 
     get(appId, function (error, app) {
         if (error) return callback(error);
+        if (app.taskId) return callback(new AppsError(AppsError.BAD_STATE, `Not allowed in this app state : ${app.installationState} / ${app.runState}`));
 
         appstore.unpurchaseApp(appId, { appstoreId: app.appStoreId, manifestId: app.manifest.id }, function (error) {
             if (error && error.reason === AppstoreError.NOT_FOUND) return callback(new AppsError(AppsError.NOT_FOUND));
@@ -1169,15 +1247,12 @@ function uninstall(appId, auditSource, callback) {
             if (error && error.reason === AppstoreError.EXTERNAL_ERROR) return callback(new AppsError(AppsError.EXTERNAL_ERROR, error.message));
             if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
 
-            taskmanager.stopAppTask(appId, function () {
-                appdb.setInstallationCommand(appId, appdb.ISTATE_PENDING_UNINSTALL, function (error) {
-                    if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new AppsError(AppsError.NOT_FOUND, 'No such app'));
-                    if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
+            scheduleTask(appId, { /* args */ }, { installationState: exports.ISTATE_PENDING_UNINSTALL }, function (error, result) {
+                if (error) return callback(error);
 
-                    eventlog.add(eventlog.ACTION_APP_UNINSTALL, auditSource, { appId: appId, app: app });
+                eventlog.add(eventlog.ACTION_APP_UNINSTALL, auditSource, { appId: appId, app: result });
 
-                    taskmanager.startAppTask(appId, callback);
-                });
+                callback(null, { taskId: result.taskId });
             });
         });
     });
@@ -1189,13 +1264,11 @@ function start(appId, callback) {
 
     debug('Will start app with id:%s', appId);
 
-    appdb.setRunCommand(appId, appdb.RSTATE_PENDING_START, function (error) {
-        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new AppsError(AppsError.BAD_STATE)); // might be a bad guess
-        if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
+    get(appId, function (error, app) {
+        if (error) return callback(error);
+        if (app.taskId) return callback(new AppsError(AppsError.BAD_STATE, `Not allowed in this app state : ${app.installationState} / ${app.runState}`));
 
-        taskmanager.restartAppTask(appId);
-
-        callback(null);
+        scheduleTask(appId, { /* args */ }, { runState: exports.RSTATE_PENDING_START }, callback);
     });
 }
 
@@ -1205,26 +1278,26 @@ function stop(appId, callback) {
 
     debug('Will stop app with id:%s', appId);
 
-    appdb.setRunCommand(appId, appdb.RSTATE_PENDING_STOP, function (error) {
-        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new AppsError(AppsError.BAD_STATE)); // might be a bad guess
-        if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
+    get(appId, function (error, app) {
+        if (error) return callback(error);
+        if (app.taskId) return callback(new AppsError(AppsError.BAD_STATE, `Not allowed in this app state : ${app.installationState} / ${app.runState}`));
 
-        taskmanager.restartAppTask(appId);
-
-        callback(null);
+        scheduleTask(appId, { /* args */ }, { runState: exports.RSTATE_PENDING_STOP }, callback);
     });
 }
 
 function checkManifestConstraints(manifest) {
     assert(manifest && typeof manifest === 'object');
 
+    if (manifest.manifestVersion > 2) return new AppsError(AppsError.BAD_FIELD, 'Manifest version must be <= 2');
+
     if (!manifest.dockerImage) return new AppsError(AppsError.BAD_FIELD, 'Missing dockerImage'); // dockerImage is optional in manifest
 
-    if (semver.valid(manifest.maxBoxVersion) && semver.gt(config.version(), manifest.maxBoxVersion)) {
+    if (semver.valid(manifest.maxBoxVersion) && semver.gt(constants.VERSION, manifest.maxBoxVersion)) {
         return new AppsError(AppsError.BAD_FIELD, 'Box version exceeds Apps maxBoxVersion');
     }
 
-    if (semver.valid(manifest.minBoxVersion) && semver.gt(manifest.minBoxVersion, config.version())) {
+    if (semver.valid(manifest.minBoxVersion) && semver.gt(manifest.minBoxVersion, constants.VERSION)) {
         return new AppsError(AppsError.BAD_FIELD, 'App version requires a new platform version');
     }
 
@@ -1242,7 +1315,7 @@ function exec(appId, options, callback) {
     get(appId, function (error, app) {
         if (error) return callback(error);
 
-        if (app.installationState !== appdb.ISTATE_INSTALLED || app.runState !== appdb.RSTATE_RUNNING) {
+        if (app.installationState !== exports.ISTATE_INSTALLED || app.runState !== exports.RSTATE_RUNNING) {
             return callback(new AppsError(AppsError.BAD_STATE, 'App not installed or running'));
         }
 
@@ -1349,22 +1422,18 @@ function backup(appId, callback) {
     assert.strictEqual(typeof appId, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    appdb.exists(appId, function (error, exists) {
-        if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
-        if (!exists) return callback(new AppsError(AppsError.NOT_FOUND));
+    get(appId, function (error, app) {
+        if (error) return callback(error);
+        if (app.taskId) return callback(new AppsError(AppsError.BAD_STATE, `Not allowed in this app state : ${app.installationState} / ${app.runState}`));
 
-        appdb.setInstallationCommand(appId, appdb.ISTATE_PENDING_BACKUP, function (error) {
-            if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new AppsError(AppsError.BAD_STATE)); // might be a bad guess
-            if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
+        scheduleTask(appId, { /* args */ }, { installationState: exports.ISTATE_PENDING_BACKUP }, (error, result) => {
+            if (error) return callback(error);
 
-            taskmanager.restartAppTask(appId);
-
-            callback(null);
+            callback(null, { taskId: result.taskId });
         });
     });
 }
 
-
 function listBackups(page, perPage, appId, callback) {
     assert(typeof page === 'number' && page > 0);
     assert(typeof perPage === 'number' && perPage > 0);
@@ -1392,14 +1461,14 @@ function restoreInstalledApps(callback) {
 
         async.map(apps, function (app, iteratorDone) {
             backups.getByAppIdPaged(1, 1, app.id, function (error, results) {
-                var restoreConfig = !error && results.length ? { backupId: results[0].id, backupFormat: results[0].format } : null;
+                const restoreConfig = !error && results.length ? { backupId: results[0].id, backupFormat: results[0].format, oldManifest: app.manifest } : null;
 
                 debug(`marking ${app.fqdn} for restore using restore config ${JSON.stringify(restoreConfig)}`);
 
-                appdb.setInstallationCommand(app.id, appdb.ISTATE_PENDING_RESTORE, { restoreConfig: restoreConfig, oldConfig: getAppConfig(app) }, function (error) {
+                appdb.update(app.id, { taskId: null }, function (error) { // clear any stale taskId
                     if (error) debug(`Error marking ${app.fqdn} for restore: ${JSON.stringify(error)}`);
 
-                    iteratorDone(); // always succeed
+                    scheduleTask(app.id, { restoreConfig }, { installationState: exports.ISTATE_PENDING_RESTORE }, () => iteratorDone()); // always succeed
                 });
             });
         }, callback);
@@ -1415,10 +1484,10 @@ function configureInstalledApps(callback) {
         async.map(apps, function (app, iteratorDone) {
             debug(`marking ${app.fqdn} for reconfigure`);
 
-            appdb.setInstallationCommand(app.id, appdb.ISTATE_PENDING_CONFIGURE, { oldConfig: null }, function (error) {
+            appdb.update(app.id, { taskId: null }, function (error) { // clear any stale taskId
                 if (error) debug(`Error marking ${app.fqdn} for reconfigure: ${JSON.stringify(error)}`);
 
-                iteratorDone(); // always succeed
+                scheduleTask(app.id, { oldConfig: getAppConfig(app) }, { installationState: exports.ISTATE_PENDING_CONFIGURE },  () => iteratorDone()); // always succeed
             });
         }, callback);
     });
@@ -1462,7 +1531,7 @@ function downloadFile(appId, filePath, callback) {
                     transform: function (chunk, ignoredEncoding, callback) {
                         this._buffer = this._buffer ? Buffer.concat([this._buffer, chunk]) : chunk;
 
-                        while (true) {
+                        for (;;) {
                             if (this._buffer.length < 8) break; // header is 8 bytes
 
                             var type = this._buffer.readUInt8(0);
@@ -1517,28 +1586,3 @@ function uploadFile(appId, sourceFilePath, destFilePath, callback) {
         readFile.pipe(stream);
     });
 }
-
-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

@@ -27,17 +27,20 @@ exports = module.exports = {
 var apps = require('./apps.js'),
     assert = require('assert'),
     async = require('async'),
-    config = require('./config.js'),
+    constants = require('./constants.js'),
     custom = require('./custom.js'),
     debug = require('debug')('box:appstore'),
     domains = require('./domains.js'),
     eventlog = require('./eventlog.js'),
+    groups = require('./groups.js'),
     mail = require('./mail.js'),
     os = require('os'),
     safe = require('safetydance'),
     semver = require('semver'),
     settings = require('./settings.js'),
     superagent = require('superagent'),
+    sysinfo = require('./sysinfo.js'),
+    users = require('./users.js'),
     util = require('util');
 
 function AppstoreError(reason, errorOrMessage) {
@@ -95,7 +98,7 @@ function login(email, password, totpToken, callback) {
         totpToken: totpToken
     };
 
-    const url = config.apiServerOrigin() + '/api/v1/login';
+    const url = settings.apiServerOrigin() + '/api/v1/login';
     superagent.post(url).send(data).timeout(30 * 1000).end(function (error, result) {
         if (error && !error.response) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, error.message));
         if (result.statusCode === 401) return callback(new AppstoreError(AppstoreError.ACCESS_DENIED));
@@ -115,7 +118,7 @@ function registerUser(email, password, callback) {
         password: password,
     };
 
-    const url = config.apiServerOrigin() + '/api/v1/register_user';
+    const url = settings.apiServerOrigin() + '/api/v1/register_user';
     superagent.post(url).send(data).timeout(30 * 1000).end(function (error, result) {
         if (error && !error.response) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, error.message));
         if (result.statusCode === 409) return callback(new AppstoreError(AppstoreError.ALREADY_EXISTS));
@@ -131,7 +134,7 @@ function getSubscription(callback) {
     getCloudronToken(function (error, token) {
         if (error) return callback(error);
 
-        const url = config.apiServerOrigin() + '/api/v1/subscription';
+        const url = settings.apiServerOrigin() + '/api/v1/subscription';
         superagent.get(url).query({ accessToken: token }).timeout(30 * 1000).end(function (error, result) {
             if (error && !error.response) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, error.message));
             if (result.statusCode === 401) return callback(new AppstoreError(AppstoreError.INVALID_TOKEN));
@@ -158,7 +161,7 @@ function purchaseApp(data, callback) {
     getCloudronToken(function (error, token) {
         if (error) return callback(error);
 
-        const url = `${config.apiServerOrigin()}/api/v1/cloudronapps`;
+        const url = `${settings.apiServerOrigin()}/api/v1/cloudronapps`;
 
         superagent.post(url).send(data).query({ accessToken: token }).timeout(30 * 1000).end(function (error, result) {
             if (error && !error.response) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, error.message));
@@ -183,7 +186,7 @@ function unpurchaseApp(appId, data, callback) {
     getCloudronToken(function (error, token) {
         if (error) return callback(error);
 
-        const url = `${config.apiServerOrigin()}/api/v1/cloudronapps/${appId}`;
+        const url = `${settings.apiServerOrigin()}/api/v1/cloudronapps/${appId}`;
 
         superagent.get(url).query({ accessToken: token }).timeout(30 * 1000).end(function (error, result) {
             if (error && !error.response) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, error.message));
@@ -206,7 +209,7 @@ function unpurchaseApp(appId, data, callback) {
 function sendAliveStatus(callback) {
     callback = callback || NOOP_CALLBACK;
 
-    var allSettings, allDomains, mailDomains, loginEvents;
+    let allSettings, allDomains, mailDomains, loginEvents, userCount, groupCount;
 
     async.series([
         function (callback) {
@@ -236,6 +239,20 @@ function sendAliveStatus(callback) {
                 loginEvents = result;
                 callback();
             });
+        },
+        function (callback) {
+            users.count(function (error, result) {
+                if (error) return callback(new AppstoreError(AppstoreError.INTERNAL_ERROR, error));
+                userCount = result;
+                callback();
+            });
+        },
+        function (callback) {
+            groups.count(function (error, result) {
+                if (error) return callback(new AppstoreError(AppstoreError.INTERNAL_ERROR, error));
+                groupCount = result;
+                callback();
+            });
         }
     ], function (error) {
         if (error) return callback(error);
@@ -255,15 +272,17 @@ function sendAliveStatus(callback) {
                 catchAllCount: mailDomains.filter(function (d) { return d.catchAll.length !== 0; }).length,
                 relayProviders: Array.from(new Set(mailDomains.map(function (d) { return d.relay.provider; })))
             },
+            userCount: userCount,
+            groupCount: groupCount,
             appAutoupdatePattern: allSettings[settings.APP_AUTOUPDATE_PATTERN_KEY],
             boxAutoupdatePattern: allSettings[settings.BOX_AUTOUPDATE_PATTERN_KEY],
             timeZone: allSettings[settings.TIME_ZONE_KEY],
         };
 
         var data = {
-            version: config.version(),
-            adminFqdn: config.adminFqdn(),
-            provider: config.provider(),
+            version: constants.VERSION,
+            adminFqdn: settings.adminFqdn(),
+            provider: sysinfo.provider(),
             backendSettings: backendSettings,
             machine: {
                 cpus: os.cpus(),
@@ -277,7 +296,7 @@ function sendAliveStatus(callback) {
         getCloudronToken(function (error, token) {
             if (error) return callback(error);
 
-            const url = `${config.apiServerOrigin()}/api/v1/alive`;
+            const url = `${settings.apiServerOrigin()}/api/v1/alive`;
             superagent.post(url).send(data).query({ accessToken: token }).timeout(30 * 1000).end(function (error, result) {
                 if (error && !error.response) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, error));
                 if (result.statusCode === 404) return callback(new AppstoreError(AppstoreError.NOT_FOUND));
@@ -297,9 +316,9 @@ function getBoxUpdate(callback) {
     getCloudronToken(function (error, token) {
         if (error) return callback(error);
 
-        const url = `${config.apiServerOrigin()}/api/v1/boxupdate`;
+        const url = `${settings.apiServerOrigin()}/api/v1/boxupdate`;
 
-        superagent.get(url).query({ accessToken: token, boxVersion: config.version() }).timeout(10 * 1000).end(function (error, result) {
+        superagent.get(url).query({ accessToken: token, boxVersion: constants.VERSION }).timeout(10 * 1000).end(function (error, result) {
             if (error && !error.response) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, error.message));
             if (result.statusCode === 401) return callback(new AppstoreError(AppstoreError.INVALID_TOKEN));
             if (result.statusCode === 422) return callback(new AppstoreError(AppstoreError.LICENSE_ERROR, result.body.message));
@@ -308,7 +327,7 @@ function getBoxUpdate(callback) {
 
             var updateInfo = result.body;
 
-            if (!semver.valid(updateInfo.version) || semver.gt(config.version(), updateInfo.version)) {
+            if (!semver.valid(updateInfo.version) || semver.gt(constants.VERSION, updateInfo.version)) {
                 return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, util.format('Invalid update version: %s %s', result.statusCode, result.text)));
             }
 
@@ -332,9 +351,9 @@ function getAppUpdate(app, callback) {
     getCloudronToken(function (error, token) {
         if (error) return callback(error);
 
-        const url = `${config.apiServerOrigin()}/api/v1/appupdate`;
+        const url = `${settings.apiServerOrigin()}/api/v1/appupdate`;
 
-        superagent.get(url).query({ accessToken: token, boxVersion: config.version(), appId: app.appStoreId, appVersion: app.manifest.version }).timeout(10 * 1000).end(function (error, result) {
+        superagent.get(url).query({ accessToken: token, boxVersion: constants.VERSION, appId: app.appStoreId, appVersion: app.manifest.version }).timeout(10 * 1000).end(function (error, result) {
             if (error && !error.response) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, error));
             if (result.statusCode === 401) return callback(new AppstoreError(AppstoreError.INVALID_TOKEN));
             if (result.statusCode === 422) return callback(new AppstoreError(AppstoreError.LICENSE_ERROR, result.body.message));
@@ -362,7 +381,7 @@ function registerCloudron(data, callback) {
     assert.strictEqual(typeof data, 'object');
     assert.strictEqual(typeof callback, 'function');
 
-    const url = `${config.apiServerOrigin()}/api/v1/register_cloudron`;
+    const url = `${settings.apiServerOrigin()}/api/v1/register_cloudron`;
 
     superagent.post(url).send(data).timeout(30 * 1000).end(function (error, result) {
         if (error && !error.response) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, error.message));
@@ -387,14 +406,15 @@ function registerCloudron(data, callback) {
     });
 }
 
-function registerWithLicense(license, callback) {
+function registerWithLicense(license, domain, callback) {
     assert.strictEqual(typeof license, 'string');
+    assert.strictEqual(typeof domain, 'string');
     assert.strictEqual(typeof callback, 'function');
 
     getCloudronToken(function (error, token) {
         if (token) return callback(new AppstoreError(AppstoreError.ALREADY_REGISTERED));
 
-        registerCloudron({ license }, callback);
+        registerCloudron({ license, domain }, callback);
     });
 }
 
@@ -417,7 +437,7 @@ function registerWithLoginCredentials(options, callback) {
             login(options.email, options.password, options.totpToken || '', function (error, result) {
                 if (error) return callback(error);
 
-                registerCloudron({ domain: config.adminDomain(), accessToken: result.accessToken }, callback);
+                registerCloudron({ domain: settings.adminDomain(), accessToken: result.accessToken }, callback);
             });
         });
     });
@@ -444,9 +464,9 @@ function createTicket(info, callback) {
             if (error) console.error('Unable to get app info', error);
             if (result) info.app = result;
 
-            let url = config.apiServerOrigin() + '/api/v1/ticket';
+            let url = settings.apiServerOrigin() + '/api/v1/ticket';
 
-            info.supportEmail = custom.supportEmail(); // destination address for tickets
+            info.supportEmail = custom.spec().support.email; // destination address for tickets
 
             superagent.post(url).query({ accessToken: token }).send(info).timeout(10 * 1000).end(function (error, result) {
                 if (error && !error.response) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, error.message));
@@ -468,8 +488,8 @@ function getApps(callback) {
 
         settings.getUnstableAppsConfig(function (error, unstable) {
             if (error) return callback(new AppstoreError(AppstoreError.INTERNAL_ERROR, error));
-            const url = `${config.apiServerOrigin()}/api/v1/apps`;
-            superagent.get(url).query({ accessToken: token, boxVersion: config.version(), unstable: unstable }).timeout(10 * 1000).end(function (error, result) {
+            const url = `${settings.apiServerOrigin()}/api/v1/apps`;
+            superagent.get(url).query({ accessToken: token, boxVersion: constants.VERSION, unstable: unstable }).timeout(10 * 1000).end(function (error, result) {
                 if (error && !error.response) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, error.message));
                 if (result.statusCode === 403 || result.statusCode === 401) return callback(new AppstoreError(AppstoreError.INVALID_TOKEN));
                 if (result.statusCode === 422) return callback(new AppstoreError(AppstoreError.LICENSE_ERROR, result.body.message));
@@ -490,7 +510,7 @@ function getAppVersion(appId, version, callback) {
     getCloudronToken(function (error, token) {
         if (error) return callback(error);
 
-        let url = `${config.apiServerOrigin()}/api/v1/apps/${appId}`;
+        let url = `${settings.apiServerOrigin()}/api/v1/apps/${appId}`;
         if (version !== 'latest') url += `/versions/${version}`;
 
         superagent.get(url).query({ accessToken: token }).timeout(10 * 1000).end(function (error, result) {

src/apptask.js

@@ -3,8 +3,7 @@
 'use strict';
 
 exports = module.exports = {
-    initialize: initialize,
-    startTask: startTask,
+    run: run,
 
     // exported for testing
     _reserveHttpPort: reserveHttpPort,
@@ -13,8 +12,8 @@ exports = module.exports = {
     _createAppDir: createAppDir,
     _deleteAppDir: deleteAppDir,
     _verifyManifest: verifyManifest,
-    _registerSubdomain: registerSubdomain,
-    _unregisterSubdomain: unregisterSubdomain,
+    _registerSubdomains: registerSubdomains,
+    _unregisterSubdomains: unregisterSubdomains,
     _waitForDnsPropagation: waitForDnsPropagation
 };
 
@@ -27,10 +26,10 @@ var addons = require('./addons.js'),
     async = require('async'),
     auditsource = require('./auditsource.js'),
     backups = require('./backups.js'),
-    config = require('./config.js'),
-    database = require('./database.js'),
+    constants = require('./constants.js'),
     DatabaseError = require('./databaseerror.js'),
     debug = require('debug')('box:apptask'),
+    df = require('@sindresorhus/df'),
     docker = require('./docker.js'),
     domains = require('./domains.js'),
     DomainsError = domains.DomainsError,
@@ -46,6 +45,7 @@ var addons = require('./addons.js'),
     reverseProxy = require('./reverseproxy.js'),
     rimraf = require('rimraf'),
     safe = require('safetydance'),
+    settings = require('./settings.js'),
     shell = require('./shell.js'),
     superagent = require('superagent'),
     sysinfo = require('./sysinfo.js'),
@@ -58,14 +58,6 @@ var COLLECTD_CONFIG_EJS = fs.readFileSync(__dirname + '/collectd.config.ejs', {
     LOGROTATE_CONFIG_EJS = fs.readFileSync(__dirname + '/logrotate.ejs', { encoding: 'utf8' }),
     CONFIGURE_LOGROTATE_CMD = path.join(__dirname, 'scripts/configurelogrotate.sh');
 
-var NOOP_CALLBACK = function (error) { if (error) debug(error); };
-
-function initialize(callback) {
-    assert.strictEqual(typeof callback, 'function');
-
-    database.initialize(callback);
-}
-
 function debugApp(app) {
     assert.strictEqual(typeof app, 'object');
 
@@ -120,7 +112,6 @@ function unconfigureReverseProxy(app, callback) {
     assert.strictEqual(typeof app, 'object');
     assert.strictEqual(typeof callback, 'function');
 
-    // TODO: maybe revoke the cert
     reverseProxy.unconfigureApp(app, callback);
 }
 
@@ -200,7 +191,7 @@ function addCollectdProfile(app, callback) {
     assert.strictEqual(typeof app, 'object');
     assert.strictEqual(typeof callback, 'function');
 
-    var collectdConf = ejs.render(COLLECTD_CONFIG_EJS, { appId: app.id, containerId: app.containerId });
+    var collectdConf = ejs.render(COLLECTD_CONFIG_EJS, { appId: app.id, containerId: app.containerId, appDataDir: apps.getDataDir(app, app.dataDir) });
     fs.writeFile(path.join(paths.COLLECTD_APPCONFIG_DIR, app.id + '.conf'), collectdConf, function (error) {
         if (error) return callback(error);
         shell.sudo('addCollectdProfile', [ CONFIGURE_COLLECTD_CMD, 'add', app.id ], {}, callback);
@@ -228,7 +219,7 @@ function addLogrotateConfig(app, callback) {
         if (!runVolume) return callback(new Error('App does not have /run mounted'));
 
         // logrotate configs can have arbitrary commands, so the config files must be owned by root
-        var logrotateConf = ejs.render(LOGROTATE_CONFIG_EJS, { volumePath: runVolume.Source });
+        var logrotateConf = ejs.render(LOGROTATE_CONFIG_EJS, { volumePath: runVolume.Source, appId: app.id });
         var tmpFilePath = path.join(os.tmpdir(), app.id + '.logrotate');
         fs.writeFile(tmpFilePath, logrotateConf, function (error) {
             if (error) return callback(error);
@@ -266,7 +257,7 @@ function downloadIcon(app, callback) {
 
     debugApp(app, 'Downloading icon of %s@%s', app.appStoreId, app.manifest.version);
 
-    var iconUrl = config.apiServerOrigin() + '/api/v1/apps/' + app.appStoreId + '/versions/' + app.manifest.version + '/icon';
+    var iconUrl = settings.apiServerOrigin() + '/api/v1/apps/' + app.appStoreId + '/versions/' + app.manifest.version + '/icon';
 
     async.retry({ times: 10, interval: 5000 }, function (retryCallback) {
         superagent
@@ -274,7 +265,7 @@ function downloadIcon(app, callback) {
             .buffer(true)
             .timeout(30 * 1000)
             .end(function (error, res) {
-                if (error && !error.response) return retryCallback(new Error('Network error downloading icon:' + error.message));
+                if (error && !error.response) return retryCallback(new Error('Network error downloading icon : ' + error.message));
                 if (res.statusCode !== 200) return retryCallback(null); // ignore error. this can also happen for apps installed with cloudron-cli
 
                 if (!safe.fs.writeFileSync(path.join(paths.APP_ICONS_DIR, app.id + '.png'), res.body)) return retryCallback(new Error('Error saving icon:' + safe.error.message));
@@ -284,7 +275,7 @@ function downloadIcon(app, callback) {
     }, callback);
 }
 
-function registerSubdomain(app, overwrite, callback) {
+function registerSubdomains(app, overwrite, callback) {
     assert.strictEqual(typeof app, 'object');
     assert.strictEqual(typeof overwrite, 'boolean');
     assert.strictEqual(typeof callback, 'function');
@@ -292,73 +283,17 @@ function registerSubdomain(app, overwrite, callback) {
     sysinfo.getPublicIp(function (error, ip) {
         if (error) return callback(error);
 
-        async.retry({ times: 200, interval: 5000 }, function (retryCallback) {
-            debugApp(app, 'Registering subdomain location [%s] overwrite: %s', app.fqdn, overwrite);
+        const allDomains = [ { subdomain: app.location, domain: app.domain }].concat(app.alternateDomains);
 
-            // get the current record before updating it
-            domains.getDnsRecords(app.location, app.domain, 'A', function (error, values) {
-                if (error && error.reason === DomainsError.EXTERNAL_ERROR) return retryCallback(error); // try again
-                if (error) return retryCallback(null, error); // give up for access and other errors
-
-                // 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) {
-                    if (error && (error.reason === DomainsError.STILL_BUSY || error.reason === DomainsError.EXTERNAL_ERROR)) {
-                        debug('Upsert error. Will retry.', error.message);
-                        return retryCallback(error); // try again
-                    }
-
-                    retryCallback(null, error);
-                });
-            });
-        }, function (error, result) {
-            if (error || result instanceof Error) return callback(error || result);
-            callback(null);
-        });
-    });
-}
-
-function unregisterSubdomain(app, location, domain, callback) {
-    assert.strictEqual(typeof app, 'object');
-    assert.strictEqual(typeof location, 'string');
-    assert.strictEqual(typeof domain, 'string');
-    assert.strictEqual(typeof callback, 'function');
-
-    sysinfo.getPublicIp(function (error, ip) {
-        if (error) return callback(error);
-
-        async.retry({ times: 30, interval: 5000 }, function (retryCallback) {
-            debugApp(app, 'Unregistering subdomain: %s', app.fqdn);
-
-            domains.removeDnsRecords(location, domain, 'A', [ ip ], function (error) {
-                if (error && error.reason === DomainsError.NOT_FOUND) return retryCallback(null, null); // domain can be not found if oldConfig.domain or restoreConfig.domain was removed
-                if (error && (error.reason === DomainsError.STILL_BUSY || error.reason === DomainsError.EXTERNAL_ERROR)) return retryCallback(error); // try again
-
-                retryCallback(null, error);
-            });
-        }, function (error, result) {
-            if (error || result instanceof Error) return callback(error || result);
-            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) {
+        console.dir(allDomains);
+        async.eachSeries(allDomains, function (domain, iteratorDone) {
             async.retry({ times: 200, interval: 5000 }, function (retryCallback) {
-                debugApp(app, 'Registering alternate subdomain [%s] overwrite: %s', (domain.subdomain ? (domain.subdomain + '.') : '') + domain.domain, overwrite);
+                debugApp(app, 'Registering subdomain: %s%s', domain.subdomain ? (domain.subdomain + '.') : '', domain.domain);
 
                 // get the current record before updating it
                 domains.getDnsRecords(domain.subdomain, domain.domain, 'A', function (error, values) {
-                    if (error) return retryCallback(error);
+                    if (error && error.reason === DomainsError.EXTERNAL_ERROR) return retryCallback(error); // try again
+                    if (error) return retryCallback(null, error); // give up for access and other errors
 
                     // 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'));
@@ -368,37 +303,28 @@ function registerAlternateDomains(app, overwrite, callback) {
                             debug('Upsert error. Will retry.', error.message);
                             return retryCallback(error); // try again
                         }
+
                         retryCallback(null, error);
                     });
                 });
             }, function (error, result) {
-                if (error || result instanceof Error) return callback(error || result);
-                callback();
+                if (error || result instanceof Error) return iteratorDone(error || result);
+
+                iteratorDone(null);
             });
         }, callback);
     });
 }
 
-function unregisterAlternateDomains(app, all, callback) {
+function unregisterSubdomains(app, allDomains, callback) {
     assert.strictEqual(typeof app, 'object');
-    assert.strictEqual(typeof all, 'boolean');
+    assert(Array.isArray(allDomains));
     assert.strictEqual(typeof callback, 'function');
 
-    let obsoleteDomains = [];
-    if (all) {
-        obsoleteDomains = app.alternateDomains;
-    } else if (app.oldConfig) { // oldConfig can be null during an infra update
-        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.eachSeries(allDomains, function (domain, iteratorDone) {
             async.retry({ times: 30, interval: 5000 }, function (retryCallback) {
                 debugApp(app, 'Unregistering subdomain: %s%s', domain.subdomain ? (domain.subdomain + '.') : '', domain.domain);
 
@@ -409,8 +335,9 @@ function unregisterAlternateDomains(app, all, callback) {
                     retryCallback(null, error);
                 });
             }, function (error, result) {
-                if (error || result instanceof Error) return callback(error || result);
-                callback();
+                if (error || result instanceof Error) return iteratorDone(error || result);
+
+                iteratorDone();
             });
         }, callback);
     });
@@ -420,10 +347,15 @@ function removeIcon(app, callback) {
     assert.strictEqual(typeof app, 'object');
     assert.strictEqual(typeof callback, 'function');
 
-    fs.unlink(path.join(paths.APP_ICONS_DIR, app.id + '.png'), function (error) {
-        if (error && error.code !== 'ENOENT') debugApp(app, 'cannot remove icon : %s', error);
-        callback(null);
-    });
+    if (!safe.fs.unlinkSync(path.join(paths.APP_ICONS_DIR, app.id + '.png'))) {
+        if (safe.error.code !== 'ENOENT') debugApp(app, 'cannot remove icon : %s', safe.error);
+    }
+
+    if (!safe.fs.unlinkSync(path.join(paths.APP_ICONS_DIR, app.id + '.user.png'))) {
+        if (safe.error.code !== 'ENOENT') debugApp(app, 'cannot remove user icon : %s', safe.error);
+    }
+
+    callback(null);
 }
 
 function cleanupLogs(app, callback) {
@@ -442,7 +374,7 @@ function waitForDnsPropagation(app, callback) {
     assert.strictEqual(typeof app, 'object');
     assert.strictEqual(typeof callback, 'function');
 
-    if (!config.CLOUDRON) {
+    if (!constants.CLOUDRON) {
         debugApp(app, 'Skipping dns propagation check for development');
         return callback(null);
     }
@@ -474,6 +406,23 @@ function migrateDataDir(app, sourceDir, callback) {
     shell.sudo('migrateDataDir', [ MV_VOLUME_CMD, resolvedSourceDir, resolvedTargetDir ], {}, callback);
 }
 
+function downloadImage(manifest, callback) {
+    assert.strictEqual(typeof manifest, 'object');
+    assert.strictEqual(typeof callback, 'function');
+
+    docker.info(function (error, info) {
+        if (error) return callback(error);
+
+        const dfAsync = util.callbackify(df.file);
+        dfAsync(info.DockerRootDir, function (error, diskUsage) {
+            if (error) return callback(error);
+            if (diskUsage.available < (1024*1024*1024)) return callback(new Error('Not enough disk space to pull docker image. See https://cloudron.io/documentation/storage/#docker-image-location'));
+
+            docker.downloadImage(manifest, callback);
+        });
+    });
+}
+
 // Ordering is based on the following rationale:
 //   - configure nginx, icon, oauth
 //   - register subdomain.
@@ -485,11 +434,13 @@ function migrateDataDir(app, sourceDir, callback) {
 //   - setup the container (requires image, volumes, addons)
 //   - setup collectd (requires container id)
 // restore is also handled here since restore is just an install with some oldConfig to clean up
-function install(app, callback) {
+function install(app, restoreConfig, progressCallback, callback) {
     assert.strictEqual(typeof app, 'object');
+    assert.strictEqual(typeof restoreConfig, 'object');
+    assert.strictEqual(typeof progressCallback, 'function');
     assert.strictEqual(typeof callback, 'function');
 
-    const restoreConfig = app.restoreConfig, isRestoring = app.installationState === appdb.ISTATE_PENDING_RESTORE;
+    const isInstalling = app.installationState !== apps.ISTATE_PENDING_RESTORE; // install or clone
 
     async.series([
         // this protects against the theoretical possibility of an app being marked for install/restore from
@@ -497,15 +448,15 @@ function install(app, callback) {
         verifyManifest.bind(null, app.manifest),
 
         // teardown for re-installs
-        updateApp.bind(null, app, { installationProgress: '10, Cleaning up old install' }),
+        progressCallback.bind(null, { percent: 10, message: 'Cleaning up old install' }),
         unconfigureReverseProxy.bind(null, app),
         removeCollectdProfile.bind(null, app),
         removeLogrotateConfig.bind(null, app),
-        stopApp.bind(null, app),
+        stopApp.bind(null, app, progressCallback),
         deleteContainers.bind(null, app, { managedOnly: true }),
         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));
+            var addonsToRemove = isInstalling ? app.manifest.addons : _.omit(restoreConfig.oldManifest.addons, Object.keys(app.manifest.addons));
 
             addons.teardownAddons(app, addonsToRemove, next);
         },
@@ -513,203 +464,205 @@ function install(app, callback) {
 
         // for restore case
         function deleteImageIfChanged(done) {
-            if (!app.oldConfig || (app.oldConfig.manifest.dockerImage === app.manifest.dockerImage)) return done();
+            if (isInstalling) return done();
 
-            docker.deleteImage(app.oldConfig.manifest, done);
+            if (restoreConfig.oldManifest.dockerImage === app.manifest.dockerImage) return done();
+
+            docker.deleteImage(restoreConfig.oldManifest, done);
         },
 
         reserveHttpPort.bind(null, app),
 
-        updateApp.bind(null, app, { installationProgress: '20, Downloading icon' }),
+        progressCallback.bind(null, { percent: 20, message: 'Downloading icon' }),
         downloadIcon.bind(null, app),
 
-        updateApp.bind(null, app, { installationProgress: '30, Registering subdomain' }),
-        registerSubdomain.bind(null, app, isRestoring /* overwrite */),
+        progressCallback.bind(null, { percent: 30, message: 'Registering subdomains' }),
+        registerSubdomains.bind(null, app, !isInstalling /* overwrite */),
 
-        updateApp.bind(null, app, { installationProgress: '35, Registering alternate domains'}),
-        registerAlternateDomains.bind(null, app, isRestoring /* overwrite */),
+        progressCallback.bind(null, { percent: 40, message: 'Downloading image' }),
+        downloadImage.bind(null, app.manifest),
 
-        updateApp.bind(null, app, { installationProgress: '40, Downloading image' }),
-        docker.downloadImage.bind(null, app.manifest),
-
-        updateApp.bind(null, app, { installationProgress: '50, Creating app data directory' }),
+        progressCallback.bind(null, { percent: 50, message: 'Creating app data directory' }),
         createAppDir.bind(null, app),
 
         function restoreFromBackup(next) {
-            if (!restoreConfig) {
+            if (!restoreConfig.backupId) {
                 async.series([
-                    updateApp.bind(null, app, { installationProgress: '60, Setting up addons' }),
+                    progressCallback.bind(null, { percent: 60, message: 'Setting up addons' }),
                     addons.setupAddons.bind(null, app, app.manifest.addons),
                 ], next);
             } else {
                 async.series([
-                    updateApp.bind(null, app, { installationProgress: '65, Download backup and restoring addons' }),
+                    progressCallback.bind(null, { percent: 65, message: 'Download backup and restoring addons' }),
                     addons.setupAddons.bind(null, app, app.manifest.addons),
                     addons.clearAddons.bind(null, app, app.manifest.addons),
-                    backups.restoreApp.bind(null, app, app.manifest.addons, restoreConfig, (progress) => updateApp(app, { installationProgress: `65, Restore - ${progress.message}` }, NOOP_CALLBACK))
+                    backups.restoreApp.bind(null, app, app.manifest.addons, restoreConfig, (progress) => {
+                        progressCallback({ percent: 65, message: `Restore - ${progress.message}` });
+                    })
                 ], next);
             }
         },
 
-        updateApp.bind(null, app, { installationProgress: '70, Creating container' }),
+        progressCallback.bind(null, { percent: 70, message: 'Creating container' }),
         createContainer.bind(null, app),
 
-        updateApp.bind(null, app, { installationProgress: '75, Setting up logrotate config' }),
+        progressCallback.bind(null, { percent: 75, message: 'Setting up logrotate config' }),
         addLogrotateConfig.bind(null, app),
 
-        updateApp.bind(null, app, { installationProgress: '80, Setting up collectd profile' }),
+        progressCallback.bind(null, { percent: 80, message: 'Setting up collectd profile' }),
         addCollectdProfile.bind(null, app),
 
-        runApp.bind(null, app),
+        runApp.bind(null, app, progressCallback),
 
-        updateApp.bind(null, app, { installationProgress: '85, Waiting for DNS propagation' }),
+        progressCallback.bind(null, { percent: 85, message: 'Waiting for DNS propagation' }),
         exports._waitForDnsPropagation.bind(null, app),
 
-        updateApp.bind(null, app, { installationProgress: '95, Configuring reverse proxy' }),
+        progressCallback.bind(null, { percent: 95, message: 'Configuring reverse proxy' }),
         configureReverseProxy.bind(null, app),
 
-        // done!
-        function (callback) {
-            debugApp(app, 'installed');
-            updateApp(app, { installationState: appdb.ISTATE_INSTALLED, installationProgress: '', health: null }, callback);
-        }
+        progressCallback.bind(null, { percent: 100, message: 'Done' }),
+        updateApp.bind(null, app, { installationState: apps.ISTATE_INSTALLED, health: null })
     ], function seriesDone(error) {
         if (error) {
             debugApp(app, 'error installing app: %s', error);
-            return updateApp(app, { installationState: appdb.ISTATE_ERROR, installationProgress: error.message }, callback.bind(null, error));
+            return updateApp(app, { installationState: apps.ISTATE_ERROR, error: { message: error.message } }, callback.bind(null, error));
         }
         callback(null);
     });
 }
 
-function backup(app, callback) {
+function backup(app, progressCallback, callback) {
     assert.strictEqual(typeof app, 'object');
+    assert.strictEqual(typeof progressCallback, 'function');
     assert.strictEqual(typeof callback, 'function');
 
     async.series([
-        updateApp.bind(null, app, { installationProgress: '10, Backing up' }),
-        backups.backupApp.bind(null, app, { /* options */ }, (progress) => updateApp(app, { installationProgress: `30, ${progress.message}` }, NOOP_CALLBACK)),
+        progressCallback.bind(null, { percent: 10, message: 'Backing up' }),
+        backups.backupApp.bind(null, app, { /* options */ }, (progress) => {
+            progressCallback({ percent: 30, message: progress.message });
+        }),
 
-        // done!
-        function (callback) {
-            debugApp(app, 'installed');
-            updateApp(app, { installationState: appdb.ISTATE_INSTALLED, installationProgress: '' }, callback);
-        }
+        progressCallback.bind(null, { percent: 100, message: 'Done' }),
+        updateApp.bind(null, app, { installationState: apps.ISTATE_INSTALLED, error: null })
     ], function seriesDone(error) {
         if (error) {
             debugApp(app, 'error backing up app: %s', error);
-            return updateApp(app, { installationState: appdb.ISTATE_INSTALLED, installationProgress: error.message }, callback.bind(null, error)); // return to installed state intentionally
+            return updateApp(app, { installationState: apps.ISTATE_INSTALLED, error: { message: error.message } }, callback.bind(null, error)); // return to installed state intentionally
         }
         callback(null);
     });
 }
 
 // note that configure is called after an infra update as well
-function configure(app, callback) {
+function configure(app, oldConfig, progressCallback, callback) {
     assert.strictEqual(typeof app, 'object');
+    assert.strictEqual(typeof oldConfig, 'object');
+    assert.strictEqual(typeof progressCallback, 'function');
     assert.strictEqual(typeof callback, 'function');
 
-    // oldConfig can be null during an infra update
-    const locationChanged = app.oldConfig && (app.oldConfig.fqdn !== app.fqdn);
-    const dataDirChanged = app.oldConfig && (app.oldConfig.dataDir !== app.dataDir);
+    const locationChanged = oldConfig.fqdn !== app.fqdn;
+    const dataDirChanged = oldConfig.dataDir !== app.dataDir;
 
     async.series([
-        updateApp.bind(null, app, { installationProgress: '10, Cleaning up old install' }),
+        progressCallback.bind(null, { percent: 10, message: 'Cleaning up old install' }),
         unconfigureReverseProxy.bind(null, app),
         removeCollectdProfile.bind(null, app),
         removeLogrotateConfig.bind(null, app),
-        stopApp.bind(null, app),
+        stopApp.bind(null, app, progressCallback),
         deleteContainers.bind(null, app, { managedOnly: true }),
-        unregisterAlternateDomains.bind(null, app, false /* all */),
         function (next) {
-            if (!locationChanged) return next();
+            let obsoleteDomains = oldConfig.alternateDomains.filter(function (o) {
+                return !app.alternateDomains.some(function (n) { return n.subdomain === o.subdomain && n.domain === o.domain; });
+            });
 
-            unregisterSubdomain(app, app.oldConfig.location, app.oldConfig.domain, next);
+            if (locationChanged) obsoleteDomains.push({ subdomain: oldConfig.location, domain: oldConfig.domain });
+
+            if (obsoleteDomains.length === 0) return next();
+
+            unregisterSubdomains(app, obsoleteDomains, next);
         },
 
         reserveHttpPort.bind(null, app),
 
-        updateApp.bind(null, app, { installationProgress: '20, Downloading icon' }),
+        progressCallback.bind(null, { percent: 20, message: 'Downloading icon' }),
         downloadIcon.bind(null, app),
 
-        updateApp.bind(null, app, { installationProgress: '30, Registering subdomain' }),
-        registerSubdomain.bind(null, app, !locationChanged /* overwrite */), // if location changed, do not overwrite to detect conflicts
+        progressCallback.bind(null, { percent: 30, message: 'Registering subdomains' }),
+        registerSubdomains.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
+        progressCallback.bind(null, { percent: 40, message: 'Downloading image' }),
+        downloadImage.bind(null, app.manifest),
 
-        updateApp.bind(null, app, { installationProgress: '40, Downloading image' }),
-        docker.downloadImage.bind(null, app.manifest),
-
-        updateApp.bind(null, app, { installationProgress: '45, Ensuring app data directory' }),
+        progressCallback.bind(null, { percent: 45, message: 'Ensuring app data directory' }),
         createAppDir.bind(null, app),
 
         // re-setup addons since they rely on the app's fqdn (e.g oauth)
-        updateApp.bind(null, app, { installationProgress: '50, Setting up addons' }),
+        progressCallback.bind(null, { percent: 50, message: 'Setting up addons' }),
         addons.setupAddons.bind(null, app, app.manifest.addons),
 
         // migrate dataDir
         function (next) {
             if (!dataDirChanged) return next();
 
-            migrateDataDir(app, app.oldConfig.dataDir, next);
+            migrateDataDir(app, oldConfig.dataDir, next);
         },
 
-        updateApp.bind(null, app, { installationProgress: '60, Creating container' }),
+        progressCallback.bind(null, { percent: 60, message: 'Creating container' }),
         createContainer.bind(null, app),
 
-        updateApp.bind(null, app, { installationProgress: '65, Setting up logrotate config' }),
+        progressCallback.bind(null, { percent: 65, message: 'Setting up logrotate config' }),
         addLogrotateConfig.bind(null, app),
 
-        updateApp.bind(null, app, { installationProgress: '70, Add collectd profile' }),
+        progressCallback.bind(null, { percent: 70, message: 'Add collectd profile' }),
         addCollectdProfile.bind(null, app),
 
-        runApp.bind(null, app),
+        runApp.bind(null, app, progressCallback),
 
-        updateApp.bind(null, app, { installationProgress: '80, Waiting for DNS propagation' }),
+        progressCallback.bind(null, { percent: 80, message: 'Waiting for DNS propagation' }),
         exports._waitForDnsPropagation.bind(null, app),
 
-        updateApp.bind(null, app, { installationProgress: '90, Configuring reverse proxy' }),
+        progressCallback.bind(null, { percent: 90, message: 'Configuring reverse proxy' }),
         configureReverseProxy.bind(null, app),
 
-        // done!
-        function (callback) {
-            debugApp(app, 'configured');
-            updateApp(app, { installationState: appdb.ISTATE_INSTALLED, installationProgress: '', health: null }, callback);
-        }
+        progressCallback.bind(null, { percent: 100, message: 'Done' }),
+        updateApp.bind(null, app, { installationState: apps.ISTATE_INSTALLED, error: null, health: null })
     ], function seriesDone(error) {
         if (error) {
             debugApp(app, 'error reconfiguring : %s', error);
-            return updateApp(app, { installationState: appdb.ISTATE_ERROR, installationProgress: error.message }, callback.bind(null, error));
+            return updateApp(app, { installationState: apps.ISTATE_ERROR, error: { message: error.message }}, callback.bind(null, error));
         }
         callback(null);
     });
 }
 
 // nginx configuration is skipped because app.httpPort is expected to be available
-function update(app, callback) {
+function update(app, updateConfig, progressCallback, callback) {
     assert.strictEqual(typeof app, 'object');
+    assert.strictEqual(typeof updateConfig, 'object');
+    assert.strictEqual(typeof progressCallback, 'function');
     assert.strictEqual(typeof callback, 'function');
 
-    debugApp(app, `Updating to ${app.updateConfig.manifest.version}`);
+    debugApp(app, `Updating to ${updateConfig.manifest.version}`);
 
     // app does not want these addons anymore
     // FIXME: this does not handle option changes (like multipleDatabases)
-    var unusedAddons = _.omit(app.manifest.addons, Object.keys(app.updateConfig.manifest.addons));
+    var unusedAddons = _.omit(app.manifest.addons, Object.keys(updateConfig.manifest.addons));
 
     async.series([
         // this protects against the theoretical possibility of an app being marked for update from
         // a previous version of box code
-        updateApp.bind(null, app, { installationProgress: '0, Verify manifest' }),
-        verifyManifest.bind(null, app.updateConfig.manifest),
+        progressCallback.bind(null, { percent: 0, message: 'Verify manifest' }),
+        verifyManifest.bind(null, updateConfig.manifest),
 
         function (next) {
-            if (app.installationState === appdb.ISTATE_PENDING_FORCE_UPDATE) return next(null);
+            if (updateConfig.skipBackup) return next(null);
 
             async.series([
-                updateApp.bind(null, app, { installationProgress: '15, Backing up app' }),
+                progressCallback.bind(null, { percent: 15, message: 'Backing up app' }),
                 // preserve update backups for 3 weeks
-                backups.backupApp.bind(null, app, { preserveSecs: 3*7*24*60*60 }, (progress) => updateApp(app, { installationProgress: `15, Backup - ${progress.message}` }, NOOP_CALLBACK))
+                backups.backupApp.bind(null, app, { preserveSecs: 3*7*24*60*60 }, (progress) => {
+                    progressCallback({ percent: 15, message: `Backup - ${progress.message}` });
+                })
             ], function (error) {
                 if (error) error.backupError = true;
                 next(error);
@@ -718,18 +671,18 @@ function update(app, callback) {
 
         // download new image before app is stopped. this is so we can reduce downtime
         // and also not remove the 'common' layers when the old image is deleted
-        updateApp.bind(null, app, { installationProgress: '25, Downloading image' }),
-        docker.downloadImage.bind(null, app.updateConfig.manifest),
+        progressCallback.bind(null, { percent: 25, message: 'Downloading image' }),
+        downloadImage.bind(null, updateConfig.manifest),
 
         // note: we cleanup first and then backup. this is done so that the app is not running should backup fail
         // we cannot easily 'recover' from backup failures because we have to revert manfest and portBindings
-        updateApp.bind(null, app, { installationProgress: '35, Cleaning up old install' }),
+        progressCallback.bind(null, { percent: 35, message: 'Cleaning up old install' }),
         removeCollectdProfile.bind(null, app),
         removeLogrotateConfig.bind(null, app),
-        stopApp.bind(null, app),
+        stopApp.bind(null, app, progressCallback),
         deleteContainers.bind(null, app, { managedOnly: true }),
         function deleteImageIfChanged(done) {
-            if (app.manifest.dockerImage === app.updateConfig.manifest.dockerImage) return done();
+            if (app.manifest.dockerImage === updateConfig.manifest.dockerImage) return done();
 
             docker.deleteImage(app.manifest, done);
         },
@@ -740,8 +693,8 @@ function update(app, callback) {
         // free unused ports
         function (next) {
             const currentPorts = app.portBindings || {};
-            const newTcpPorts = app.updateConfig.manifest.tcpPorts || {};
-            const newUdpPorts = app.updateConfig.manifest.udpPorts || {};
+            const newTcpPorts = updateConfig.manifest.tcpPorts || {};
+            const newUdpPorts = updateConfig.manifest.udpPorts || {};
 
             async.each(Object.keys(currentPorts), function (portName, callback) {
                 if (newTcpPorts[portName] || newUdpPorts[portName]) return callback(); // port still in use
@@ -758,138 +711,124 @@ function update(app, callback) {
             }, next);
         },
 
-        // switch over to the new config. manifest, memoryLimit, portBindings, appstoreId are updated here
-        updateApp.bind(null, app, app.updateConfig),
+        updateApp.bind(null, app, _.pick(updateConfig, 'manifest', 'appStoreId', 'memoryLimit')), // switch over to the new config
 
-        updateApp.bind(null, app, { installationProgress: '45, Downloading icon' }),
+        progressCallback.bind(null, { percent: 45, message: 'Downloading icon' }),
         downloadIcon.bind(null, app),
 
-        updateApp.bind(null, app, { installationProgress: '70, Updating addons' }),
-        addons.setupAddons.bind(null, app, app.updateConfig.manifest.addons),
+        progressCallback.bind(null, { percent: 70, message: 'Updating addons' }),
+        addons.setupAddons.bind(null, app, updateConfig.manifest.addons),
 
-        updateApp.bind(null, app, { installationProgress: '80, Creating container' }),
+        progressCallback.bind(null, { percent: 80, message: 'Creating container' }),
         createContainer.bind(null, app),
 
-        updateApp.bind(null, app, { installationProgress: '85, Setting up logrotate config' }),
+        progressCallback.bind(null, { percent: 85, message: 'Setting up logrotate config' }),
         addLogrotateConfig.bind(null, app),
 
-        updateApp.bind(null, app, { installationProgress: '90, Add collectd profile' }),
+        progressCallback.bind(null, { percent: 90, message: 'Add collectd profile' }),
         addCollectdProfile.bind(null, app),
 
-        runApp.bind(null, app),
+        runApp.bind(null, app, progressCallback),
 
-        // done!
-        function (callback) {
-            debugApp(app, 'updated');
-            updateApp(app, { installationState: appdb.ISTATE_INSTALLED, installationProgress: '', health: null, updateConfig: null, updateTime: new Date() }, callback);
-        }
+        progressCallback.bind(null, { percent: 100, message: 'Done' }),
+        updateApp.bind(null, app, { installationState: apps.ISTATE_INSTALLED, error: null, health: null, updateTime: new Date() })
     ], function seriesDone(error) {
         if (error && error.backupError) {
             debugApp(app, 'update aborted because backup failed', error);
-            updateApp(app, { installationState: appdb.ISTATE_INSTALLED, installationProgress: '', health: null, updateConfig: null }, callback.bind(null, error));
+            updateApp(app, { installationState: apps.ISTATE_INSTALLED, error: null, health: null }, callback.bind(null, error));
         } else if (error) {
             debugApp(app, 'Error updating app: %s', error);
-            updateApp(app, { installationState: appdb.ISTATE_ERROR, installationProgress: error.message, updateTime: new Date() }, callback.bind(null, error));
+            updateApp(app, { installationState: apps.ISTATE_ERROR, error: { message: error.message }, updateTime: new Date() }, callback.bind(null, error));
         } else {
+            if (updateConfig.skipNotification) return callback();
+
             eventlog.add(eventlog.ACTION_APP_UPDATE_FINISH, auditsource.APP_TASK, { app: app, success: true }, callback);
         }
     });
 }
 
-function uninstall(app, callback) {
+function uninstall(app, progressCallback, callback) {
     assert.strictEqual(typeof app, 'object');
+    assert.strictEqual(typeof progressCallback, 'function');
     assert.strictEqual(typeof callback, 'function');
 
-    debugApp(app, 'uninstalling');
-
     async.series([
-        updateApp.bind(null, app, { installationProgress: '0, Remove collectd profile' }),
+        progressCallback.bind(null, { percent: 0, message: 'Remove collectd profile' }),
         removeCollectdProfile.bind(null, app),
 
-        updateApp.bind(null, app, { installationProgress: '5, Remove logrotate config' }),
+        progressCallback.bind(null, { percent: 5, message: 'Remove logrotate config' }),
         removeLogrotateConfig.bind(null, app),
 
-        updateApp.bind(null, app, { installationProgress: '10, Stopping app' }),
-        stopApp.bind(null, app),
+        progressCallback.bind(null, { percent: 10, message: 'Stopping app' }),
+        stopApp.bind(null, app, progressCallback),
 
-        updateApp.bind(null, app, { installationProgress: '20, Deleting container' }),
+        progressCallback.bind(null, { percent: 20, message: 'Deleting container' }),
         deleteContainers.bind(null, app, {}),
 
-        updateApp.bind(null, app, { installationProgress: '30, Teardown addons' }),
+        progressCallback.bind(null, { percent: 30, message: 'Teardown addons' }),
         addons.teardownAddons.bind(null, app, app.manifest.addons),
 
-        updateApp.bind(null, app, { installationProgress: '40, Deleting app data directory' }),
+        progressCallback.bind(null, { percent: 40, message: 'Deleting app data directory' }),
         deleteAppDir.bind(null, app, { removeDirectory: true }),
 
-        updateApp.bind(null, app, { installationProgress: '50, Deleting image' }),
+        progressCallback.bind(null, { percent: 50, message: 'Deleting image' }),
         docker.deleteImage.bind(null, app.manifest),
 
-        updateApp.bind(null, app, { installationProgress: '60, Unregistering domains' }),
-        unregisterAlternateDomains.bind(null, app, true /* all */),
-        unregisterSubdomain.bind(null, app, app.location, app.domain),
+        progressCallback.bind(null, { percent: 60, message: 'Unregistering domains' }),
+        unregisterSubdomains.bind(null, app, [ { subdomain: app.location, domain: app.domain } ].concat(app.alternateDomains)),
 
-        updateApp.bind(null, app, { installationProgress: '70, Cleanup icon' }),
+        progressCallback.bind(null, { percent: 70, message: 'Cleanup icon' }),
         removeIcon.bind(null, app),
 
-        updateApp.bind(null, app, { installationProgress: '80, Unconfiguring reverse proxy' }),
+        progressCallback.bind(null, { percent: 80, message: 'Unconfiguring reverse proxy' }),
         unconfigureReverseProxy.bind(null, app),
 
-        updateApp.bind(null, app, { installationProgress: '90, Cleanup logs' }),
+        progressCallback.bind(null, { percent: 90, message: 'Cleanup logs' }),
         cleanupLogs.bind(null, app),
 
-        updateApp.bind(null, app, { installationProgress: '95, Remove app from database' }),
+        progressCallback.bind(null, { percent: 95, message: 'Remove app from database' }),
         appdb.del.bind(null, app.id)
     ], function seriesDone(error) {
         if (error) {
             debugApp(app, 'error uninstalling app: %s', error);
-            return updateApp(app, { installationState: appdb.ISTATE_ERROR, installationProgress: error.message }, callback.bind(null, error));
+            return updateApp(app, { installationState: apps.ISTATE_ERROR, error: { message: error.message } }, callback.bind(null, error));
         }
         callback(null);
     });
 }
 
-function runApp(app, callback) {
+function runApp(app, progressCallback, callback) {
     assert.strictEqual(typeof app, 'object');
+    assert.strictEqual(typeof progressCallback, 'function');
     assert.strictEqual(typeof callback, 'function');
 
+    progressCallback({ message: 'Starting app' });
+
     docker.startContainer(app.containerId, function (error) {
         if (error) return callback(error);
 
-        updateApp(app, { runState: appdb.RSTATE_RUNNING }, callback);
+        updateApp(app, { runState: apps.RSTATE_RUNNING }, callback);
     });
 }
 
-function stopApp(app, callback) {
+function stopApp(app, progressCallback, callback) {
     assert.strictEqual(typeof app, 'object');
+    assert.strictEqual(typeof progressCallback, 'function');
     assert.strictEqual(typeof callback, 'function');
 
+    progressCallback({ message: 'Stopping app' });
+
     docker.stopContainers(app.id, function (error) {
         if (error) return callback(error);
 
-        updateApp(app, { runState: appdb.RSTATE_STOPPED, health: null }, callback);
+        updateApp(app, { runState: apps.RSTATE_STOPPED, health: null }, callback);
     });
 }
 
-function handleRunCommand(app, callback) {
-    assert.strictEqual(typeof app, 'object');
-    assert.strictEqual(typeof callback, 'function');
-
-    if (app.runState === appdb.RSTATE_PENDING_STOP) {
-        return stopApp(app, callback);
-    }
-
-    if (app.runState === appdb.RSTATE_PENDING_START || app.runState === appdb.RSTATE_RUNNING) {
-        debugApp(app, 'Resuming app with state : %s', app.runState);
-        return runApp(app, callback);
-    }
-
-    debugApp(app, 'handleRunCommand - doing nothing: %s', app.runState);
-
-    return callback(null);
-}
-
-function startTask(appId, callback) {
+function run(appId, args, progressCallback, callback) {
     assert.strictEqual(typeof appId, 'string');
+    assert.strictEqual(typeof args, 'object');
+    assert.strictEqual(typeof progressCallback, 'function');
     assert.strictEqual(typeof callback, 'function');
 
     // determine what to do
@@ -899,51 +838,23 @@ function startTask(appId, callback) {
         debugApp(app, 'startTask installationState: %s runState: %s', app.installationState, app.runState);
 
         switch (app.installationState) {
-        case appdb.ISTATE_PENDING_UNINSTALL: return uninstall(app, callback);
-        case appdb.ISTATE_PENDING_CONFIGURE: return configure(app, callback);
+        case apps.ISTATE_PENDING_INSTALL: return install(app, args.restoreConfig || {}, progressCallback, callback);
+        case apps.ISTATE_PENDING_CONFIGURE: return configure(app, args.oldConfig, progressCallback, callback);
+        case apps.ISTATE_PENDING_UNINSTALL: return uninstall(app, progressCallback, callback);
+        case apps.ISTATE_PENDING_CLONE: return install(app, args.restoreConfig || {}, progressCallback, callback);
+        case apps.ISTATE_PENDING_RESTORE: return install(app, args.restoreConfig || {}, progressCallback, callback);
+        case apps.ISTATE_PENDING_UPDATE: return update(app, args.updateConfig, progressCallback, callback);
+        case apps.ISTATE_PENDING_BACKUP: return backup(app, progressCallback, callback);
+        case apps.ISTATE_INSTALLED:
+            switch (app.runState) {
+            case apps.RSTATE_PENDING_STOP: return stopApp(app, progressCallback, callback);
+            case apps.RSTATE_PENDING_START: return runApp(app, progressCallback, callback);
+            default: return callback(new Error('Unknown run command in apptask:' + app.runState));
+            }
 
-        case appdb.ISTATE_PENDING_UPDATE: return update(app, callback);
-        case appdb.ISTATE_PENDING_FORCE_UPDATE: return update(app, callback);
-
-        case appdb.ISTATE_PENDING_INSTALL: return install(app, callback);
-        case appdb.ISTATE_PENDING_CLONE: return install(app, callback);
-        case appdb.ISTATE_PENDING_RESTORE: return install(app, callback);
-
-        case appdb.ISTATE_PENDING_BACKUP: return backup(app, callback);
-        case appdb.ISTATE_INSTALLED: return handleRunCommand(app, callback);
-
-        case appdb.ISTATE_ERROR:
-            debugApp(app, 'Internal error. apptask launched with error status.');
-            return callback(null);
         default:
             debugApp(app, 'apptask launched with invalid command');
-            return callback(new Error('Unknown command in apptask:' + app.installationState));
+            return callback(new Error('Unknown install command in apptask:' + app.installationState));
         }
     });
 }
-
-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 () {
-        debug('taskmanager sent SIGTERM since it got a new task for this app');
-        process.exit(0);
-    });
-
-    initialize(function (error) {
-        if (error) throw error;
-
-        startTask(process.argv[2], function (error) {
-            if (error) debug('Apptask completed with error', error);
-
-            debug('Apptask completed for %s', process.argv[2]);
-            // https://nodejs.org/api/process.html are exit codes used by node. apps.js uses the value below
-            // to check apptask crashes
-            process.exit(error ? 50 : 0);
-        });
-    });
-}

src/apptaskmanager.js

@@ -0,0 +1,103 @@
+'use strict';
+
+exports = module.exports = {
+    resumeTasks: resumeTasks,
+    scheduleTask: scheduleTask
+};
+
+let apps = require('./apps.js'),
+    assert = require('assert'),
+    debug = require('debug')('box:taskmanager'),
+    fs = require('fs'),
+    locker = require('./locker.js'),
+    safe = require('safetydance'),
+    path = require('path'),
+    paths = require('./paths.js'),
+    tasks = require('./tasks.js');
+
+let gActiveTasks = { }; // indexed by app id
+let gPendingTasks = [ ];
+
+const TASK_CONCURRENCY = 3;
+const NOOP_CALLBACK = function (error) { if (error) debug(error); };
+
+function waitText(lockOperation) {
+    if (lockOperation === locker.OP_BOX_UPDATE) return 'Waiting for Cloudron to finish updating. See the Settings view';
+    if (lockOperation === locker.OP_PLATFORM_START) return 'Waiting for Cloudron to initialize';
+    if (lockOperation === locker.OP_FULL_BACKUP) return 'Wait for Cloudron to finish backup. See the Backups view';
+
+    return ''; // cannot happen
+}
+
+// callback is called when task is finished
+function scheduleTask(appId, taskId, callback) {
+    assert.strictEqual(typeof appId, 'string');
+    assert.strictEqual(typeof taskId, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    if (appId in gActiveTasks) {
+        return callback(new Error(`Task for %s is already active: ${appId}`));
+    }
+
+    if (Object.keys(gActiveTasks).length >= TASK_CONCURRENCY) {
+        debug(`Reached concurrency limit, queueing task id ${taskId}`);
+        tasks.update(taskId, { percent: 0, message: 'Waiting for other app tasks to complete' }, NOOP_CALLBACK);
+        gPendingTasks.push({ appId, taskId, callback });
+        return;
+    }
+
+    var lockError = locker.recursiveLock(locker.OP_APPTASK);
+
+    if (lockError) {
+        debug(`Could not get lock. ${lockError.message}, queueing task id ${taskId}`);
+        tasks.update(taskId, { percent: 0, message: waitText(lockError.operation) }, NOOP_CALLBACK);
+        gPendingTasks.push({ appId, taskId, callback });
+        return;
+    }
+
+    gActiveTasks[appId] = {};
+
+    const logFile = path.join(paths.LOG_DIR, appId, 'apptask.log');
+
+    if (!fs.existsSync(path.dirname(logFile))) safe.fs.mkdirSync(path.dirname(logFile)); // ensure directory
+
+    tasks.startTask(taskId, { logFile }, function (error, result) {
+        callback(error, result);
+
+        delete gActiveTasks[appId];
+        locker.unlock(locker.OP_APPTASK); // unlock event will trigger next task
+    });
+}
+
+function startNextTask() {
+    if (gPendingTasks.length === 0) return;
+
+    assert(Object.keys(gActiveTasks).length < TASK_CONCURRENCY);
+
+    const t = gPendingTasks.shift();
+    scheduleTask(t.appId, t.taskId, t.callback);
+}
+
+// resume app tasks when platform is ready or after a crash
+function resumeTasks(callback) {
+    assert.strictEqual(typeof callback, 'function');
+
+    debug('resuming tasks');
+
+    locker.on('unlocked', startNextTask);
+
+    apps.getAll(function (error, result) {
+        if (error) return callback(error);
+
+        result.forEach(function (app) {
+            if (app.installationState === apps.ISTATE_INSTALLED && app.runState === apps.RSTATE_RUNNING) return;
+            if (app.installationState === apps.ISTATE_ERROR) return;
+
+            debug(`resumeTask: schedule task for ${app.fqdn} ${app.id}: state=${app.installationState},taskId=${app.taskId}`);
+
+            scheduleTask(app.id, app.taskId, NOOP_CALLBACK);
+        });
+
+        callback(null);
+    });
+}

src/auditsource.js

@@ -4,8 +4,8 @@ exports = module.exports = {
     CRON:  { userId: null, username: 'cron' },
     HEALTH_MONITOR: { userId: null, username: 'healthmonitor' },
     SYSADMIN: { userId: null, username: 'sysadmin' },
-    TASK_MANAGER: { userId: null, username: 'taskmanager' },
     APP_TASK: { userId: null, username: 'apptask' },
+    EXTERNAL_LDAP_TASK: { userId: null, username: 'externalldap' },
 
     fromRequest: fromRequest
 };

src/backups.js

@@ -40,18 +40,18 @@ exports = module.exports = {
 };
 
 var addons = require('./addons.js'),
-    appdb = require('./appdb.js'),
     apps = require('./apps.js'),
     AppsError = require('./apps.js').AppsError,
     async = require('async'),
     assert = require('assert'),
     backupdb = require('./backupdb.js'),
-    config = require('./config.js'),
+    constants = require('./constants.js'),
     crypto = require('crypto'),
     database = require('./database.js'),
     DatabaseError = require('./databaseerror.js'),
     DataLayout = require('./datalayout.js'),
     debug = require('debug')('box:backups'),
+    df = require('@sindresorhus/df'),
     eventlog = require('./eventlog.js'),
     fs = require('fs'),
     locker = require('./locker.js'),
@@ -60,6 +60,7 @@ var addons = require('./addons.js'),
     path = require('path'),
     paths = require('./paths.js'),
     progressStream = require('progress-stream'),
+    prettyBytes = require('pretty-bytes'),
     safe = require('safetydance'),
     shell = require('./shell.js'),
     settings = require('./settings.js'),
@@ -112,6 +113,7 @@ function api(provider) {
     case 's3-v4-compat': return require('./storage/s3.js');
     case 'digitalocean-spaces': return require('./storage/s3.js');
     case 'exoscale-sos': return require('./storage/s3.js');
+    case 'wasabi': return require('./storage/s3.js');
     case 'scaleway-objectstorage': return require('./storage/s3.js');
     case 'noop': return require('./storage/noop.js');
     default: return null;
@@ -291,6 +293,9 @@ function tarPack(dataLayout, key, callback) {
         },
         map: function(header) {
             header.name = dataLayout.toRemotePath(header.name);
+            // the tar pax format allows us to encode filenames > 100 and size > 8GB (see #640)
+            // https://www.systutorials.com/docs/linux/man/5-star/
+            if (header.size > 8589934590 || header.name > 99) header.pax = { size: header.size };
             return header;
         },
         strict: false // do not error for unknown types (skip fifo, char/block devices)
@@ -408,6 +413,34 @@ function saveFsMetadata(dataLayout, metadataFile, callback) {
     callback();
 }
 
+// the du call in the function below requires root
+function checkFreeDiskSpace(backupConfig, dataLayout, callback) {
+    assert.strictEqual(typeof backupConfig, 'object');
+    assert(dataLayout instanceof DataLayout, 'dataLayout must be a DataLayout');
+    assert.strictEqual(typeof callback, 'function');
+
+    if (backupConfig.provider !== 'filesystem') return callback();
+
+    let used = 0;
+    for (let localPath of dataLayout.localPaths()) {
+        debug(`checkFreeDiskSpace: getting disk usage of ${localPath}`);
+        let result = safe.child_process.execSync(`du -Dsb ${localPath}`, { encoding: 'utf8' });
+        if (!result) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, safe.error));
+        used += parseInt(result, 10);
+    }
+
+    debug(`checkFreeDiskSpace: ${used} bytes`);
+
+    df.file(backupConfig.backupFolder).then(function (diskUsage) {
+        const needed = used + (1024 * 1024 * 1024); // check if there is atleast 1GB left afterwards
+        if (diskUsage.available <= needed) return callback(new BackupsError(BackupsError.EXTERNAL_ERROR, `Not enough disk space for backup. Needed: ${prettyBytes(needed)} Available: ${prettyBytes(diskUsage.available)}`));
+
+        callback(null);
+    }).catch(function (error) {
+        callback(new BackupsError(BackupsError.INTERNAL_ERROR, error));
+    });
+}
+
 // this function is called via backupupload (since it needs root to traverse app's directory)
 function upload(backupId, format, dataLayoutString, progressCallback, callback) {
     assert.strictEqual(typeof backupId, 'string');
@@ -423,29 +456,33 @@ function upload(backupId, format, dataLayoutString, progressCallback, callback)
     settings.getBackupConfig(function (error, backupConfig) {
         if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error));
 
-        if (format === 'tgz') {
-            async.retry({ times: 5, interval: 20000 }, function (retryCallback) {
-                retryCallback = once(retryCallback); // protect again upload() erroring much later after tar stream error
+        checkFreeDiskSpace(backupConfig, dataLayout, function (error) {
+            if (error) return callback(error);
 
-                tarPack(dataLayout, backupConfig.key || null, function (error, tarStream) {
-                    if (error) return retryCallback(error);
+            if (format === 'tgz') {
+                async.retry({ times: 5, interval: 20000 }, function (retryCallback) {
+                    retryCallback = once(retryCallback); // protect again upload() erroring much later after tar stream error
 
-                    tarStream.on('progress', function(progress) {
-                        const transferred = Math.round(progress.transferred/1024/1024), speed = Math.round(progress.speed/1024/1024);
-                        if (!transferred && !speed) return progressCallback({ message: 'Uploading backup' }); // 0M@0Mbps looks wrong
-                        progressCallback({ message: `Uploading backup ${transferred}M@${speed}Mbps` });
+                    tarPack(dataLayout, backupConfig.key || null, function (error, tarStream) {
+                        if (error) return retryCallback(error);
+
+                        tarStream.on('progress', function(progress) {
+                            const transferred = Math.round(progress.transferred/1024/1024), speed = Math.round(progress.speed/1024/1024);
+                            if (!transferred && !speed) return progressCallback({ message: 'Uploading backup' }); // 0M@0Mbps looks wrong
+                            progressCallback({ message: `Uploading backup ${transferred}M@${speed}Mbps` });
+                        });
+                        tarStream.on('error', retryCallback); // already returns BackupsError
+
+                        api(backupConfig.provider).upload(backupConfig, getBackupFilePath(backupConfig, backupId, format), tarStream, retryCallback);
                     });
-                    tarStream.on('error', retryCallback); // already returns BackupsError
-
-                    api(backupConfig.provider).upload(backupConfig, getBackupFilePath(backupConfig, backupId, format), tarStream, retryCallback);
-                });
-            }, callback);
-        } else {
-            async.series([
-                saveFsMetadata.bind(null, dataLayout, `${dataLayout.localRoot()}/fsmetadata.json`),
-                sync.bind(null, backupConfig, backupId, dataLayout, progressCallback)
-            ], callback);
-        }
+                }, callback);
+            } else {
+                async.series([
+                    saveFsMetadata.bind(null, dataLayout, `${dataLayout.localRoot()}/fsmetadata.json`),
+                    sync.bind(null, backupConfig, backupId, dataLayout, progressCallback)
+                ], callback);
+            }
+        });
     });
 }
 
@@ -638,7 +675,7 @@ function restore(backupConfig, backupId, progressCallback, callback) {
 
             debug('restore: database imported');
 
-            callback();
+            settings.initCache(callback);
         });
     });
 }
@@ -689,7 +726,7 @@ function runBackupUpload(backupId, format, dataLayout, progressCallback, callbac
         callback();
     }).on('message', function (message) {
         if (!message.result) return progressCallback(message);
-        debug(`runBackupUpload: result - ${message}`);
+        debug(`runBackupUpload: result - ${JSON.stringify(message)}`);
         result = message.result;
     });
 }
@@ -764,12 +801,12 @@ function rotateBoxBackup(backupConfig, tag, appBackupIds, progressCallback, call
     if (!snapshotInfo) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, 'Snapshot info missing or corrupt'));
 
     const snapshotTime = snapshotInfo.timestamp.replace(/[T.]/g, '-').replace(/[:Z]/g,''); // add this to filename to make it unique, so it's easy to download them
-    const backupId = util.format('%s/box_%s_v%s', tag, snapshotTime, config.version());
+    const backupId = util.format('%s/box_%s_v%s', tag, snapshotTime, constants.VERSION);
     const format = backupConfig.format;
 
     debug(`Rotating box backup to id ${backupId}`);
 
-    backupdb.add(backupId, { version: config.version(), type: backupdb.BACKUP_TYPE_BOX, dependsOn: appBackupIds, manifest: null, format: format }, function (error) {
+    backupdb.add(backupId, { version: constants.VERSION, type: backupdb.BACKUP_TYPE_BOX, dependsOn: appBackupIds, manifest: null, format: format }, function (error) {
         if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error));
 
         var copy = api(backupConfig.provider).copy(backupConfig, getBackupFilePath(backupConfig, 'snapshot/box', format), getBackupFilePath(backupConfig, backupId, format));
@@ -809,10 +846,10 @@ function backupBoxWithAppBackupIds(appBackupIds, tag, progressCallback, callback
 function canBackupApp(app) {
     // only backup apps that are installed or pending configure or called from apptask. Rest of them are in some
     // state not good for consistent backup (i.e addons may not have been setup completely)
-    return (app.installationState === appdb.ISTATE_INSTALLED && app.health === appdb.HEALTH_HEALTHY) ||
-            app.installationState === appdb.ISTATE_PENDING_CONFIGURE ||
-            app.installationState === appdb.ISTATE_PENDING_BACKUP ||  // called from apptask
-            app.installationState === appdb.ISTATE_PENDING_UPDATE; // called from apptask
+    return (app.installationState === apps.ISTATE_INSTALLED && app.health === apps.HEALTH_HEALTHY) ||
+            app.installationState === apps.ISTATE_PENDING_CONFIGURE ||
+            app.installationState === apps.ISTATE_PENDING_BACKUP ||  // called from apptask
+            app.installationState === apps.ISTATE_PENDING_UPDATE; // called from apptask
 }
 
 function snapshotApp(app, progressCallback, callback) {
@@ -982,19 +1019,21 @@ function startBackupTask(auditSource, callback) {
     let error = locker.lock(locker.OP_FULL_BACKUP);
     if (error) return callback(new BackupsError(BackupsError.BAD_STATE, `Cannot backup now: ${error.message}`));
 
-    let task = tasks.startTask(tasks.TASK_BACKUP, []);
-    task.on('error', (error) => callback(new BackupsError(BackupsError.INTERNAL_ERROR, error)));
-    task.on('start', (taskId) => {
+    tasks.add(tasks.TASK_BACKUP, [ ], function (error, taskId) {
+        if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error));
+
         eventlog.add(eventlog.ACTION_BACKUP_START, auditSource, { taskId });
+
+        tasks.startTask(taskId, {}, function (error, result) {
+            locker.unlock(locker.OP_FULL_BACKUP);
+
+            const errorMessage = error ? error.message : '';
+
+            eventlog.add(eventlog.ACTION_BACKUP_FINISH, auditSource, { taskId: taskId, errorMessage: errorMessage, backupId: result });
+        });
+
         callback(null, taskId);
     });
-    task.on('finish', (error, result) => {
-        locker.unlock(locker.OP_FULL_BACKUP);
-
-        const errorMessage = error ? error.message : '';
-
-        eventlog.add(eventlog.ACTION_BACKUP_FINISH, auditSource, { taskId: task.id, errorMessage: errorMessage, backupId: result });
-    });
 }
 
 function ensureBackup(auditSource, callback) {
@@ -1218,18 +1257,21 @@ function cleanup(auditSource, progressCallback, callback) {
 }
 
 function startCleanupTask(auditSource, callback) {
-    let task = tasks.startTask(tasks.TASK_CLEAN_BACKUPS, [ auditSource ]);
-    task.on('error', (error) => callback(new BackupsError(BackupsError.INTERNAL_ERROR, error)));
-    task.on('start', (taskId) => {
+
+    tasks.add(tasks.TASK_CLEAN_BACKUPS, [ auditSource ], function (error, taskId) {
+        if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error));
+
         eventlog.add(eventlog.ACTION_BACKUP_CLEANUP_START, auditSource, { taskId });
-        callback(null, taskId);
-    });
-    task.on('finish', (error, result) => { // result is { removedBoxBackups, removedAppBackups }
-        eventlog.add(eventlog.ACTION_BACKUP_CLEANUP_FINISH, auditSource, {
-            errorMessage: error ? error.message : null,
-            removedBoxBackups: result ? result.removedBoxBackups : [],
-            removedAppBackups: result ? result.removedAppBackups : []
+
+        tasks.startTask(taskId, {}, (error, result) => { // result is { removedBoxBackups, removedAppBackups }
+            eventlog.add(eventlog.ACTION_BACKUP_CLEANUP_FINISH, auditSource, {
+                errorMessage: error ? error.message : null,
+                removedBoxBackups: result ? result.removedBoxBackups : [],
+                removedAppBackups: result ? result.removedAppBackups : []
+            });
         });
+
+        callback(null, taskId);
     });
 }
 

src/changelog.js

@@ -0,0 +1,38 @@
+'use strict';
+
+let assert = require('assert'),
+    fs = require('fs'),
+    path = require('path');
+
+exports = module.exports = {
+    getChanges: getChanges
+};
+
+function getChanges(version) {
+    assert.strictEqual(typeof version, 'string');
+
+    let changelog = [ ];
+    const lines = fs.readFileSync(path.join(__dirname, '../CHANGES'), 'utf8').split('\n');
+
+    version = version.replace(/[+-].*/, ''); // strip prerelease
+
+    let i;
+    for (i = 0; i < lines.length; i++) {
+        if (lines[i] === '[' + version + ']') break;
+    }
+
+    for (i = i + 1; i < lines.length; i++) {
+        if (lines[i] === '') continue;
+        if (lines[i][0] === '[') break;
+
+        lines[i] = lines[i].trim();
+
+        // detect and remove list style - and * in changelog lines
+        if (lines[i].indexOf('-') === 0) lines[i] = lines[i].slice(1).trim();
+        if (lines[i].indexOf('*') === 0) lines[i] = lines[i].slice(1).trim();
+
+        changelog.push(lines[i]);
+    }
+
+    return changelog;
+}

src/cloudron.js

@@ -6,7 +6,6 @@ exports = module.exports = {
     initialize: initialize,
     uninitialize: uninitialize,
     getConfig: getConfig,
-    getDisks: getDisks,
     getLogs: getLogs,
 
     reboot: reboot,
@@ -19,24 +18,22 @@ exports = module.exports = {
     setDashboardAndMailDomain: setDashboardAndMailDomain,
     renewCerts: renewCerts,
 
-    runSystemChecks: runSystemChecks,
+    setupDashboard: setupDashboard,
 
-    // exposed for testing
-    _checkDiskSpace: checkDiskSpace
+    runSystemChecks: runSystemChecks,
 };
 
 var apps = require('./apps.js'),
     assert = require('assert'),
     async = require('async'),
+    auditSource = require('./auditsource.js'),
     backups = require('./backups.js'),
     clients = require('./clients.js'),
-    config = require('./config.js'),
     constants = require('./constants.js'),
     cron = require('./cron.js'),
     debug = require('debug')('box:cloudron'),
     domains = require('./domains.js'),
     DomainsError = require('./domains.js').DomainsError,
-    df = require('@sindresorhus/df'),
     eventlog = require('./eventlog.js'),
     custom = require('./custom.js'),
     fs = require('fs'),
@@ -47,10 +44,12 @@ var apps = require('./apps.js'),
     paths = require('./paths.js'),
     platform = require('./platform.js'),
     reverseProxy = require('./reverseproxy.js'),
+    safe = require('safetydance'),
     settings = require('./settings.js'),
     shell = require('./shell.js'),
     spawn = require('child_process').spawn,
     split = require('split'),
+    sysinfo = require('./sysinfo.js'),
     tasks = require('./tasks.js'),
     users = require('./users.js'),
     util = require('util');
@@ -89,7 +88,7 @@ function initialize(callback) {
 
     runStartupTasks();
 
-    callback();
+    notifyUpdate(callback);
 }
 
 function uninitialize(callback) {
@@ -113,13 +112,45 @@ function onActivated(callback) {
     ], callback);
 }
 
+function setUpdateSuccess(callback) {
+    tasks.listByTypePaged(tasks.TASK_UPDATE, 1, 1, function (error, results) {
+        if (error) return callback(new CloudronError(CloudronError.INTERNAL_ERROR, error));
+        if (results.length !== 1) return callback(); // when hotfixing
+
+        tasks.update(results[0].id, { percent: 100, error: null }, function (error) {
+            if (error) return callback(new CloudronError(CloudronError.INTERNAL_ERROR, error));
+
+            callback();
+        });
+    });
+}
+
+function notifyUpdate(callback) {
+    assert.strictEqual(typeof callback, 'function');
+
+    const version = safe.fs.readFileSync(paths.VERSION_FILE, 'utf8');
+    if (version === constants.VERSION) return callback();
+
+    eventlog.add(eventlog.ACTION_UPDATE_FINISH, auditSource.CRON, { oldVersion: version || 'dev', newVersion: constants.VERSION }, function (error) {
+        if (error) return callback(new CloudronError(CloudronError.INTERNAL_ERROR, error));
+
+        setUpdateSuccess(function (error) {
+            if (error) return callback(error);
+
+            safe.fs.writeFileSync(paths.VERSION_FILE, constants.VERSION, 'utf8');
+
+            callback();
+        });
+    });
+}
+
 // each of these tasks can fail. we will add some routes to fix/re-run them
 function runStartupTasks() {
     // configure nginx to be reachable by IP
     reverseProxy.configureDefaultServer(NOOP_CALLBACK);
 
     // always generate webadmin config since we have no versioning mechanism for the ejs
-    if (config.adminDomain()) reverseProxy.writeAdminConfig(config.adminDomain(), NOOP_CALLBACK);
+    if (settings.adminDomain()) reverseProxy.writeAdminConfig(settings.adminDomain(), NOOP_CALLBACK);
 
     // check activation state and start the platform
     users.isActivated(function (error, activated) {
@@ -130,32 +161,6 @@ function runStartupTasks() {
     });
 }
 
-function getDisks(callback) {
-    assert.strictEqual(typeof callback, 'function');
-
-    var disks = {
-        boxDataDisk: null,
-        platformDataDisk: null,
-        appsDataDisk: null
-    };
-
-    df.file(paths.BOX_DATA_DIR).then(function (result) {
-        disks.boxDataDisk = result.filesystem;
-
-        return df.file(paths.PLATFORM_DATA_DIR);
-    }).then(function (result) {
-        disks.platformDataDisk = result.filesystem;
-
-        return df.file(paths.APPS_DATA_DIR);
-    }).then(function (result) {
-        disks.appsDataDisk = result.filesystem;
-
-        callback(null, disks);
-    }).catch(function (error) {
-        callback(new CloudronError(CloudronError.INTERNAL_ERROR, error));
-    });
-}
-
 function getConfig(callback) {
     assert.strictEqual(typeof callback, 'function');
 
@@ -164,18 +169,17 @@ function getConfig(callback) {
 
         // 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(),
-            isDemo: config.isDemo(),
+            apiServerOrigin: settings.apiServerOrigin(),
+            webServerOrigin: settings.webServerOrigin(),
+            adminDomain: settings.adminDomain(),
+            adminFqdn: settings.adminFqdn(),
+            mailFqdn: settings.mailFqdn(),
+            version: constants.VERSION,
+            isDemo: settings.isDemo(),
             memory: os.totalmem(),
-            provider: config.provider(),
+            provider: sysinfo.provider(),
             cloudronName: allSettings[settings.CLOUDRON_NAME_KEY],
-            features: custom.features(),
-            supportEmail: custom.supportEmail()
+            uiSpec: custom.uiSpec()
         });
     });
 }
@@ -195,7 +199,6 @@ function isRebootRequired(callback) {
 function runSystemChecks() {
     async.parallel([
         checkBackupConfiguration,
-        checkDiskSpace,
         checkMailStatus,
         checkRebootRequired
     ], function (error) {
@@ -215,45 +218,6 @@ function checkBackupConfiguration(callback) {
     });
 }
 
-function checkDiskSpace(callback) {
-    assert.strictEqual(typeof callback, 'function');
-
-    debug('Checking disk space');
-
-    getDisks(function (error, disks) {
-        if (error) {
-            debug('df error %s', error.message);
-            return callback();
-        }
-
-        df().then(function (entries) {
-            /*
-                [{
-                filesystem: '/dev/disk1',
-                size: 499046809600,
-                used: 443222245376,
-                available: 55562420224,
-                capacity: 0.89,
-                mountpoint: '/'
-            }, ...]
-            */
-            var oos = entries.some(function (entry) {
-                // ignore other filesystems but where box, app and platform data is
-                if (entry.filesystem !== disks.boxDataDisk && entry.filesystem !== disks.platformDataDisk && entry.filesystem !== disks.appsDataDisk) return false;
-
-                return (entry.available <= (1.25 * 1024 * 1024 * 1024)); // 1.5G
-            });
-
-            debug('Disk space checked. ok: %s', !oos);
-
-            notifications.alert(notifications.ALERT_DISK_SPACE, 'Server is running out of disk space', oos ? JSON.stringify(entries, null, 4) : '', callback);
-        }).catch(function (error) {
-            if (error) console.error(error);
-            callback();
-        });
-    });
-}
-
 function checkMailStatus(callback) {
     assert.strictEqual(typeof callback, 'function');
 
@@ -343,9 +307,13 @@ function prepareDashboardDomain(domain, auditSource, callback) {
             const conflict = result.filter(app => app.fqdn === fqdn);
             if (conflict.length) return callback(new CloudronError(CloudronError.BAD_STATE, 'Dashboard location conflicts with an existing app'));
 
-            let task = tasks.startTask(tasks.TASK_PREPARE_DASHBOARD_DOMAIN, [ domain, auditSource ]);
-            task.on('error', (error) => callback(new CloudronError(CloudronError.INTERNAL_ERROR, error)));
-            task.on('start', (taskId) => callback(null, taskId));
+            tasks.add(tasks.TASK_PREPARE_DASHBOARD_DOMAIN, [ domain, auditSource ], function (error, taskId) {
+                if (error) return callback(new CloudronError(CloudronError.INTERNAL_ERROR, error));
+
+                tasks.startTask(taskId, {}, NOOP_CALLBACK);
+
+                callback(null, taskId);
+            });
         });
     });
 }
@@ -367,10 +335,10 @@ function setDashboardDomain(domain, auditSource, callback) {
 
             const fqdn = domains.fqdn(constants.ADMIN_LOCATION, domainObject);
 
-            config.setAdminDomain(domain);
-            config.setAdminFqdn(fqdn);
-
-            clients.addDefaultClients(config.adminOrigin(), function (error) {
+            async.series([
+                (done) => settings.setAdmin(domain, fqdn, done),
+                (done) => clients.addDefaultClients(settings.adminOrigin(), done)
+            ], function (error) {
                 if (error) return callback(new CloudronError(CloudronError.INTERNAL_ERROR, error));
 
                 eventlog.add(eventlog.ACTION_DASHBOARD_DOMAIN_UPDATE, auditSource, { domain: domain, fqdn: fqdn });
@@ -398,12 +366,27 @@ function setDashboardAndMailDomain(domain, auditSource, callback) {
     });
 }
 
+function setupDashboard(auditSource, progressCallback, callback) {
+    assert.strictEqual(typeof auditSource, 'object');
+    assert.strictEqual(typeof progressCallback, 'function');
+    assert.strictEqual(typeof callback, 'function');
+
+    async.series([
+        domains.prepareDashboardDomain.bind(null, settings.adminDomain(), auditSource, progressCallback),
+        setDashboardDomain.bind(null, settings.adminDomain(), auditSource)
+    ], callback);
+}
+
 function renewCerts(options, auditSource, callback) {
     assert.strictEqual(typeof options, 'object');
     assert.strictEqual(typeof auditSource, 'object');
     assert.strictEqual(typeof callback, 'function');
 
-    let task = tasks.startTask(tasks.TASK_RENEW_CERTS, [ options, auditSource ]);
-    task.on('error', (error) => callback(new CloudronError(CloudronError.INTERNAL_ERROR, error)));
-    task.on('start', (taskId) => callback(null, taskId));
+    tasks.add(tasks.TASK_RENEW_CERTS, [ options, auditSource ], function (error, taskId) {
+        if (error) return callback(new CloudronError(CloudronError.INTERNAL_ERROR, error));
+
+        tasks.startTask(taskId, {}, NOOP_CALLBACK);
+
+        callback(null, taskId);
+    });
 }

src/collectd.config.ejs

@@ -30,3 +30,13 @@ LoadPlugin "table"
     </Result>
   </Table>
 </Plugin>
+
+<Plugin python>
+  <Module du>
+    <Path>
+        Instance "<%= appId %>"
+        Dir "<%= appDataDir %>"
+    </Path>
+  </Module>
+</Plugin>
+

src/config.js

@@ -1,203 +0,0 @@
-'use strict';
-
-exports = module.exports = {
-    baseDir: baseDir,
-
-    // values set here will be lost after a upgrade/update. use the sqlite database
-    // for persistent values that need to be backed up
-    get: get,
-    set: set,
-
-    // ifdefs to check environment
-    CLOUDRON: process.env.BOX_ENV === 'cloudron',
-    TEST: process.env.BOX_ENV === 'test',
-
-    // convenience getters
-    provider: provider,
-    apiServerOrigin: apiServerOrigin,
-    webServerOrigin: webServerOrigin,
-    adminDomain: adminDomain,
-    setFqdn: setAdminDomain,
-    setAdminDomain: setAdminDomain,
-    setAdminFqdn: setAdminFqdn,
-    version: version,
-    database: database,
-
-    // these values are derived
-    adminOrigin: adminOrigin,
-    internalAdminOrigin: internalAdminOrigin,
-    sysadminOrigin: sysadminOrigin, // localhost routes
-    adminFqdn: adminFqdn,
-    mailFqdn: mailFqdn,
-    hasIPv6: hasIPv6,
-
-    isDemo: isDemo,
-
-    // for testing resets to defaults
-    _reset: _reset
-};
-
-var assert = require('assert'),
-    fs = require('fs'),
-    path = require('path'),
-    safe = require('safetydance'),
-    _ = require('underscore');
-
-
-// assert on unknown environment can't proceed
-assert(exports.CLOUDRON || exports.TEST, 'Unknown environment. This should not happen!');
-
-var data = { };
-
-function baseDir() {
-    const homeDir = process.env.HOME || process.env.HOMEPATH || process.env.USERPROFILE;
-    if (exports.CLOUDRON) return homeDir;
-    if (exports.TEST) return path.join(homeDir, '.cloudron_test');
-    // cannot reach
-}
-
-const cloudronConfigFileName = exports.CLOUDRON ? '/etc/cloudron/cloudron.conf' : path.join(baseDir(), 'cloudron.conf');
-
-function saveSync() {
-    // only save values we want to have in the cloudron.conf, see start.sh
-    var conf = {
-        apiServerOrigin: data.apiServerOrigin,
-        webServerOrigin: data.webServerOrigin,
-        adminDomain: data.adminDomain,
-        adminFqdn: data.adminFqdn,
-        provider: data.provider,
-        isDemo: data.isDemo
-    };
-
-    fs.writeFileSync(cloudronConfigFileName, JSON.stringify(conf, null, 4)); // functions are ignored by JSON.stringify
-}
-
-function _reset(callback) {
-    safe.fs.unlinkSync(cloudronConfigFileName);
-
-    initConfig();
-
-    if (callback) callback();
-}
-
-function initConfig() {
-    // setup defaults
-    data.adminFqdn = '';
-    data.adminDomain = '';
-    data.port = 3000;
-    data.apiServerOrigin = null;
-    data.webServerOrigin = null;
-    data.provider = 'generic';
-    data.smtpPort = 2525; // this value comes from mail container
-    data.sysadminPort = 3001;
-    data.ldapPort = 3002;
-    data.dockerProxyPort = 3003;
-
-    // keep in sync with start.sh
-    data.database = {
-        hostname: '127.0.0.1',
-        username: 'root',
-        password: 'password',
-        port: 3306,
-        name: 'box'
-    };
-
-    // overrides for local testings
-    if (exports.TEST) {
-        data.port = 5454;
-        data.apiServerOrigin = 'http://localhost:6060'; // hock doesn't support https
-
-        // see setupTest script how the mysql-server is run
-        data.database.hostname = require('child_process').execSync('docker inspect -f "{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}" mysql-server').toString().trim();
-    }
-
-    // overwrite defaults with saved config
-    var existingData = safe.JSON.parse(safe.fs.readFileSync(cloudronConfigFileName, 'utf8'));
-    _.extend(data, existingData);
-}
-
-initConfig();
-
-// set(obj) or set(key, value)
-function set(key, value) {
-    if (typeof key === 'object') {
-        var obj = key;
-        for (var k in obj) {
-            assert(k in data, 'config.js is missing key "' + k + '"');
-            data[k] = obj[k];
-        }
-    } else {
-        data = safe.set(data, key, value);
-    }
-
-    saveSync();
-}
-
-function get(key) {
-    assert.strictEqual(typeof key, 'string');
-
-    return safe.query(data, key);
-}
-
-function apiServerOrigin() {
-    return get('apiServerOrigin');
-}
-
-function webServerOrigin() {
-    return get('webServerOrigin');
-}
-
-function setAdminDomain(domain) {
-    set('adminDomain', domain);
-}
-
-function adminDomain() {
-    return get('adminDomain');
-}
-
-function setAdminFqdn(adminFqdn) {
-    set('adminFqdn', adminFqdn);
-}
-
-function adminFqdn() {
-    return get('adminFqdn');
-}
-
-function mailFqdn() {
-    return adminFqdn();
-}
-
-function adminOrigin() {
-    return 'https://' + adminFqdn();
-}
-
-function internalAdminOrigin() {
-    return 'http://127.0.0.1:' + get('port');
-}
-
-function sysadminOrigin() {
-    return 'http://127.0.0.1:' + get('sysadminPort');
-}
-
-function version() {
-    if (exports.TEST) return '3.0.0-test';
-    return fs.readFileSync(path.join(__dirname, '../VERSION'), 'utf8').trim();
-}
-
-function database() {
-    return get('database');
-}
-
-function isDemo() {
-    return get('isDemo') === true;
-}
-
-function provider() {
-    return get('provider');
-}
-
-function hasIPv6() {
-    const IPV6_PROC_FILE = '/proc/net/if_inet6';
-    // on contabo, /proc/net/if_inet6 is an empty file. so just exists is not enough
-    return fs.existsSync(IPV6_PROC_FILE) && fs.readFileSync(IPV6_PROC_FILE, 'utf8').trim().length !== 0;
-}

src/constants.js

@@ -1,7 +1,12 @@
 'use strict';
 
+let fs = require('fs'),
+    path = require('path');
+
+const CLOUDRON = process.env.BOX_ENV === 'cloudron',
+    TEST = process.env.BOX_ENV === 'test';
+
 exports = module.exports = {
-    API_LOCATION: 'api', // this is unused but reserved for future use (#403)
     SMTP_LOCATION: 'smtp',
     IMAP_LOCATION: 'imap',
 
@@ -18,7 +23,12 @@ exports = module.exports = {
     ],
 
     ADMIN_LOCATION: 'my',
-    DKIM_SELECTOR: 'cloudron',
+
+    PORT: CLOUDRON ? 3000 : 5454,
+    INTERNAL_SMTP_PORT: 2525, // this value comes from the mail container
+    SYSADMIN_PORT: 3001,
+    LDAP_PORT: 3002,
+    DOCKER_PROXY_PORT: 3003,
 
     NGINX_DEFAULT_CONFIG_FILE_NAME: 'default.conf',
 
@@ -32,6 +42,11 @@ exports = module.exports = {
 
     AUTOUPDATE_PATTERN_NEVER: 'never',
 
-    SECRET_PLACEHOLDER: String.fromCharCode(0x25CF).repeat(8)
+    SECRET_PLACEHOLDER: String.fromCharCode(0x25CF).repeat(8),
+
+    CLOUDRON: CLOUDRON,
+    TEST: TEST,
+
+    VERSION: process.env.BOX_ENV === 'cloudron' ? fs.readFileSync(path.join(__dirname, '../VERSION'), 'utf8').trim() : '4.2.0-test'
 };
 

src/cron.js

@@ -15,10 +15,10 @@ var appHealthMonitor = require('./apphealthmonitor.js'),
     auditSource = require('./auditsource.js'),
     backups = require('./backups.js'),
     cloudron = require('./cloudron.js'),
-    config = require('./config.js'),
     constants = require('./constants.js'),
     CronJob = require('cron').CronJob,
     debug = require('debug')('box:cron'),
+    disks = require('./disks.js'),
     dyndns = require('./dyndns.js'),
     eventlog = require('./eventlog.js'),
     janitor = require('./janitor.js'),
@@ -35,6 +35,7 @@ var gJobs = {
     backup: null,
     boxUpdateChecker: null,
     systemChecks: null,
+    diskSpaceChecker: null,
     certificateRenew: null,
     cleanupBackups: null,
     cleanupEventlog: null,
@@ -112,6 +113,15 @@ function recreateJobs(tz) {
         timeZone: tz
     });
 
+    if (gJobs.diskSpaceChecker) gJobs.diskSpaceChecker.stop();
+    gJobs.diskSpaceChecker = new CronJob({
+        cronTime: '00 30 * * * *', // every 30 minutes. if you change this interval, change the notification messages with correct duration
+        onTick: () => disks.checkDiskSpace(NOOP_CALLBACK),
+        start: true,
+        runOnInit: true, // run system check immediately
+        timeZone: tz
+    });
+
     // randomized pattern per cloudron every hour
     var randomMinute = Math.floor(60*Math.random());
 
@@ -165,7 +175,7 @@ function recreateJobs(tz) {
 
     if (gJobs.schedulerSync) gJobs.schedulerSync.stop();
     gJobs.schedulerSync = new CronJob({
-        cronTime: config.TEST ? '*/10 * * * * *' : '00 */1 * * * *', // every minute
+        cronTime: constants.TEST ? '*/10 * * * * *' : '00 */1 * * * *', // every minute
         onTick: scheduler.sync,
         start: true,
         timeZone: tz
@@ -204,7 +214,7 @@ function boxAutoupdatePatternChanged(pattern) {
             var updateInfo = updateChecker.getUpdateInfo();
             if (updateInfo.box) {
                 debug('Starting autoupdate to %j', updateInfo.box);
-                updater.updateToLatest(auditSource.CRON, NOOP_CALLBACK);
+                updater.updateToLatest({ skipBackup: false }, auditSource.CRON, NOOP_CALLBACK);
             } else {
                 debug('No box auto updates available');
             }
@@ -248,7 +258,7 @@ function dynamicDnsChanged(enabled) {
 
     if (enabled) {
         gJobs.dynamicDns = new CronJob({
-            cronTime: '00 */10 * * * *',
+            cronTime: '5 * * * * *',    // we only update the records if the ip has changed.
             onTick: dyndns.sync.bind(null, auditSource.CRON, NOOP_CALLBACK),
             start: true,
             timeZone: gJobs.boxUpdateCheckerJob.cronTime.zone // hack

src/custom.js

@@ -1,44 +1,66 @@
 'use strict';
 
-let debug = require('debug')('box:features'),
+let debug = require('debug')('box:custom'),
+    lodash = require('lodash'),
     paths = require('./paths.js'),
     safe = require('safetydance'),
     yaml = require('js-yaml');
 
 exports = module.exports = {
-    features: features,
-    supportEmail: supportEmail,
-    alertsEmail: alertsEmail,
-    sendAlertsToCloudronAdmins: sendAlertsToCloudronAdmins
+    uiSpec: uiSpec,
+    spec: spec
 };
 
-const gCustom = (function () {
+const DEFAULT_SPEC = {
+    appstore: {
+        blacklist: [],
+        whitelist: null // null imples, not set. this is an object and not an array
+    },
+    backups: {
+        configurable: true
+    },
+    domains: {
+        dynamicDns: true,
+        changeDashboardDomain: true
+    },
+    subscription: {
+        configurable: true
+    },
+    support: {
+        email: 'support@cloudron.io',
+        remoteSupport: true,
+        ticketFormBody:
+            'Use this form to open support tickets. You can also write directly to [support@cloudron.io](mailto:support@cloudron.io).\n\n'
+            + '* [Knowledge Base & App Docs](https://cloudron.io/documentation/apps/?support_view)\n'
+            + '* [Custom App Packaging & API](https://cloudron.io/developer/packaging/?support_view)\n'
+            + '* [Forum](https://forum.cloudron.io/)\n\n',
+        submitTickets: true
+    },
+    alerts: {
+        email: '',
+        notifyCloudronAdmins: false
+    },
+    footer: {
+        body: '&copy; 2019 [Cloudron](https://cloudron.io) [Forum <i class="fa fa-comments"></i>](https://forum.cloudron.io)'
+    }
+};
+
+const gSpec = (function () {
     try {
-        if (!safe.fs.existsSync(paths.CUSTOM_FILE)) return {};
-        return yaml.safeLoad(safe.fs.readFileSync(paths.CUSTOM_FILE, 'utf8'));
+        if (!safe.fs.existsSync(paths.CUSTOM_FILE)) return DEFAULT_SPEC;
+        const c = yaml.safeLoad(safe.fs.readFileSync(paths.CUSTOM_FILE, 'utf8'));
+        return lodash.merge({}, DEFAULT_SPEC, c);
     } catch (e) {
         debug(`Error loading features file from ${paths.CUSTOM_FILE} : ${e.message}`);
-        return {};
+        return DEFAULT_SPEC;
     }
 })();
 
-function features() {
-    return {
-        dynamicDns: safe.query(gCustom, 'features.dynamicDns', true),
-        remoteSupport: safe.query(gCustom, 'features.remoteSupport', true),
-        subscription: safe.query(gCustom, 'features.subscription', true),
-        configureBackup: safe.query(gCustom, 'features.configureBackup', true)
-    };
+// flags sent to the UI. this is separate because we have values that are secret to the backend
+function uiSpec() {
+    return gSpec;
 }
 
-function supportEmail() {
-    return safe.query(gCustom, 'support.email', 'support@cloudron.io');
-}
-
-function alertsEmail() {
-    return safe.query(gCustom, 'alerts.email', '');
-}
-
-function sendAlertsToCloudronAdmins() {
-    return safe.query(gCustom, 'alerts.notifyCloudronAdmins', true);
-}
+function spec() {
+    return gSpec;
+}

src/database.js

@@ -15,7 +15,7 @@ exports = module.exports = {
 var assert = require('assert'),
     async = require('async'),
     child_process = require('child_process'),
-    config = require('./config.js'),
+    constants = require('./constants.js'),
     mysql = require('mysql'),
     once = require('once'),
     util = require('util');
@@ -23,25 +23,38 @@ var assert = require('assert'),
 var gConnectionPool = null,
     gDefaultConnection = null;
 
+const gDatabase = {
+    hostname: '127.0.0.1',
+    username: 'root',
+    password: 'password',
+    port: 3306,
+    name: 'box'
+};
+
 function initialize(callback) {
     assert.strictEqual(typeof callback, 'function');
 
     if (gConnectionPool !== null) return callback(null);
 
+    if (constants.TEST) {
+        // see setupTest script how the mysql-server is run
+        gDatabase.hostname = require('child_process').execSync('docker inspect -f "{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}" mysql-server').toString().trim();
+    }
+
     gConnectionPool  = mysql.createPool({
         connectionLimit: 5, // this has to be > 1 since we store one connection as 'default'. the rest for transactions
-        host: config.database().hostname,
-        user: config.database().username,
-        password: config.database().password,
-        port: config.database().port,
-        database: config.database().name,
+        host: gDatabase.hostname,
+        user: gDatabase.username,
+        password: gDatabase.password,
+        port: gDatabase.port,
+        database: gDatabase.name,
         multipleStatements: false,
         ssl: false,
         timezone: 'Z' // mysql follows the SYSTEM timezone. on Cloudron, this is UTC
     });
 
     gConnectionPool.on('connection', function (connection) {
-        connection.query('USE ' + config.database().name);
+        connection.query('USE ' + gDatabase.name);
         connection.query('SET SESSION sql_mode = \'strict_all_tables\'');
     });
 
@@ -87,8 +100,8 @@ function clear(callback) {
     assert.strictEqual(typeof callback, 'function');
 
     var cmd = util.format('mysql --host="%s" --user="%s" --password="%s" -Nse "SHOW TABLES" %s | grep -v "^migrations$" | while read table; do mysql --host="%s" --user="%s" --password="%s" -e "SET FOREIGN_KEY_CHECKS = 0; TRUNCATE TABLE $table" %s; done',
-        config.database().hostname, config.database().username, config.database().password, config.database().name,
-        config.database().hostname, config.database().username, config.database().password, config.database().name);
+        gDatabase.hostname, gDatabase.username, gDatabase.password, gDatabase.name,
+        gDatabase.hostname, gDatabase.username, gDatabase.password, gDatabase.name);
 
     async.series([
         child_process.exec.bind(null, cmd),
@@ -178,7 +191,7 @@ function importFromFile(file, callback) {
     assert.strictEqual(typeof file, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    var cmd = `/usr/bin/mysql -h "${config.database().hostname}" -u ${config.database().username} -p${config.database().password} ${config.database().name} < ${file}`;
+    var cmd = `/usr/bin/mysql -h "${gDatabase.hostname}" -u ${gDatabase.username} -p${gDatabase.password} ${gDatabase.name} < ${file}`;
 
     async.series([
         query.bind(null, 'CREATE DATABASE IF NOT EXISTS box'),
@@ -190,7 +203,7 @@ function exportToFile(file, callback) {
     assert.strictEqual(typeof file, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    var cmd = `/usr/bin/mysqldump -h "${config.database().hostname}" -u root -p${config.database().password} --single-transaction --routines --triggers ${config.database().name} > "${file}"`;
+    var cmd = `/usr/bin/mysqldump -h "${gDatabase.hostname}" -u root -p${gDatabase.password} --single-transaction --routines --triggers ${gDatabase.name} > "${file}"`;
 
     child_process.exec(cmd, callback);
 }

src/disks.js

@@ -0,0 +1,118 @@
+'use strict';
+
+exports = module.exports = {
+    getDisks: getDisks,
+    checkDiskSpace: checkDiskSpace
+};
+
+const apps = require('./apps.js'),
+    assert = require('assert'),
+    async = require('async'),
+    debug = require('debug')('box:disks'),
+    df = require('@sindresorhus/df'),
+    docker = require('./docker.js'),
+    notifications = require('./notifications.js'),
+    paths = require('./paths.js'),
+    util = require('util');
+
+function DisksError(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(DisksError, Error);
+DisksError.INTERNAL_ERROR = 'Internal Error';
+DisksError.EXTERNAL_ERROR = 'External Error';
+
+function getDisks(callback) {
+    assert.strictEqual(typeof callback, 'function');
+
+    const dfAsync = async.asyncify(df), dfFileAsync = async.asyncify(df.file);
+
+    docker.info(function (error, info) {
+        if (error) return callback(new DisksError(DisksError.INTERNAL_ERROR, error));
+
+        async.series([
+            dfAsync,
+            dfFileAsync.bind(null, paths.BOX_DATA_DIR),
+            dfFileAsync.bind(null, paths.PLATFORM_DATA_DIR),
+            dfFileAsync.bind(null, paths.APPS_DATA_DIR),
+            dfFileAsync.bind(null, info.DockerRootDir)
+        ], function (error, values) {
+            if (error) return callback(new DisksError(DisksError.INTERNAL_ERROR, error));
+
+            // filter by ext4 and then sort to make sure root disk is first
+            const ext4Disks = values[0].filter((r) => r.type === 'ext4').sort((a, b) => a.mountpoint.localeCompare(b.mountpoint));
+
+            const disks = {
+                disks: ext4Disks, // root disk is first
+                boxDataDisk: values[1].filesystem,
+                mailDataDisk: values[1].filesystem,
+                platformDataDisk: values[2].filesystem,
+                appsDataDisk: values[3].filesystem,
+                dockerDataDisk: values[4].filesystem,
+                apps: {}
+            };
+
+            apps.getAll(function (error, allApps) {
+                if (error) return callback(new DisksError(DisksError.INTERNAL_ERROR, error));
+
+                async.eachSeries(allApps, function (app, iteratorDone) {
+                    if (!app.dataDir) {
+                        disks.apps[app.id] = disks.appsDataDisk;
+                        return iteratorDone();
+                    }
+
+                    dfFileAsync(app.dataDir, function (error, result) {
+                        disks.apps[app.id] = error ? disks.appsDataDisk : result.filesystem; // ignore any errors
+                        iteratorDone();
+                    });
+                }, function (error) {
+                    if (error) return callback(new DisksError(DisksError.INTERNAL_ERROR, error));
+
+                    callback(null, disks);
+                });
+            });
+        });
+    });
+}
+
+function checkDiskSpace(callback) {
+    assert.strictEqual(typeof callback, 'function');
+
+    debug('Checking disk space');
+
+    getDisks(function (error, disks) {
+        if (error) {
+            debug('checkDiskSpace: error getting disks %s', error.message);
+            return callback();
+        }
+
+        var oos = disks.disks.some(function (entry) {
+            // ignore other filesystems but where box, app and platform data is
+            if (entry.filesystem !== disks.boxDataDisk
+                && entry.filesystem !== disks.platformDataDisk
+                && entry.filesystem !== disks.appsDataDisk
+                && entry.filesystem !== disks.dockerDataDisk) return false;
+
+            return (entry.available <= (1.25 * 1024 * 1024 * 1024)); // 1.5G
+        });
+
+        debug('checkDiskSpace: disk space checked. ok: %s', !oos);
+
+        notifications.alert(notifications.ALERT_DISK_SPACE, 'Server is running out of disk space', oos ? JSON.stringify(disks.disks, null, 4) : '', callback);
+    });
+}

src/dns/caas.js

@@ -11,10 +11,10 @@ exports = module.exports = {
 };
 
 var assert = require('assert'),
-    config = require('../config.js'),
     debug = require('debug')('box:dns/caas'),
     domains = require('../domains.js'),
     DomainsError = require('../domains.js').DomainsError,
+    settings = require('../settings.js'),
     superagent = require('superagent'),
     util = require('util'),
     waitForDns = require('./waitfordns.js');
@@ -58,7 +58,7 @@ function upsert(domainObject, location, type, values, callback) {
     };
 
     superagent
-        .post(config.apiServerOrigin() + '/api/v1/caas/domains/' + fqdn)
+        .post(settings.apiServerOrigin() + '/api/v1/caas/domains/' + fqdn)
         .query({ token: dnsConfig.token })
         .send(data)
         .timeout(30 * 1000)
@@ -84,7 +84,7 @@ function get(domainObject, location, type, callback) {
     debug('get: zoneName: %s subdomain: %s type: %s fqdn: %s', domainObject.domain, location, type, fqdn);
 
     superagent
-        .get(config.apiServerOrigin() + '/api/v1/caas/domains/' + fqdn)
+        .get(settings.apiServerOrigin() + '/api/v1/caas/domains/' + fqdn)
         .query({ token: dnsConfig.token, type: type })
         .timeout(30 * 1000)
         .end(function (error, result) {
@@ -111,7 +111,7 @@ function del(domainObject, location, type, values, callback) {
     };
 
     superagent
-        .del(config.apiServerOrigin() + '/api/v1/caas/domains/' + getFqdn(location, domainObject.domain))
+        .del(settings.apiServerOrigin() + '/api/v1/caas/domains/' + getFqdn(location, domainObject.domain))
         .query({ token: dnsConfig.token })
         .send(data)
         .timeout(30 * 1000)

src/dns/digitalocean.js

@@ -111,7 +111,7 @@ function upsert(domainObject, location, type, values, callback) {
                 name: name,
                 data: value,
                 priority: priority,
-                ttl: 1
+                ttl: 30 // Recent DO DNS API break means this value must atleast be 30
             };
 
             if (i >= result.length) {

src/dns/gcdns.js

@@ -15,7 +15,7 @@ var assert = require('assert'),
     dns = require('../native-dns.js'),
     domains = require('../domains.js'),
     DomainsError = require('../domains.js').DomainsError,
-    GCDNS = require('@google-cloud/dns'),
+    GCDNS = require('@google-cloud/dns').DNS,
     util = require('util'),
     waitForDns = require('./waitfordns.js'),
     _ = require('underscore');
@@ -46,7 +46,7 @@ function getZoneByName(dnsConfig, zoneName, callback) {
     assert.strictEqual(typeof zoneName, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    var gcdns = GCDNS(getDnsCredentials(dnsConfig));
+    var gcdns = new GCDNS(getDnsCredentials(dnsConfig));
 
     gcdns.getZones(function (error, zones) {
         if (error && error.message === 'invalid_grant') return callback(new DomainsError(DomainsError.ACCESS_DENIED, 'The key was probably revoked'));

src/dns/namecheap.js

@@ -15,14 +15,14 @@ var assert = require('assert'),
     dns = require('../native-dns.js'),
     domains = require('../domains.js'),
     DomainsError = require('../domains.js').DomainsError,
-    Namecheap = require('namecheap'),
+    safe = require('safetydance'),
+    superagent = require('superagent'),
     sysinfo = require('../sysinfo.js'),
     util = require('util'),
-    waitForDns = require('./waitfordns.js');
+    waitForDns = require('./waitfordns.js'),
+    xml2js = require('xml2js');
 
-function formatError(response) {
-    return util.format('NameCheap DNS error [%s] %j', response.code, response.message);
-}
+const ENDPOINT = 'https://api.namecheap.com/xml.response';
 
 function removePrivateFields(domainObject) {
     domainObject.config.token = domains.SECRET_PLACEHOLDER;
@@ -33,37 +33,19 @@ function injectPrivateFields(newConfig, currentConfig) {
     if (newConfig.token === domains.SECRET_PLACEHOLDER) newConfig.token = currentConfig.token;
 }
 
-// Only send required fields - https://www.namecheap.com/support/api/methods/domains-dns/set-hosts.aspx
-function mapHosts(hosts) {
-    return hosts.map(function (host) {
-        let tmp = {};
-
-        tmp.TTL = '300';
-        tmp.RecordType = host.RecordType || host.Type;
-        tmp.HostName = host.HostName || host.Name;
-        tmp.Address = host.Address;
-
-        if (tmp.RecordType === 'MX') {
-            tmp.EmailType = 'MX';
-            if (host.MXPref) tmp.MXPref = host.MXPref;
-        }
-
-        return tmp;
-    });
-}
-
-function getApi(dnsConfig, callback) {
+function getQuery(dnsConfig, callback) {
     assert.strictEqual(typeof dnsConfig, 'object');
     assert.strictEqual(typeof callback, 'function');
 
     sysinfo.getPublicIp(function (error, ip) {
         if (error) return callback(new DomainsError(DomainsError.INTERNAL_ERROR, error));
 
-        // Note that for all NameCheap calls to go through properly, the public IP returned by the getPublicIp method below must be whitelisted on NameCheap's API dashboard
-        let namecheap = new Namecheap(dnsConfig.username, dnsConfig.token, ip);
-        namecheap.setUsername(dnsConfig.username);
-
-        callback(null, namecheap);
+        callback(null, {
+            ApiUser: dnsConfig.username,
+            ApiKey: dnsConfig.token,
+            UserName: dnsConfig.username,
+            ClientIp: ip
+        });
     });
 }
 
@@ -74,15 +56,31 @@ function getInternal(dnsConfig, zoneName, subdomain, type, callback) {
     assert.strictEqual(typeof type, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    getApi(dnsConfig, function (error, namecheap) {
+    getQuery(dnsConfig, function (error, query) {
         if (error) return callback(error);
 
-        namecheap.domains.dns.getHosts(zoneName, function (error, result) {
-            if (error) return callback(new DomainsError(DomainsError.EXTERNAL_ERROR, formatError(error)));
+        query.Command = 'namecheap.domains.dns.getHosts';
+        query.SLD = zoneName.split('.')[0];
+        query.TLD = zoneName.split('.')[1];
 
-            debug('entire getInternal response: %j', result);
+        superagent.get(ENDPOINT).query(query).end(function (error, result) {
+            if (error) return callback(new DomainsError(DomainsError.EXTERNAL_ERROR, error));
 
-            return callback(null, result['DomainDNSGetHostsResult']['host']);
+            var parser = new xml2js.Parser();
+            parser.parseString(result.text, function (error, result) {
+                if (error) return callback(new DomainsError(DomainsError.EXTERNAL_ERROR, error));
+
+                var tmp = result.ApiResponse;
+                if (tmp['$'].Status !== 'OK') return callback(new DomainsError(DomainsError.EXTERNAL_ERROR, safe.query(tmp, 'Errors[0].Error[0]._', 'Invalid response')));
+                if (!tmp.CommandResponse[0]) return callback(new DomainsError(DomainsError.EXTERNAL_ERROR, 'Invalid response'));
+                if (!tmp.CommandResponse[0].DomainDNSGetHostsResult[0]) return callback(new DomainsError(DomainsError.EXTERNAL_ERROR, 'Invalid response'));
+
+                var hosts = result.ApiResponse.CommandResponse[0].DomainDNSGetHostsResult[0].host.map(function (h) {
+                    return h['$'];
+                });
+
+                callback(null, hosts);
+            });
         });
     });
 }
@@ -93,15 +91,42 @@ function setInternal(dnsConfig, zoneName, hosts, callback) {
     assert(Array.isArray(hosts));
     assert.strictEqual(typeof callback, 'function');
 
-    let mappedHosts = mapHosts(hosts);
-
-    getApi(dnsConfig, function (error, namecheap) {
+    getQuery(dnsConfig, function (error, query) {
         if (error) return callback(error);
 
-        namecheap.domains.dns.setHosts(zoneName, mappedHosts, function (error, result) {
-            if (error) return callback(new DomainsError(DomainsError.EXTERNAL_ERROR, formatError(error)));
+        query.Command = 'namecheap.domains.dns.setHosts';
+        query.SLD = zoneName.split('.')[0];
+        query.TLD = zoneName.split('.')[1];
 
-            return callback(null, result);
+        // Map to query params https://www.namecheap.com/support/api/methods/domains-dns/set-hosts.aspx
+        hosts.forEach(function (host, i) {
+            var n = i+1; // api starts with 1 not 0
+            query['TTL' + n] = '300'; // keep it low
+            query['HostName' + n] = host.HostName || host.Name;
+            query['RecordType' + n] = host.RecordType || host.Type;
+            query['Address' + n] = host.Address;
+
+            if (host.Type === 'MX') {
+                query['EmailType' + n] = 'MX';
+                if (host.MXPref) query['MXPref' + n] = host.MXPref;
+            }
+        });
+
+        superagent.post(ENDPOINT).query(query).end(function (error, result) {
+            if (error) return callback(new DomainsError(DomainsError.EXTERNAL_ERROR, error));
+
+            var parser = new xml2js.Parser();
+            parser.parseString(result.text, function (error, result) {
+                if (error) return callback(new DomainsError(DomainsError.EXTERNAL_ERROR, error));
+
+                var tmp = result.ApiResponse;
+                if (tmp['$'].Status !== 'OK') return callback(new DomainsError(DomainsError.EXTERNAL_ERROR, safe.query(tmp, 'Errors[0].Error[0]._', 'Invalid response')));
+                if (!tmp.CommandResponse[0]) return callback(new DomainsError(DomainsError.EXTERNAL_ERROR, 'Invalid response'));
+                if (!tmp.CommandResponse[0].DomainDNSSetHostsResult[0]) return callback(new DomainsError(DomainsError.EXTERNAL_ERROR, 'Invalid response'));
+                if (tmp.CommandResponse[0].DomainDNSSetHostsResult[0]['$'].IsSuccess !== 'true') return callback(new DomainsError(DomainsError.EXTERNAL_ERROR, 'Invalid response'));
+
+                callback(null);
+            });
         });
     });
 }

src/dns/namecom.js

@@ -131,7 +131,7 @@ function getInternal(dnsConfig, zoneName, name, type, callback) {
 
             result.body.records.forEach(function (r) {
                 // name.com api simply strips empty properties
-                r.host = r.host || '@';
+                r.host = r.host || '';
             });
 
             var results = result.body.records.filter(function (r) {
@@ -153,7 +153,7 @@ function upsert(domainObject, location, type, values, callback) {
 
     const dnsConfig = domainObject.config,
         zoneName = domainObject.zoneName,
-        name = domains.getName(domainObject, location, type) || '@';
+        name = domains.getName(domainObject, location, type) || '';
 
     debug(`upsert: ${name} in zone ${zoneName} of type ${type} with values ${JSON.stringify(values)}`);
 
@@ -174,7 +174,7 @@ function get(domainObject, location, type, callback) {
 
     const dnsConfig = domainObject.config,
         zoneName = domainObject.zoneName,
-        name = domains.getName(domainObject, location, type) || '@';
+        name = domains.getName(domainObject, location, type) || '';
 
     getInternal(dnsConfig, zoneName, name, type, function (error, result) {
         if (error) return callback(error);
@@ -196,7 +196,7 @@ function del(domainObject, location, type, values, callback) {
 
     const dnsConfig = domainObject.config,
         zoneName = domainObject.zoneName,
-        name = domains.getName(domainObject, location, type) || '@';
+        name = domains.getName(domainObject, location, type) || '';
 
     debug(`del: ${name} in zone ${zoneName} of type ${type} with values ${JSON.stringify(values)}`);
 

src/docker.js

@@ -8,6 +8,7 @@ exports = module.exports = {
 
     ping: ping,
 
+    info: info,
     downloadImage: downloadImage,
     createContainer: createContainer,
     startContainer: startContainer,
@@ -33,18 +34,7 @@ exports = module.exports = {
 // timeout is optional
 function connectionInstance(timeout) {
     var Docker = require('dockerode');
-    var docker;
-
-    if (process.env.BOX_ENV === 'test') {
-        // test code runs a docker proxy on this port
-        docker = new Docker({ host: 'http://localhost', port: 5687, timeout: timeout });
-
-        // proxy code uses this to route to the real docker
-        docker.options = { socketPath: '/var/run/docker.sock' };
-    } else {
-        docker = new Docker({ socketPath: '/var/run/docker.sock', timeout: timeout });
-    }
-
+    var docker = new Docker({ socketPath: '/var/run/docker.sock', timeout: timeout });
     return docker;
 }
 
@@ -52,12 +42,13 @@ var addons = require('./addons.js'),
     async = require('async'),
     assert = require('assert'),
     child_process = require('child_process'),
-    config = require('./config.js'),
     constants = require('./constants.js'),
     debug = require('debug')('box:docker.js'),
     once = require('once'),
     path = require('path'),
+    settings = require('./settings.js'),
     shell = require('./shell.js'),
+    safe = require('safetydance'),
     spawn = child_process.spawn,
     util = require('util'),
     _ = require('underscore');
@@ -85,10 +76,11 @@ function DockerError(reason, errorOrMessage) {
 }
 util.inherits(DockerError, Error);
 DockerError.INTERNAL_ERROR = 'Internal Error';
+DockerError.EXTERNAL_ERROR = 'External Error';
 DockerError.NOT_FOUND = 'Not found';
 DockerError.BAD_FIELD = 'Bad field';
 
-function debugApp(app, args) {
+function debugApp(app) {
     assert(typeof app === 'object');
 
     debug(app.fqdn + ' ' + util.format.apply(util, Array.prototype.slice.call(arguments, 1)));
@@ -129,23 +121,32 @@ function pullImage(manifest, callback) {
 
     // Use docker CLI here to support downloading of private repos. for dockerode, we have to use
     // https://github.com/apocas/dockerode#pull-from-private-repos
-    shell.spawn('pullImage', '/usr/bin/docker', [ 'pull', manifest.dockerImage ], {}, function (error) {
-        if (error) {
-            debug(`pullImage: Error pulling image ${manifest.dockerImage} of ${manifest.id}: ${error.message}`);
-            return callback(new Error('Failed to pull image'));
-        }
+    docker.pull(manifest.dockerImage, function (error, stream) {
+        if (error) return callback(new DockerError(DockerError.EXTERNAL_ERROR, 'Unable to pull image. statusCode: ' + error.statusCode));
 
-        var image = docker.getImage(manifest.dockerImage);
+        // https://github.com/dotcloud/docker/issues/1074 says each status message
+        // is emitted as a chunk
+        stream.on('data', function (chunk) {
+            var data = safe.JSON.parse(chunk) || { };
+            debug('pullImage %s: %j', manifest.id, data);
 
-        image.inspect(function (err, data) {
-            if (err) return callback(new Error('Error inspecting image:' + err.message));
-            if (!data || !data.Config) return callback(new Error('Missing Config in image:' + JSON.stringify(data, null, 4)));
-            if (!data.Config.Entrypoint && !data.Config.Cmd) return callback(new Error('Only images with entry point are allowed'));
+            // The data.status here is useless because this is per layer as opposed to per image
+            if (!data.status && data.error) {
+                debug('pullImage error %s: %s', manifest.id, data.errorDetail.message);
+            }
+        });
 
-            if (data.Config.ExposedPorts) debug('This image of %s exposes ports: %j', manifest.id, data.Config.ExposedPorts);
+        stream.on('end', function () {
+            debug('downloaded image %s of %s successfully', manifest.dockerImage, manifest.id);
 
             callback(null);
         });
+
+        stream.on('error', function (error) {
+            debug('error pulling image %s of %s: %j', manifest.dockerImage, manifest.id, error);
+
+            callback(new DockerError(DockerError.EXTERNAL_ERROR, error.message));
+        });
     });
 }
 
@@ -176,19 +177,24 @@ function createSubcontainer(app, name, cmd, options, callback) {
     assert.strictEqual(typeof callback, 'function');
 
     var docker = exports.connection,
-        isAppContainer = !cmd; // non app-containers are like scheduler containers
+        isAppContainer = !cmd; // non app-containers are like scheduler and exec (terminal) containers
 
     var manifest = app.manifest;
     var exposedPorts = {}, dockerPortBindings = { };
     var domain = app.fqdn;
-    // TODO: these should all have the CLOUDRON_ prefix
-    var stdEnv = [
+    const hostname = isAppContainer ? app.id : name;
+
+    const envPrefix = manifest.manifestVersion <= 1 ? '' : 'CLOUDRON_';
+
+    let stdEnv = [
         'CLOUDRON=1',
         'CLOUDRON_PROXY_IP=172.18.0.1',
-        'WEBADMIN_ORIGIN=' + config.adminOrigin(),
-        'API_ORIGIN=' + config.adminOrigin(),
-        'APP_ORIGIN=https://' + domain,
-        'APP_DOMAIN=' + domain
+        `CLOUDRON_APP_HOSTNAME=${app.id}`,
+        `CLOUDRON_ADMIN_EMAIL=${app.adminEmail}`,
+        `${envPrefix}WEBADMIN_ORIGIN=${settings.adminOrigin()}`,
+        `${envPrefix}API_ORIGIN=${settings.adminOrigin()}`,
+        `${envPrefix}APP_ORIGIN=https://${domain}`,
+        `${envPrefix}APP_DOMAIN=${domain}`
     ];
 
     // docker portBindings requires ports to be exposed
@@ -235,9 +241,9 @@ function createSubcontainer(app, name, cmd, options, callback) {
         // Note that Hostname has no effect on DNS. We have to use the --net-alias for dns.
         // Hostname cannot be set with container NetworkMode
         var containerOptions = {
-            name: name, // used for filtering logs
+            name: name, // for referencing containers
             Tty: isAppContainer,
-            Hostname: app.id, // set to something 'constant' so app containers can use this to communicate (across app updates)
+            Hostname: hostname,
             Image: app.manifest.dockerImage,
             Cmd: (isAppContainer && app.debugMode && app.debugMode.cmd) ? app.debugMode.cmd : cmd,
             Env: stdEnv.concat(addonEnv).concat(portEnv).concat(appEnv),
@@ -273,10 +279,17 @@ function createSubcontainer(app, name, cmd, options, callback) {
                 },
                 CpuShares: 512, // relative to 1024 for system processes
                 VolumesFrom: isAppContainer ? null : [ app.containerId + ':rw' ],
-                NetworkMode: 'cloudron',
+                NetworkMode: 'cloudron', // user defined bridge network
                 Dns: ['172.18.0.1'], // use internal dns
                 DnsSearch: ['.'], // use internal dns
                 SecurityOpt: [ 'apparmor=docker-cloudron-app' ]
+            },
+            NetworkingConfig: {
+                EndpointsConfig: {
+                    cloudron: {
+                        Aliases: [ name ] // this allows sub-containers reach app containers by name
+                    }
+                }
             }
         };
 
@@ -309,7 +322,8 @@ function startContainer(containerId, callback) {
     debug('Starting container %s', containerId);
 
     container.start(function (error) {
-        if (error && error.statusCode !== 304) return callback(new Error('Error starting container :' + error));
+        if (error && error.statusCode === 404) return callback(new DockerError(DockerError.NOT_FOUND));
+        if (error && error.statusCode !== 304) return callback(new DockerError(DockerError.INTERNAL_ERROR, error));
 
         return callback(null);
     });
@@ -599,3 +613,15 @@ function removeVolume(app, name, callback) {
         callback();
     });
 }
+
+function info(callback) {
+    assert.strictEqual(typeof callback, 'function');
+
+    let docker = exports.connection;
+
+    docker.info(function (error, result) {
+        if (error) return callback(new DockerError(DockerError.EXTERNAL_ERROR, 'Error connecting to docker. statusCode: ' + error.statusCode));
+
+        callback(null, result);
+    });
+}

src/dockerproxy.js

@@ -8,7 +8,7 @@ exports = module.exports = {
 var apps = require('./apps.js'),
     AppsError = apps.AppsError,
     assert = require('assert'),
-    config = require('./config.js'),
+    constants = require('./constants.js'),
     express = require('express'),
     debug = require('debug')('box:dockerproxy'),
     http = require('http'),
@@ -29,7 +29,7 @@ function authorizeApp(req, res, next) {
     // - only allow managing and inspection of containers belonging to the app
 
     // make the tests pass for now
-    if (config.TEST) {
+    if (constants.TEST) {
         req.app = { id: 'testappid' };
         return next();
     }
@@ -120,7 +120,7 @@ function start(callback) {
 
     let proxyServer = express();
 
-    if (config.TEST) {
+    if (constants.TEST) {
         proxyServer.use(function (req, res, next) {
             debug('proxying: ' + req.method, req.url);
             next();
@@ -135,9 +135,9 @@ function start(callback) {
         .use(middleware.lastMile());
 
     gHttpServer = http.createServer(proxyServer);
-    gHttpServer.listen(config.get('dockerProxyPort'), '0.0.0.0', callback);
+    gHttpServer.listen(constants.DOCKER_PROXY_PORT, '0.0.0.0', callback);
 
-    debug(`startDockerProxy: started proxy on port ${config.get('dockerProxyPort')}`);
+    debug(`startDockerProxy: started proxy on port ${constants.DOCKER_PROXY_PORT}`);
 
     gHttpServer.on('upgrade', function (req, client, head) {
         // Create a new tcp connection to the TCP server
@@ -150,7 +150,7 @@ function start(callback) {
             if (req.headers['content-type'] === 'application/json') {
                 // TODO we have to parse the immediate upgrade request body, but I don't know how
                 let plainBody = '{"Detach":false,"Tty":false}\r\n';
-                upgradeMessage += `Content-Type: application/json\r\n`;
+                upgradeMessage += 'Content-Type: application/json\r\n';
                 upgradeMessage += `Content-Length: ${Buffer.byteLength(plainBody)}\r\n`;
                 upgradeMessage += '\r\n';
                 upgradeMessage += plainBody;

src/domains.js

@@ -35,7 +35,6 @@ module.exports = exports = {
 
 var assert = require('assert'),
     async = require('async'),
-    config = require('./config.js'),
     constants = require('./constants.js'),
     DatabaseError = require('./databaseerror.js'),
     debug = require('debug')('box:domains'),
@@ -44,6 +43,7 @@ var assert = require('assert'),
     reverseProxy = require('./reverseproxy.js'),
     ReverseProxyError = reverseProxy.ReverseProxyError,
     safe = require('safetydance'),
+    settings = require('./settings.js'),
     sysinfo = require('./sysinfo.js'),
     tld = require('tldjs'),
     util = require('util'),
@@ -145,13 +145,12 @@ function validateHostname(location, domainObject) {
     const hostname = fqdn(location, domainObject);
 
     const RESERVED_LOCATIONS = [
-        constants.API_LOCATION,
         constants.SMTP_LOCATION,
         constants.IMAP_LOCATION
     ];
     if (RESERVED_LOCATIONS.indexOf(location) !== -1) return new DomainsError(DomainsError.BAD_FIELD, location + ' is reserved');
 
-    if (hostname === config.adminFqdn()) return new DomainsError(DomainsError.BAD_FIELD, location + ' is reserved');
+    if (hostname === settings.adminFqdn()) return new DomainsError(DomainsError.BAD_FIELD, location + ' is reserved');
 
     // workaround https://github.com/oncletom/tld.js/issues/73
     var tmp = hostname.replace('_', '-');
@@ -344,7 +343,7 @@ function del(domain, auditSource, callback) {
     assert.strictEqual(typeof auditSource, 'object');
     assert.strictEqual(typeof callback, 'function');
 
-    if (domain === config.adminDomain()) return callback(new DomainsError(DomainsError.IN_USE));
+    if (domain === settings.adminDomain()) return callback(new DomainsError(DomainsError.IN_USE));
 
     domaindb.del(domain, function (error) {
         if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new DomainsError(DomainsError.NOT_FOUND));
@@ -494,15 +493,17 @@ function prepareDashboardDomain(domain, auditSource, progressCallback, callback)
     get(domain, function (error, domainObject) {
         if (error) return callback(error);
 
+        const adminFqdn = fqdn(constants.ADMIN_LOCATION, domainObject);
+
         sysinfo.getPublicIp(function (error, ip) {
             if (error) return callback(new DomainsError(DomainsError.EXTERNAL_ERROR, error.message));
 
             async.series([
-                (done) => { progressCallback({ percent: 10, message: 'Updating DNS' }); done(); },
+                (done) => { progressCallback({ percent: 10, message: `Updating DNS of ${adminFqdn}` }); done(); },
                 upsertDnsRecords.bind(null, constants.ADMIN_LOCATION, domain, 'A', [ ip ]),
-                (done) => { progressCallback({ percent: 40, message: 'Waiting for DNS' }); done(); },
+                (done) => { progressCallback({ percent: 40, message: `Waiting for DNS of ${adminFqdn}` }); done(); },
                 waitForDnsRecord.bind(null, constants.ADMIN_LOCATION, domain, 'A', ip, { interval: 30000, times: 50000 }),
-                (done) => { progressCallback({ percent: 70, message: 'Getting certificate' }); done(); },
+                (done) => { progressCallback({ percent: 70, message: `Getting certificate of ${adminFqdn}` }); done(); },
                 reverseProxy.ensureCertificate.bind(null, fqdn(constants.ADMIN_LOCATION, domainObject), domain, auditSource)
             ], function (error) {
                 if (error) return callback(error);

src/dyndns.js

@@ -4,17 +4,16 @@ exports = module.exports = {
     sync: sync
 };
 
-var appdb = require('./appdb.js'),
-    apps = require('./apps.js'),
+let apps = require('./apps.js'),
     assert = require('assert'),
     async = require('async'),
-    config = require('./config.js'),
     constants = require('./constants.js'),
     debug = require('debug')('box:dyndns'),
     domains = require('./domains.js'),
     eventlog = require('./eventlog.js'),
     paths = require('./paths.js'),
     safe = require('safetydance'),
+    settings = require('./settings.js'),
     sysinfo = require('./sysinfo.js');
 
 // called for dynamic dns setups where we have to update the IP
@@ -33,7 +32,7 @@ function sync(auditSource, callback) {
 
         debug(`refreshDNS: updating ip from ${info.ip} to ${ip}`);
 
-        domains.upsertDnsRecords(constants.ADMIN_LOCATION, config.adminDomain(), 'A', [ ip ], function (error) {
+        domains.upsertDnsRecords(constants.ADMIN_LOCATION, settings.adminDomain(), 'A', [ ip ], function (error) {
             if (error) return callback(error);
 
             debug('refreshDNS: updated admin location');
@@ -43,7 +42,7 @@ function sync(auditSource, callback) {
 
                 async.each(result, function (app, callback) {
                     // do not change state of installing apps since apptask will error if dns record already exists
-                    if (app.installationState !== appdb.ISTATE_INSTALLED) return callback();
+                    if (app.installationState !== apps.ISTATE_INSTALLED) return callback();
 
                     domains.upsertDnsRecords(app.location, app.domain, 'A', [ ip ], callback);
                 }, function (error) {

src/eventlog.js

@@ -22,9 +22,6 @@ exports = module.exports = {
     ACTION_APP_OOM: 'app.oom',
     ACTION_APP_UP: 'app.up',
     ACTION_APP_DOWN: 'app.down',
-    ACTION_APP_TASK_START: 'app.task.start',
-    ACTION_APP_TASK_CRASH: 'app.task.crash',
-    ACTION_APP_TASK_SUCCESS: 'app.task.success',
 
     ACTION_BACKUP_FINISH: 'backup.finish',
     ACTION_BACKUP_START: 'backup.start',
@@ -51,6 +48,7 @@ exports = module.exports = {
     ACTION_RESTORE: 'cloudron.restore', // unused
     ACTION_START: 'cloudron.start',
     ACTION_UPDATE: 'cloudron.update',
+    ACTION_UPDATE_FINISH: 'cloudron.update.finish',
 
     ACTION_USER_ADD: 'user.add',
     ACTION_USER_LOGIN: 'user.login',

src/externalldap.js

@@ -0,0 +1,231 @@
+'use strict';
+
+exports = module.exports = {
+    ExternalLdapError: ExternalLdapError,
+
+    verifyPassword: verifyPassword,
+
+    testConfig: testConfig,
+    startSyncer: startSyncer,
+
+    sync: sync
+};
+
+var assert = require('assert'),
+    async = require('async'),
+    auditsource = require('./auditsource.js'),
+    debug = require('debug')('box:externalldap'),
+    ldap = require('ldapjs'),
+    settings = require('./settings.js'),
+    tasks = require('./tasks.js'),
+    users = require('./users.js'),
+    UserError = users.UsersError,
+    util = require('util');
+
+function ExternalLdapError(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(ExternalLdapError, Error);
+ExternalLdapError.EXTERNAL_ERROR = 'external error';
+ExternalLdapError.INTERNAL_ERROR = 'internal error';
+ExternalLdapError.INVALID_CREDENTIALS = 'invalid credentials';
+ExternalLdapError.BAD_STATE = 'bad state';
+ExternalLdapError.BAD_FIELD = 'bad field';
+ExternalLdapError.NOT_FOUND = 'not found';
+
+// performs service bind if required
+function getClient(externalLdapConfig, callback) {
+    assert.strictEqual(typeof callback, 'function');
+
+    // basic validation to not crash
+    try { ldap.parseDN(externalLdapConfig.baseDn); } catch (e) { return callback(new ExternalLdapError(ExternalLdapError.BAD_FIELD, 'invalid baseDn')); }
+    try { ldap.parseFilter(externalLdapConfig.filter); } catch (e) { return callback(new ExternalLdapError(ExternalLdapError.BAD_FIELD, 'invalid filter')); }
+    if (externalLdapConfig.bindDn) try { ldap.parseFilter(externalLdapConfig.bindDn); } catch (e) { return callback(new ExternalLdapError(ExternalLdapError.INVALID_CREDENTIALS)); }
+
+    var client;
+    try {
+        client = ldap.createClient({ url: externalLdapConfig.url });
+    } catch (e) {
+        if (e instanceof ldap.ProtocolError) return callback(new ExternalLdapError(ExternalLdapError.BAD_FIELD, 'url protocol is invalid'));
+        return callback(new ExternalLdapError(ExternalLdapError.INTERNAL_ERROR, e));
+    }
+
+    if (!externalLdapConfig.bindDn) return callback(null, client);
+
+    client.bind(externalLdapConfig.bindDn, externalLdapConfig.bindPassword, function (error) {
+        if (error instanceof ldap.InvalidCredentialsError) return callback(new ExternalLdapError(ExternalLdapError.INVALID_CREDENTIALS));
+        if (error) return callback(new ExternalLdapError(ExternalLdapError.EXTERNAL_ERROR, error));
+
+        callback(null, client, externalLdapConfig);
+    });
+}
+
+function testConfig(config, callback) {
+    assert.strictEqual(typeof config, 'object');
+    assert.strictEqual(typeof callback, 'function');
+
+    if (!config.enabled) return callback();
+
+    if (!config.url) return callback(new ExternalLdapError(ExternalLdapError.BAD_FIELD, 'url must not be empty'));
+    if (!config.baseDn) return callback(new ExternalLdapError(ExternalLdapError.BAD_FIELD, 'basedn must not be empty'));
+    if (!config.filter) return callback(new ExternalLdapError(ExternalLdapError.BAD_FIELD, 'filter must not be empty'));
+
+    getClient(config, function (error, client) {
+        if (error) return callback(error);
+
+        var opts = {
+            filter: config.filter,
+            scope: 'sub'
+        };
+
+        client.search(config.baseDn, opts, function (error, result) {
+            if (error) return callback(new ExternalLdapError(ExternalLdapError.EXTERNAL_ERROR, error));
+
+            result.on('searchEntry', function (entry) {});
+            result.on('error', function (error) { callback(new ExternalLdapError(ExternalLdapError.BAD_FIELD, 'Unable to search directory')); });
+            result.on('end', function (result) { callback(); });
+        });
+    });
+}
+
+function verifyPassword(user, password, callback) {
+    assert.strictEqual(typeof user, 'object');
+    assert.strictEqual(typeof password, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    settings.getExternalLdapConfig(function (error, externalLdapConfig) {
+        if (error) return callback(new ExternalLdapError(ExternalLdapError.INTERNAL_ERROR, error));
+        if (!externalLdapConfig.enabled) return callback(new ExternalLdapError(ExternalLdapError.BAD_STATE, 'not enabled'));
+
+        getClient(externalLdapConfig, function (error, client) {
+            if (error) return callback(error);
+
+            const dn = `uid=${user.username},${externalLdapConfig.baseDn}`;
+
+            client.bind(dn, password, function (error) {
+                if (error instanceof ldap.InvalidCredentialsError) return callback(new ExternalLdapError(ExternalLdapError.INVALID_CREDENTIALS));
+                if (error) return callback(new ExternalLdapError(ExternalLdapError.EXTERNAL_ERROR, error));
+
+                callback();
+            });
+        });
+    });
+}
+
+function startSyncer(callback) {
+    assert.strictEqual(typeof callback, 'function');
+
+    settings.getExternalLdapConfig(function (error, externalLdapConfig) {
+        if (error) return callback(new ExternalLdapError(ExternalLdapError.INTERNAL_ERROR, error));
+        if (!externalLdapConfig.enabled) return callback(new ExternalLdapError(ExternalLdapError.BAD_STATE, 'not enabled'));
+
+        tasks.add(tasks.TASK_SYNC_EXTERNAL_LDAP, [], function (error, taskId) {
+            if (error) return callback(new ExternalLdapError(ExternalLdapError.INTERNAL_ERROR, error));
+
+            tasks.startTask(taskId, {}, function (error, result) {
+                debug('sync: done', error, result);
+            });
+
+            callback(null, taskId);
+        });
+    });
+}
+
+function sync(progressCallback, callback) {
+    assert.strictEqual(typeof progressCallback, 'function');
+    assert.strictEqual(typeof callback, 'function');
+
+    debug('Start user syncing ...');
+
+    settings.getExternalLdapConfig(function (error, externalLdapConfig) {
+        if (error) return callback(new ExternalLdapError(ExternalLdapError.INTERNAL_ERROR, error));
+        if (!externalLdapConfig.enabled) return callback(new ExternalLdapError(ExternalLdapError.BAD_STATE, 'not enabled'));
+
+        getClient(externalLdapConfig, function (error, client) {
+            if (error) return callback(error);
+
+            var opts = {
+                paged: true,
+                filter: externalLdapConfig.filter,
+                scope: 'sub'    // We may have to make this configurable
+            };
+
+            debug(`Listing users at ${externalLdapConfig.baseDn} with filter ${externalLdapConfig.filter}`);
+
+            client.search(externalLdapConfig.baseDn, opts, function (error, result) {
+                if (error) return callback(new ExternalLdapError(ExternalLdapError.EXTERNAL_ERROR, error));
+
+                var ldapUsers = [];
+
+                result.on('searchEntry', function (entry) {
+                    ldapUsers.push(entry.object);
+                });
+
+                result.on('error', function (error) {
+                    callback(new ExternalLdapError(ExternalLdapError.EXTERNAL_ERROR, error));
+                });
+
+                result.on('end', function (result) {
+                    if (result.status !== 0) return callback(new ExternalLdapError(ExternalLdapError.EXTERNAL_ERROR, 'Server returned status ' + result.status));
+
+                    debug(`Found ${ldapUsers.length} users`);
+
+                    // we ignore all errors here and just log them for now
+                    async.eachSeries(ldapUsers, function (user, callback) {
+
+                        // ignore the bindDn user if any
+                        if (user.dn === externalLdapConfig.bindDn) return callback();
+
+                        users.getByUsername(user.uid, function (error, result) {
+                            if (error && error.reason !== UserError.NOT_FOUND) {
+                                console.error(error);
+                                return callback();
+                            }
+
+                            if (error) {
+                                debug('[adding user]     ', user.uid, user.mail, user.cn);
+
+                                users.create(user.uid, null, user.mail, user.cn, { source: 'ldap' }, auditsource.EXTERNAL_LDAP_TASK, function (error) {
+                                    if (error) console.error('Failed to create user', user, error);
+                                    callback();
+                                });
+                            } else if (result.source !== 'ldap') {
+                                debug('[conflicting user]', user.uid, user.mail, user.cn);
+
+                                callback();
+                            } else if (result.email !== user.mail || result.displayName !== user.cn) {
+                                debug('[updating user]   ', user.uid, user.mail, user.cn);
+
+                                users.update(result.id, { email: user.mail, fallbackEmail: user.mail, displayName: user.cn }, auditsource.EXTERNAL_LDAP_TASK, function (error) {
+                                    if (error) console.error('Failed to update user', user, error);
+                                    callback();
+                                });
+                            } else {
+                                // user known and up-to-date
+                                callback();
+                            }
+                        });
+                    }, function () {
+                        debug('User sync done.');
+                        callback();
+                    });
+                });
+            });
+        });
+    });
+}

src/graphs.js

@@ -19,6 +19,7 @@ function startGraphite(existingInfra, callback) {
     if (existingInfra.version === infra.version && infra.images.graphite.tag === existingInfra.images.graphite.tag) return callback();
 
     const cmd = `docker run --restart=always -d --name="graphite" \
+                --hostname graphite \
                 --net cloudron \
                 --net-alias graphite \
                 --log-driver syslog \

src/groups.js

@@ -20,7 +20,9 @@ exports = module.exports = {
     getGroups: getGroups,
 
     setMembership: setMembership,
-    getMembership: getMembership
+    getMembership: getMembership,
+
+    count: count
 };
 
 var assert = require('assert'),
@@ -268,3 +270,13 @@ function getGroups(userId, callback) {
         callback(null, results);
     });
 }
+
+function count(callback) {
+    assert.strictEqual(typeof callback, 'function');
+
+    groupdb.count(function (error, count) {
+        if (error) return callback(new GroupsError(GroupsError.INTERNAL_ERROR, error));
+
+        callback(null, count);
+    });
+}

src/infra_version.js

@@ -6,7 +6,7 @@
 
 exports = module.exports = {
     // a version change recreates all containers with latest docker config
-    'version': '48.14.0',
+    'version': '48.15.0',
 
     'baseImages': [
         { repo: 'cloudron/base', tag: 'cloudron/base:1.0.0@sha256:147a648a068a2e746644746bbfb42eb7a50d682437cead3c67c933c546357617' }
@@ -17,10 +17,10 @@ exports = module.exports = {
     'images': {
         'mysql': { repo: 'cloudron/mysql', tag: 'cloudron/mysql:2.0.2@sha256:a28320f313785816be60e3f865e09065504170a3d20ed37de675c719b32b01eb' },
         'postgresql': { repo: 'cloudron/postgresql', tag: 'cloudron/postgresql:2.0.2@sha256:6dcee0731dfb9b013ed94d56205eee219040ee806c7e251db3b3886eaa4947ff' },
-        'mongodb': { repo: 'cloudron/mongodb', tag: 'cloudron/mongodb:2.0.2@sha256:95e006390ddce7db637e1672eb6f3c257d3c2652747424f529b1dee3cbe6728c' },
+        'mongodb': { repo: 'cloudron/mongodb', tag: 'cloudron/mongodb:2.1.0@sha256:6d1bf221cfe6124957e2c58b57c0a47214353496009296acb16adf56df1da9d5' },
         'redis': { repo: 'cloudron/redis', tag: 'cloudron/redis:2.0.0@sha256:8a88dd334b62b578530a014ca1a2425a54cb9df1e475f5d3a36806e5cfa22121' },
-        'mail': { repo: 'cloudron/mail', tag: 'cloudron/mail:2.2.0@sha256:20e4d2508dcf712eb56481067993ae39bf541d793d44f99f6a41d630ad941d9e' },
-        'graphite': { repo: 'cloudron/graphite', tag: 'cloudron/graphite:2.0.2@sha256:454f035d60b768153d4f31210380271b5ba1c09367c9d95c7fa37f9e39d2f59c' },
+        'mail': { repo: 'cloudron/mail', tag: 'cloudron/mail:2.3.1@sha256:9693e3ae42a12a7ac8cf5df94d828d46f5b22b4e2e1c7d1bc614d6ee2a22c365' },
+        'graphite': { repo: 'cloudron/graphite', tag: 'cloudron/graphite:2.1.0@sha256:cf0e00d6fadfb5ece0f4beaa182f3c9d57d62817f5b4571077f2cea71b6992c3' },
         'sftp': { repo: 'cloudron/sftp', tag: 'cloudron/sftp:0.1.0@sha256:e177c5bf5f38c84ce1dea35649c22a1b05f96eec67a54a812c5a35e585670f0f' }
     }
 };

src/janitor.js

@@ -63,7 +63,7 @@ function cleanupTmpVolume(containerInfo, callback) {
     assert.strictEqual(typeof containerInfo, 'object');
     assert.strictEqual(typeof callback, 'function');
 
-    var cmd = 'find /tmp -mtime +10 -exec rm -rf {} +'.split(' '); // 10 days old
+    var cmd = 'find /tmp -type f -mtime +10 -exec rm -rf {} +'.split(' '); // 10 day old files
 
     debug('cleanupTmpVolume %j', containerInfo.Names);
 

src/ldap.js

@@ -9,7 +9,7 @@ var assert = require('assert'),
     appdb = require('./appdb.js'),
     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'),
@@ -135,7 +135,7 @@ function userSearch(req, res, next) {
             var dn = ldap.parseDN('cn=' + entry.id + ',ou=users,dc=cloudron');
 
             var groups = [ GROUP_USERS_DN ];
-            if (entry.admin || req.app.ownerId === entry.id) groups.push(GROUP_ADMINS_DN);
+            if (entry.admin) groups.push(GROUP_ADMINS_DN);
 
             var displayName = entry.displayName || entry.username || ''; // displayName can be empty and username can be null
             var nameParts = displayName.split(' ');
@@ -155,7 +155,7 @@ function userSearch(req, res, next) {
                     givenName: firstName,
                     username: entry.username,
                     samaccountname: entry.username,      // to support ActiveDirectory clients
-                    isadmin: (entry.admin || req.app.ownerId === entry.id) ? 1 : 0,
+                    isadmin: entry.admin,
                     memberof: groups
                 }
             };
@@ -195,7 +195,7 @@ function groupSearch(req, res, next) {
 
         groups.forEach(function (group) {
             var dn = ldap.parseDN('cn=' + group.name + ',ou=groups,dc=cloudron');
-            var members = group.admin ? result.filter(function (entry) { return entry.admin || req.app.ownerId === entry.id; }) : result;
+            var members = group.admin ? result.filter(function (entry) { return entry.admin; }) : result;
 
             var obj = {
                 dn: dn.toString(),
@@ -244,7 +244,7 @@ function groupAdminsCompare(req, res, next) {
         // we only support memberuid here, if we add new group attributes later add them here
         if (req.attribute === 'memberuid') {
             var found = result.find(function (u) { return u.id === req.value; });
-            if (found && (found.admin || req.app.ownerId == found.id)) return res.end(true);
+            if (found && found.admin) return res.end(true);
         }
 
         res.end(false);
@@ -371,7 +371,7 @@ function mailingListSearch(req, res, next) {
     var parts = email.split('@');
     if (parts.length !== 2) return next(new ldap.NoSuchObjectError(req.dn.toString()));
 
-    mailboxdb.getGroup(parts[0], parts[1], function (error, group) {
+    mailboxdb.getList(parts[0], parts[1], function (error, group) {
         if (error && error.reason === DatabaseError.NOT_FOUND) return next(new ldap.NoSuchObjectError(req.dn.toString()));
         if (error) return next(new ldap.OperationsError(error.toString()));
 
@@ -520,22 +520,25 @@ function userSearchSftp(req, res, next) {
         users.getByUsername(username, function (error, user) {
             if (error) return next(new ldap.OperationsError(error.toString()));
 
-            if (!user.admin) return next(new ldap.InsufficientAccessRightsError('Not authorized'));
+            apps.hasAccessTo(app, user, function (error, hasAccess) {
+                if (error) return next(new ldap.OperationsError(error.toString()));
+                if (!hasAccess) return next(new ldap.InsufficientAccessRightsError('Not authorized'));
 
-            var obj = {
-                dn: ldap.parseDN(`cn=${username}@${appFqdn},ou=sftp,dc=cloudron`).toString(),
-                attributes: {
-                    homeDirectory: path.join('/app/data', app.id, 'data'),
-                    objectclass: ['user'],
-                    objectcategory: 'person',
-                    cn: user.id,
-                    uid: `${username}@${appFqdn}`,  // for bind after search
-                    uidNumber: uidNumber,           // unix uid for ftp access
-                    gidNumber: uidNumber            // unix gid for ftp access
-                }
-            };
+                var obj = {
+                    dn: ldap.parseDN(`cn=${username}@${appFqdn},ou=sftp,dc=cloudron`).toString(),
+                    attributes: {
+                        homeDirectory: path.join('/app/data', app.id, 'data'),
+                        objectclass: ['user'],
+                        objectcategory: 'person',
+                        cn: user.id,
+                        uid: `${username}@${appFqdn}`,  // for bind after search
+                        uidNumber: uidNumber,           // unix uid for ftp access
+                        gidNumber: uidNumber            // unix gid for ftp access
+                    }
+                };
 
-            finalSend([ obj ], req, res, next);
+                finalSend([ obj ], req, res, next);
+            });
         });
     });
 }
@@ -557,13 +560,13 @@ function authenticateMailAddon(req, res, next) {
 
         if (addonId === 'recvmail' && !domain.enabled) return next(new ldap.NoSuchObjectError(req.dn.toString()));
 
-        let name;
-        if (addonId === 'sendmail') name = 'MAIL_SMTP_PASSWORD';
-        else if (addonId === 'recvmail') name = 'MAIL_IMAP_PASSWORD';
+        let namePattern; // manifest v2 has a CLOUDRON_ prefix for names
+        if (addonId === 'sendmail') namePattern = '%MAIL_SMTP_PASSWORD';
+        else if (addonId === 'recvmail') namePattern = '%MAIL_IMAP_PASSWORD';
         else return next(new ldap.OperationsError('Invalid DN'));
 
         // note: with sendmail addon, apps can send mail without a mailbox (unlike users)
-        appdb.getAppIdByAddonConfigValue(addonId, name, req.credentials || '', function (error, appId) {
+        appdb.getAppIdByAddonConfigValue(addonId, namePattern, req.credentials || '', function (error, appId) {
             if (error && error.reason !== DatabaseError.NOT_FOUND) return next(new ldap.OperationsError(error.message));
             if (appId) { // matched app password
                 eventlog.add(eventlog.ACTION_APP_LOGIN, { authType: 'ldap', mailboxId: email }, { appId: appId, addonId: addonId });
@@ -637,7 +640,7 @@ function start(callback) {
         res.end();
     });
 
-    gServer.listen(config.get('ldapPort'), '0.0.0.0', callback);
+    gServer.listen(constants.LDAP_PORT, '0.0.0.0', callback);
 }
 
 function stop(callback) {

src/locker.js

@@ -22,7 +22,11 @@ Locker.prototype.OP_APPTASK = 'apptask';
 Locker.prototype.lock = function (operation) {
     assert.strictEqual(typeof operation, 'string');
 
-    if (this._operation !== null) return new Error('Already locked for ' + this._operation);
+    if (this._operation !== null) {
+        let error = new Error(`Locked for ${this._operation}`);
+        error.operation = this._operation;
+        return error;
+    }
 
     this._operation = operation;
     ++this._lockDepth;

src/logrotate.ejs

@@ -1,11 +1,23 @@
-# Generated by apptask for the /run mount
+# Generated by apptask
 
+# keep upto 7 rotated logs. rotation triggered daily or ahead of time if size is > 1M
 <%= volumePath %>/*.log <%= volumePath %>/*/*.log <%= volumePath %>/*/*/*.log {
-  rotate 7
-  daily
-  compress
-  maxsize=1M
-  missingok
-  delaycompress
-  copytruncate
+    rotate 7
+    daily
+    compress
+    maxsize 1M
+    missingok
+    delaycompress
+    copytruncate
 }
+
+/home/yellowtent/platformdata/logs/<%= appId %>/*.log {
+    # only keep one rotated file, we currently do not send that over the api
+    rotate 1
+    size 10M
+    missingok
+    # we never compress so we can simply tail the files
+    nocompress
+    copytruncate
+}
+

src/mail.js

@@ -53,7 +53,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'),
@@ -71,6 +70,7 @@ var assert = require('assert'),
     paths = require('./paths.js'),
     reverseProxy = require('./reverseproxy.js'),
     safe = require('safetydance'),
+    settings = require('./settings.js'),
     shell = require('./shell.js'),
     smtpTransport = require('nodemailer-smtp-transport'),
     sysinfo = require('./sysinfo.js'),
@@ -126,7 +126,6 @@ function checkOutboundPort25(callback) {
         'smtp.gmail.com',
         'smtp.live.com',
         'smtp.mail.yahoo.com',
-        'smtp.o2.ie',
         'smtp.comcast.net',
         'smtp.1und1.de',
     ]);
@@ -210,10 +209,14 @@ function verifyRelay(relay, callback) {
     });
 }
 
-function checkDkim(domain, callback) {
-    var dkim = {
-        domain: `${constants.DKIM_SELECTOR}._domainkey.${domain}`,
-        name: `${constants.DKIM_SELECTOR}._domainkey`,
+function checkDkim(mailDomain, callback) {
+    assert.strictEqual(typeof mailDomain, 'object');
+    assert.strictEqual(typeof callback, 'function');
+
+    const domain = mailDomain.domain;
+    let dkim = {
+        domain: `${mailDomain.dkimSelector}._domainkey.${domain}`,
+        name: `${mailDomain.dkimSelector}._domainkey`,
         type: 'TXT',
         expected: null,
         value: null,
@@ -259,14 +262,14 @@ function checkSpf(domain, mailFqdn, callback) {
             let txtRecord = txtRecords[i].join(''); // https://agari.zendesk.com/hc/en-us/articles/202952749-How-long-can-my-SPF-record-be-
             if (txtRecord.indexOf('v=spf1 ') !== 0) continue; // not SPF
             spf.value = txtRecord;
-            spf.status = spf.value.indexOf(' a:' + config.adminFqdn()) !== -1;
+            spf.status = spf.value.indexOf(' a:' + settings.adminFqdn()) !== -1;
             break;
         }
 
         if (spf.status) {
             spf.expected = spf.value;
         } else if (i !== txtRecords.length) {
-            spf.expected = 'v=spf1 a:' + config.adminFqdn() + ' ' + spf.value.slice('v=spf1 '.length);
+            spf.expected = 'v=spf1 a:' + settings.adminFqdn() + ' ' + spf.value.slice('v=spf1 '.length);
         }
 
         callback(null, spf);
@@ -289,13 +292,25 @@ function checkMx(domain, mailFqdn, callback) {
 
     dns.resolve(mx.domain, mx.type, DNS_OPTIONS, function (error, mxRecords) {
         if (error) return callback(error, mx);
+        if (mxRecords.length === 0) return callback(null, mx);
 
-        if (mxRecords.length !== 0) {
-            mx.status = mxRecords.length == 1 && mxRecords[0].exchange === mailFqdn;
-            mx.value = mxRecords.map(function (r) { return r.priority + ' ' + r.exchange + '.'; }).join(' ');
-        }
+        mx.status = mxRecords.length == 1 && mxRecords[0].exchange === mailFqdn;
+        mx.value = mxRecords.map(function (r) { return r.priority + ' ' + r.exchange + '.'; }).join(' ');
 
-        callback(null, mx);
+        if (mx.status) return callback(null, mx); // MX record is "my."
+
+        // cloudflare might create a conflict subdomain (https://support.cloudflare.com/hc/en-us/articles/360020296512-DNS-Troubleshooting-FAQ)
+        dns.resolve(mxRecords[0].exchange, 'A', DNS_OPTIONS, function (error, mxIps) {
+            if (error || mxIps.length !== 1) return callback(null, mx);
+
+            sysinfo.getPublicIp(function (error, ip) {
+                if (error) return callback(null, mx);
+
+                mx.status = mxIps[0] === ip;
+
+                callback(null, mx);
+            });
+        });
     });
 }
 
@@ -481,30 +496,30 @@ function getStatus(domain, callback) {
         };
     }
 
-    const mailFqdn = config.mailFqdn();
+    const mailFqdn = settings.mailFqdn();
 
-    getDomain(domain, function (error, result) {
+    getDomain(domain, function (error, mailDomain) {
         if (error) return callback(error);
 
         let checks = [];
-        if (result.enabled) {
+        if (mailDomain.enabled) {
             checks.push(
                 recordResult('dns.mx', checkMx.bind(null, domain, mailFqdn)),
                 recordResult('dns.dmarc', checkDmarc.bind(null, domain))
             );
         }
 
-        if (result.relay.provider === 'cloudron-smtp') {
+        if (mailDomain.relay.provider === 'cloudron-smtp') {
             // these tests currently only make sense when using Cloudron's SMTP server at this point
             checks.push(
                 recordResult('dns.spf', checkSpf.bind(null, domain, mailFqdn)),
-                recordResult('dns.dkim', checkDkim.bind(null, domain)),
+                recordResult('dns.dkim', checkDkim.bind(null, mailDomain)),
                 recordResult('dns.ptr', checkPtr.bind(null, mailFqdn)),
                 recordResult('relay', checkOutboundPort25),
                 recordResult('rbl', checkRblStatus.bind(null, domain))
             );
-        } else if (result.relay.provider !== 'noop') {
-            checks.push(recordResult('relay', checkSmtpRelay.bind(null, result.relay)));
+        } else if (mailDomain.relay.provider !== 'noop') {
+            checks.push(recordResult('relay', checkSmtpRelay.bind(null, mailDomain.relay)));
         }
 
         async.parallel(checks, function () {
@@ -552,7 +567,7 @@ function checkConfiguration(callback) {
                 markdownMessage += '\n\n';
             });
 
-            if (markdownMessage) markdownMessage += 'Email Status is checked every 30 minutes\n See the [troubleshooting docs](https://cloudron.io/documentation/troubleshooting/#mail-dns) for more information.\n';
+            if (markdownMessage) markdownMessage += 'Email Status is checked every 30 minutes.\n See the [troubleshooting docs](https://cloudron.io/documentation/troubleshooting/#mail-dns) for more information.\n';
 
             callback(null, markdownMessage); // empty message means all status checks succeeded
         });
@@ -596,13 +611,14 @@ function createMailConfig(mailFqdn, callback) {
             const enableRelay = relay.provider !== 'cloudron-smtp' && relay.provider !== 'noop',
                 host = relay.host || '',
                 port = relay.port || 25,
+                authType = relay.username ? 'plain' : '',
                 username = relay.username || '',
                 password = relay.password || '';
 
             if (!enableRelay) return;
 
             if (!safe.fs.appendFileSync(paths.ADDON_CONFIG_DIR + '/mail/smtp_forward.ini',
-                `[${domain.domain}]\nenable_outbound=true\nhost=${host}\nport=${port}\nenable_tls=true\nauth_type=plain\nauth_user=${username}\nauth_pass=${password}\n\n`, 'utf8')) {
+                `[${domain.domain}]\nenable_outbound=true\nhost=${host}\nport=${port}\nenable_tls=true\nauth_type=${authType}\nauth_user=${username}\nauth_pass=${password}\n\n`, 'utf8')) {
                 return callback(new Error('Could not create mail var file:' + safe.error.message));
             }
         });
@@ -674,8 +690,8 @@ function restartMail(callback) {
 
     if (process.env.BOX_ENV === 'test' && !process.env.TEST_CREATE_INFRA) return callback();
 
-    debug(`restartMail: restarting mail container with ${config.mailFqdn()} ${config.adminDomain()}`);
-    configureMail(config.mailFqdn(), config.adminDomain(), callback);
+    debug(`restartMail: restarting mail container with ${settings.mailFqdn()} ${settings.adminDomain()}`);
+    configureMail(settings.mailFqdn(), settings.adminDomain(), callback);
 }
 
 function restartMailIfActivated(callback) {
@@ -757,9 +773,10 @@ function txtRecordsWithSpf(domain, mailFqdn, callback) {
     });
 }
 
-function ensureDkimKeySync(domain) {
-    assert.strictEqual(typeof domain, 'string');
+function ensureDkimKeySync(mailDomain) {
+    assert.strictEqual(typeof mailDomain, 'object');
 
+    const domain = mailDomain.domain;
     const dkimPath = path.join(paths.MAIL_DATA_DIR, `dkim/${domain}`);
     const dkimPrivateKeyFile = path.join(dkimPath, 'private');
     const dkimPublicKeyFile = path.join(dkimPath, 'public');
@@ -782,7 +799,10 @@ function ensureDkimKeySync(domain) {
     if (!safe.child_process.execSync('openssl genrsa -out ' + dkimPrivateKeyFile + ' 1024')) return new MailError(MailError.INTERNAL_ERROR, safe.error);
     if (!safe.child_process.execSync('openssl rsa -in ' + dkimPrivateKeyFile + ' -out ' + dkimPublicKeyFile + ' -pubout -outform PEM')) return new MailError(MailError.INTERNAL_ERROR, safe.error);
 
-    if (!safe.fs.writeFileSync(dkimSelectorFile, constants.DKIM_SELECTOR, 'utf8')) return new MailError(MailError.INTERNAL_ERROR, safe.error);
+    if (!safe.fs.writeFileSync(dkimSelectorFile, mailDomain.dkimSelector, 'utf8')) return new MailError(MailError.INTERNAL_ERROR, safe.error);
+
+    // if the 'yellowtent' user of OS and the 'cloudron' user of mail container don't match, the keys become inaccessible by mail code
+    if (!safe.fs.chmodSync(dkimPrivateKeyFile, 0o644)) return new MailError(MailError.INTERNAL_ERROR, safe.error);
 
     return null;
 }
@@ -813,11 +833,11 @@ function upsertDnsRecords(domain, mailFqdn, callback) {
 
     debug(`upsertDnsRecords: updating mail dns records of domain ${domain} and mail fqdn ${mailFqdn}`);
 
-    maildb.get(domain, function (error, result) {
+    maildb.get(domain, function (error, mailDomain) {
         if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new MailError(MailError.NOT_FOUND));
         if (error) return callback(new MailError(MailError.INTERNAL_ERROR, error));
 
-        error = ensureDkimKeySync(domain);
+        error = ensureDkimKeySync(mailDomain);
         if (error) return callback(error);
 
         if (process.env.BOX_ENV === 'test') return callback();
@@ -826,11 +846,11 @@ function upsertDnsRecords(domain, mailFqdn, callback) {
         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: `${constants.DKIM_SELECTOR}._domainkey`, domain: domain, type: 'TXT', values: [ '"v=DKIM1; t=s; p=' + dkimKey + '"' ] };
+        var dkimRecord = { subdomain: `${mailDomain.dkimSelector}._domainkey`, domain: domain, type: 'TXT', values: [ '"v=DKIM1; t=s; p=' + dkimKey + '"' ] };
 
         var records = [ ];
         records.push(dkimRecord);
-        if (result.enabled) {
+        if (mailDomain.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 ' + mailFqdn + '.' ] });
         }
@@ -862,14 +882,14 @@ function setDnsRecords(domain, callback) {
     assert.strictEqual(typeof domain, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    upsertDnsRecords(domain, config.mailFqdn(), callback);
+    upsertDnsRecords(domain, settings.mailFqdn(), callback);
 }
 
 function onMailFqdnChanged(callback) {
     assert.strictEqual(typeof callback, 'function');
 
-    const mailFqdn = config.mailFqdn(),
-        mailDomain = config.adminDomain();
+    const mailFqdn = settings.mailFqdn(),
+        mailDomain = settings.adminDomain();
 
     domains.getAll(function (error, allDomains) {
         if (error) return callback(new MailError(MailError.INTERNAL_ERROR, error));
@@ -888,13 +908,15 @@ function addDomain(domain, callback) {
     assert.strictEqual(typeof domain, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    maildb.add(domain, function (error) {
+    const dkimSelector = domain === settings.adminDomain() ? 'cloudron' : ('cloudron-' + settings.adminDomain().replace(/\./g, ''));
+
+    maildb.add(domain, { dkimSelector }, function (error) {
         if (error && error.reason === DatabaseError.ALREADY_EXISTS) return callback(new MailError(MailError.ALREADY_EXISTS, 'Domain already exists'));
         if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new MailError(MailError.NOT_FOUND, 'No such domain'));
         if (error) return callback(new MailError(MailError.INTERNAL_ERROR, error));
 
         async.series([
-            upsertDnsRecords.bind(null, domain, config.mailFqdn()), // do this first to ensure DKIM keys
+            upsertDnsRecords.bind(null, domain, settings.mailFqdn()), // do this first to ensure DKIM keys
             restartMailIfActivated
         ], NOOP_CALLBACK); // do these asynchronously
 
@@ -906,7 +928,7 @@ function removeDomain(domain, callback) {
     assert.strictEqual(typeof domain, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    if (domain === config.adminDomain()) return callback(new MailError(MailError.IN_USE));
+    if (domain === settings.adminDomain()) return callback(new MailError(MailError.IN_USE));
 
     maildb.del(domain, function (error) {
         if (error && error.reason === DatabaseError.IN_USE) return callback(new MailError(MailError.IN_USE));
@@ -1181,7 +1203,7 @@ function getLists(domain, callback) {
     assert.strictEqual(typeof domain, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    mailboxdb.listGroups(domain, function (error, result) {
+    mailboxdb.getLists(domain, function (error, result) {
         if (error) return callback(new MailError(MailError.INTERNAL_ERROR, error));
 
         callback(null, result);
@@ -1193,7 +1215,7 @@ function getList(domain, listName, callback) {
     assert.strictEqual(typeof listName, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    mailboxdb.getGroup(listName, domain, function (error, result) {
+    mailboxdb.getList(listName, domain, function (error, result) {
         if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new MailError(MailError.NOT_FOUND, 'no such list'));
         if (error) return callback(new MailError(MailError.INTERNAL_ERROR, error));
 
@@ -1220,7 +1242,7 @@ function addList(name, domain, members, auditSource, callback) {
         if (error) return callback(error);
     }
 
-    mailboxdb.addGroup(name, domain, members, function (error) {
+    mailboxdb.addList(name, domain, members, function (error) {
         if (error && error.reason === DatabaseError.ALREADY_EXISTS) return callback(new MailError(MailError.ALREADY_EXISTS, 'list already exits'));
         if (error) return callback(new MailError(MailError.INTERNAL_ERROR, error));
 

src/mail_templates/app_updated.ejs

@@ -4,10 +4,37 @@ Dear Cloudron Admin,
 
 The application '<%= title %>' installed at <%= appFqdn %> was updated to app package version <%= version %>.
 
+Changes:
+<%= changelog %>
+
 Powered by https://cloudron.io
 
 Sent at: <%= new Date().toUTCString() %>
 
 <% } else { %>
 
+    <center>
+
+        <img src="<%= cloudronAvatarUrl %>" width="128px" height="128px"/>
+
+        <h3>Dear <%= cloudronName %> Admin,</h3>
+
+        <br/>
+
+        <div style="width: 650px; text-align: left;">
+            The application '<%= title %>' installed at <%= appFqdn %> was updated to app package version <%= version %>.
+
+            <h5>Changelog:</h5>
+            <%- changelogHTML %>
+        </div>
+
+        <br/>
+        <br/>
+
+        <div style="font-size: 10px; color: #333333; background: #ffffff;">
+            Powered by <a href="https://cloudron.io">Cloudron</a>.<br/>
+            Sent at: <%= new Date().toUTCString() %>
+        </div>
+
+    </center>
 <% } %>

src/mail_templates/app_updates_available.ejs

@@ -3,7 +3,7 @@
 Dear Cloudron Admin,
 
 <% for (var i = 0; i < apps.length; i++) { -%>
-A new version <%= apps[i].updateInfo.manifest.version %> of the app '<%= apps[i].app.manifest.title %>' installed at <%= apps[i].app.fqdn %> is available!
+A new version <%= apps[i].updateInfo.manifest.version %> of the app '<%= apps[i].app.manifest.title %>' installed at <%= apps[i].app.fqdn %> is available.
 
 Changes:
 <%= apps[i].updateInfo.manifest.changelog %>
@@ -28,10 +28,12 @@ Sent at: <%= new Date().toUTCString() %>
 
     <h3>Dear <%= cloudronName %> Admin,</h3>
 
+    <br/>
+
     <div style="width: 650px; text-align: left;">
 <% for (var i = 0; i < apps.length; i++) { -%>
         <p>
-            A new version <%= apps[i].updateInfo.manifest.version %> of the app '<%= apps[i].app.manifest.title %>' installed at <a href="https://<%= apps[i].app.fqdn %>"><%= apps[i].app.fqdn %></a> is available!
+            A new version <%= apps[i].updateInfo.manifest.version %> of the app '<%= apps[i].app.manifest.title %>' installed at <a href="https://<%= apps[i].app.fqdn %>"><%= apps[i].app.fqdn %></a> is available.
         </p>
 
         <h5>Changelog:</h5>
@@ -40,21 +42,20 @@ Sent at: <%= new Date().toUTCString() %>
         <br/>
 <% } -%>
 
-        <% if (!hasSubscription) { %>
+<% if (!hasSubscription) { -%>
         <p>Keep your Cloudron automatically up-to-date and secure by upgrading to a <a href="<%= webadminUrl %>/#/settings">paid plan</a>.</p>
-        <% } else { -%>
+<% } else { -%>
         <p>
             <br/>
             <center><a href="<%= webadminUrl %>">Update now</a></center>
             <br/>
         </p>
-        <% } -%>
-
-        <br/>
+<% } -%>
     </div>
 
     <div style="font-size: 10px; color: #333333; background: #ffffff;">
-        Powered by <a href="https://cloudron.io">Cloudron</a>.
+        Powered by <a href="https://cloudron.io">Cloudron</a>.<br/>
+        Sent at: <%= new Date().toUTCString() %>
     </div>
 
     </center>

src/mail_templates/test_data.json

@@ -1,58 +1,48 @@
 {
+  "app_updated.ejs": {
+    "format": "html",
+    "title": "WordPress",
+    "appFqdn": "updated.smartserver.io",
+    "version": "1.3.4",
+    "changelog": "* This has changed\n * and that as well",
+    "changelogHTML": "<ul><li>This has changed</li><li>and that as well</li></ul>",
+    "cloudronName": "Smartserver",
+    "cloudronAvatarUrl": "https://cloudron.io/img/logo.png"
+  },
+  "app_updates_available.ejs": {
     "format": "html",
     "webadminUrl": "https://my.cloudron.io",
     "cloudronName": "Smartserver",
     "cloudronAvatarUrl": "https://cloudron.io/img/logo.png",
-    "info": {
-        "pendingBoxUpdate": {
-            "version": "1.3.7",
-            "changelog": [
-                "Feature one",
-                "Feature two"
-            ]
-        },
-        "pendingAppUpdates": [{
-            "manifest": {
-                "title": "Wordpress",
-                "version": "1.2.3",
-                "changelog": "* This has changed\n * and that as well"
-            }
-        }],
-        "finishedBoxUpdates": [{
-            "boxUpdateInfo": {
-                "version": "1.0.1",
-                "changelog": [
-                    "Feature one",
-                    "Feature two"
-                ]
-            }
-        }, {
-            "boxUpdateInfo": {
-                "version": "1.0.2",
-                "changelog": [
-                    "Feature one",
-                    "Feature two",
-                    "Feature three"
-                ]
-            }
-        }],
-        "finishedAppUpdates": [{
-            "toManifest": {
-                "title": "Rocket.Chat",
-                "version": "0.2.1",
-                "changelog": "* This has changed\n * and that as well\n * some more"
-            }
-        }, {
-            "toManifest": {
-                "title": "Redmine",
-                "version": "1.2.1",
-                "changelog": "* This has changed\n * and that as well\n * some more"
-            }
-        }],
-        "certRenewals": [],
-        "finishedBackups": [],
-        "usersAdded": [],
-        "usersRemoved": [],
-        "hasSubscription": false
-    }
+    "hasSubscription": true,
+    "apps": [{
+      "updateInfo": {
+        "manifest": {
+          "version": "1.4.3"
+        }
+      },
+      "app": {
+        "fqdn": "site.smartserver.io",
+        "manifest": {
+          "title": "WordPress"
+        }
+      },
+      "changelog": "* This has changed\n * and that as well",
+      "changelogHTML": "<ul><li>This has changed</li><li>and that as well</li></ul>"
+    }, {
+      "updateInfo": {
+        "manifest": {
+          "version": "0.1.3"
+        }
+      },
+      "app": {
+        "fqdn": "another.smartserver.io",
+        "manifest": {
+          "title": "RocketChat"
+        }
+      },
+      "changelog": "* This has changed\n * and that as well",
+      "changelogHTML": "<ul><li>This has changed</li><li>and that as well</li></ul>"
+    }]
+  }
 }

src/mailboxdb.js

@@ -2,7 +2,7 @@
 
 exports = module.exports = {
     addMailbox: addMailbox,
-    addGroup: addGroup,
+    addList: addList,
 
     updateMailboxOwner: updateMailboxOwner,
     updateList: updateList,
@@ -10,10 +10,10 @@ exports = module.exports = {
 
     listAliases: listAliases,
     listMailboxes: listMailboxes,
-    listGroups: listGroups,
+    getLists: getLists,
 
     getMailbox: getMailbox,
-    getGroup: getGroup,
+    getList: getList,
     getAlias: getAlias,
 
     getAliasesForName: getAliasesForName,
@@ -75,7 +75,7 @@ function updateMailboxOwner(name, domain, ownerId, callback) {
     });
 }
 
-function addGroup(name, domain, members, callback) {
+function addList(name, domain, members, callback) {
     assert.strictEqual(typeof name, 'string');
     assert.strictEqual(typeof domain, 'string');
     assert(Array.isArray(members));
@@ -197,7 +197,7 @@ function listMailboxes(domain, callback) {
         });
 }
 
-function listGroups(domain, callback) {
+function getLists(domain, callback) {
     assert.strictEqual(typeof domain, 'string');
     assert.strictEqual(typeof callback, 'function');
 
@@ -211,7 +211,7 @@ function listGroups(domain, callback) {
         });
 }
 
-function getGroup(name, domain, callback) {
+function getList(name, domain, callback) {
     assert.strictEqual(typeof name, 'string');
     assert.strictEqual(typeof domain, 'string');
     assert.strictEqual(typeof callback, 'function');

src/maildb.js

@@ -19,7 +19,7 @@ var assert = require('assert'),
     DatabaseError = require('./databaseerror.js'),
     safe = require('safetydance');
 
-var MAILDB_FIELDS = [ 'domain', 'enabled', 'mailFromValidation', 'catchAllJson', 'relayJson' ].join(',');
+var MAILDB_FIELDS = [ 'domain', 'enabled', 'mailFromValidation', 'catchAllJson', 'relayJson', 'dkimSelector' ].join(',');
 
 function postProcess(data) {
     data.enabled = !!data.enabled; // int to boolean
@@ -34,10 +34,12 @@ function postProcess(data) {
     return data;
 }
 
-function add(domain, callback) {
+function add(domain, data, callback) {
     assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof data, 'object');
+    assert.strictEqual(typeof callback, 'function');
 
-    database.query('INSERT INTO mail (domain) VALUES (?)', [ domain ], function (error) {
+    database.query('INSERT INTO mail (domain, dkimSelector) VALUES (?, ?)', [ domain, data.dkimSelector || 'cloudron' ], function (error) {
         if (error && error.code === 'ER_DUP_ENTRY') return callback(new DatabaseError(DatabaseError.ALREADY_EXISTS, 'mail domain already exists'));
         if (error && error.code === 'ER_NO_REFERENCED_ROW_2') return callback(new DatabaseError(DatabaseError.NOT_FOUND), 'no such domain');
         if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));

src/mailer.js

@@ -24,7 +24,7 @@ exports = module.exports = {
 };
 
 var assert = require('assert'),
-    config = require('./config.js'),
+    constants = require('./constants.js'),
     custom = require('./custom.js'),
     debug = require('debug')('box:mailer'),
     docker = require('./docker.js').connection,
@@ -54,7 +54,7 @@ function getMailConfig(callback) {
 
         callback(null, {
             cloudronName: cloudronName,
-            notificationFrom: `"${cloudronName}" <no-reply@${config.adminDomain()}>`
+            notificationFrom: `"${cloudronName}" <no-reply@${settings.adminDomain()}>`
         });
     });
 }
@@ -84,9 +84,9 @@ function sendMail(mailOptions, callback) {
 
         var transport = nodemailer.createTransport(smtpTransport({
             host: mailServerIp,
-            port: config.get('smtpPort'),
+            port: constants.INTERNAL_SMTP_PORT,
             auth: {
-                user: mailOptions.authUser || `no-reply@${config.adminDomain()}`,
+                user: mailOptions.authUser || `no-reply@${settings.adminDomain()}`,
                 pass: relayToken
             }
         }));
@@ -146,11 +146,11 @@ function sendInvite(user, invitor) {
 
         var templateData = {
             user: user,
-            webadminUrl: config.adminOrigin(),
-            setupLink: `${config.adminOrigin()}/api/v1/session/account/setup.html?reset_token=${user.resetToken}&email=${encodeURIComponent(user.email)}`,
+            webadminUrl: settings.adminOrigin(),
+            setupLink: `${settings.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'
+            cloudronAvatarUrl: settings.adminOrigin() + '/api/v1/cloudron/avatar'
         };
 
         var templateDataText = JSON.parse(JSON.stringify(templateData));
@@ -183,7 +183,7 @@ function userAdded(mailTo, user) {
         var templateData = {
             user: user,
             cloudronName: mailConfig.cloudronName,
-            cloudronAvatarUrl: config.adminOrigin() + '/api/v1/cloudron/avatar'
+            cloudronAvatarUrl: settings.adminOrigin() + '/api/v1/cloudron/avatar'
         };
 
         var templateDataText = JSON.parse(JSON.stringify(templateData));
@@ -233,9 +233,9 @@ function passwordReset(user) {
 
         var templateData = {
             user: user,
-            resetLink: `${config.adminOrigin()}/api/v1/session/password/reset.html?reset_token=${user.resetToken}&email=${encodeURIComponent(user.email)}`,
+            resetLink: `${settings.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'
+            cloudronAvatarUrl: settings.adminOrigin() + '/api/v1/cloudron/avatar'
         };
 
         var templateDataText = JSON.parse(JSON.stringify(templateData));
@@ -289,7 +289,7 @@ function appDied(mailTo, app) {
             from: mailConfig.notificationFrom,
             to: mailTo,
             subject: util.format('[%s] App %s is down', mailConfig.cloudronName, app.fqdn),
-            text: render('app_down.ejs', { title: app.manifest.title, appFqdn: app.fqdn, supportEmail: custom.supportEmail(), format: 'text' })
+            text: render('app_down.ejs', { title: app.manifest.title, appFqdn: app.fqdn, supportEmail: custom.spec().support.email, format: 'text' })
         };
 
         sendMail(mailOptions);
@@ -306,11 +306,29 @@ function appUpdated(mailTo, app, callback) {
     getMailConfig(function (error, mailConfig) {
         if (error) return debug('Error getting mail details:', error);
 
+        var converter = new showdown.Converter();
+        var templateData = {
+            title: app.manifest.title,
+            appFqdn: app.fqdn,
+            version: app.manifest.version,
+            changelog: app.manifest.changelog,
+            changelogHTML: converter.makeHtml(app.manifest.changelog),
+            cloudronName: mailConfig.cloudronName,
+            cloudronAvatarUrl: settings.adminOrigin() + '/api/v1/cloudron/avatar'
+        };
+
+        var templateDataText = JSON.parse(JSON.stringify(templateData));
+        templateDataText.format = 'text';
+
+        var templateDataHTML = JSON.parse(JSON.stringify(templateData));
+        templateDataHTML.format = 'html';
+
         var mailOptions = {
             from: mailConfig.notificationFrom,
             to: mailTo,
-            subject: util.format('[%s] App %s was updated', mailConfig.cloudronName, app.fqdn),
-            text: render('app_updated.ejs', { title: app.manifest.title, appFqdn: app.fqdn, version: app.manifest.version, format: 'text' })
+            subject: `[${mailConfig.cloudronName}] App ${app.fqdn} was updated`,
+            text: render('app_updated.ejs', templateDataText),
+            html: render('app_updated.ejs', templateDataHTML)
         };
 
         sendMail(mailOptions, callback);
@@ -332,11 +350,11 @@ function appUpdatesAvailable(mailTo, apps, hasSubscription, callback) {
         });
 
         var templateData = {
-            webadminUrl: config.adminOrigin(),
+            webadminUrl: settings.adminOrigin(),
             hasSubscription: hasSubscription,
             apps: apps,
             cloudronName: mailConfig.cloudronName,
-            cloudronAvatarUrl: config.adminOrigin() + '/api/v1/cloudron/avatar'
+            cloudronAvatarUrl: settings.adminOrigin() + '/api/v1/cloudron/avatar'
         };
 
         var templateDataText = JSON.parse(JSON.stringify(templateData));

src/native-dns.js

@@ -5,7 +5,7 @@ exports = module.exports = {
 };
 
 var assert = require('assert'),
-    config = require('./config.js'),
+    constants = require('./constants.js'),
     dns = require('dns'),
     _ = require('underscore');
 
@@ -24,7 +24,7 @@ function resolve(hostname, rrtype, options, callback) {
     options = _.extend({ }, DEFAULT_OPTIONS, options);
 
     // Only use unbound on a Cloudron
-    if (config.CLOUDRON) resolver.setServers([ options.server ]);
+    if (constants.CLOUDRON) resolver.setServers([ options.server ]);
 
     // should callback with ECANCELLED but looks like we might hit https://github.com/nodejs/node/issues/14814
     const timerId = setTimeout(resolver.cancel.bind(resolver), options.timeout || 5000);

src/notificationdb.js

@@ -112,7 +112,7 @@ function listByUserIdPaged(userId, page, perPage, callback) {
     var data = [ userId ];
     var query = 'SELECT ' + NOTIFICATION_FIELDS + ' FROM notifications WHERE userId=?';
 
-    query += ' ORDER BY creationTime, title DESC LIMIT ?,?';
+    query += ' ORDER BY creationTime DESC LIMIT ?,?';
 
     data.push((page-1)*perPage);
     data.push(perPage);

src/notifications.js

@@ -24,13 +24,15 @@ exports = module.exports = {
 
 let assert = require('assert'),
     async = require('async'),
-    config = require('./config.js'),
+    auditsource = require('./auditsource.js'),
+    changelog = require('./changelog.js'),
     custom = require('./custom.js'),
     DatabaseError = require('./databaseerror.js'),
     debug = require('debug')('box:notifications'),
     eventlog = require('./eventlog.js'),
     mailer = require('./mailer.js'),
     notificationdb = require('./notificationdb.js'),
+    settings = require('./settings.js'),
     users = require('./users.js'),
     util = require('util');
 
@@ -144,7 +146,7 @@ function userAdded(performedBy, eventId, user, callback) {
 
     actionForAllAdmins([ performedBy, user.id ], function (admin, done) {
         mailer.userAdded(admin.email, user);
-        add(admin.id, eventId, 'User added', `User ${user.fallbackEmail} was added`, done);
+        add(admin.id, eventId, `User '${user.displayName}' added`, `User '${user.username || user.email || user.fallbackEmail}' was added.`, done);
     }, callback);
 }
 
@@ -156,7 +158,7 @@ function userRemoved(performedBy, eventId, user, callback) {
 
     actionForAllAdmins([ performedBy, user.id ], function (admin, done) {
         mailer.userRemoved(admin.email, user);
-        add(admin.id, eventId, 'User removed', `User ${user.username || user.email || user.fallbackEmail} was removed`, done);
+        add(admin.id, eventId, `User '${user.displayName}' removed`, `User '${user.username || user.email || user.fallbackEmail}' was removed.`, done);
     }, callback);
 }
 
@@ -167,7 +169,7 @@ function adminChanged(performedBy, eventId, user, callback) {
 
     actionForAllAdmins([ performedBy, user.id ], function (admin, done) {
         mailer.adminChanged(admin.email, user, user.admin);
-        add(admin.id, eventId, 'Admin status change', `User ${user.username || user.email || user.fallbackEmail} ${user.admin ? 'is now an admin' : 'is no more an admin'}`, done);
+        add(admin.id, eventId, `User '${user.displayName} ' ${user.admin ? 'is now an admin' : 'is no more an admin'}`, `User '${user.username || user.email || user.fallbackEmail}' ${user.admin ? 'is now an admin' : 'is no more an admin'}.`, done);
     }, callback);
 }
 
@@ -193,8 +195,8 @@ function oomEvent(eventId, app, addon, containerId, event, callback) {
         message = 'The container has been restarted automatically. Consider increasing the [memory limit](https://docs.docker.com/v17.09/edge/engine/reference/commandline/update/#update-a-containers-kernel-memory-constraints)';
     }
 
-    if (custom.alertsEmail()) mailer.oomEvent(custom.alertsEmail(), program, event);
-    if (!custom.sendAlertsToCloudronAdmins()) return callback();
+    if (custom.spec().alerts.email) mailer.oomEvent(custom.spec().alerts.email, program, event);
+    if (!custom.spec().alerts.notifyCloudronAdmins) return callback();
 
     actionForAllAdmins([], function (admin, done) {
         mailer.oomEvent(admin.email, program, event);
@@ -208,8 +210,8 @@ function appUp(eventId, app, callback) {
     assert.strictEqual(typeof app, 'object');
     assert.strictEqual(typeof callback, 'function');
 
-    if (custom.alertsEmail()) mailer.appUp(custom.alertsEmail(), app);
-    if (!custom.sendAlertsToCloudronAdmins()) return callback();
+    if (custom.spec().alerts.email) mailer.appUp(custom.spec().alerts.email, app);
+    if (!custom.spec().alerts.notifyCloudronAdmins) return callback();
 
     actionForAllAdmins([], function (admin, done) {
         mailer.appUp(admin.email, app);
@@ -222,8 +224,8 @@ function appDied(eventId, app, callback) {
     assert.strictEqual(typeof app, 'object');
     assert.strictEqual(typeof callback, 'function');
 
-    if (custom.alertsEmail()) mailer.appDied(custom.alertsEmail(), app);
-    if (!custom.sendAlertsToCloudronAdmins()) return callback();
+    if (custom.spec().alerts.email) mailer.appDied(custom.spec().alerts.email, app);
+    if (!custom.spec().alerts.notifyCloudronAdmins) return callback();
 
     actionForAllAdmins([], function (admin, callback) {
         mailer.appDied(admin.email, app);
@@ -236,8 +238,13 @@ function appUpdated(eventId, app, callback) {
     assert.strictEqual(typeof app, 'object');
     assert.strictEqual(typeof callback, 'function');
 
+    const tmp = app.manifest.description.match(/<upstream>(.*)<\/upstream>/i);
+    const upstreamVersion = (tmp && tmp[1]) ? tmp[1] : '';
+    const title = upstreamVersion ? `${app.manifest.title} at ${app.fqdn} updated to ${upstreamVersion} (package version ${app.manifest.version})`
+        : `${app.manifest.title} at ${app.fqdn} updated to package version ${app.manifest.version}`;
+
     actionForAllAdmins([], function (admin, done) {
-        add(admin.id, eventId, `App ${app.fqdn} updated`, `The application ${app.manifest.title} installed at https://${app.fqdn} was updated to package version ${app.manifest.version}.`, function (error) {
+        add(admin.id, eventId, title, `The application ${app.manifest.title} installed at https://${app.fqdn} was updated.\n\nChangelog:\n${app.manifest.changelog}\n`, function (error) {
             if (error) return callback(error);
 
             mailer.appUpdated(admin.email, app, function (error) {
@@ -248,14 +255,27 @@ function appUpdated(eventId, app, callback) {
     }, callback);
 }
 
+function boxUpdated(oldVersion, newVersion, callback) {
+    assert.strictEqual(typeof oldVersion, 'string');
+    assert.strictEqual(typeof newVersion, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    const changes = changelog.getChanges(newVersion);
+    const changelogMarkdown = changes.map((m) => `* ${m}\n`).join('');
+
+    actionForAllAdmins([], function (admin, done) {
+        add(admin.id, null, `Cloudron updated to v${newVersion}`, `Cloudron was updated from v${oldVersion} to v${newVersion}.\n\nChangelog:\n${changelogMarkdown}\n`, done);
+    }, callback);
+}
+
 function certificateRenewalError(eventId, vhost, errorMessage, callback) {
     assert.strictEqual(typeof eventId, 'string');
     assert.strictEqual(typeof vhost, 'string');
     assert.strictEqual(typeof errorMessage, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    if (custom.alertsEmail()) mailer.certificateRenewalError(custom.alertsEmail(), vhost, errorMessage);
-    if (!custom.sendAlertsToCloudronAdmins()) return callback();
+    if (custom.spec().alerts.email) mailer.certificateRenewalError(custom.spec().alerts.email, vhost, errorMessage);
+    if (!custom.spec().alerts.notifyCloudronAdmins) return callback();
 
     actionForAllAdmins([], function (admin, callback) {
         mailer.certificateRenewalError(admin.email, vhost, errorMessage);
@@ -269,11 +289,11 @@ function backupFailed(eventId, taskId, errorMessage, callback) {
     assert.strictEqual(typeof errorMessage, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    if (custom.alertsEmail()) mailer.backupFailed(custom.alertsEmail(), errorMessage, `${config.adminOrigin()}/logs.html?taskId=${taskId}`);
-    if (!custom.sendAlertsToCloudronAdmins()) return callback();
+    if (custom.spec().alerts.email) mailer.backupFailed(custom.spec().alerts.email, errorMessage, `${settings.adminOrigin()}/logs.html?taskId=${taskId}`);
+    if (!custom.spec().alerts.notifyCloudronAdmins) return callback();
 
     actionForAllAdmins([], function (admin, callback) {
-        mailer.backupFailed(admin.email, errorMessage, `${config.adminOrigin()}/logs.html?taskId=${taskId}`);
+        mailer.backupFailed(admin.email, errorMessage, `${settings.adminOrigin()}/logs.html?taskId=${taskId}`);
         add(admin.id, eventId, 'Failed to backup', `Backup failed: ${errorMessage}. Logs are available [here](/logs.html?taskId=${taskId}). Will be retried in 4 hours`, callback);
     }, callback);
 }
@@ -326,6 +346,9 @@ function onEvent(id, action, source, data, callback) {
     assert.strictEqual(typeof data, 'object');
     assert.strictEqual(typeof callback, 'function');
 
+    // external ldap syncer does not generate notifications - FIXME username might be an issue here
+    if (source.username === auditsource.EXTERNAL_LDAP_TASK.username) return callback();
+
     switch (action) {
     case eventlog.ACTION_USER_ADD:
         return userAdded(source.userId, id, data.user, callback);
@@ -358,6 +381,9 @@ function onEvent(id, action, source, data, callback) {
         if (!data.errorMessage || source.username !== 'cron') return callback();
         return backupFailed(id, data.taskId, data.errorMessage, callback); // only notify for automated backups
 
+    case eventlog.ACTION_UPDATE_FINISH:
+        return boxUpdated(data.oldVersion, data.newVersion, callback);
+
     default:
         return callback();
     }

src/oauth2views/account_setup.ejs

@@ -61,7 +61,7 @@ app.controller('Controller', ['$scope', function ($scope) {
             <div class="control-label" ng-show="setupForm.password.$dirty && setupForm.password.$invalid">
               <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="/^.{8,30}$/" required>
+            <input type="password" class="form-control" ng-model="password" name="password" ng-pattern="/^.{8,}$/" required>
           </div>
 
           <div class="form-group" ng-class="{ 'has-error': (setupForm.passwordRepeat.$dirty && (password !== passwordRepeat)) }">

src/oauth2views/footer.ejs

@@ -1,8 +1,6 @@
 
     <footer class="text-center">
       <span class="text-muted">&copy; 2016-19 <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>
 
 	</div>

src/oauth2views/header.ejs

@@ -13,7 +13,7 @@
     <link href="<%= adminOrigin %>/theme.css" rel="stylesheet">
 
     <!-- Custom Fonts -->
-    <link href="<%= adminOrigin %>/3rdparty/css/font-awesome.min.css" rel="stylesheet" rel="stylesheet" type="text/css">
+    <link href="<%= adminOrigin %>/3rdparty/fontawesome/css/all.min.css" rel="stylesheet" rel="stylesheet" type="text/css">
 
     <!-- jQuery-->
     <script src="<%= adminOrigin %>/3rdparty/js/jquery.min.js"></script>

src/paths.js

@@ -1,45 +1,57 @@
 'use strict';
 
-var config = require('./config.js'),
+var constants = require('./constants.js'),
     path = require('path');
 
+function baseDir() {
+    const homeDir = process.env.HOME || process.env.HOMEPATH || process.env.USERPROFILE;
+    if (constants.CLOUDRON) return homeDir;
+    if (constants.TEST) return path.join(homeDir, '.cloudron_test');
+    // cannot reach
+}
+
 // keep these values in sync with start.sh
 exports = module.exports = {
+    baseDir: baseDir,
+
     CLOUDRON_DEFAULT_AVATAR_FILE: path.join(__dirname + '/../assets/avatar.png'),
-    INFRA_VERSION_FILE: path.join(config.baseDir(), 'platformdata/INFRA_VERSION'),
+    INFRA_VERSION_FILE: path.join(baseDir(), 'platformdata/INFRA_VERSION'),
 
     LICENSE_FILE: '/etc/cloudron/LICENSE',
-    CUSTOM_FILE: '/etc/cloudron/custom.yml',
+    PROVIDER_FILE: '/etc/cloudron/PROVIDER',
 
-    PLATFORM_DATA_DIR: path.join(config.baseDir(), 'platformdata'),
-    APPS_DATA_DIR: path.join(config.baseDir(), 'appsdata'),
-    BOX_DATA_DIR: path.join(config.baseDir(), 'boxdata'),
+    PLATFORM_DATA_DIR: path.join(baseDir(), 'platformdata'),
+    APPS_DATA_DIR: path.join(baseDir(), 'appsdata'),
+    BOX_DATA_DIR: path.join(baseDir(), 'boxdata'),
 
-    ACME_CHALLENGES_DIR: path.join(config.baseDir(), 'platformdata/acme'),
-    ADDON_CONFIG_DIR: path.join(config.baseDir(), 'platformdata/addons'),
-    COLLECTD_APPCONFIG_DIR: path.join(config.baseDir(), 'platformdata/collectd/collectd.conf.d'),
-    LOGROTATE_CONFIG_DIR: path.join(config.baseDir(), 'platformdata/logrotate.d'),
-    NGINX_CONFIG_DIR: path.join(config.baseDir(), 'platformdata/nginx'),
-    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'),
-    DYNDNS_INFO_FILE: path.join(config.baseDir(), 'platformdata/dyndns-info.json'),
+    CUSTOM_FILE: path.join(baseDir(), 'boxdata/custom.yml'),
+
+    ACME_CHALLENGES_DIR: path.join(baseDir(), 'platformdata/acme'),
+    ADDON_CONFIG_DIR: path.join(baseDir(), 'platformdata/addons'),
+    COLLECTD_APPCONFIG_DIR: path.join(baseDir(), 'platformdata/collectd/collectd.conf.d'),
+    LOGROTATE_CONFIG_DIR: path.join(baseDir(), 'platformdata/logrotate.d'),
+    NGINX_CONFIG_DIR: path.join(baseDir(), 'platformdata/nginx'),
+    NGINX_APPCONFIG_DIR: path.join(baseDir(), 'platformdata/nginx/applications'),
+    NGINX_CERT_DIR: path.join(baseDir(), 'platformdata/nginx/cert'),
+    BACKUP_INFO_DIR: path.join(baseDir(), 'platformdata/backup'),
+    UPDATE_DIR: path.join(baseDir(), 'platformdata/update'),
+    SNAPSHOT_INFO_FILE: path.join(baseDir(), 'platformdata/backup/snapshot-info.json'),
+    DYNDNS_INFO_FILE: path.join(baseDir(), 'platformdata/dyndns-info.json'),
+    VERSION_FILE: path.join(baseDir(), 'platformdata/VERSION'),
 
     // this is not part of appdata because an icon may be set before install
-    APP_ICONS_DIR: path.join(config.baseDir(), 'boxdata/appicons'),
-    MAIL_DATA_DIR: path.join(config.baseDir(), 'boxdata/mail'),
-    ACME_ACCOUNT_KEY_FILE: path.join(config.baseDir(), 'boxdata/acme/acme.key'),
-    APP_CERTS_DIR: path.join(config.baseDir(), 'boxdata/certs'),
-    CLOUDRON_AVATAR_FILE: path.join(config.baseDir(), 'boxdata/avatar.png'),
-    UPDATE_CHECKER_FILE: path.join(config.baseDir(), 'boxdata/updatechecker.json'),
+    APP_ICONS_DIR: path.join(baseDir(), 'boxdata/appicons'),
+    MAIL_DATA_DIR: path.join(baseDir(), 'boxdata/mail'),
+    ACME_ACCOUNT_KEY_FILE: path.join(baseDir(), 'boxdata/acme/acme.key'),
+    APP_CERTS_DIR: path.join(baseDir(), 'boxdata/certs'),
+    CLOUDRON_AVATAR_FILE: path.join(baseDir(), 'boxdata/avatar.png'),
+    UPDATE_CHECKER_FILE: path.join(baseDir(), 'boxdata/updatechecker.json'),
 
-    LOG_DIR: path.join(config.baseDir(), 'platformdata/logs'),
-    TASKS_LOG_DIR: path.join(config.baseDir(), 'platformdata/logs/tasks'),
-    CRASH_LOG_DIR: path.join(config.baseDir(), 'platformdata/logs/crash'),
+    LOG_DIR: path.join(baseDir(), 'platformdata/logs'),
+    TASKS_LOG_DIR: path.join(baseDir(), 'platformdata/logs/tasks'),
+    CRASH_LOG_DIR: path.join(baseDir(), 'platformdata/logs/crash'),
 
     // this pattern is for the cloudron logs API route to work
-    BACKUP_LOG_FILE: path.join(config.baseDir(), 'platformdata/logs/backup/app.log'),
-    UPDATER_LOG_FILE: path.join(config.baseDir(), 'platformdata/logs/updater/app.log')
+    BACKUP_LOG_FILE: path.join(baseDir(), 'platformdata/logs/backup/app.log'),
+    UPDATER_LOG_FILE: path.join(baseDir(), 'platformdata/logs/updater/app.log')
 };

src/platform.js

@@ -10,6 +10,7 @@ exports = module.exports = {
 
 var addons = require('./addons.js'),
     apps = require('./apps.js'),
+    appTaskManager = require('./apptaskmanager.js'),
     assert = require('assert'),
     async = require('async'),
     debug = require('debug')('box:platform'),
@@ -23,7 +24,7 @@ var addons = require('./addons.js'),
     settings = require('./settings.js'),
     sftp = require('./sftp.js'),
     shell = require('./shell.js'),
-    taskmanager = require('./taskmanager.js'),
+    tasks = require('./tasks.js'),
     _ = require('underscore');
 
 var NOOP_CALLBACK = function (error) { if (error) debug(error); };
@@ -75,13 +76,13 @@ function start(callback) {
 }
 
 function stop(callback) {
-    taskmanager.pauseTasks(callback);
+    tasks.stopAllTasks(callback);
 }
 
 function onPlatformReady() {
     debug('onPlatformReady: platform is ready');
     exports._isReady = true;
-    taskmanager.resumeTasks();
+    appTaskManager.resumeTasks(NOOP_CALLBACK);
 
     applyPlatformConfig(NOOP_CALLBACK);
     pruneInfraImages(NOOP_CALLBACK);
@@ -119,10 +120,13 @@ function pruneInfraImages(callback) {
             if (!line) continue;
             let parts = line.split(' '); // [ ID, Repo:Tag@Digest ]
             if (image.tag === parts[1]) continue; // keep
-            debug(`pruneInfraImages: removing unused image of ${image.repo}: ${line}`);
+            debug(`pruneInfraImages: removing unused image of ${image.repo}: tag: ${parts[1]} id: ${parts[0]}`);
 
-            shell.exec('pruneInfraImages', `docker rmi ${parts[0]}`, iteratorCallback);
+            let result = safe.child_process.execSync(`docker rmi ${parts[0]}`, { encoding: 'utf8' });
+            if (result === null) debug(`Erroring removing image ${parts[0]}: ${safe.error.mesage}`);
         }
+
+        iteratorCallback();
     }, callback);
 }
 

src/provision.js

@@ -17,7 +17,6 @@ var appstore = require('./appstore.js'),
     async = require('async'),
     backups = require('./backups.js'),
     BackupsError = require('./backups.js').BackupsError,
-    config = require('./config.js'),
     constants = require('./constants.js'),
     clients = require('./clients.js'),
     cloudron = require('./cloudron.js'),
@@ -32,6 +31,7 @@ var appstore = require('./appstore.js'),
     semver = require('semver'),
     settings = require('./settings.js'),
     superagent = require('superagent'),
+    sysinfo = require('./sysinfo.js'),
     users = require('./users.js'),
     UsersError = users.UsersError,
     tld = require('tldjs'),
@@ -78,6 +78,7 @@ ProvisionError.BAD_STATE = 'Bad State';
 ProvisionError.ALREADY_SETUP = 'Already Setup';
 ProvisionError.INTERNAL_ERROR = 'Internal Error';
 ProvisionError.EXTERNAL_ERROR = 'External Error';
+ProvisionError.LICENSE_ERROR = 'License Error';
 ProvisionError.ALREADY_PROVISIONED = 'Already Provisioned';
 
 function setProgress(task, message, callback) {
@@ -86,29 +87,8 @@ function setProgress(task, message, callback) {
     callback();
 }
 
-function autoprovision(autoconf, callback) {
-    assert.strictEqual(typeof autoconf, 'object');
-    assert.strictEqual(typeof callback, 'function');
-
-    async.eachSeries(Object.keys(autoconf), function (key, iteratorDone) {
-        debug(`autoprovision: ${key}`);
-
-        switch (key) {
-        case 'backupConfig':
-            settings.setBackupConfig(autoconf[key], iteratorDone);
-            break;
-        default:
-            debug(`autoprovision: ${key} ignored`);
-            return iteratorDone();
-        }
-    }, function (error) {
-        if (error) return callback(new ProvisionError(ProvisionError.INTERNAL_ERROR, error));
-
-        callback(null);
-    });
-}
-
-function autoRegister(callback) {
+function autoRegister(domain, callback) {
+    assert.strictEqual(typeof domain, 'string');
     assert.strictEqual(typeof callback, 'function');
 
     if (!fs.existsSync(paths.LICENSE_FILE)) return callback();
@@ -118,7 +98,7 @@ function autoRegister(callback) {
 
     debug('Auto-registering cloudron');
 
-    appstore.registerWithLicense(license.trim(), function (error) {
+    appstore.registerWithLicense(license.trim(), domain, function (error) {
         if (error && error.reason !== AppstoreError.ALREADY_REGISTERED) {
             debug('Failed to auto-register cloudron', error);
             return callback(new ProvisionError(ProvisionError.LICENSE_ERROR, 'Failed to auto-register Cloudron with license. Please contact support@cloudron.io'));
@@ -133,20 +113,18 @@ function unprovision(callback) {
 
     debug('unprovision');
 
-    config.setAdminDomain('');
-    config.setAdminFqdn('');
-
     // TODO: also cancel any existing configureWebadmin task
     async.series([
+        settings.setAdmin.bind(null, '', ''),
         mail.clearDomains,
         domains.clear
     ], callback);
 }
 
 
-function setup(dnsConfig, autoconf, auditSource, callback) {
+function setup(dnsConfig, backupConfig, auditSource, callback) {
     assert.strictEqual(typeof dnsConfig, 'object');
-    assert.strictEqual(typeof autoconf, 'object');
+    assert.strictEqual(typeof backupConfig, 'object');
     assert.strictEqual(typeof auditSource, 'object');
     assert.strictEqual(typeof callback, 'function');
 
@@ -188,12 +166,11 @@ function setup(dnsConfig, autoconf, auditSource, callback) {
                 callback(); // now that args are validated run the task in the background
 
                 async.series([
-                    autoRegister,
+                    autoRegister.bind(null, domain),
                     domains.prepareDashboardDomain.bind(null, domain, auditSource, (progress) => setProgress('setup', progress.message, NOOP_CALLBACK)),
-                    cloudron.setDashboardDomain.bind(null, domain, auditSource), // this sets up the config.fqdn()
-                    mail.addDomain.bind(null, domain), // this relies on config.mailFqdn()
-                    setProgress.bind(null, 'setup', 'Applying auto-configuration'),
-                    autoprovision.bind(null, autoconf),
+                    cloudron.setDashboardDomain.bind(null, domain, auditSource),
+                    mail.addDomain.bind(null, domain), // this relies on settings.mailFqdn() and settings.adminDomain()
+                    (next) => { if (!backupConfig) return next(); settings.setBackupConfig(backupConfig, next); },
                     setProgress.bind(null, 'setup', 'Done'),
                     eventlog.add.bind(null, eventlog.ACTION_PROVISION, auditSource, { })
                 ], function (error) {
@@ -264,16 +241,15 @@ function activate(username, password, email, displayName, ip, auditSource, callb
     });
 }
 
-function restore(backupConfig, backupId, version, autoconf, auditSource, callback) {
+function restore(backupConfig, backupId, version, auditSource, callback) {
     assert.strictEqual(typeof backupConfig, 'object');
     assert.strictEqual(typeof backupId, 'string');
     assert.strictEqual(typeof version, 'string');
-    assert.strictEqual(typeof autoconf, 'object');
     assert.strictEqual(typeof auditSource, 'object');
     assert.strictEqual(typeof callback, 'function');
 
     if (!semver.valid(version)) return callback(new ProvisionError(ProvisionError.BAD_STATE, 'version is not a valid semver'));
-    if (semver.major(config.version()) !== semver.major(version) || semver.minor(config.version()) !== semver.minor(version)) return callback(new ProvisionError(ProvisionError.BAD_STATE, `Run cloudron-setup with --version ${version} to restore from this backup`));
+    if (semver.major(constants.VERSION) !== semver.major(version) || semver.minor(constants.VERSION) !== semver.minor(version)) return callback(new ProvisionError(ProvisionError.BAD_STATE, `Run cloudron-setup with --version ${version} to restore from this backup`));
 
     if (gProvisionStatus.setup.active || gProvisionStatus.restore.active) return callback(new ProvisionError(ProvisionError.BAD_STATE, 'Already setting up or restoring'));
 
@@ -287,7 +263,7 @@ function restore(backupConfig, backupId, version, autoconf, auditSource, callbac
 
     users.isActivated(function (error, activated) {
         if (error) return done(new ProvisionError(ProvisionError.INTERNAL_ERROR, error));
-        if (activated) return done(new ProvisionError(ProvisionError.ALREADY_PROVISIONED, 'Already activated'));
+        if (activated) return done(new ProvisionError(ProvisionError.ALREADY_PROVISIONED, 'Already activated. Restore with a fresh Cloudron installation.'));
 
         backups.testConfig(backupConfig, function (error) {
             if (error && error.reason === BackupsError.BAD_FIELD) return done(new ProvisionError(ProvisionError.BAD_FIELD, error.message));
@@ -301,12 +277,8 @@ function restore(backupConfig, backupId, version, autoconf, auditSource, callbac
             async.series([
                 setProgress.bind(null, 'restore', 'Downloading backup'),
                 backups.restore.bind(null, backupConfig, backupId, (progress) => setProgress('restore', progress.message, NOOP_CALLBACK)),
-                setProgress.bind(null, 'restore', 'Applying auto-configuration'),
-                autoprovision.bind(null, autoconf),
-                // currently, our suggested restore flow is after a dnsSetup. The dnSetup creates DKIM keys and updates the DNS
-                // for this reason, we have to re-setup DNS after a restore so it has DKIm from the backup
-                // Once we have a 100% IP based restore, we can skip this
-                mail.setDnsRecords.bind(null, config.adminDomain()),
+                cloudron.setupDashboard.bind(null, auditSource, (progress) => setProgress('restore', progress.message, NOOP_CALLBACK)),
+                settings.setBackupConfig.bind(null, backupConfig), // update with the latest backupConfig
                 eventlog.add.bind(null, eventlog.ACTION_RESTORE, auditSource, { backupId }),
             ], function (error) {
                 gProvisionStatus.restore.active = false;
@@ -328,11 +300,11 @@ function getStatus(callback) {
             if (error) return callback(new ProvisionError(ProvisionError.INTERNAL_ERROR, error));
 
             callback(null, _.extend({
-                version: config.version(),
-                apiServerOrigin: config.apiServerOrigin(), // used by CaaS tool
-                provider: config.provider(),
+                version: constants.VERSION,
+                apiServerOrigin: settings.apiServerOrigin(), // used by CaaS tool
+                provider: sysinfo.provider(),
                 cloudronName: cloudronName,
-                adminFqdn: config.adminDomain() ? config.adminFqdn() : null,
+                adminFqdn: settings.adminDomain() ? settings.adminFqdn() : null,
                 activated: activated,
             }, gProvisionStatus));
         });

src/reverseproxy.js

@@ -36,7 +36,6 @@ var acme2 = require('./cert/acme2.js'),
     assert = require('assert'),
     async = require('async'),
     caas = require('./cert/caas.js'),
-    config = require('./config.js'),
     constants = require('./constants.js'),
     crypto = require('crypto'),
     debug = require('debug')('box:reverseproxy'),
@@ -51,7 +50,9 @@ var acme2 = require('./cert/acme2.js'),
     paths = require('./paths.js'),
     rimraf = require('rimraf'),
     safe = require('safetydance'),
+    settings = require('./settings.js'),
     shell = require('./shell.js'),
+    sysinfo = require('./sysinfo.js'),
     users = require('./users.js'),
     util = require('util');
 
@@ -90,8 +91,8 @@ function getCertApi(domainObject, callback) {
     var api = domainObject.tlsConfig.provider === 'caas' ? caas : acme2;
 
     var options = { prod: false, performHttpAuthorization: false, wildcard: false, email: '' };
-    if (domainObject.tlsConfig.provider !== 'caas') { // matches 'le-prod' or 'letsencrypt-prod'
-        options.prod = domainObject.tlsConfig.provider.match(/.*-prod/) !== null;
+    if (domainObject.tlsConfig.provider !== 'caas') {
+        options.prod = domainObject.tlsConfig.provider.match(/.*-prod/) !== null; // matches 'le-prod' or 'letsencrypt-prod'
         options.performHttpAuthorization = domainObject.provider.match(/noop|manual|wildcard/) !== null;
         options.wildcard = !!domainObject.tlsConfig.wildcard;
     }
@@ -331,7 +332,7 @@ function notifyCertChanged(vhost, callback) {
     assert.strictEqual(typeof vhost, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    if (vhost !== config.mailFqdn()) return callback();
+    if (vhost !== settings.mailFqdn()) return callback();
 
     mail.handleCertChanged(callback);
 }
@@ -386,13 +387,12 @@ function writeAdminNginxConfig(bundle, configFileName, vhost, callback) {
 
     var data = {
         sourceDir: path.resolve(__dirname, '..'),
-        adminOrigin: config.adminOrigin(),
+        adminOrigin: settings.adminOrigin(),
         vhost: vhost, // if vhost is empty it will become the default_server
-        hasIPv6: config.hasIPv6(),
+        hasIPv6: sysinfo.hasIPv6(),
         endpoint: 'admin',
         certFilePath: bundle.certFilePath,
         keyFilePath: bundle.keyFilePath,
-        xFrameOptions: 'SAMEORIGIN',
         robotsTxtQuoted: JSON.stringify('User-agent: *\nDisallow: /\n')
     };
     var nginxConf = ejs.render(NGINX_APPCONFIG_EJS, data);
@@ -450,15 +450,14 @@ function writeAppNginxConfig(app, bundle, callback) {
 
     var data = {
         sourceDir: sourceDir,
-        adminOrigin: config.adminOrigin(),
+        adminOrigin: settings.adminOrigin(),
         vhost: app.fqdn,
-        hasIPv6: config.hasIPv6(),
+        hasIPv6: sysinfo.hasIPv6(),
         port: app.httpPort,
         endpoint: endpoint,
         certFilePath: bundle.certFilePath,
         keyFilePath: bundle.keyFilePath,
-        robotsTxtQuoted: app.robotsTxt ? JSON.stringify(app.robotsTxt) : null,
-        xFrameOptions: app.xFrameOptions || 'SAMEORIGIN'    // once all apps have been updated/
+        robotsTxtQuoted: app.robotsTxt ? JSON.stringify(app.robotsTxt) : null
     };
     var nginxConf = ejs.render(NGINX_APPCONFIG_EJS, data);
 
@@ -483,12 +482,11 @@ function writeAppRedirectNginxConfig(app, fqdn, bundle, callback) {
         sourceDir: path.resolve(__dirname, '..'),
         vhost: fqdn,
         redirectTo: app.fqdn,
-        hasIPv6: config.hasIPv6(),
+        hasIPv6: sysinfo.hasIPv6(),
         endpoint: 'redirect',
         certFilePath: bundle.certFilePath,
         keyFilePath: bundle.keyFilePath,
-        robotsTxtQuoted: null,
-        xFrameOptions: 'SAMEORIGIN'
+        robotsTxtQuoted: null
     };
     var nginxConf = ejs.render(NGINX_APPCONFIG_EJS, data);
 
@@ -550,7 +548,7 @@ function renewCerts(options, auditSource, progressCallback, callback) {
         var appDomains = [];
 
         // add webadmin domain
-        appDomains.push({ domain: config.adminDomain(), fqdn: config.adminFqdn(), type: 'webadmin', nginxConfigFilename: path.join(paths.NGINX_APPCONFIG_DIR, `${config.adminFqdn()}.conf`) });
+        appDomains.push({ domain: settings.adminDomain(), fqdn: settings.adminFqdn(), type: 'webadmin', nginxConfigFilename: path.join(paths.NGINX_APPCONFIG_DIR, `${settings.adminFqdn()}.conf`) });
 
         // add app main
         allApps.forEach(function (app) {
@@ -580,7 +578,7 @@ function renewCerts(options, auditSource, progressCallback, callback) {
 
                 // reconfigure since the cert changed
                 var configureFunc;
-                if (appDomain.type === 'webadmin') configureFunc = writeAdminNginxConfig.bind(null, bundle, `${config.adminFqdn()}.conf`, config.adminFqdn());
+                if (appDomain.type === 'webadmin') configureFunc = writeAdminNginxConfig.bind(null, bundle, `${settings.adminFqdn()}.conf`, settings.adminFqdn());
                 else if (appDomain.type === 'main') configureFunc = writeAppNginxConfig.bind(null, appDomain.app, bundle);
                 else if (appDomain.type === 'alternate') configureFunc = writeAppRedirectNginxConfig.bind(null, appDomain.app, appDomain.fqdn, bundle);
                 else return iteratorCallback(new Error(`Unknown domain type for ${appDomain.fqdn}. This should never happen`));

src/routes/apps.js

@@ -21,8 +21,6 @@ exports = module.exports = {
 
     cloneApp: cloneApp,
 
-    setOwner: setOwner,
-
     uploadFile: uploadFile,
     downloadFile: downloadFile
 };
@@ -31,22 +29,37 @@ var apps = require('../apps.js'),
     AppsError = apps.AppsError,
     assert = require('assert'),
     auditSource = require('../auditsource.js'),
-    config = require('../config.js'),
     debug = require('debug')('box:routes/apps'),
-    fs = require('fs'),
     HttpError = require('connect-lastmile').HttpError,
     HttpSuccess = require('connect-lastmile').HttpSuccess,
-    paths = require('../paths.js'),
     safe = require('safetydance'),
     util = require('util'),
     WebSocket = require('ws');
 
+function toHttpError(appError) {
+    switch (appError.reason) {
+    case AppsError.NOT_FOUND:
+        return new HttpError(404, appError);
+    case AppsError.ALREADY_EXISTS:
+    case AppsError.BAD_STATE:
+        return new HttpError(409, appError);
+    case AppsError.BAD_FIELD:
+        return new HttpError(400, appError);
+    case AppsError.PLAN_LIMIT:
+        return new HttpError(402, appError);
+    case AppsError.EXTERNAL_ERROR:
+        return new HttpError(424, appError);
+    case AppsError.INTERNAL_ERROR:
+    default:
+        return new HttpError(500, appError);
+    }
+}
+
 function getApp(req, res, next) {
     assert.strictEqual(typeof req.params.id, 'string');
 
     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 (error) return next(toHttpError(error));
 
         next(new HttpSuccess(200, apps.removeInternalFields(app)));
     });
@@ -56,7 +69,7 @@ function getApps(req, res, next) {
     assert.strictEqual(typeof req.user, 'object');
 
     apps.getAllByUser(req.user, function (error, allApps) {
-        if (error) return next(new HttpError(500, error));
+        if (error) return next(toHttpError(error));
 
         allApps = allApps.map(apps.removeRestrictedFields);
 
@@ -67,9 +80,9 @@ function getApps(req, res, next) {
 function getAppIcon(req, res, next) {
     assert.strictEqual(typeof req.params.id, 'string');
 
-    var iconPath = paths.APP_ICONS_DIR + '/' + req.params.id + '.png';
-    fs.exists(iconPath, function (exists) {
-        if (!exists) return next(new HttpError(404, 'No such icon'));
+    apps.getIconPath(req.params.id, { original: req.query.original }, function (error, iconPath) {
+        if (error) return next(toHttpError(error));
+
         res.sendFile(iconPath);
     });
 }
@@ -78,7 +91,6 @@ 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'));
@@ -107,8 +119,6 @@ function installApp(req, res, next) {
 
     if ('memoryLimit' in data && typeof data.memoryLimit !== 'number') return next(new HttpError(400, 'memoryLimit is not a number'));
 
-    if (data.xFrameOptions && typeof data.xFrameOptions !== 'string') return next(new HttpError(400, 'xFrameOptions must be a string'));
-
     if ('sso' in data && typeof data.sso !== 'boolean') return next(new HttpError(400, 'sso must be a boolean'));
     if ('enableBackup' in data && typeof data.enableBackup !== 'boolean') return next(new HttpError(400, 'enableBackup must be a boolean'));
     if ('enableAutomaticUpdate' in data && typeof data.enableAutomaticUpdate !== 'boolean') return next(new HttpError(400, 'enableAutomaticUpdate must be a boolean'));
@@ -129,18 +139,10 @@ function installApp(req, res, next) {
 
     debug('Installing app :%j', data);
 
-    apps.install(data, req.user, auditSource.fromRequest(req), function (error, app) {
-        if (error && error.reason === AppsError.NOT_FOUND) return next(new HttpError(404, error.message));
-        if (error && error.reason === AppsError.ALREADY_EXISTS) return next(new HttpError(409, error.message));
-        if (error && error.reason === AppsError.PORT_RESERVED) return next(new HttpError(409, 'Port ' + error.message + ' is reserved.'));
-        if (error && error.reason === AppsError.PORT_CONFLICT) return next(new HttpError(409, 'Port ' + error.message + ' is already in use.'));
-        if (error && error.reason === AppsError.BAD_FIELD) return next(new HttpError(400, error.message));
-        if (error && error.reason === AppsError.PLAN_LIMIT) return next(new HttpError(402, error.message));
-        if (error && error.reason === AppsError.BAD_CERTIFICATE) return next(new HttpError(400, error.message));
-        if (error && error.reason === AppsError.EXTERNAL_ERROR) return next(new HttpError(424, error.message));
-        if (error) return next(new HttpError(500, error));
+    apps.install(data, req.user, auditSource.fromRequest(req), function (error, result) {
+        if (error) return next(toHttpError(error));
 
-        next(new HttpSuccess(202, app));
+        next(new HttpSuccess(202, { id: result.id, taskId: result.taskId }));
     });
 }
 
@@ -166,7 +168,6 @@ function configureApp(req, res, next) {
     if (!data.cert && data.key) return next(new HttpError(400, 'cert must be provided'));
 
     if ('memoryLimit' in data && typeof data.memoryLimit !== 'number') return next(new HttpError(400, 'memoryLimit is not a number'));
-    if (data.xFrameOptions && typeof data.xFrameOptions !== 'string') return next(new HttpError(400, 'xFrameOptions must be a string'));
 
     if ('enableBackup' in data && typeof data.enableBackup !== 'boolean') return next(new HttpError(400, 'enableBackup must be a boolean'));
     if ('enableAutomaticUpdate' in data && typeof data.enableAutomaticUpdate !== 'boolean') return next(new HttpError(400, 'enableAutomaticUpdate must be a boolean'));
@@ -189,20 +190,14 @@ function configureApp(req, res, next) {
 
     if ('label' in data && typeof data.label !== 'string') return next(new HttpError(400, 'label must be a string'));
     if ('dataDir' in data && typeof data.dataDir !== 'string') return next(new HttpError(400, 'dataDir must be a string'));
+    if ('icon' in data && typeof data.icon !== 'string') return next(new HttpError(400, 'icon is not a string'));
 
     debug('Configuring app id:%s data:%j', req.params.id, data);
 
-    apps.configure(req.params.id, data, req.user, auditSource.fromRequest(req), function (error) {
-        if (error && error.reason === AppsError.ALREADY_EXISTS) return next(new HttpError(409, error.message));
-        if (error && error.reason === AppsError.PORT_RESERVED) return next(new HttpError(409, 'Port ' + error.message + ' is reserved.'));
-        if (error && error.reason === AppsError.PORT_CONFLICT) return next(new HttpError(409, 'Port ' + error.message + ' is already in use.'));
-        if (error && error.reason === AppsError.NOT_FOUND) return next(new HttpError(404, 'No such app'));
-        if (error && error.reason === AppsError.BAD_STATE) return next(new HttpError(409, error.message));
-        if (error && error.reason === AppsError.BAD_FIELD) return next(new HttpError(400, error.message));
-        if (error && error.reason === AppsError.BAD_CERTIFICATE) return next(new HttpError(400, error.message));
-        if (error) return next(new HttpError(500, error));
+    apps.configure(req.params.id, data, req.user, auditSource.fromRequest(req), function (error, result) {
+        if (error) return next(toHttpError(error));
 
-        next(new HttpSuccess(202, { }));
+        next(new HttpSuccess(202, { taskId: result.taskId }));
     });
 }
 
@@ -217,14 +212,10 @@ function restoreApp(req, res, next) {
     if (!('backupId' in req.body)) return next(new HttpError(400, 'backupId is required'));
     if (data.backupId !== null && typeof data.backupId !== 'string') return next(new HttpError(400, 'backupId must be string or null'));
 
-    apps.restore(req.params.id, data, auditSource.fromRequest(req), function (error) {
-        if (error && error.reason === AppsError.NOT_FOUND) return next(new HttpError(404, 'No such app'));
-        if (error && error.reason === AppsError.BAD_FIELD) return next(new HttpError(400, error.message));
-        if (error && error.reason === AppsError.BAD_STATE) return next(new HttpError(409, error.message));
-        if (error && error.reason === AppsError.EXTERNAL_ERROR) return next(new HttpError(424, error.message));
-        if (error) return next(new HttpError(500, error));
+    apps.restore(req.params.id, data, auditSource.fromRequest(req), function (error, result) {
+        if (error) return next(toHttpError(error));
 
-        next(new HttpSuccess(202, { }));
+        next(new HttpSuccess(202, { taskId: result.taskId }));
     });
 }
 
@@ -233,7 +224,6 @@ 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);
 
@@ -243,18 +233,9 @@ function cloneApp(req, res, next) {
     if (('portBindings' in data) && typeof data.portBindings !== 'object') return next(new HttpError(400, 'portBindings must be an object'));
 
     apps.clone(req.params.id, data, req.user, auditSource.fromRequest(req), function (error, result) {
-        if (error && error.reason === AppsError.NOT_FOUND) return next(new HttpError(404, 'No such app'));
-        if (error && error.reason === AppsError.PORT_RESERVED) return next(new HttpError(409, 'Port ' + error.message + ' is reserved.'));
-        if (error && error.reason === AppsError.PORT_CONFLICT) return next(new HttpError(409, 'Port ' + error.message + ' is already in use.'));
-        if (error && error.reason === AppsError.ALREADY_EXISTS) return next(new HttpError(409, error.message));
-        if (error && error.reason === AppsError.BAD_FIELD) return next(new HttpError(400, error.message));
-        if (error && error.reason === AppsError.BAD_STATE) return next(new HttpError(409, error.message));
-        if (error && error.reason === AppsError.PLAN_LIMIT) return next(new HttpError(402, error.message));
-        if (error && error.reason === AppsError.BAD_CERTIFICATE) return next(new HttpError(400, error.message));
-        if (error && error.reason === AppsError.EXTERNAL_ERROR) return next(new HttpError(424, error.message));
-        if (error) return next(new HttpError(500, error));
+        if (error) return next(toHttpError(error));
 
-        next(new HttpSuccess(201, { id: result.id }));
+        next(new HttpSuccess(201, { id: result.id, taskId: result.taskId }));
     });
 }
 
@@ -263,13 +244,10 @@ function backupApp(req, res, next) {
 
     debug('Backup app id:%s', req.params.id);
 
-    apps.backup(req.params.id, function (error) {
-        if (error && error.reason === AppsError.NOT_FOUND) return next(new HttpError(404, 'No such app'));
-        if (error && error.reason === AppsError.BAD_STATE) return next(new HttpError(409, error.message));
-        if (error && error.reason === AppsError.EXTERNAL_ERROR) return next(new HttpError(424, error));
-        if (error) return next(new HttpError(500, error));
+    apps.backup(req.params.id, function (error, result) {
+        if (error) return next(toHttpError(error));
 
-        next(new HttpSuccess(202, { }));
+        next(new HttpSuccess(202, { taskId: result.taskId }));
     });
 }
 
@@ -278,12 +256,10 @@ function uninstallApp(req, res, next) {
 
     debug('Uninstalling app id:%s', req.params.id);
 
-    apps.uninstall(req.params.id, auditSource.fromRequest(req), function (error) {
-        if (error && error.reason === AppsError.EXTERNAL_ERROR) return next(new HttpError(424, error));
-        if (error && error.reason === AppsError.NOT_FOUND) return next(new HttpError(404, 'No such app'));
-        if (error) return next(new HttpError(500, error));
+    apps.uninstall(req.params.id, auditSource.fromRequest(req), function (error, result) {
+        if (error) return next(toHttpError(error));
 
-        next(new HttpSuccess(202, { }));
+        next(new HttpSuccess(202, { taskId: result.taskId }));
     });
 }
 
@@ -293,9 +269,7 @@ function startApp(req, res, next) {
     debug('Start app id:%s', req.params.id);
 
     apps.start(req.params.id, function (error) {
-        if (error && error.reason === AppsError.NOT_FOUND) return next(new HttpError(404, 'No such app'));
-        if (error && error.reason === AppsError.BAD_STATE) return next(new HttpError(409, error.message));
-        if (error) return next(new HttpError(500, error));
+        if (error) return next(toHttpError(error));
 
         next(new HttpSuccess(202, { }));
     });
@@ -307,9 +281,7 @@ function stopApp(req, res, next) {
     debug('Stop app id:%s', req.params.id);
 
     apps.stop(req.params.id, function (error) {
-        if (error && error.reason === AppsError.NOT_FOUND) return next(new HttpError(404, 'No such app'));
-        if (error && error.reason === AppsError.BAD_STATE) return next(new HttpError(409, error.message));
-        if (error) return next(new HttpError(500, error));
+        if (error) return next(toHttpError(error));
 
         next(new HttpSuccess(202, { }));
     });
@@ -326,18 +298,14 @@ function updateApp(req, res, next) {
     if ('appStoreId' in data && typeof data.appStoreId !== 'string') return next(new HttpError(400, 'appStoreId must be a string'));
     if (!data.manifest && !data.appStoreId) return next(new HttpError(400, 'appStoreId or manifest is required'));
 
-    if ('icon' in data && typeof data.icon !== 'string') return next(new HttpError(400, 'icon is not a string'));
     if ('force' in data && typeof data.force !== 'boolean') return next(new HttpError(400, 'force must be a boolean'));
 
     debug('Update app id:%s to manifest:%j', req.params.id, data.manifest);
 
-    apps.update(req.params.id, req.body, auditSource.fromRequest(req), function (error) {
-        if (error && error.reason === AppsError.NOT_FOUND) return next(new HttpError(404, 'No such app'));
-        if (error && error.reason === AppsError.BAD_FIELD) return next(new HttpError(400, error.message));
-        if (error && error.reason === AppsError.BAD_STATE) return next(new HttpError(409, error.message));
-        if (error) return next(new HttpError(500, error));
+    apps.update(req.params.id, req.body, auditSource.fromRequest(req), function (error, result) {
+        if (error) return next(toHttpError(error));
 
-        next(new HttpSuccess(202, { }));
+        next(new HttpSuccess(202, { taskId: result.taskId }));
     });
 }
 
@@ -361,9 +329,7 @@ function getLogStream(req, res, next) {
     };
 
     apps.getLogs(req.params.id, options, function (error, logStream) {
-        if (error && error.reason === AppsError.NOT_FOUND) return next(new HttpError(404, 'No such app'));
-        if (error && error.reason === AppsError.BAD_STATE) return next(new HttpError(412, error.message));
-        if (error) return next(new HttpError(500, error));
+        if (error) return next(toHttpError(error));
 
         res.writeHead(200, {
             'Content-Type': 'text/event-stream',
@@ -398,9 +364,7 @@ function getLogs(req, res, next) {
     };
 
     apps.getLogs(req.params.id, options, function (error, logStream) {
-        if (error && error.reason === AppsError.NOT_FOUND) return next(new HttpError(404, 'No such app'));
-        if (error && error.reason === AppsError.BAD_STATE) return next(new HttpError(412, error.message));
-        if (error) return next(new HttpError(500, error));
+        if (error) return next(toHttpError(error));
 
         res.writeHead(200, {
             'Content-Type': 'application/x-logs',
@@ -454,9 +418,7 @@ function exec(req, res, next) {
     var tty = req.query.tty === 'true' ? true : false;
 
     apps.exec(req.params.id, { cmd: cmd, rows: rows, columns: columns, tty: tty }, function (error, duplexStream) {
-        if (error && error.reason === AppsError.NOT_FOUND) return next(new HttpError(404, 'No such app'));
-        if (error && error.reason === AppsError.BAD_STATE) return next(new HttpError(409, error.message));
-        if (error) return next(new HttpError(500, error));
+        if (error) return next(toHttpError(error));
 
         if (req.headers['upgrade'] !== 'tcp') return next(new HttpError(404, 'exec requires TCP upgrade'));
 
@@ -496,9 +458,7 @@ function execWebSocket(req, res, next) {
     var tty = req.query.tty === 'true' ? true : false;
 
     apps.exec(req.params.id, { cmd: cmd, rows: rows, columns: columns, tty: tty }, function (error, duplexStream) {
-        if (error && error.reason === AppsError.NOT_FOUND) return next(new HttpError(404, 'No such app'));
-        if (error && error.reason === AppsError.BAD_STATE) return next(new HttpError(409, error.message));
-        if (error) return next(new HttpError(500, error));
+        if (error) return next(toHttpError(error));
 
         debug('Connected to terminal');
 
@@ -538,8 +498,7 @@ function listBackups(req, res, next) {
     if (!perPage || perPage < 0) return next(new HttpError(400, 'per_page query param has to be a postive number'));
 
     apps.listBackups(page, perPage, req.params.id, function (error, result) {
-        if (error && error.reason === AppsError.NOT_FOUND) return next(new HttpError(404, 'No such app'));
-        if (error) return next(new HttpError(500, error));
+        if (error) return next(toHttpError(error));
 
         next(new HttpSuccess(200, { backups: result }));
     });
@@ -554,8 +513,7 @@ function uploadFile(req, res, next) {
     if (!req.files.file) return next(new HttpError(400, 'file must be provided as multipart'));
 
     apps.uploadFile(req.params.id, req.files.file.path, req.query.file, function (error) {
-        if (error && error.reason === AppsError.NOT_FOUND) return next(new HttpError(404, error.message));
-        if (error) return next(new HttpError(500, error));
+        if (error) return next(toHttpError(error));
 
         debug('uploadFile: done');
 
@@ -571,8 +529,7 @@ function downloadFile(req, res, next) {
     if (typeof req.query.file !== 'string' || !req.query.file) return next(new HttpError(400, 'file query argument must be provided'));
 
     apps.downloadFile(req.params.id, req.query.file, function (error, stream, info) {
-        if (error && error.reason === AppsError.NOT_FOUND) return next(new HttpError(404, error.message));
-        if (error) return next(new HttpError(500, error));
+        if (error) return next(toHttpError(error));
 
         var headers = {
             'Content-Type': 'application/octet-stream',
@@ -585,17 +542,3 @@ 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/appstore.js

@@ -12,9 +12,19 @@ exports = module.exports = {
 var appstore = require('../appstore.js'),
     AppstoreError = appstore.AppstoreError,
     assert = require('assert'),
+    custom = require('../custom.js'),
     HttpError = require('connect-lastmile').HttpError,
     HttpSuccess = require('connect-lastmile').HttpSuccess;
 
+function isAppAllowed(appstoreId) {
+    if (custom.spec().appstore.blacklist.includes(appstoreId)) return false;
+
+    if (!custom.spec().appstore.whitelist) return true;
+    if (!custom.spec().appstore.whitelist[appstoreId]) return false;
+
+    return true;
+}
+
 function getApps(req, res, next) {
     appstore.getApps(function (error, apps) {
         if (error && error.reason === AppstoreError.INVALID_TOKEN) return next(new HttpError(402, error.message));
@@ -22,13 +32,18 @@ function getApps(req, res, next) {
         if (error && error.reason === AppstoreError.NOT_REGISTERED) return next(new HttpError(412, error.message));
         if (error) return next(new HttpError(500, error));
 
-        next(new HttpSuccess(200, { apps: apps }));
+        let filteredApps = apps.filter((app) => !custom.spec().appstore.blacklist.includes(app.id));
+        if (custom.spec().appstore.whitelist) filteredApps = filteredApps.filter((app) => app.id in custom.spec().appstore.whitelist);
+
+        next(new HttpSuccess(200, { apps: filteredApps }));
     });
 }
 
 function getApp(req, res, next) {
     assert.strictEqual(typeof req.params.appstoreId, 'string');
 
+    if (!isAppAllowed(req.params.appstoreId)) return next(new HttpError(405, 'feature disabled by admin'));
+
     appstore.getApp(req.params.appstoreId, function (error, app) {
         if (error && error.reason === AppstoreError.NOT_FOUND) return next(new HttpError(404, 'No such app'));
         if (error && error.reason === AppstoreError.INVALID_TOKEN) return next(new HttpError(402, error.message));
@@ -44,6 +59,8 @@ function getAppVersion(req, res, next) {
     assert.strictEqual(typeof req.params.appstoreId, 'string');
     assert.strictEqual(typeof req.params.versionId, 'string');
 
+    if (!isAppAllowed(req.params.appstoreId)) return next(new HttpError(405, 'feature disabled by admin'));
+
     appstore.getAppVersion(req.params.appstoreId, req.params.versionId, function (error, manifest) {
         if (error && error.reason === AppstoreError.NOT_FOUND) return next(new HttpError(404, 'No such app or version'));
         if (error && error.reason === AppstoreError.INVALID_TOKEN) return next(new HttpError(402, error.message));

src/routes/cloudron.js

@@ -12,7 +12,8 @@ exports = module.exports = {
     getLogStream: getLogStream,
     setDashboardAndMailDomain: setDashboardAndMailDomain,
     prepareDashboardDomain: prepareDashboardDomain,
-    renewCerts: renewCerts
+    renewCerts: renewCerts,
+    syncExternalLdap: syncExternalLdap
 };
 
 let assert = require('assert'),
@@ -20,6 +21,9 @@ let assert = require('assert'),
     auditSource = require('../auditsource.js'),
     cloudron = require('../cloudron.js'),
     CloudronError = cloudron.CloudronError,
+    custom = require('../custom.js'),
+    disks = require('../disks.js'),
+    externalldap = require('../externalldap.js'),
     HttpError = require('connect-lastmile').HttpError,
     HttpSuccess = require('connect-lastmile').HttpSuccess,
     updater = require('../updater.js'),
@@ -50,15 +54,17 @@ function getConfig(req, res, next) {
 }
 
 function getDisks(req, res, next) {
-    cloudron.getDisks(function (error, result) {
+    disks.getDisks(function (error, result) {
         if (error) return next(new HttpError(500, error));
         next(new HttpSuccess(200, result));
     });
 }
 
 function update(req, res, next) {
+    if ('skipBackup' in req.body && typeof req.body.skipBackup !== 'boolean') return next(new HttpError(400, 'skipBackup must be a boolean'));
+
     // this only initiates the update, progress can be checked via the progress route
-    updater.updateToLatest(auditSource.fromRequest(req), function (error, taskId) {
+    updater.updateToLatest(req.body, auditSource.fromRequest(req), function (error, taskId) {
         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) return next(new HttpError(500, error));
@@ -150,6 +156,8 @@ function getLogStream(req, res, next) {
 function setDashboardAndMailDomain(req, res, next) {
     if (!req.body.domain || typeof req.body.domain !== 'string') return next(new HttpError(400, 'domain must be a string'));
 
+    if (!custom.spec().domains.changeDashboardDomain) return next(new HttpError(405, 'feature disabled by admin'));
+
     cloudron.setDashboardAndMailDomain(req.body.domain, auditSource.fromRequest(req), function (error) {
         if (error && error.reason === CloudronError.BAD_FIELD) return next(new HttpError(404, error.message));
         if (error) return next(new HttpError(500, error));
@@ -161,6 +169,8 @@ function setDashboardAndMailDomain(req, res, next) {
 function prepareDashboardDomain(req, res, next) {
     if (!req.body.domain || typeof req.body.domain !== 'string') return next(new HttpError(400, 'domain must be a string'));
 
+    if (!custom.spec().domains.changeDashboardDomain) return next(new HttpError(405, 'feature disabled by admin'));
+
     cloudron.prepareDashboardDomain(req.body.domain, auditSource.fromRequest(req), function (error, taskId) {
         if (error && error.reason === CloudronError.BAD_FIELD) return next(new HttpError(404, error.message));
         if (error && error.reason === CloudronError.BAD_STATE) return next(new HttpError(409, error.message));
@@ -178,3 +188,11 @@ function renewCerts(req, res, next) {
         next(new HttpSuccess(202, { taskId }));
     });
 }
+
+function syncExternalLdap(req, res, next) {
+    externalldap.startSyncer(function (error, taskId) {
+        if (error) return next(new HttpError(500, error.message));
+
+        next(new HttpSuccess(202, { taskId: taskId }));
+    });
+}

src/routes/developer.js

@@ -20,7 +20,7 @@ function login(req, res, next) {
         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 });
+            let verified = speakeasy.totp.verify({ secret: user.twoFactorAuthenticationSecret, encoding: 'base32', token: req.body.totpToken, window: 2 });
             if (!verified) return next(new HttpError(401, 'Invalid totpToken'));
         }
 

src/routes/graphs.js

@@ -7,14 +7,18 @@ exports = module.exports = {
 var middleware = require('../middleware/index.js'),
     url = require('url');
 
-var graphiteProxy = middleware.proxy(url.parse('http://127.0.0.1:8417'));
+// for testing locally: curl 'http://127.0.0.1:8417/graphite-web/render?format=json&from=-1min&target=absolute(collectd.localhost.du-docker.capacity-usage)'
+// the datapoint is (value, timestamp) https://buildmedia.readthedocs.org/media/pdf/graphite/0.9.16/graphite.pdf
+const graphiteProxy = middleware.proxy(url.parse('http://127.0.0.1:8417'));
 
 function getGraphs(req, res, next) {
     var parsedUrl = url.parse(req.url, true /* parseQueryString */);
     delete parsedUrl.query['access_token'];
     delete req.headers['authorization'];
     delete req.headers['cookies'];
-    req.url = url.format({ pathname: 'render', query: parsedUrl.query });
+
+    // 'graphite-web' is the URL_PREFIX in docker-graphite
+    req.url = url.format({ pathname: 'graphite-web/render', query: parsedUrl.query });
 
     // graphs may take very long to respond so we run into headers already sent issues quite often
     // nginx still has a request timeout which can deal with this then.

src/routes/oauth2.js

@@ -24,7 +24,6 @@ var apps = require('../apps.js'),
     authcodedb = require('../authcodedb.js'),
     clients = require('../clients'),
     ClientsError = clients.ClientsError,
-    config = require('../config.js'),
     constants = require('../constants.js'),
     DatabaseError = require('../databaseerror.js'),
     debug = require('debug')('box:routes/oauth2'),
@@ -154,7 +153,7 @@ function renderTemplate(res, template, data) {
 
         // amend template properties, for example used in the header
         data.title = data.title || 'Cloudron';
-        data.adminOrigin = config.adminOrigin();
+        data.adminOrigin = settings.adminOrigin();
         data.cloudronName = cloudronName;
 
         res.render(template, data);
@@ -214,8 +213,8 @@ function loginForm(req, res) {
             applicationName: applicationName,
             applicationLogo: applicationLogo,
             error: error,
-            username: config.isDemo() ? constants.DEMO_USERNAME : '',
-            password: config.isDemo() ? 'cloudron' : '',
+            username: settings.isDemo() ? constants.DEMO_USERNAME : '',
+            password: settings.isDemo() ? 'cloudron' : '',
             title: applicationName + ' Login'
         });
     }
@@ -263,7 +262,7 @@ function login(req, res) {
                 return res.redirect('/api/v1/session/login?' + failureQuery);
             }
 
-            let verified = speakeasy.totp.verify({ secret: req.user.twoFactorAuthenticationSecret, encoding: 'base32', token: req.body.totpToken });
+            let verified = speakeasy.totp.verify({ secret: req.user.twoFactorAuthenticationSecret, encoding: 'base32', token: req.body.totpToken, window: 2 });
             if (!verified) {
                 let failureQuery = querystring.stringify({ error: 'The 2FA token is invalid', returnTo: returnTo });
                 return res.redirect('/api/v1/session/login?' + failureQuery);
@@ -373,7 +372,7 @@ function accountSetup(req, res, next) {
                 clients.addTokenByUserId('cid-webadmin', userObject.id, Date.now() + constants.DEFAULT_TOKEN_EXPIRATION, {}, function (error, result) {
                     if (error) return next(new HttpError(500, error));
 
-                    res.redirect(`${config.adminOrigin()}?accessToken=${result.accessToken}&expiresAt=${result.expires}`);
+                    res.redirect(`${settings.adminOrigin()}?accessToken=${result.accessToken}&expiresAt=${result.expires}`);
                 });
             });
         });
@@ -421,7 +420,7 @@ function passwordReset(req, res, next) {
             clients.addTokenByUserId('cid-webadmin', userObject.id, Date.now() + constants.DEFAULT_TOKEN_EXPIRATION, {}, function (error, result) {
                 if (error) return next(new HttpError(500, error));
 
-                res.redirect(`${config.adminOrigin()}?accessToken=${result.accessToken}&expiresAt=${result.expires}`);
+                res.redirect(`${settings.adminOrigin()}?accessToken=${result.accessToken}&expiresAt=${result.expires}`);
             });
         });
     });

src/routes/profile.js

@@ -27,7 +27,8 @@ function get(req, res, next) {
         fallbackEmail: req.user.fallbackEmail,
         displayName: req.user.displayName,
         twoFactorAuthenticationEnabled: req.user.twoFactorAuthenticationEnabled,
-        admin: req.user.admin
+        admin: req.user.admin,
+        source: req.user.source
     }));
 }
 
@@ -85,7 +86,7 @@ function enableTwoFactorAuthentication(req, res, next) {
 
     users.enableTwoFactorAuthentication(req.user.id, req.body.totpToken, function (error) {
         if (error && error.reason === UsersError.NOT_FOUND) return next(new HttpError(404, 'User not found'));
-        if (error && error.reason === UsersError.BAD_TOKEN) return next(new HttpError(403, 'Invalid token'));
+        if (error && error.reason === UsersError.BAD_TOKEN) return next(new HttpError(412, '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));
 

src/routes/provision.js

@@ -10,18 +10,18 @@ exports = module.exports = {
 
 var assert = require('assert'),
     auditSource = require('../auditsource'),
-    config = require('../config.js'),
     debug = require('debug')('box:routes/setup'),
     HttpError = require('connect-lastmile').HttpError,
     HttpSuccess = require('connect-lastmile').HttpSuccess,
     provision = require('../provision.js'),
     ProvisionError = require('../provision.js').ProvisionError,
+    sysinfo = require('../sysinfo.js'),
     superagent = require('superagent');
 
 function providerTokenAuth(req, res, next) {
     assert.strictEqual(typeof req.body, 'object');
 
-    if (config.provider() === 'ami') {
+    if (sysinfo.provider() === 'ami') {
         if (typeof req.body.providerToken !== 'string' || !req.body.providerToken) return next(new HttpError(400, 'providerToken must be a non empty string'));
 
         superagent.get('http://169.254.169.254/latest/meta-data/instance-id').timeout(30 * 1000).end(function (error, result) {
@@ -53,19 +53,18 @@ function setup(req, res, next) {
     if ('tlsConfig' in dnsConfig && typeof dnsConfig.tlsConfig !== 'object') return next(new HttpError(400, 'tlsConfig must be an object'));
     if (dnsConfig.tlsConfig && (!dnsConfig.tlsConfig.provider || typeof dnsConfig.tlsConfig.provider !== 'string')) return next(new HttpError(400, 'tlsConfig.provider must be a string'));
 
-    // TODO: validate subfields of these objects
-    if (req.body.autoconf && typeof req.body.autoconf !== 'object') return next(new HttpError(400, 'autoconf must be an object'));
+    if ('backupConfig' in req.body && typeof req.body.backupConfig !== 'object') return next(new HttpError(400, 'backupConfig must be an object'));
 
     // it can take sometime to setup DNS, register cloudron
     req.clearTimeout();
 
-    provision.setup(dnsConfig, req.body.autoconf || {}, auditSource.fromRequest(req), function (error) {
+    provision.setup(dnsConfig, req.body.backupConfig || null, auditSource.fromRequest(req), function (error) {
         if (error && error.reason === ProvisionError.ALREADY_SETUP) return next(new HttpError(409, error.message));
         if (error && error.reason === ProvisionError.BAD_FIELD) return next(new HttpError(400, error.message));
         if (error && error.reason === ProvisionError.BAD_STATE) return next(new HttpError(409, error.message));
         if (error) return next(new HttpError(500, error));
 
-        next(new HttpSuccess(200));
+        next(new HttpSuccess(200, {}));
     });
 }
 
@@ -108,17 +107,14 @@ function restore(req, res, next) {
     if (typeof req.body.backupId !== 'string') return next(new HttpError(400, 'backupId must be a string or null'));
     if (typeof req.body.version !== 'string') return next(new HttpError(400, 'version must be a string'));
 
-    // TODO: validate subfields of these objects
-    if (req.body.autoconf && typeof req.body.autoconf !== 'object') return next(new HttpError(400, 'autoconf must be an object'));
-
-    provision.restore(backupConfig, req.body.backupId, req.body.version, req.body.autoconf || {}, auditSource.fromRequest(req), function (error) {
+    provision.restore(backupConfig, req.body.backupId, req.body.version, auditSource.fromRequest(req), function (error) {
         if (error && error.reason === ProvisionError.ALREADY_SETUP) return next(new HttpError(409, error.message));
         if (error && error.reason === ProvisionError.BAD_FIELD) return next(new HttpError(400, error.message));
         if (error && error.reason === ProvisionError.BAD_STATE) return next(new HttpError(409, error.message));
         if (error && error.reason === ProvisionError.EXTERNAL_ERROR) return next(new HttpError(424, error.message));
         if (error) return next(new HttpError(500, error));
 
-        next(new HttpSuccess(200));
+        next(new HttpSuccess(200, {}));
     });
 }
 

src/routes/services.js

@@ -17,6 +17,8 @@ var addons = require('../addons.js'),
     HttpSuccess = require('connect-lastmile').HttpSuccess;
 
 function getAll(req, res, next) {
+    req.clearTimeout(); // can take a while to get status of all services
+
     addons.getServices(function (error, result) {
         if (error) return next(new HttpError(500, error));
 

src/routes/settings.js

@@ -128,22 +128,22 @@ function getCloudronAvatar(req, res, next) {
 }
 
 function getBackupConfig(req, res, next) {
-    settings.getBackupConfig(function (error, config) {
+    settings.getBackupConfig(function (error, backupConfig) {
         if (error) return next(new HttpError(500, error));
 
-        // used by the UI to figure if backups are disabled
-        if (!custom.features().configureBackup) {
-            return next(new HttpSuccess(200, { provider: config.provider }));
+        // always send provider as it is used by the UI to figure if backups are disabled ('noop' backend)
+        if (!custom.spec().backups.configurable) {
+            return next(new HttpSuccess(200, { provider: backupConfig.provider }));
         }
 
-        next(new HttpSuccess(200, backups.removePrivateFields(config)));
+        next(new HttpSuccess(200, backups.removePrivateFields(backupConfig)));
     });
 }
 
 function setBackupConfig(req, res, next) {
     assert.strictEqual(typeof req.body, 'object');
 
-    if (!custom.features().configureBackup) return next(new HttpError(405, 'feature disabled by admin'));
+    if (!custom.spec().backups.configurable) return next(new HttpError(405, 'feature disabled by admin'));
 
     if (typeof req.body.provider !== 'string') return next(new HttpError(400, 'provider is required'));
     if (typeof req.body.retentionSecs !== 'number') return next(new HttpError(400, 'retentionSecs is required'));
@@ -196,6 +196,33 @@ function setPlatformConfig(req, res, next) {
     });
 }
 
+function getExternalLdapConfig(req, res, next) {
+    settings.getExternalLdapConfig(function (error, config) {
+        if (error) return next(new HttpError(500, error));
+
+        next(new HttpSuccess(200, config));
+    });
+}
+
+function setExternalLdapConfig(req, res, next) {
+    assert.strictEqual(typeof req.body, 'object');
+
+    if (typeof req.body.enabled !== 'boolean') return next(new HttpError(400, 'enabled must be a boolean'));
+    if (typeof req.body.url !== 'string' || req.body.url === '') return next(new HttpError(400, 'url must be a non empty string'));
+    if (typeof req.body.baseDn !== 'string' || req.body.baseDn === '') return next(new HttpError(400, 'baseDn must be a non empty string'));
+    if (typeof req.body.filter !== 'string' || req.body.filter === '') return next(new HttpError(400, 'filter must be a non empty string'));
+    if ('bindDn' in req.body && (typeof req.body.bindDn !== 'string' || req.body.bindDn === '')) return next(new HttpError(400, 'bindDn must be a non empty string'));
+    if ('bindPassword' in req.body && typeof req.body.bindPassword !== 'string') return next(new HttpError(400, 'bindPassword must be a string'));
+
+    settings.setExternalLdapConfig(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(424, error.message));
+        if (error) return next(new HttpError(500, error));
+
+        next(new HttpSuccess(200, {}));
+    });
+}
+
 function getDynamicDnsConfig(req, res, next) {
     settings.getDynamicDnsConfig(function (error, enabled) {
         if (error) return next(new HttpError(500, error));
@@ -207,7 +234,7 @@ function getDynamicDnsConfig(req, res, next) {
 function setDynamicDnsConfig(req, res, next) {
     assert.strictEqual(typeof req.body, 'object');
 
-    if (!custom.features().dynamicDns) return next(new HttpError(405, 'feature disabled by admin'));
+    if (!custom.spec().domains.dynamicDns) return next(new HttpError(405, 'feature disabled by admin'));
 
     if (typeof req.body.enabled !== 'boolean') return next(new HttpError(400, 'enabled boolean is required'));
 
@@ -262,6 +289,7 @@ function get(req, res, next) {
     case settings.DYNAMIC_DNS_KEY: return getDynamicDnsConfig(req, res, next);
     case settings.BACKUP_CONFIG_KEY: return getBackupConfig(req, res, next);
     case settings.PLATFORM_CONFIG_KEY: return getPlatformConfig(req, res, next);
+    case settings.EXTERNAL_LDAP_KEY: return getExternalLdapConfig(req, res, next);
     case settings.UNSTABLE_APPS_KEY: return getUnstableAppsConfig(req, res, next);
 
     case settings.APP_AUTOUPDATE_PATTERN_KEY: return getAppAutoupdatePattern(req, res, next);
@@ -282,6 +310,7 @@ function set(req, res, next) {
     case settings.DYNAMIC_DNS_KEY: return setDynamicDnsConfig(req, res, next);
     case settings.BACKUP_CONFIG_KEY: return setBackupConfig(req, res, next);
     case settings.PLATFORM_CONFIG_KEY: return setPlatformConfig(req, res, next);
+    case settings.EXTERNAL_LDAP_KEY: return setExternalLdapConfig(req, res, next);
     case settings.UNSTABLE_APPS_KEY: return setUnstableAppsConfig(req, res, next);
 
     case settings.APP_AUTOUPDATE_PATTERN_KEY: return setAppAutoupdatePattern(req, res, next);

src/routes/support.js

@@ -18,6 +18,8 @@ var appstore = require('../appstore.js'),
 function createTicket(req, res, next) {
     assert.strictEqual(typeof req.user, 'object');
 
+    if (!custom.spec().support.submitTickets) return next(new HttpError(405, 'feature disabled by admin'));
+
     const VALID_TYPES = [ 'feedback', 'ticket', 'app_missing', 'app_error', 'upgrade_request' ];
 
     if (typeof req.body.type !== 'string' || !req.body.type) return next(new HttpError(400, 'type must be string'));
@@ -27,16 +29,16 @@ function createTicket(req, res, next) {
     if (req.body.appId && typeof req.body.appId !== 'string') return next(new HttpError(400, 'appId must be string'));
 
     appstore.createTicket(_.extend({ }, req.body, { email: req.user.email, displayName: req.user.displayName }), function (error) {
-        if (error) return next(new HttpError(503, `Error contacting cloudron.io: ${error.message}. Please email ${custom.supportEmail()}`));
+        if (error) return next(new HttpError(503, `Error contacting cloudron.io: ${error.message}. Please email ${custom.spec().support.email}`));
 
-        next(new HttpSuccess(201, {}));
+        next(new HttpSuccess(201, { message: `An email for sent to ${custom.spec().support.email}. We will get back shortly!` }));
     });
 }
 
 function enableRemoteSupport(req, res, next) {
     assert.strictEqual(typeof req.body, 'object');
 
-    if (!custom.features().remoteSupport) return next(new HttpError(405, 'feature disabled by admin'));
+    if (!custom.spec().support.remoteSupport) return next(new HttpError(405, 'feature disabled by admin'));
 
     if (typeof req.body.enable !== 'boolean') return next(new HttpError(400, 'enabled is required'));
 

src/routes/sysadmin.js

@@ -38,7 +38,7 @@ function update(req, res, next) {
     debug('triggering update');
 
     // this only initiates the update, progress can be checked via the progress route
-    updater.updateToLatest(auditSource.SYSADMIN, function (error, taskId) {
+    updater.updateToLatest({ skipBackup: false }, auditSource.SYSADMIN, function (error, taskId) {
         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) return next(new HttpError(500, error));

src/routes/test/accesscontrol-test.js

@@ -94,4 +94,4 @@ describe('scopes middleware', function () {
             done();
         });
     });
-});
+});

src/routes/test/apps-test.js

@@ -6,13 +6,11 @@
 /* global after:false */
 /* global xit:false */
 
-var appdb = require('../../appdb.js'),
-    apps = require('../../apps.js'),
+let apps = require('../../apps.js'),
     assert = require('assert'),
     async = require('async'),
     child_process = require('child_process'),
     clients = require('../../clients.js'),
-    config = require('../../config.js'),
     constants = require('../../constants.js'),
     database = require('../../database.js'),
     docker = require('../../docker.js').connection,
@@ -21,7 +19,6 @@ var appdb = require('../../appdb.js'),
     hat = require('../../hat.js'),
     hock = require('hock'),
     http = require('http'),
-    https = require('https'),
     ldap = require('../../ldap.js'),
     net = require('net'),
     nock = require('nock'),
@@ -33,17 +30,15 @@ var appdb = require('../../appdb.js'),
     settings = require('../../settings.js'),
     settingsdb = require('../../settingsdb.js'),
     superagent = require('superagent'),
-    taskmanager = require('../../taskmanager.js'),
     tokendb = require('../../tokendb.js'),
     url = require('url'),
-    uuid = require('uuid'),
-    _ = require('underscore');
+    uuid = require('uuid');
 
-var SERVER_URL = 'http://localhost:' + config.get('port');
+var SERVER_URL = 'http://localhost:' + constants.PORT;
 
 // Test image information
 var TEST_IMAGE_REPO = 'cloudron/test';
-var TEST_IMAGE_TAG = '25.15.2';
+var TEST_IMAGE_TAG = '25.19.0';
 var TEST_IMAGE = TEST_IMAGE_REPO + ':' + TEST_IMAGE_TAG;
 
 const DOMAIN_0 = {
@@ -56,8 +51,6 @@ const DOMAIN_0 = {
     tlsConfig: { provider: 'fallback' }
 };
 
-const CLOUDRON_ID = 'somecloudronid';
-
 var APP_STORE_ID = 'test', APP_ID;
 var APP_LOCATION = 'appslocation';
 var APP_LOCATION_2 = 'appslocationtwo';
@@ -79,32 +72,6 @@ var user_1_id = null;
 var token = null;
 var token_1 = null;
 
-function startDockerProxy(interceptor, callback) {
-    assert.strictEqual(typeof interceptor, 'function');
-
-    return http.createServer(function (req, res) {
-        if (interceptor(req, res)) return;
-
-        // rejectUnauthorized should not be required but it doesn't work without it
-        var options = _.extend({ }, docker.options, { method: req.method, path: req.url, headers: req.headers, rejectUnauthorized: false });
-        delete options.protocol; // https module doesn't like this key
-        var proto = docker.options.protocol === 'https' ? https : http;
-        var dockerRequest = proto.request(options, function (dockerResponse) {
-            res.writeHead(dockerResponse.statusCode, dockerResponse.headers);
-            dockerResponse.on('error', console.error);
-            dockerResponse.pipe(res, { end: true });
-        });
-
-        req.on('error', console.error);
-        if (!req.readable) {
-            dockerRequest.end();
-        } else {
-            req.pipe(dockerRequest, { end: true });
-        }
-
-    }).listen(5687, callback);
-}
-
 function checkAddons(appEntry, done) {
     async.retry({ times: 15, interval: 3000 }, function (callback) {
         // this was previously written with superagent but it was getting sporadic EPIPE
@@ -155,7 +122,6 @@ function checkRedis(containerId, done) {
     });
 }
 
-var dockerProxy;
 var imageDeleted;
 var imageCreated;
 
@@ -175,8 +141,6 @@ function waitForSetup(done) {
 function startBox(done) {
     console.log('Starting box code...');
 
-    config._reset();
-
     imageDeleted = false;
     imageCreated = false;
 
@@ -190,6 +154,7 @@ function startBox(done) {
         database._clear,
         server.start,
         ldap.start,
+        settings._setApiServerOrigin.bind(null, 'http://localhost:6060'),
 
         function (callback) {
             superagent.post(SERVER_URL + '/api/v1/cloudron/setup')
@@ -231,23 +196,6 @@ function startBox(done) {
                 });
         },
 
-        function (callback) {
-            dockerProxy = startDockerProxy(function interceptor(req, res) {
-                if (req.method === 'POST' && req.url === '/images/create?fromImage=' + encodeURIComponent(TEST_IMAGE_REPO) + '&tag=' + TEST_IMAGE_TAG) {
-                    imageCreated = true;
-                    res.writeHead(200);
-                    res.end();
-                    return true;
-                } else if (req.method === 'DELETE' && req.url === '/images/' + TEST_IMAGE + '?force=false&noprune=false') {
-                    imageDeleted = true;
-                    res.writeHead(200);
-                    res.end();
-                    return true;
-                }
-                return false;
-            }, callback);
-        },
-
         function (callback) {
             process.stdout.write('Waiting for platform to be ready...');
             async.retry({ times: 500, interval: 1000 }, function (retryCallback) {
@@ -257,6 +205,7 @@ function startBox(done) {
             }, function (error) {
                 if (error) return callback(error);
                 console.log();
+                console.log('Platform is ready');
                 callback();
             });
         }
@@ -270,19 +219,16 @@ function stopBox(done) {
 
     child_process.execSync('docker ps -qa --filter \'network=cloudron\' | xargs --no-run-if-empty docker rm -f');
 
-    // db is not cleaned up here since it's too late to call it after server.stop. if called before server.stop taskmanager apptasks are unhappy :/
     async.series([
-        dockerProxy.close.bind(dockerProxy),
-        taskmanager._stopPendingTasks,
-        taskmanager._waitForPendingTasks,
-        appdb._clear,
+        database._clear,
         server.stop,
-        ldap.stop,
-        config._reset,
+        ldap.stop
     ], done);
 }
 
 describe('App API', function () {
+    let taskId = '';
+
     before(startBox);
     after(stopBox);
 
@@ -383,13 +329,13 @@ describe('App API', function () {
             });
     });
 
-    it('app install fails - reserved api location', function (done) {
+    it('app install fails - reserved smtp 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 })
+            .send({ manifest: APP_MANIFEST, location: constants.SMTP_LOCATION, accessRestriction: null, domain: DOMAIN_0.domain })
             .end(function (err, res) {
                 expect(res.statusCode).to.equal(400);
-                expect(res.body.message).to.contain(constants.API_LOCATION + ' is reserved');
+                expect(res.body.message).to.contain(constants.SMTP_LOCATION + ' is reserved');
                 done();
             });
     });
@@ -438,7 +384,7 @@ describe('App API', function () {
     });
 
     it('app install fails because manifest download fails', function (done) {
-        var fake = nock(config.apiServerOrigin()).get('/api/v1/apps/test').reply(404, {});
+        var fake = nock(settings.apiServerOrigin()).get('/api/v1/apps/test').reply(404, {});
 
         superagent.post(SERVER_URL + '/api/v1/apps/install')
             .query({ access_token: token })
@@ -451,7 +397,7 @@ describe('App API', function () {
     });
 
     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 });
+        var fake1 = nock(settings.apiServerOrigin()).get('/api/v1/apps/test').reply(200, { manifest: APP_MANIFEST });
 
         superagent.post(SERVER_URL + '/api/v1/apps/install')
             .query({ access_token: token })
@@ -464,8 +410,8 @@ describe('App API', function () {
     });
 
     it('app install succeeds with purchase', function (done) {
-        var fake2 = nock(config.apiServerOrigin()).get('/api/v1/apps/' + APP_STORE_ID).reply(200, { manifest: APP_MANIFEST });
-        var fake3 = nock(config.apiServerOrigin()).post(function (uri) { return uri.indexOf('/api/v1/cloudronapps') >= 0; }, (body) => body.appstoreId === APP_STORE_ID && body.manifestId === APP_MANIFEST.id && body.appId).reply(201, { });
+        var fake2 = nock(settings.apiServerOrigin()).get('/api/v1/apps/' + APP_STORE_ID).reply(200, { manifest: APP_MANIFEST });
+        var fake3 = nock(settings.apiServerOrigin()).post(function (uri) { return uri.indexOf('/api/v1/cloudronapps') >= 0; }, (body) => body.appstoreId === APP_STORE_ID && body.manifestId === APP_MANIFEST.id && body.appId).reply(201, { });
 
         settingsdb.set(settings.CLOUDRON_TOKEN_KEY, USER_1_APPSTORE_TOKEN, function (error) {
             if (error) return done(error);
@@ -479,6 +425,7 @@ describe('App API', function () {
                     APP_ID = res.body.id;
                     expect(fake2.isDone()).to.be.ok();
                     expect(fake3.isDone()).to.be.ok();
+                    taskId = res.body.taskId;
                     done();
                 });
         });
@@ -539,7 +486,6 @@ describe('App API', function () {
 
     it('cannot uninstall invalid app', function (done) {
         superagent.post(SERVER_URL + '/api/v1/apps/whatever/uninstall')
-            .send({ password: PASSWORD })
             .query({ access_token: token })
             .end(function (err, res) {
                 expect(res.statusCode).to.equal(404);
@@ -547,28 +493,8 @@ describe('App API', function () {
             });
     });
 
-    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();
-            });
-    });
-
-    it('cannot uninstall app with wrong password', function (done) {
-        superagent.post(SERVER_URL + '/api/v1/apps/' + APP_ID + '/uninstall')
-            .send({ password: PASSWORD+PASSWORD })
-            .query({ access_token: token })
-            .end(function (err, res) {
-                expect(res.statusCode).to.equal(403);
-                done();
-            });
-    });
-
     it('non admin cannot uninstall app', function (done) {
         superagent.post(SERVER_URL + '/api/v1/apps/' + APP_ID + '/uninstall')
-            .send({ password: PASSWORD })
             .query({ access_token: token_1 })
             .end(function (err, res) {
                 expect(res.statusCode).to.equal(403);
@@ -576,12 +502,20 @@ describe('App API', function () {
             });
     });
 
+    it('can stop the task', function (done) {
+        superagent.post(SERVER_URL + '/api/v1/tasks/' + taskId + '/stop')
+            .query({ access_token: token })
+            .end(function (err, res) {
+                expect(res.statusCode).to.equal(204);
+                setTimeout(done, 4000); // wait for it to really die
+            });
+    });
+
     it('can uninstall app', function (done) {
-        var fake1 = nock(config.apiServerOrigin()).get(function (uri) { return uri.indexOf('/api/v1/cloudronapps/') >= 0; }).reply(200, { });
-        var fake2 = nock(config.apiServerOrigin()).delete(function (uri) { return uri.indexOf('/api/v1/cloudronapps/') >= 0; }).reply(204, { });
+        var fake1 = nock(settings.apiServerOrigin()).get(function (uri) { return uri.indexOf('/api/v1/cloudronapps/') >= 0; }).reply(200, { });
+        var fake2 = nock(settings.apiServerOrigin()).delete(function (uri) { return uri.indexOf('/api/v1/cloudronapps/') >= 0; }).reply(204, { });
 
         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);
@@ -592,8 +526,8 @@ describe('App API', function () {
     });
 
     it('app install succeeds again', function (done) {
-        var fake1 = nock(config.apiServerOrigin()).get('/api/v1/apps/' + APP_STORE_ID).reply(200, { manifest: APP_MANIFEST });
-        var fake2 = nock(config.apiServerOrigin()).post(function (uri) { return uri.indexOf('/api/v1/cloudronapps') >= 0; }, (body) => body.appstoreId === APP_STORE_ID && body.manifestId === APP_MANIFEST.id && body.appId).reply(201, { });
+        var fake1 = nock(settings.apiServerOrigin()).get('/api/v1/apps/' + APP_STORE_ID).reply(200, { manifest: APP_MANIFEST });
+        var fake2 = nock(settings.apiServerOrigin()).post(function (uri) { return uri.indexOf('/api/v1/cloudronapps') >= 0; }, (body) => body.appstoreId === APP_STORE_ID && body.manifestId === APP_MANIFEST.id && body.appId).reply(201, { });
 
         superagent.post(SERVER_URL + '/api/v1/apps/install')
             .query({ access_token: token })
@@ -650,7 +584,7 @@ describe('App installation', function () {
                     .get('/api/v1/apps/' + APP_STORE_ID + '/versions/' + APP_MANIFEST.version + '/icon')
                     .replyWithFile(200, path.resolve(__dirname, '../../../assets/avatar.png'));
 
-                var port = parseInt(url.parse(config.apiServerOrigin()).port, 10);
+                var port = parseInt(url.parse(settings.apiServerOrigin()).port, 10);
                 http.createServer(apiHockInstance.handler).listen(port, callback);
             },
 
@@ -664,13 +598,11 @@ describe('App installation', function () {
         ], done);
     });
 
-    after(stopBox);
-
     var appResult = null, appEntry = null;
 
     it('can install test app', function (done) {
-        var fake1 = nock(config.apiServerOrigin()).get('/api/v1/apps/' + APP_STORE_ID).reply(200, { manifest: APP_MANIFEST });
-        var fake2 = nock(config.apiServerOrigin()).post(function (uri) { return uri.indexOf('/api/v1/cloudronapps') >= 0; }, (body) => body.appstoreId === APP_STORE_ID && body.manifestId === APP_MANIFEST.id && body.appId).reply(201, { });
+        var fake1 = nock(settings.apiServerOrigin()).get('/api/v1/apps/' + APP_STORE_ID).reply(200, { manifest: APP_MANIFEST });
+        var fake2 = nock(settings.apiServerOrigin()).post(function (uri) { return uri.indexOf('/api/v1/cloudronapps') >= 0; }, (body) => body.appstoreId === APP_STORE_ID && body.manifestId === APP_MANIFEST.id && body.appId).reply(201, { });
 
         var count = 0;
         function checkInstallStatus() {
@@ -679,8 +611,8 @@ describe('App installation', function () {
                 .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 (res.body.installationState === apps.ISTATE_INSTALLED) { appResult = res.body; return done(null); }
+                    if (res.body.installationState === apps.ISTATE_ERROR) return done(new Error('Install error'));
                     if (++count > 500) return done(new Error('Timedout'));
 
                     setTimeout(checkInstallStatus, 1000);
@@ -695,6 +627,7 @@ describe('App installation', function () {
                 expect(fake1.isDone()).to.be.ok();
                 expect(fake2.isDone()).to.be.ok();
                 APP_ID = res.body.id;
+
                 checkInstallStatus();
             });
     });
@@ -719,11 +652,11 @@ describe('App installation', function () {
         docker.getContainer(appEntry.containerId).inspect(function (error, data) {
             expect(error).to.not.be.ok();
             expect(data.Config.ExposedPorts['7777/tcp']).to.eql({ });
-            expect(data.Config.Env).to.contain('WEBADMIN_ORIGIN=' + config.adminOrigin());
-            expect(data.Config.Env).to.contain('API_ORIGIN=' + config.adminOrigin());
+            expect(data.Config.Env).to.contain('CLOUDRON_WEBADMIN_ORIGIN=' + settings.adminOrigin());
+            expect(data.Config.Env).to.contain('CLOUDRON_API_ORIGIN=' + settings.adminOrigin());
             expect(data.Config.Env).to.contain('CLOUDRON=1');
-            expect(data.Config.Env).to.contain('APP_ORIGIN=https://' + APP_LOCATION + '.' + DOMAIN_0.domain);
-            expect(data.Config.Env).to.contain('APP_DOMAIN=' + APP_LOCATION + '.' + DOMAIN_0.domain);
+            expect(data.Config.Env).to.contain('CLOUDRON_APP_ORIGIN=https://' + APP_LOCATION + '.' + DOMAIN_0.domain);
+            expect(data.Config.Env).to.contain('CLOUDRON_APP_DOMAIN=' + APP_LOCATION + '.' + DOMAIN_0.domain);
             // Hostname must not be set of app fqdn or app location!
             expect(data.Config.Hostname).to.not.contain(APP_LOCATION);
             expect(data.Config.Env).to.contain('ECHO_SERVER_PORT=7171');
@@ -812,16 +745,16 @@ describe('App installation', function () {
                 expect(error).to.not.be.ok();
                 expect(client.id.length).to.be(40); // cid- + 32 hex chars (128 bits) + 4 hyphens
                 expect(client.clientSecret.length).to.be(256); // 32 hex chars (8 * 256 bits)
-                expect(data.Config.Env).to.contain('OAUTH_CLIENT_ID=' + client.id);
-                expect(data.Config.Env).to.contain('OAUTH_CLIENT_SECRET=' + client.clientSecret);
+                expect(data.Config.Env).to.contain('CLOUDRON_OAUTH_CLIENT_ID=' + client.id);
+                expect(data.Config.Env).to.contain('CLOUDRON_OAUTH_CLIENT_SECRET=' + client.clientSecret);
                 done();
             });
         });
     });
 
     it('installation - app can populate addons', function (done) {
-        superagent.get('http://localhost:' + appEntry.httpPort + '/populate_addons').end(function (err, res) {
-            expect(!err).to.be.ok();
+        superagent.get(`http://localhost:${appEntry.httpPort}/populate_addons`).end(function (error, res) {
+            expect(!error).to.be.ok();
             expect(res.statusCode).to.equal(200);
             for (var key in res.body) {
                 expect(res.body[key]).to.be('OK');
@@ -865,7 +798,7 @@ describe('App installation', function () {
 
     it('logStream - stream logs', function (done) {
         var options = {
-            port: config.get('port'), host: 'localhost', path: '/api/v1/apps/' + APP_ID + '/logstream?access_token=' + token,
+            port: constants.PORT, host: 'localhost', path: '/api/v1/apps/' + APP_ID + '/logstream?access_token=' + token,
             headers: { 'Accept': 'text/event-stream', 'Connection': 'keep-alive' }
         };
 
@@ -968,8 +901,8 @@ describe('App installation', function () {
             .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 (res.body.installationState === apps.ISTATE_INSTALLED) { appResult = res.body; expect(appResult).to.be.ok(); return done(null); }
+                if (res.body.installationState === apps.ISTATE_ERROR) return done(new Error('Install error'));
                 if (++count > 50) return done(new Error('Timedout'));
                 setTimeout(checkConfigureStatus.bind(null, count, done), 1000);
             });
@@ -1131,15 +1064,15 @@ describe('App installation', function () {
     });
 
     it('can uninstall app', function (done) {
-        var fake1 = nock(config.apiServerOrigin()).get(function (uri) { return uri.indexOf('/api/v1/cloudronapps/') >= 0; }).reply(200, { });
-        var fake2 = nock(config.apiServerOrigin()).delete(function (uri) { return uri.indexOf('/api/v1/cloudronapps/') >= 0; }).reply(204, { });
+        var fake1 = nock(settings.apiServerOrigin()).get(function (uri) { return uri.indexOf('/api/v1/cloudronapps/') >= 0; }).reply(200, { });
+        var fake2 = nock(settings.apiServerOrigin()).delete(function (uri) { return uri.indexOf('/api/v1/cloudronapps/') >= 0; }).reply(204, { });
 
         var count = 0;
         function checkUninstallStatus() {
             superagent.get(SERVER_URL + '/api/v1/apps/' + APP_ID)
                 .query({ access_token: token })
                 .end(function (err, res) {
-                    if (res) console.log('Uninstall progress', res.body.installationState, res.body.installationProgress);
+                    if (res) console.log('Uninstall progress', res.body.installationState, res.body.errorMessage);
 
                     if (res.statusCode === 404) return done(null);
                     if (++count > 50) return done(new Error('Timedout'));
@@ -1148,7 +1081,6 @@ describe('App installation', function () {
         }
 
         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);
@@ -1196,4 +1128,7 @@ describe('App installation', function () {
             done();
         });
     });
+
+    // this is here so that --bail does not stop the box code
+    it('stop box', stopBox);
 });

src/routes/test/appstore-test.js

@@ -6,32 +6,30 @@
 'use strict';
 
 var async = require('async'),
-    config = require('../../config.js'),
+    constants = require('../../constants.js'),
     database = require('../../database.js'),
     expect = require('expect.js'),
     nock = require('nock'),
-    path = require('path'),
-    safe = require('safetydance'),
+    settings = require('../../settings.js'),
     superagent = require('superagent'),
     server = require('../../server.js');
 
-var SERVER_URL = 'http://localhost:' + config.get('port');
+var SERVER_URL = 'http://localhost:' + constants.PORT;
 
 var USERNAME = 'superadmin', PASSWORD = 'Foobar?1337', EMAIL ='silly@me.com';
-var AUTHORIZED_KEYS_FILE = path.join(config.baseDir(), 'authorized_keys');
 var token = null;
 
 function setup(done) {
     nock.cleanAll();
-    config._reset();
-    config.setFqdn('example-ssh-test.com');
-    safe.fs.unlinkSync(AUTHORIZED_KEYS_FILE);
 
     async.series([
         server.start.bind(server),
 
         database._clear,
 
+        settings._setApiServerOrigin.bind(null, 'http://localhost:6060'),
+        settings.setAdmin.bind(null, 'appstore-test.example.com', 'my.appstore-test.example.com'),
+
         function createAdmin(callback) {
             superagent.post(SERVER_URL + '/api/v1/cloudron/activate')
                 .query({ setupToken: 'somesetuptoken' })
@@ -53,8 +51,6 @@ function cleanup(done) {
     database._clear(function (error) {
         expect(error).to.not.be.ok();
 
-        config._reset();
-
         server.stop(done);
     });
 }
@@ -82,11 +78,11 @@ describe('Appstore Apps API', function () {
     });
 
     it('register cloudron', function (done) {
-        var scope1 = nock(config.apiServerOrigin())
+        var scope1 = nock(settings.apiServerOrigin())
             .post('/api/v1/login', (body) => body.email && body.password)
             .reply(200, { userId: 'userId', accessToken: 'SECRET_TOKEN' });
 
-        var scope2 = nock(config.apiServerOrigin())
+        var scope2 = nock(settings.apiServerOrigin())
             .post('/api/v1/register_cloudron', (body) => !!body.domain && body.accessToken === 'SECRET_TOKEN')
             .reply(201, { cloudronId: 'cid', cloudronToken: 'CLOUDRON_TOKEN', licenseKey: 'lkey' });
 
@@ -102,8 +98,8 @@ describe('Appstore Apps API', function () {
     });
 
     it('can list apps', function (done) {
-        var scope1 = nock(config.apiServerOrigin())
-            .get(`/api/v1/apps?accessToken=CLOUDRON_TOKEN&boxVersion=${config.version()}&unstable=false`, () => true)
+        var scope1 = nock(settings.apiServerOrigin())
+            .get(`/api/v1/apps?accessToken=CLOUDRON_TOKEN&boxVersion=${constants.VERSION}&unstable=false`, () => true)
             .reply(200, { apps: [] });
 
         superagent.get(SERVER_URL + '/api/v1/appstore/apps')
@@ -116,7 +112,7 @@ describe('Appstore Apps API', function () {
     });
 
     it('can get app', function (done) {
-        var scope1 = nock(config.apiServerOrigin())
+        var scope1 = nock(settings.apiServerOrigin())
             .get('/api/v1/apps/org.wordpress.cloudronapp?accessToken=CLOUDRON_TOKEN', () => true)
             .reply(200, { apps: [] });
 
@@ -130,7 +126,7 @@ describe('Appstore Apps API', function () {
     });
 
     it('can get app version', function (done) {
-        var scope1 = nock(config.apiServerOrigin())
+        var scope1 = nock(settings.apiServerOrigin())
             .get('/api/v1/apps/org.wordpress.cloudronapp/versions/3.4.2?accessToken=CLOUDRON_TOKEN', () => true)
             .reply(200, { apps: [] });
 
@@ -150,11 +146,11 @@ describe('Subscription API - no signup', function () {
     after(cleanup);
 
     it('can setup subscription', function (done) {
-        var scope1 = nock(config.apiServerOrigin())
+        var scope1 = nock(settings.apiServerOrigin())
             .post('/api/v1/login', (body) => body.email && body.password)
             .reply(200, { userId: 'userId', accessToken: 'SECRET_TOKEN' });
 
-        var scope2 = nock(config.apiServerOrigin())
+        var scope2 = nock(settings.apiServerOrigin())
             .post('/api/v1/register_cloudron', (body) => !!body.domain && body.accessToken === 'SECRET_TOKEN')
             .reply(201, { cloudronId: 'cid', cloudronToken: 'CLOUDRON_TOKEN', licenseKey: 'lkey' });
 
@@ -185,15 +181,15 @@ describe('Subscription API - signup', function () {
     after(cleanup);
 
     it('can setup subscription', function (done) {
-        var scope1 = nock(config.apiServerOrigin())
+        var scope1 = nock(settings.apiServerOrigin())
             .post('/api/v1/register_user', (body) => body.email && body.password)
             .reply(201, { });
 
-        var scope2 = nock(config.apiServerOrigin())
+        var scope2 = nock(settings.apiServerOrigin())
             .post('/api/v1/login', (body) => body.email && body.password)
             .reply(200, { userId: 'userId', accessToken: 'SECRET_TOKEN' });
 
-        var scope3 = nock(config.apiServerOrigin())
+        var scope3 = nock(settings.apiServerOrigin())
             .post('/api/v1/register_cloudron', (body) => !!body.domain && body.accessToken === 'SECRET_TOKEN')
             .reply(201, { cloudronId: 'cid', cloudronToken: 'CLOUDRON_TOKEN', licenseKey: 'lkey' });
 
@@ -210,7 +206,7 @@ describe('Subscription API - signup', function () {
     });
 
     it('can get subscription', function (done) {
-        var scope1 = nock(config.apiServerOrigin())
+        var scope1 = nock(settings.apiServerOrigin())
             .get('/api/v1/subscription?accessToken=CLOUDRON_TOKEN', () => true)
             .reply(200, { subscription: { plan: { id: 'free' } }, email: 'test@cloudron.io' });
 

src/routes/test/backups-test.js

@@ -7,7 +7,7 @@
 
 var appdb = require('../../appdb.js'),
     async = require('async'),
-    config = require('../../config.js'),
+    constants = require('../../constants.js'),
     database = require('../../database.js'),
     domains = require('../../domains.js'),
     expect = require('expect.js'),
@@ -16,7 +16,7 @@ var appdb = require('../../appdb.js'),
     server = require('../../server.js'),
     settings = require('../../settings.js');
 
-const SERVER_URL = 'http://localhost:' + config.get('port');
+const SERVER_URL = 'http://localhost:' + constants.PORT;
 
 const USERNAME = 'superadmin', PASSWORD = 'Foobar?1337', EMAIL ='silly@me.com';
 
@@ -31,11 +31,10 @@ const DOMAIN_0 = {
 
 let AUDIT_SOURCE = { ip: '1.2.3.4' };
 
-var token = null, ownerId = null;
+var token = null;
 
 function setup(done) {
     nock.cleanAll();
-    config._reset();
 
     async.series([
         server.start,
@@ -51,7 +50,6 @@ function setup(done) {
                     expect(result.statusCode).to.eql(201);
 
                     // stash token for further use
-                    ownerId = result.body.userId;
                     token = result.body.token;
 
                     callback();
@@ -60,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, ownerId, [ ] /* portBindings */, { }, callback);
+            appdb.add('appid', 'appStoreId', manifest, 'location', DOMAIN_0.domain, [ ] /* portBindings */, { }, callback);
         },
 
         function createSettings(callback) {

src/routes/test/clients-test.js

@@ -7,7 +7,7 @@
 
 var accesscontrol = require('../../accesscontrol.js'),
     async = require('async'),
-    config = require('../../config.js'),
+    constants = require('../../constants.js'),
     clients = require('../../clients.js'),
     database = require('../../database.js'),
     oauth2 = require('../oauth2.js'),
@@ -17,15 +17,12 @@ var accesscontrol = require('../../accesscontrol.js'),
     superagent = require('superagent'),
     server = require('../../server.js');
 
-var SERVER_URL = 'http://localhost:' + config.get('port');
+var SERVER_URL = 'http://localhost:' + constants.PORT;
 
 var USERNAME = 'superadmin', PASSWORD = 'Foobar?1337', EMAIL ='silly@me.com';
 var token = null;
 
 function setup(done) {
-    config._reset();
-    config.setFqdn('example-clients-test.com');
-
     async.series([
         server.start,
         database._clear,

src/routes/test/cloudron-test.js

@@ -6,7 +6,7 @@
 /* global after:false */
 
 let async = require('async'),
-    config = require('../../config.js'),
+    constants = require('../../constants.js'),
     database = require('../../database.js'),
     expect = require('expect.js'),
     hat = require('../../hat.js'),
@@ -18,7 +18,7 @@ let async = require('async'),
     settings = require('../../settings.js'),
     tokendb = require('../../tokendb.js');
 
-var SERVER_URL = 'http://localhost:' + config.get('port');
+var SERVER_URL = 'http://localhost:' + constants.PORT;
 
 var USERNAME = 'superadmin', PASSWORD = 'Foobar?1337', EMAIL ='silly@me.com';
 var token = null; // authentication token
@@ -26,13 +26,11 @@ var USERNAME_1 = 'userTheFirst', EMAIL_1 = 'taO@zen.mac', userId_1, token_1;
 
 function setup(done) {
     nock.cleanAll();
-    config._reset();
-    config.setFqdn('example-cloudron-test.com');
-    config.setAdminFqdn('my.example-cloudron-test.com');
 
     async.series([
         server.start.bind(server),
         database._clear,
+        settings._setApiServerOrigin.bind(null, 'http://localhost:6060'),
         settings.setBackupConfig.bind(null, { provider: 'filesystem', backupFolder: '/tmp', format: 'tgz' })
     ], done);
 }
@@ -41,8 +39,6 @@ function cleanup(done) {
     database._clear(function (error) {
         expect(error).to.not.be.ok();
 
-        config._reset();
-
         server.stop(done);
     });
 }
@@ -187,9 +183,9 @@ describe('Cloudron', function () {
                 .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.version).to.eql(config.version());
+                    expect(result.body.webServerOrigin).to.eql('https://cloudron.io');
+                    expect(result.body.adminFqdn).to.eql(settings.adminFqdn());
+                    expect(result.body.version).to.eql(constants.VERSION);
                     expect(result.body.memory).to.eql(os.totalmem());
                     expect(result.body.cloudronName).to.be.a('string');
 
@@ -242,7 +238,7 @@ describe('Cloudron', function () {
         it('logStream - stream logs', function (done) {
             var options = {
                 host: 'localhost',
-                port: config.get('port'),
+                port: constants.PORT,
                 path: '/api/v1/cloudron/logstream/box?lines=10&access_token=' + token,
                 headers: { 'Accept': 'text/event-stream', 'Connection': 'keep-alive' }
             };