cname fix again

e4d9dbb558 left out this line by mistake

(cherry picked from commit 2b260c873f)

CHANGES

@@ -2489,3 +2489,105 @@
 * Update cloudron-manifestformat for new scheduler patterns
 * collectd: FQDNLookup causes collectd install to fail
 
+[7.2.3]
+* appstore: allow re-registration on server side delete
+* transfer ownership route is not used anymore
+* graphite: fix issue where disk names with '.' do not render
+* dark mode fixes
+* sendmail: mail from display name
+* Use volumes for app data instead of raw path
+* initial xfs support
+
+[7.2.4]
+* volumes: Ensure long volume names do not overflow the table
+* Move all appstore filter to the left
+* app data: allow sameness of old and new dir
+
+[7.2.5]
+* Fix storage volume migration
+* Fix issue where only 25 group members were returned
+* Fix eventlog display
+
+[7.3.0]
+* Proxied apps
+* Applinks - app bookmarks in dashboard
+* backups: optional encryption of backup file names
+* eventlog: add event for impersonated user login
+* ldap & user directory: Remove virtual user and admin groups
+* Randomize certificate generation cronjob to lighten load on Let's Encrypt servers
+* mail: catch all address can be any domain
+* mail: accept only STARTTLS servers for relay
+* graphs: cgroup v2 support
+* mail: fix issue where signature was appended to text attachments
+* redis: restart button will now rebuild if the container is missing
+* backups: allow space in label name
+* mail: fix crash when solr is enabled on Ubuntu 22 (cgroup v2 detection fix)
+* mail: fix issue where certificate renewal did not restart the mail container properly
+* notification: Fix crash when backupId is null
+* IPv6: initial support for ipv6 only server
+* User directory: Cloudron connector uses 2FA auth
+* port bindings: add read only flag
+* mail: add storage quota support
+* mail: allow aliases to have wildcard
+* proxyAuth: add supportsBearerAuth flag
+* backups: Fix precondition check which was not erroring if mount is missing
+* mail: add queue management API and UI
+* graphs: show app disk usage graphs
+* UI: fix issue where mailbox display name was not init correctly
+* wasabi: add singapore and sydney regions
+* filemanager: add split view
+* nginx: fix zero length certs when out of disk space
+* read only API tokens
+
+[7.3.1]
+* Add cloudlare R2
+* app proxy: fixes to https proxying
+* app links: fix icons
+
+[7.3.2]
+* support: require owner permissions
+* postgresql: fix issue when restoring large dumps
+* graphs: add cpu/disk/network usage
+* graphs: new disk usage UI
+* relay: add office 365
+
+[7.3.3]
+* Fix oom detection in tasks
+* ldap: memberof is a DN and not just group name
+* mail relay: office365 provider
+* If we can't fetch applink upstreamUri, just stop icon and title detection
+* manifest: add runtimeDirs
+* remove external df module
+* Show remaining disk space in usage graph
+* Make users and groups available for the new app link dialog
+* Show swaps in disk graphs
+* disk usage: run once a day
+* mail: fix 100% cpu use with unreachable servers
+* security: do not password reset mail to cloudron owned mail domain
+* logrotate: only keep 14 days of logs
+* mail: fix dnsbl count when all servers are removed
+* applink: make users and groups available for the new app link dialog
+* Show app disk usage in storage tab
+* Make volume read-only checkbox a dropdown
+
+[7.3.4]
+* Display platform update status in the UI
+* Fix image pruning
+* cloudflare: fix issue where incorrect URL configuration is accepted
+
+[7.3.5]
+* du: fix crash when filesystem is cifs/nfs/sshfs
+* Start with a default to not fail if no swap is present
+* Fix bug in cert cleanup logic causing it to repeatedly cleanup
+* Fix crash in RBL check
+* unbound: disable controller interface explicitly
+* Fix issue where cert renewal logs where not displayed
+* Fix loading of mailboxes
+
+[7.3.6]
+* aws: add melbourne region
+* Fix display of box backups
+* mail usage: fix issue caused by deleted mailboxes
+* reverseproxy: fix issue where renewed certs are not written to disk
+* support: fix crash when opening tickets with 0 length files
+

box.js

@@ -9,7 +9,7 @@ const fs = require('fs'),
     safe = require('safetydance'),
     server = require('./src/server.js'),
     settings = require('./src/settings.js'),
-    userdirectory = require('./src/userdirectory.js');
+    directoryServer = require('./src/directoryserver.js');
 
 let logFd;
 
@@ -38,8 +38,8 @@ async function startServers() {
     await proxyAuth.start();
     await ldap.start();
 
-    const conf = await settings.getUserDirectoryConfig();
-    if (conf.enabled) await userdirectory.start();
+    const conf = await settings.getDirectoryServerConfig();
+    if (conf.enabled) await directoryServer.start();
 }
 
 async function main() {
@@ -49,12 +49,18 @@ async function main() {
     // require this here so that logging handler is already setup
     const debug = require('debug')('box:box');
 
+    process.on('SIGHUP', async function () {
+        debug('Received SIGHUP. Re-reading configs.');
+        const conf = await settings.getDirectoryServerConfig();
+        if (conf.enabled) await directoryServer.checkCertificate();
+    });
+
     process.on('SIGINT', async function () {
         debug('Received SIGINT. Shutting down.');
 
         await proxyAuth.stop();
         await server.stop();
-        await userdirectory.stop();
+        await directoryServer.stop();
         await ldap.stop();
         setTimeout(process.exit.bind(process), 3000);
     });
@@ -64,7 +70,7 @@ async function main() {
 
         await proxyAuth.stop();
         await server.stop();
-        await userdirectory.stop();
+        await directoryServer.stop();
         await ldap.stop();
         setTimeout(process.exit.bind(process), 3000);
     });

migrations/20220601004757-apps-add-mailboxDisplayName.js

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

migrations/20220602050517-apps-add-storageVolumeId.js

@@ -0,0 +1,53 @@
+'use strict';
+
+const path = require('path'),
+    safe = require('safetydance'),
+    uuid = require('uuid');
+
+function getMountPoint(dataDir) {
+    const output = safe.child_process.execSync(`df --output=target "${dataDir}" | tail -1`, { encoding: 'utf8' });
+    if (!output) return dataDir;
+    const mountPoint = output.trim();
+    if (mountPoint === '/') return dataDir;
+    return mountPoint;
+}
+
+exports.up = async function(db) {
+    // use safe() here because this migration failed midway in 7.2.4
+    await safe(db.runSql('ALTER TABLE apps ADD storageVolumeId VARCHAR(128), ADD FOREIGN KEY(storageVolumeId) REFERENCES volumes(id)'));
+    await safe(db.runSql('ALTER TABLE apps ADD storageVolumePrefix VARCHAR(128)'));
+    await safe(db.runSql('ALTER TABLE apps ADD CONSTRAINT apps_storageVolume UNIQUE (storageVolumeId, storageVolumePrefix)'));
+
+    const apps = await db.runSql('SELECT * FROM apps WHERE dataDir IS NOT NULL');
+
+    for (const app of apps) {
+        const allVolumes = await db.runSql('SELECT * FROM volumes');
+
+        console.log(`data-dir (${app.id}): migrating data dir ${app.dataDir}`);
+
+        const mountPoint = getMountPoint(app.dataDir);
+        const prefix = path.relative(mountPoint, app.dataDir);
+
+        console.log(`data-dir (${app.id}): migrating to mountpoint ${mountPoint} and prefix ${prefix}`);
+
+        const volume = allVolumes.find(v => v.hostPath === mountPoint);
+        if (volume) {
+            console.log(`data-dir (${app.id}): using existing volume ${volume.id}`);
+            await db.runSql('UPDATE apps SET storageVolumeId=?, storageVolumePrefix=? WHERE id=?', [ volume.id, prefix, app.id ]);
+            continue;
+        }
+
+        const id = uuid.v4().replace(/-/g, ''); // to make systemd mount file names more readable
+        const name = `appdata-${id}`;
+        const type = app.dataDir === mountPoint ? 'filesystem' : 'mountpoint';
+
+        console.log(`data-dir (${app.id}): creating new volume ${id}`);
+        await db.runSql('INSERT INTO volumes (id, name, hostPath, mountType, mountOptionsJson) VALUES (?, ?, ?, ?, ?)', [ id, name, mountPoint, type, JSON.stringify({}) ]);
+        await db.runSql('UPDATE apps SET storageVolumeId=?, storageVolumePrefix=? WHERE id=?', [ id, prefix, app.id ]);
+    }
+
+    await db.runSql('ALTER TABLE apps DROP COLUMN dataDir');
+};
+
+exports.down = async function(/*db*/) {
+};

migrations/20220607204734-apps-add-upstreamUri.js

@@ -0,0 +1,9 @@
+'use strict';
+
+exports.up = async function (db) {
+    await db.runSql('ALTER TABLE apps ADD COLUMN upstreamUri VARCHAR(256) DEFAULT ""');
+};
+
+exports.down = async function (db) {
+    await db.runSql('ALTER TABLE apps DROP COLUMN upstreamUri');
+};

migrations/20220626163116-backupConfig-default-encryptedFilenames.js

@@ -0,0 +1,15 @@
+'use strict';
+
+exports.up = async function(db) {
+    const result = await db.runSql('SELECT * FROM settings WHERE name=?', [ 'backup_config' ]);
+    if (!result.length) return;
+
+    const backupConfig = JSON.parse(result[0].value);
+
+    if (backupConfig.encryption && backupConfig.format === 'rsync') backupConfig.encryptedFilenames = true;
+
+    await db.runSql('UPDATE settings SET value=? WHERE name=?', [ JSON.stringify(backupConfig), 'backup_config',  ]);
+};
+
+exports.down = async function(/* db */) {
+};

migrations/20220706170039-applinks-create-table.js

@@ -0,0 +1,22 @@
+'use strict';
+
+exports.up = async function (db) {
+    var cmd = 'CREATE TABLE applinks(' +
+                'id VARCHAR(128) NOT NULL UNIQUE,' +
+                'accessRestrictionJson TEXT,' +
+                'creationTime TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,' +
+                'updateTime TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,' +
+                'ts TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,' +
+                'label VARCHAR(128),' +
+                'tagsJson VARCHAR(2048),' +
+                'icon MEDIUMBLOB,' +
+                'upstreamUri VARCHAR(256) DEFAULT "",' +
+                'PRIMARY KEY (id)) CHARACTER SET utf8 COLLATE utf8_bin';
+
+    await db.runSql(cmd);
+};
+
+exports.down = async function (db) {
+    await db.runSql('DROP TABLE applinks');
+};
+

migrations/20220817211634-mailboxes-add-quota.js

@@ -0,0 +1,17 @@
+'use strict';
+
+const async = require('async');
+
+exports.up = function(db, callback) {
+    async.series([
+        db.runSql.bind(db, 'ALTER TABLE mailboxes ADD COLUMN storageQuota BIGINT DEFAULT 0'),
+        db.runSql.bind(db, 'ALTER TABLE mailboxes ADD COLUMN messagesQuota BIGINT DEFAULT 0'),
+    ], callback);
+};
+
+exports.down = function(db, callback) {
+    async.series([
+        db.runSql.bind(db, 'ALTER TABLE mailboxes DROP COLUMN storageQuota'),
+        db.runSql.bind(db, 'ALTER TABLE mailboxes DROP COLUMN messagesQuota')
+    ], callback);
+};

migrations/20220911090713-mail-catchAll-make-absolute.js

@@ -0,0 +1,18 @@
+'use strict';
+
+const safe = require('safetydance');
+
+exports.up = async function (db) {
+    const mailDomains = await db.runSql('SELECT * FROM mail', []);
+
+    for (const mailDomain of mailDomains) {
+        let catchAll = safe.JSON.parse(mailDomain.catchAllJson) || [];
+        if (catchAll.length === 0) continue;
+
+        catchAll = catchAll.map(a => `${a}@${mailDomain.domain}`);
+        await db.runSql('UPDATE mail SET catchAllJson = ? WHERE domain = ?', [ JSON.stringify(catchAll), mailDomain.domain ]);
+    }
+};
+
+exports.down = async function( /* db */) {
+};

migrations/20220922194751-tokens-add-scopeJson.js

@@ -0,0 +1,13 @@
+'use strict';
+
+exports.up = async function (db) {
+    await db.runSql('ALTER TABLE tokens DROP COLUMN scope');
+    await db.runSql('ALTER TABLE tokens ADD COLUMN scopeJson TEXT');
+
+    await db.runSql('UPDATE tokens SET scopeJson = ?', [ JSON.stringify({'*':'rw'})]);
+};
+
+exports.down = async function (db) {
+    await db.runSql('ALTER TABLE tokens ADD COLUMN scope VARCHAR(512) NOT NULL DEFAULT ""');
+    await db.runSql('ALTER TABLE tokens DROP COLUMN scopeJson');
+};

migrations/schema.sql

@@ -58,7 +58,7 @@ CREATE TABLE IF NOT EXISTS tokens(
     accessToken VARCHAR(128) NOT NULL UNIQUE,
     identifier VARCHAR(128) NOT NULL, // resourceId: app id or user id
     clientId VARCHAR(128),
-    scope VARCHAR(512) NOT NULL,
+    scopeJson TEXT,
     expires BIGINT NOT NULL, // FIXME: make this a timestamp
     lastUsedTime TIMESTAMP NULL,
     PRIMARY KEY(accessToken));
@@ -86,13 +86,15 @@ CREATE TABLE IF NOT EXISTS apps(
     enableAutomaticUpdate BOOLEAN DEFAULT 1,
     enableMailbox BOOLEAN DEFAULT 1, // whether sendmail addon is enabled
     mailboxName VARCHAR(128), // mailbox of this app
-    mailboxDomain VARCHAR(128), // mailbox domain of this apps
+    mailboxDomain VARCHAR(128), // mailbox domain of this app
+    mailboxDisplayName VARCHAR(128), // mailbox display name
     enableInbox BOOLEAN DEFAULT 0, // whether recvmail addon is enabled
     inboxName VARCHAR(128), // mailbox of this app
-    inboxDomain VARCHAR(128), // mailbox domain of this apps
+    inboxDomain VARCHAR(128), // mailbox domain of this app
     label VARCHAR(128),     // display name
     tagsJson VARCHAR(2048), // array of tags
-    dataDir VARCHAR(256) UNIQUE,
+    storageVolumeId VARCHAR(128),
+    storageVolumePrefix VARCHAR(128),
     taskId INTEGER, // current task
     errorJson TEXT,
     servicesConfigJson TEXT, // app services configuration
@@ -100,9 +102,12 @@ CREATE TABLE IF NOT EXISTS apps(
     appStoreIcon MEDIUMBLOB,
     icon MEDIUMBLOB,
     crontab TEXT,
+    upstreamUri VARCHAR(256) DEFAULT "",
 
     FOREIGN KEY(mailboxDomain) REFERENCES domains(domain),
     FOREIGN KEY(taskId) REFERENCES tasks(id),
+    FOREIGN KEY(storageVolumeId) REFERENCES volumes(id),
+    UNIQUE (storageVolumeId, storageVolumePrefix),
     PRIMARY KEY(id));
 
 CREATE TABLE IF NOT EXISTS appPortBindings(
@@ -212,6 +217,8 @@ CREATE TABLE IF NOT EXISTS mailboxes(
     domain VARCHAR(128),
     active BOOLEAN DEFAULT 1,
     enablePop3 BOOLEAN DEFAULT 0,
+    storageQuota BIGINT DEFAULT 0,
+    messagesQuota BIGINT DEFAULT 0,
 
     FOREIGN KEY(domain) REFERENCES mail(domain),
     FOREIGN KEY(aliasDomain) REFERENCES mail(domain),
@@ -293,4 +300,17 @@ CREATE TABLE IF NOT EXISTS blobs(
     value MEDIUMBLOB,
     PRIMARY KEY(id));
 
+CREATE TABLE IF NOT EXISTS appLinks(
+    id VARCHAR(128) NOT NULL UNIQUE,
+    accessRestrictionJson TEXT, // { users: [ ], groups: [ ] }
+    creationTime TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, // when the app was installed
+    updateTime TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,   // when the last app update was done
+    ts TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, // when this db record was updated (useful for UI caching)
+    label VARCHAR(128),     // display name
+    tagsJson VARCHAR(2048), // array of tags
+    icon MEDIUMBLOB,
+    upstreamUri VARCHAR(256) DEFAULT "",
+
+    PRIMARY KEY(id));
+
 CHARACTER SET utf8 COLLATE utf8_bin;

package.json

@@ -12,13 +12,12 @@
   },
   "dependencies": {
     "@google-cloud/dns": "^2.2.4",
-    "@google-cloud/storage": "^5.19.2",
-    "@sindresorhus/df": "git+https://github.com/cloudron-io/df.git#type",
-    "async": "^3.2.3",
-    "aws-sdk": "^2.1115.0",
+    "@google-cloud/storage": "^5.20.5",
+    "async": "^3.2.4",
+    "aws-sdk": "^2.1248.0",
     "basic-auth": "^2.0.1",
-    "body-parser": "^1.20.0",
-    "cloudron-manifestformat": "^5.16.0",
+    "body-parser": "^1.20.1",
+    "cloudron-manifestformat": "^5.19.1",
     "connect": "^3.7.0",
     "connect-lastmile": "^2.1.1",
     "connect-timeout": "^1.9.0",
@@ -28,39 +27,33 @@
     "db-migrate": "^0.11.13",
     "db-migrate-mysql": "^2.2.0",
     "debug": "^4.3.4",
-    "dockerode": "^3.3.1",
-    "ejs": "^3.1.6",
-    "ejs-cli": "^2.2.3",
-    "express": "^4.17.3",
+    "dockerode": "^3.3.4",
+    "ejs": "^3.1.8",
+    "express": "^4.18.2",
     "ipaddr.js": "^2.0.1",
-    "js-yaml": "^4.1.0",
-    "json": "^11.0.0",
+    "jsdom": "^20.0.2",
     "jsonwebtoken": "^8.5.1",
-    "ldapjs": "^2.3.2",
+    "ldapjs": "^2.3.3",
     "lodash": "^4.17.21",
-    "moment": "^2.29.2",
-    "moment-timezone": "^0.5.34",
+    "moment": "^2.29.4",
+    "moment-timezone": "^0.5.38",
     "morgan": "^1.10.0",
     "multiparty": "^4.2.3",
     "mysql": "^2.18.1",
-    "nodemailer": "^6.7.3",
-    "nodemailer-smtp-transport": "^2.7.4",
-    "progress-stream": "^2.0.0",
-    "qrcode": "^1.5.0",
+    "nodemailer": "^6.8.0",
+    "qrcode": "^1.5.1",
     "readdirp": "^3.6.0",
     "safetydance": "^2.2.0",
-    "semver": "^7.3.7",
+    "semver": "^7.3.8",
     "speakeasy": "^2.0.0",
-    "split": "^1.0.1",
-    "superagent": "^7.1.1",
+    "superagent": "^7.1.5",
     "tar-fs": "github:cloudron-io/tar-fs#ignore_stat_error",
-    "tar-stream": "^2.2.0",
     "tldjs": "^2.3.1",
-    "ua-parser-js": "^1.0.2",
-    "underscore": "^1.13.2",
+    "ua-parser-js": "^1.0.32",
+    "underscore": "^1.13.6",
     "uuid": "^8.3.2",
     "validator": "^13.7.0",
-    "ws": "^8.5.0",
+    "ws": "^8.10.0",
     "xml2js": "^0.4.23"
   },
   "devDependencies": {
@@ -69,15 +62,9 @@
     "js2xmlparser": "^4.0.2",
     "mocha": "^9.2.2",
     "mock-aws-s3": "git+https://github.com/cloudron-io/mock-aws-s3.git",
-    "nock": "^13.2.4",
-    "node-sass": "^7.0.1",
-    "nyc": "^15.1.0"
+    "nock": "^13.2.9"
   },
   "scripts": {
-    "test": "./runTests",
-    "postmerge": "/bin/true",
-    "precommit": "/bin/true",
-    "prepush": "npm test",
-    "dashboard": "node_modules/.bin/gulp"
+    "test": "./run-tests"
   }
 }

run-tests

@@ -6,7 +6,7 @@ readonly source_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 readonly DATA_DIR="${HOME}/.cloudron_test"
 readonly DEFAULT_TESTS="./src/test/*-test.js ./src/routes/test/*-test.js"
 
-! "${source_dir}/src/test/checkInstall" && exit 1
+! "${source_dir}/src/test/check-install" && exit 1
 
 # cleanup old data dirs some of those docker container data requires sudo to be removed
 echo "=> Provide root password to purge any leftover data in ${DATA_DIR} and load apparmor profile:"
@@ -23,7 +23,7 @@ mkdir -p ${DATA_DIR}
 cd ${DATA_DIR}
 mkdir -p appsdata
 mkdir -p boxdata/box boxdata/mail boxdata/certs boxdata/mail/dkim/localhost boxdata/mail/dkim/foobar.com
-mkdir -p platformdata/addons/mail/banner platformdata/nginx/cert platformdata/nginx/applications platformdata/collectd/collectd.conf.d platformdata/addons platformdata/logrotate.d platformdata/backup platformdata/logs/tasks platformdata/sftp/ssh platformdata/firewall platformdata/update
+mkdir -p platformdata/addons/mail/banner platformdata/nginx/cert platformdata/nginx/applications/dashboard platformdata/collectd/collectd.conf.d platformdata/addons platformdata/logrotate.d platformdata/backup platformdata/logs/tasks platformdata/sftp/ssh platformdata/firewall platformdata/update
 sudo mkdir -p /mnt/cloudron-test-music /media/cloudron-test-music # volume test
 
 # translations
@@ -39,7 +39,7 @@ if [[ -z ${FAST+x} ]]; then
     echo "=> Delete all docker containers first"
     docker ps -qa --filter "label=isCloudronManaged" | xargs --no-run-if-empty docker rm -f
     docker rm -f mysql-server
-    echo "==> To skip this run with: FAST=1 ./runTests"
+    echo "==> To skip this run with: FAST=1 ./run-tests"
 else
     echo "==> WARNING!! Skipping docker container cleanup, the database might not be pristine!"
 fi
@@ -84,10 +84,5 @@ if [[ $# -gt 0 ]]; then
     TESTS="$*"
 fi
 
-if [[ -z ${COVERAGE+x} ]]; then
-    echo "=> Run tests with mocha"
-    BOX_ENV=test ./node_modules/.bin/mocha --bail --no-timeouts --exit -R spec ${TESTS}
-else
-    echo "=> Run tests with mocha and coverage"
-    BOX_ENV=test ./node_modules/.bin/nyc --reporter=html  ./node_modules/.bin/mocha --no-timeouts --exit -R spec ${TESTS}
-fi
+echo "=> Run tests with mocha"
+BOX_ENV=test ./node_modules/.bin/mocha --bail --no-timeouts --exit -R spec ${TESTS}

scripts/cloudron-setup

@@ -11,7 +11,7 @@ trap exitHandler EXIT
 # change this to a hash when we make a upgrade release
 readonly LOG_FILE="/var/log/cloudron-setup.log"
 readonly MINIMUM_DISK_SIZE_GB="18" # this is the size of "/" and required to fit in docker images 18 is a safe bet for different reporting on 20GB min
-readonly MINIMUM_MEMORY="974"      # this is mostly reported for 1GB main memory (DO 992, EC2 990, Linode 989, Serverdiscounter.com 974)
+readonly MINIMUM_MEMORY="960"      # this is mostly reported for 1GB main memory (DO 992, EC2 967, Linode 989, Serverdiscounter.com 974)
 
 readonly curl="curl --fail --connect-timeout 20 --retry 10 --retry-delay 2 --max-time 2400"
 
@@ -26,8 +26,8 @@ readonly GREEN='\033[32m'
 readonly DONE='\033[m'
 
 # verify the system has minimum requirements met
-if [[ "${rootfs_type}" != "ext4" ]]; then
-    echo "Error: Cloudron requires '/' to be ext4" # see #364
+if [[ "${rootfs_type}" != "ext4" && "${rootfs_type}" != "xfs" ]]; then
+    echo "Error: Cloudron requires '/' to be ext4 or xfs" # see #364
     exit 1
 fi
 
@@ -236,20 +236,31 @@ while true; do
     sleep 10
 done
 
-if ! ip=$(curl -s --fail --connect-timeout 2 --max-time 2 https://ipv4.api.cloudron.io/api/v1/helper/public_ip | sed -n -e 's/.*"ip": "\(.*\)"/\1/p'); then
-    ip='<IP>'
-fi
+ip4=$(curl -s --fail --connect-timeout 10 --max-time 10 https://ipv4.api.cloudron.io/api/v1/helper/public_ip | sed -n -e 's/.*"ip": "\(.*\)"/\1/p' || true)
+ip6=$(curl -s --fail --connect-timeout 10 --max-time 10 https://ipv6.api.cloudron.io/api/v1/helper/public_ip | sed -n -e 's/.*"ip": "\(.*\)"/\1/p' || true)
+
+url4=""
+url6=""
+fallbackUrl=""
 if [[ -z "${setupToken}" ]]; then
-    url="https://${ip}"
+    [[ -n "${ip4}" ]] && url4="https://${ip4}"
+    [[ -n "${ip6}" ]] && url6="https://[${ip6}]"
+    [[ -z "${ip4}" && -z "${ip6}" ]] && fallbackUrl="https://<IP>"
 else
-    url="https://${ip}/?setupToken=${setupToken}"
+    [[ -n "${ip4}" ]] && url4="https://${ip4}/?setupToken=${setupToken}"
+    [[ -n "${ip6}" ]] && url6="https://[${ip6}]/?setupToken=${setupToken}"
+    [[ -z "${ip4}" && -z "${ip6}" ]] && fallbackUrl="https://<IP>?setupToken=${setupToken}"
 fi
-echo -e "\n\n${GREEN}After reboot, visit ${url} and accept the self-signed certificate to finish setup.${DONE}\n"
+echo -e "\n\n${GREEN}After reboot, visit one of the following URLs and accept the self-signed certificate to finish setup.${DONE}\n"
+[[ -n "${url4}" ]] && echo -e "  * ${GREEN}${url4}${DONE}"
+[[ -n "${url6}" ]] && echo -e "  * ${GREEN}${url6}${DONE}"
+[[ -n "${fallbackUrl}" ]] && echo -e "  * ${GREEN}${fallbackUrl}${DONE}"
 
 if [[ "${rebootServer}" == "true" ]]; then
     systemctl stop box mysql # sometimes mysql ends up having corrupt privilege tables
 
-    read -p "The server has to be rebooted to apply all the settings. Reboot now ? [Y/n] " yn
+    # https://www.gnu.org/savannah-checkouts/gnu/bash/manual/bash.html#ANSI_002dC-Quoting
+    read -p $'\n'"The server has to be rebooted to apply all the settings. Reboot now ? [Y/n] " yn
     yn=${yn:-y}
     case $yn in
         [Yy]* ) exitHandler; systemctl reboot;;

scripts/create-release-tarball

@@ -41,8 +41,8 @@ if ! $(cd "${SOURCE_DIR}/../dashboard" && git diff --exit-code >/dev/null); then
     exit 1
 fi
 
-if [[ "$(node --version)" != "v16.13.1" ]]; then
-    echo "This script requires node 16.13.1"
+if [[ "$(node --version)" != "v16.18.1" ]]; then
+    echo "This script requires node 16.18.1"
     exit 1
 fi
 

scripts/init-ubuntu.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 # This script is run on the base ubuntu. Put things here which are managed by ubuntu
+# This script is also run after ubuntu upgrade
 
 set -euv -o pipefail
 
@@ -120,13 +121,13 @@ else
     if ! apt-get install -y --no-install-recommends collectd collectd-utils; then
         # FQDNLookup is true in default debian config. The box code has a custom collectd.conf that fixes this
         echo "Failed to install collectd, continuing anyway. Presumably because of http://mailman.verplant.org/pipermail/collectd/2015-March/006491.html"
-        sed -e 's/^FQDNLookup true/FQDNLookup false/' -i /etc/collectd/collectd.conf
     fi
 
     if [[ "${ubuntu_version}" == "20.04" ]]; then
         echo -e "\nLD_PRELOAD=/usr/lib/python3.8/config-3.8-x86_64-linux-gnu/libpython3.8.so" >> /etc/default/collectd
     fi
 fi
+sed -e 's/^FQDNLookup true/FQDNLookup false/' -i /etc/collectd/collectd.conf
 
 # some hosts like atlantic install ntp which conflicts with timedatectl. https://serverfault.com/questions/1024770/ubuntu-20-04-time-sync-problems-and-possibly-incorrect-status-information
 echo "==> Configuring host"
@@ -178,8 +179,8 @@ systemctl disable systemd-resolved || true
 # on vultr, ufw is enabled by default. we have our own firewall
 ufw disable || true
 
-# we need unbound to work as this is required for installer.sh to do any DNS requests
-echo -e "server:\n\tinterface: 127.0.0.1\n\tdo-ip6: no" > /etc/unbound/unbound.conf.d/cloudron-network.conf
+# we need unbound to work as this is required for installer.sh to do any DNS requests. control-enable is for https://github.com/NLnetLabs/unbound/issues/806
+echo -e "server:\n\tinterface: 127.0.0.1\n\nremote-control:\n\tcontrol-enable: no\n" > /etc/unbound/unbound.conf.d/cloudron-network.conf
 systemctl restart unbound
 
 # Ubuntu 22 has private home directories by default (https://discourse.ubuntu.com/t/private-home-directories-for-ubuntu-21-04-onwards/)

scripts/installer.sh

@@ -69,10 +69,11 @@ readonly ubuntu_codename=$(lsb_release -cs)
 
 readonly is_update=$(systemctl is-active -q box && echo "yes" || echo "no")
 
-log "Updating from $(cat $box_src_dir/VERSION) to $(cat $box_src_tmp_dir/VERSION)"
+log "Updating from $(cat $box_src_dir/VERSION 2>/dev/null) to $(cat $box_src_tmp_dir/VERSION 2>/dev/null)"
 
 # https://docs.docker.com/engine/installation/linux/ubuntulinux/
-readonly docker_version=20.10.14
+readonly docker_version=20.10.21
+readonly containerd_version=1.6.10-1
 if ! which docker 2>/dev/null || [[ $(docker version --format {{.Client.Version}}) != "${docker_version}" ]]; then
     log "installing/updating docker"
 
@@ -80,8 +81,8 @@ if ! which docker 2>/dev/null || [[ $(docker version --format {{.Client.Version}
     mkdir -p /etc/systemd/system/docker.service.d
     echo -e "[Service]\nExecStart=\nExecStart=/usr/bin/dockerd -H fd:// --log-driver=journald --exec-opt native.cgroupdriver=cgroupfs --storage-driver=overlay2 --experimental --ip6tables" > /etc/systemd/system/docker.service.d/cloudron.conf
 
-    # there are 3 packages for docker - containerd, CLI and the daemon
-    $curl -sL "https://download.docker.com/linux/ubuntu/dists/${ubuntu_codename}/pool/stable/amd64/containerd.io_1.5.11-1_amd64.deb" -o /tmp/containerd.deb
+    # there are 3 packages for docker - containerd, CLI and the daemon (https://download.docker.com/linux/ubuntu/dists/jammy/pool/stable/amd64/)
+    $curl -sL "https://download.docker.com/linux/ubuntu/dists/${ubuntu_codename}/pool/stable/amd64/containerd.io_${containerd_version}_amd64.deb" -o /tmp/containerd.deb
     $curl -sL "https://download.docker.com/linux/ubuntu/dists/${ubuntu_codename}/pool/stable/amd64/docker-ce-cli_${docker_version}~3-0~ubuntu-${ubuntu_codename}_amd64.deb" -o /tmp/docker-ce-cli.deb
     $curl -sL "https://download.docker.com/linux/ubuntu/dists/${ubuntu_codename}/pool/stable/amd64/docker-ce_${docker_version}~3-0~ubuntu-${ubuntu_codename}_amd64.deb" -o /tmp/docker.deb
 
@@ -114,14 +115,14 @@ elif [[ "${ubuntu_version}" == "18.04" ]]; then
     fi
 fi
 
-readonly node_version=16.14.2
+readonly node_version=16.18.1
 if ! which node 2>/dev/null || [[ "$(node --version)" != "v${node_version}" ]]; then
     log "installing/updating node ${node_version}"
     mkdir -p /usr/local/node-${node_version}
     $curl -sL https://nodejs.org/dist/v${node_version}/node-v${node_version}-linux-x64.tar.gz | tar zxvf - --strip-components=1 -C /usr/local/node-${node_version}
     ln -sf /usr/local/node-${node_version}/bin/node /usr/bin/node
     ln -sf /usr/local/node-${node_version}/bin/npm /usr/bin/npm
-    rm -rf /usr/local/node-16.13.1
+    rm -rf /usr/local/node-16.14.2
 fi
 
 # note that rebuild requires the above node
@@ -145,12 +146,18 @@ log "downloading new addon images"
 images=$(node -e "let i = require('${box_src_tmp_dir}/src/infra_version.js'); console.log(i.baseImages.map(function (x) { return x.tag; }).join(' '), Object.keys(i.images).map(function (x) { return i.images[x].tag; }).join(' '));")
 
 log "\tPulling docker images: ${images}"
+if ! curl -s --fail --connect-timeout 2 --max-time 2 https://ipv4.api.cloudron.io/api/v1/helper/public_ip; then
+    docker_registry=registry.ipv6.docker.com
+else
+    docker_registry=registry-1.docker.io
+fi
+
 for image in ${images}; do
-    while ! docker pull "${image}"; do           # this pulls the image using the sha256
+    while ! docker pull "${docker_registry}/${image}"; do           # this pulls the image using the sha256
         log "Could not pull ${image}"
         sleep 5
     done
-    while ! docker pull "${image%@sha256:*}"; do  # this will tag the image for readability
+    while ! docker pull "${docker_registry}/${image%@sha256:*}"; do  # this will tag the image for readability
         log "Could not pull ${image%@sha256:*}"
         sleep 5
    done
@@ -163,7 +170,8 @@ CLOUDRON_SYSLOG_VERSION="1.1.0"
 while [[ ! -f "${CLOUDRON_SYSLOG}" || "$(${CLOUDRON_SYSLOG} --version)" != ${CLOUDRON_SYSLOG_VERSION} ]]; do
     rm -rf "${CLOUDRON_SYSLOG_DIR}"
     mkdir -p "${CLOUDRON_SYSLOG_DIR}"
-    if npm install --unsafe-perm -g --prefix "${CLOUDRON_SYSLOG_DIR}" cloudron-syslog@${CLOUDRON_SYSLOG_VERSION}; then break; fi
+    # verbatim is not needed in node 18 since that is the default there. in node 16, ipv4 is preferred and this breaks on ipv6 only servers
+    if NODE_OPTIONS="--dns-result-order=verbatim" npm install --unsafe-perm -g --prefix "${CLOUDRON_SYSLOG_DIR}" cloudron-syslog@${CLOUDRON_SYSLOG_VERSION}; then break; fi
     log "Failed to install cloudron-syslog, trying again"
     sleep 5
 done

scripts/recreate-containers

@@ -0,0 +1,32 @@
+#!/bin/bash
+
+set -eu -o pipefail
+
+readonly logfile="/home/yellowtent/platformdata/logs/box.log"
+
+if [[ ${EUID} -ne 0 ]]; then
+    echo "This script should be run as root." > /dev/stderr
+    exit 1
+fi
+
+echo "This will re-create all the containers. Services will go down for a bit."
+
+read -p "Do you want to proceed? (y/N) " -n 1 -r choice
+echo
+
+if [[ ! $choice =~ ^[Yy]$ ]]; then
+    exit 1
+fi
+
+echo -n "Re-creating addon containers (this takes a while) ."
+line_count=$(cat /home/yellowtent/platformdata/logs/box.log | wc -l)
+sed -e 's/"version": ".*",/"version":"48.0.0",/' -i /home/yellowtent/platformdata/INFRA_VERSION
+systemctl restart box
+
+while ! tail -n "+${line_count}" "${logfile}" | grep -q "platform is ready"; do
+    echo -n "."
+    sleep 2
+done
+
+echo -e "\nDone.\nThe Cloudron dashboard will say 'Configuring (Queued)' for each app. The apps will come up in a short while."
+

setup/start.sh

@@ -20,7 +20,6 @@ readonly BOX_DATA_DIR="${HOME_DIR}/boxdata/box"
 readonly MAIL_DATA_DIR="${HOME_DIR}/boxdata/mail"
 
 readonly script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-readonly json="$(realpath ${script_dir}/../node_modules/.bin/json)"
 readonly ubuntu_version=$(lsb_release -rs)
 
 cp -f "${script_dir}/../scripts/cloudron-support" /usr/bin/cloudron-support
@@ -57,9 +56,10 @@ mkdir -p "${PLATFORM_DATA_DIR}/mysql"
 mkdir -p "${PLATFORM_DATA_DIR}/postgresql"
 mkdir -p "${PLATFORM_DATA_DIR}/mongodb"
 mkdir -p "${PLATFORM_DATA_DIR}/redis"
+mkdir -p "${PLATFORM_DATA_DIR}/tls"
 mkdir -p "${PLATFORM_DATA_DIR}/addons/mail/banner" \
          "${PLATFORM_DATA_DIR}/addons/mail/dkim"
-mkdir -p "${PLATFORM_DATA_DIR}/collectd/collectd.conf.d"
+mkdir -p "${PLATFORM_DATA_DIR}/collectd"
 mkdir -p "${PLATFORM_DATA_DIR}/logrotate.d"
 mkdir -p "${PLATFORM_DATA_DIR}/acme"
 mkdir -p "${PLATFORM_DATA_DIR}/backup"
@@ -107,8 +107,6 @@ unbound-anchor -a /var/lib/unbound/root.key
 
 log "Adding systemd services"
 cp -r "${script_dir}/start/systemd/." /etc/systemd/system/
-[[ "${ubuntu_version}" == "16.04" ]] && sed -e 's/MemoryMax/MemoryLimit/g' -i /etc/systemd/system/box.service
-[[ "${ubuntu_version}" == "16.04" ]] && sed -e 's/Type=notify/Type=simple/g' -i /etc/systemd/system/unbound.service
 systemctl daemon-reload
 systemctl enable --now cloudron-syslog
 systemctl enable unbound
@@ -133,7 +131,7 @@ rm -f /etc/sudoers.d/${USER} /etc/sudoers.d/cloudron
 cp "${script_dir}/start/sudoers" /etc/sudoers.d/cloudron
 
 log "Configuring collectd"
-rm -rf /etc/collectd /var/log/collectd.log
+rm -rf /etc/collectd /var/log/collectd.log "${PLATFORM_DATA_DIR}/collectd/collectd.conf.d"
 ln -sfF "${PLATFORM_DATA_DIR}/collectd" /etc/collectd
 cp "${script_dir}/start/collectd/collectd.conf" "${PLATFORM_DATA_DIR}/collectd/collectd.conf"
 systemctl restart collectd
@@ -163,7 +161,7 @@ log "Configuring nginx"
 # link nginx config to system config
 unlink /etc/nginx 2>/dev/null || rm -rf /etc/nginx
 ln -s "${PLATFORM_DATA_DIR}/nginx" /etc/nginx
-mkdir -p "${PLATFORM_DATA_DIR}/nginx/applications"
+mkdir -p "${PLATFORM_DATA_DIR}/nginx/applications/dashboard"
 mkdir -p "${PLATFORM_DATA_DIR}/nginx/cert"
 cp "${script_dir}/start/nginx/nginx.conf" "${PLATFORM_DATA_DIR}/nginx/nginx.conf"
 cp "${script_dir}/start/nginx/mime.types" "${PLATFORM_DATA_DIR}/nginx/mime.types"
@@ -227,11 +225,14 @@ fi
 
 rm -f /etc/cloudron/cloudron.conf
 
+# 7.3 branch only: we had a bug in 7.3 that renewed certs were not written to disk. this will rebuild nginx/certs in the cron job
+touch "${PLATFORM_DATA_DIR}/nginx/rebuild-needed"
+
 log "Changing ownership"
 # note, change ownership after db migrate. this allow db migrate to move files around as root and then we can fix it up here
 # be careful of what is chown'ed here. subdirs like mysql,redis etc are owned by the containers and will stop working if perms change
 chown -R "${USER}" /etc/cloudron
-chown "${USER}:${USER}" -R "${PLATFORM_DATA_DIR}/nginx" "${PLATFORM_DATA_DIR}/collectd" "${PLATFORM_DATA_DIR}/addons" "${PLATFORM_DATA_DIR}/acme" "${PLATFORM_DATA_DIR}/backup" "${PLATFORM_DATA_DIR}/logs" "${PLATFORM_DATA_DIR}/update" "${PLATFORM_DATA_DIR}/sftp" "${PLATFORM_DATA_DIR}/firewall" "${PLATFORM_DATA_DIR}/sshfs" "${PLATFORM_DATA_DIR}/cifs"
+chown "${USER}:${USER}" -R "${PLATFORM_DATA_DIR}/nginx" "${PLATFORM_DATA_DIR}/collectd" "${PLATFORM_DATA_DIR}/addons" "${PLATFORM_DATA_DIR}/acme" "${PLATFORM_DATA_DIR}/backup" "${PLATFORM_DATA_DIR}/logs" "${PLATFORM_DATA_DIR}/update" "${PLATFORM_DATA_DIR}/sftp" "${PLATFORM_DATA_DIR}/firewall" "${PLATFORM_DATA_DIR}/sshfs" "${PLATFORM_DATA_DIR}/cifs" "${PLATFORM_DATA_DIR}/tls"
 chown "${USER}:${USER}" "${PLATFORM_DATA_DIR}/INFRA_VERSION" 2>/dev/null || true
 chown "${USER}:${USER}" "${PLATFORM_DATA_DIR}"
 chown "${USER}:${USER}" "${APPS_DATA_DIR}"

setup/start/cloudron-firewall.sh

@@ -77,8 +77,6 @@ if [[ -f "${ldap_allowlist_json}" ]]; then
     done < "${ldap_allowlist_json}"
 
     # ldap server we expose 3004 and also redirect from standard ldaps port 636
-    $iptables -t filter -C INPUT -j CLOUDRON_RATELIMIT 2>/dev/null || $iptables -t filter -I INPUT 1 -j CLOUDRON_RATELIMIT
-
     $iptables -t nat -I PREROUTING -p tcp --dport 636 -j REDIRECT --to-ports 3004
     $iptables -t filter -A CLOUDRON -m set --match-set cloudron_ldap_allowlist src -p tcp --dport 3004 -j ACCEPT
 
@@ -149,6 +147,7 @@ for port in 3306 5432 6379 27017; do
     $iptables -A CLOUDRON_RATELIMIT -p tcp --syn -s 172.18.0.0/16 -d 172.18.0.0/16 --dport ${port} -m connlimit --connlimit-above 5000 -j CLOUDRON_RATELIMIT_LOG
 done
 
+# Add the rate limit chain to input chain
 $iptables -t filter -C INPUT -j CLOUDRON_RATELIMIT 2>/dev/null || $iptables -t filter -I INPUT 1 -j CLOUDRON_RATELIMIT
 $ip6tables -t filter -C INPUT -j CLOUDRON_RATELIMIT 2>/dev/null || $ip6tables -t filter -I INPUT 1 -j CLOUDRON_RATELIMIT
 

setup/start/cloudron-motd

@@ -4,30 +4,51 @@
 
 printf "**********************************************************************\n\n"
 
-cache_file="/var/cache/cloudron-motd-cache"
+readonly cache_file4="/var/cache/cloudron-motd-cache4"
+readonly cache_file6="/var/cache/cloudron-motd-cache6"
 
-if [[ -z "$(ls -A /home/yellowtent/platformdata/addons/mail/dkim)" ]]; then
-    if [[ ! -f "${cache_file}" ]]; then
-        curl --fail --connect-timeout 2 --max-time 2 -q https://ipv4.api.cloudron.io/api/v1/helper/public_ip --output "${cache_file}" || true
-    fi
-    if [[ -f "${cache_file}" ]]; then
-        ip=$(sed -n -e 's/.*"ip": "\(.*\)"/\1/p' /var/cache/cloudron-motd-cache)
+url4=""
+url6=""
+fallbackUrl=""
+
+function detectIp() {
+    if [[ ! -f "${cache_file4}" ]]; then
+        ip4=$(curl -s --fail --connect-timeout 2 --max-time 2 https://ipv4.api.cloudron.io/api/v1/helper/public_ip | sed -n -e 's/.*"ip": "\(.*\)"/\1/p' || true)
+        [[ -n "${ip4}" ]] && echo "${ip4}" > "${cache_file4}"
     else
-        ip='<IP>'
+        ip4=$(cat "${cache_file4}")
+    fi
+
+    if [[ ! -f "${cache_file6}" ]]; then
+        ip6=$(curl -s --fail --connect-timeout 2 --max-time 2 https://ipv6.api.cloudron.io/api/v1/helper/public_ip | sed -n -e 's/.*"ip": "\(.*\)"/\1/p' || true)
+        [[ -n "${ip6}" ]] && echo "${ip6}" > "${cache_file6}"
+    else
+        ip6=$(cat "${cache_file6}")
     fi
 
     if [[ ! -f /etc/cloudron/SETUP_TOKEN ]]; then
-        url="https://${ip}"
+        [[ -n "${ip4}" ]] && url4="https://${ip4}"
+        [[ -n "${ip6}" ]] && url6="https://[${ip6}]"
+        [[ -z "${ip4}" && -z "${ip6}" ]] && fallbackUrl="https://<IP>"
     else
         setupToken="$(cat /etc/cloudron/SETUP_TOKEN)"
-        url="https://${ip}/?setupToken=${setupToken}"
+        [[ -n "${ip4}" ]] && url4="https://${ip4}/?setupToken=${setupToken}"
+        [[ -n "${ip6}" ]] && url6="https://[${ip6}]/?setupToken=${setupToken}"
+        [[ -z "${ip4}" && -z "${ip6}" ]] && fallbackUrl="https://<IP>?setupToken=${setupToken}"
     fi
+}
+
+if [[ -z "$(ls -A /home/yellowtent/platformdata/addons/mail/dkim)" ]]; then
+    detectIp
 
     printf "\t\t\tWELCOME TO CLOUDRON\n"
     printf "\t\t\t-------------------\n"
 
-    printf '\n\e[1;32m%-6s\e[m\n\n' "Visit ${url} on your browser and accept the self-signed certificate to finish setup."
-    printf "Cloudron overview - https://docs.cloudron.io/ \n"
+    printf '\n\e[1;32m%-6s\e[m\n' "Visit one of the following URLs on your browser and accept the self-signed certificate to finish setup."
+    [[ -n "${url4}" ]] && printf '\e[1;32m%-6s\e[m\n' "  * ${url4}"
+    [[ -n "${url6}" ]] && printf '\e[1;32m%-6s\e[m\n' "  * ${url6}"
+    [[ -n "${fallbackUrl}" ]] && printf '\e[1;32m%-6s\e[m\n' "  * ${fallbackUrl}"
+    printf "\nCloudron overview - https://docs.cloudron.io/ \n"
     printf "Cloudron setup - https://docs.cloudron.io/installation/#setup \n"
 else
     printf "\t\t\tNOTE TO CLOUDRON ADMINS\n"

setup/start/collectd/collectd.conf

@@ -187,9 +187,9 @@ LoadPlugin swap
 
        CalculateNum false
        CalculateSum true
-       CalculateAverage true
+       CalculateAverage false
        CalculateMinimum false
-       CalculateMaximum true
+       CalculateMaximum false
        CalculateStddev false
    </Aggregation>
 </Plugin>
@@ -211,28 +211,12 @@ LoadPlugin swap
     Interactive false
 
     Import "df"
-
-    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>
+    Import "docker-stats"
 </Plugin>
 
 <Plugin write_graphite>
    <Node "graphing">
-       Host "localhost"
+       Host "127.0.0.1"
        Port "2003"
        Protocol "tcp"
        LogSendErrors true
@@ -243,6 +227,3 @@ LoadPlugin swap
    </Node>
 </Plugin>
 
-<Include "/etc/collectd/collectd.conf.d">
-    Filter "*.conf"
-</Include>

setup/start/collectd/df.py

@@ -14,7 +14,7 @@ def read():
     for d in disks:
         device = d[0]
         if 'devicemapper' in d[1] or not device.startswith('/dev/'): continue
-        instance = device[len('/dev/'):].replace('/', '_') # see #348
+        instance = device[len('/dev/'):].replace('/', '_').replace('.', '_') # see #348
 
         try:
             st = os.statvfs(d[1]) # handle disk removal

setup/start/collectd/docker-stats.py

@@ -0,0 +1,64 @@
+import collectd,os,subprocess,json,re
+
+# https://blog.dbrgn.ch/2017/3/10/write-a-collectd-python-plugin/
+
+def parseSiSize(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 parseBinarySize(size):
+    units = {"B": 1, "KIB": 2**10, "MIB": 2**20, "GIB": 2**30, "TIB": 2**40}
+    number, unit, _ = re.split('([a-zA-Z]+)', size.upper())
+    return int(float(number)*units[unit])
+
+def init():
+    collectd.info('custom docker-status plugin initialized')
+
+def read():
+    try:
+        lines = subprocess.check_output('docker stats --format  "{{ json . }}" --no-stream --no-trunc', shell=True).decode('utf-8').strip().split("\n")
+    except Exception as e:
+        collectd.info('\terror getting docker stats: %s' % (str(e)))
+        return 0
+
+    # Sample line
+    # {"BlockIO":"430kB / 676kB","CPUPerc":"0.00%","Container":"7eae5e6f4f11","ID":"7eae5e6f4f11","MemPerc":"59.15%","MemUsage":"45.55MiB / 77MiB","Name":"1062eef3-ec96-4d81-9f02-15b7dd81ccb9","NetIO":"1.5MB / 3.48MB","PIDs":"5"}
+
+    for line in lines:
+        stat = json.loads(line)
+        containerName = stat["Name"] # same as app id
+        networkData = stat["NetIO"].split("/")
+        networkRead = parseSiSize(networkData[0].strip())
+        networkWrite = parseSiSize(networkData[1].strip())
+
+        blockData = stat["BlockIO"].split("/")
+        blockRead = parseSiSize(blockData[0].strip())
+        blockWrite = parseSiSize(blockData[1].strip())
+
+        memUsageData = stat["MemUsage"].split("/")
+        memUsed = parseBinarySize(memUsageData[0].strip())
+        memMax = parseBinarySize(memUsageData[1].strip())
+
+        cpuPercData = stat["CPUPerc"].strip("%")
+        cpuPerc = float(cpuPercData)
+
+        # type comes from https://github.com/collectd/collectd/blob/master/src/types.db and https://collectd.org/wiki/index.php/Data_source
+        val = collectd.Values(type='gauge', plugin='docker-stats', plugin_instance=containerName)
+        val.dispatch(values=[networkRead], type_instance='network-read')
+        val.dispatch(values=[networkWrite], type_instance='network-write')
+        val.dispatch(values=[blockRead], type_instance='blockio-read')
+        val.dispatch(values=[blockWrite], type_instance='blockio-write')
+        val.dispatch(values=[memUsed], type_instance='mem-used')
+        val.dispatch(values=[memMax], type_instance='mem-max')
+        val.dispatch(values=[cpuPerc], type_instance='cpu-perc')
+
+        val = collectd.Values(type='counter', plugin='docker-stats', plugin_instance=containerName)
+        val.dispatch(values=[networkRead], type_instance='network-read')
+        val.dispatch(values=[networkWrite], type_instance='network-write')
+        val.dispatch(values=[blockRead], type_instance='blockio-read')
+        val.dispatch(values=[blockWrite], type_instance='blockio-write')
+
+collectd.register_init(init)
+# see Interval setting in collectd.conf for polling interval
+collectd.register_read(read)

setup/start/collectd/du.py

@@ -1,105 +0,0 @@
-import collectd,os,subprocess,sys,re,time
-
-# https://www.programcreek.com/python/example/106897/collectd.register_read
-
-PATHS = [] # { name, dir, exclude }
-# there is a pattern in carbon/storage-schemas.conf which stores values every 12h for a year
-INTERVAL = 60 * 60 * 12 # twice a day. change values in docker-graphite if you change this
-
-# we used to pass the INTERVAL as a parameter to register_read. however, collectd write_graphite
-# takes a bit to load (tcp connection) and drops the du data. this then means that we have to wait
-# for INTERVAL secs for du data. instead, we just cache the value for INTERVAL instead
-CACHE = dict()
-CACHE_TIME = 0
-
-def du(pathinfo):
-    # -B1 makes du print block sizes and not apparent sizes (to match df which also uses block sizes)
-    dirname = pathinfo['dir']
-    cmd = 'timeout 1800 du -DsB1 "{}"'.format(dirname)
-    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)' % (dirname, size, int(time.time())))
-        return size
-    except Exception as e:
-        collectd.info('\terror getting the size of %s: %s' % (dirname, 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
-    # https://godoc.org/github.com/docker/go-units#HumanSize is used. so it's 1000 (KB) and not 1024 (KiB)
-    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():
-    global CACHE, CACHE_TIME
-
-    # read from cache if < 12 hours
-    read_cache = (time.time() - CACHE_TIME) < INTERVAL
-
-    if not read_cache:
-        CACHE_TIME = time.time()
-
-    for pathinfo in PATHS:
-        dirname = pathinfo['dir']
-        if read_cache and dirname in CACHE:
-            size = CACHE[dirname]
-        else:
-            size = du(pathinfo)
-            CACHE[dirname] = size
-
-        # 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')
-
-    if read_cache and 'docker' in CACHE:
-        size = CACHE['docker']
-    else:
-        size = dockerSize()
-        CACHE['docker'] = size
-
-    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)

setup/start/logrotate/box

@@ -1,9 +1,11 @@
 # logrotate config for box logs
 
-# keep upto 5 logs of size 10M each
+# we rotate weekly, unless 10M was hit. Keep only up to 5 rotated files. Also, delete if > 14 days old
 /home/yellowtent/platformdata/logs/box.log {
     rotate 5
-    size 10M
+    weekly
+    maxage 14
+    maxsize 10M
     # we never compress so we can simply tail the files
     nocompress
     copytruncate

setup/start/logrotate/platform

@@ -14,7 +14,9 @@
 /home/yellowtent/platformdata/logs/updater/*.log {
     # only keep one rotated file, we currently do not send that over the api
     rotate 1
-    size 10M
+    weekly
+    maxage 14
+    maxsize 10M
     missingok
     # we never compress so we can simply tail the files
     nocompress
@@ -23,7 +25,7 @@
 }
 
 # keep task logs for a week. the 'nocreate' option ensures empty log files are not
-# created post rotation
+# created post rotation. task logs are kept for 7 days
 /home/yellowtent/platformdata/logs/tasks/*.log {
     minage 7
     daily

setup/start/nginx/nginx.conf

@@ -39,4 +39,5 @@ http {
     limit_req_zone $binary_remote_addr zone=admin_login:10m rate=10r/s; # 10 request a second
 
     include applications/*.conf;
+    include applications/*/*.conf;
 }

setup/start/sudoers

@@ -1,6 +1,9 @@
 # sudo logging breaks journalctl output with very long urls (systemd bug)
 Defaults !syslog
 
+Defaults!/home/yellowtent/box/src/scripts/checkvolume.sh env_keep="HOME BOX_ENV"
+yellowtent ALL=(root) NOPASSWD: /home/yellowtent/box/src/scripts/checkvolume.sh
+
 Defaults!/home/yellowtent/box/src/scripts/clearvolume.sh env_keep="HOME BOX_ENV"
 yellowtent ALL=(root) NOPASSWD: /home/yellowtent/box/src/scripts/clearvolume.sh
 
@@ -16,9 +19,6 @@ yellowtent ALL=(root) NOPASSWD: /home/yellowtent/box/src/scripts/rmaddondir.sh
 Defaults!/home/yellowtent/box/src/scripts/reboot.sh env_keep="HOME BOX_ENV"
 yellowtent ALL=(root) NOPASSWD: /home/yellowtent/box/src/scripts/reboot.sh
 
-Defaults!/home/yellowtent/box/src/scripts/configurecollectd.sh env_keep="HOME BOX_ENV"
-yellowtent ALL=(root) NOPASSWD: /home/yellowtent/box/src/scripts/configurecollectd.sh
-
 Defaults!/home/yellowtent/box/src/scripts/collectlogs.sh env_keep="HOME BOX_ENV"
 yellowtent ALL=(root) NOPASSWD: /home/yellowtent/box/src/scripts/collectlogs.sh
 
@@ -65,5 +65,7 @@ yellowtent ALL=(root) NOPASSWD: /home/yellowtent/box/src/scripts/rmmount.sh
 Defaults!/home/yellowtent/box/src/scripts/remountmount.sh env_keep="HOME BOX_ENV"
 yellowtent ALL=(root) NOPASSWD: /home/yellowtent/box/src/scripts/remountmount.sh
 
-cloudron-support ALL=(ALL) NOPASSWD: ALL
+Defaults!/home/yellowtent/box/src/scripts/du.sh env_keep="HOME BOX_ENV"
+yellowtent ALL=(root) NOPASSWD: /home/yellowtent/box/src/scripts/du.sh
 
+cloudron-support ALL=(ALL) NOPASSWD: ALL

setup/start/systemd/box.service

@@ -13,6 +13,7 @@ Type=idle
 WorkingDirectory=/home/yellowtent/box
 Restart=always
 ExecStart=/home/yellowtent/box/box.js
+ExecReload=/usr/bin/kill -HUP $MAINPID
 ; we run commands like df which will parse properly only with correct locale
 Environment="HOME=/home/yellowtent" "USER=yellowtent" "DEBUG=box:*,connect-lastmile,-box:ldap" "BOX_ENV=cloudron" "NODE_ENV=production" "LC_ALL=C"
 ; kill apptask processes as well

setup/start/unbound.conf

@@ -6,7 +6,7 @@ server:
         interface: 127.0.0.1
         interface: 172.18.0.1
         ip-freebind: yes
-        do-ip6: no
+        do-ip6: yes
         access-control: 127.0.0.1 allow
         access-control: 172.18.0.1/16 allow
         cache-max-negative-ttl: 30
@@ -14,3 +14,8 @@ server:
         # enable below for logging to journalctl -u unbound
         # verbosity: 5
         # log-queries: yes
+
+# https://github.com/NLnetLabs/unbound/issues/806
+remote-control:
+    control-enable: no
+

src/accesscontrol.js

@@ -1,26 +0,0 @@
-'use strict';
-
-exports = module.exports = {
-    verifyToken
-};
-
-const assert = require('assert'),
-    BoxError = require('./boxerror.js'),
-    safe = require('safetydance'),
-    tokens = require('./tokens.js'),
-    users = require('./users.js');
-
-async function verifyToken(accessToken) {
-    assert.strictEqual(typeof accessToken, 'string');
-
-    const token = await tokens.getByAccessToken(accessToken);
-    if (!token) throw new BoxError(BoxError.INVALID_CREDENTIALS, 'No such token');
-
-    const user = await users.get(token.identifier);
-    if (!user) throw new BoxError(BoxError.INVALID_CREDENTIALS, 'User not found');
-    if (!user.active) throw new BoxError(BoxError.INVALID_CREDENTIALS, 'User not active');
-
-    await safe(tokens.update(token.id, { lastUsedTime: new Date() })); // ignore any error
-
-    return user;
-}

src/acme2.js

@@ -17,9 +17,11 @@ const assert = require('assert'),
     fs = require('fs'),
     os = require('os'),
     path = require('path'),
+    paths = require('./paths.js'),
     promiseRetry = require('./promise-retry.js'),
     superagent = require('superagent'),
     safe = require('safetydance'),
+    users = require('./users.js'),
     _ = require('underscore');
 
 const CA_PROD_DIRECTORY_URL = 'https://acme-v02.api.letsencrypt.org/directory',
@@ -29,16 +31,26 @@ const CA_PROD_DIRECTORY_URL = 'https://acme-v02.api.letsencrypt.org/directory',
 // https://www.ietf.org/proceedings/92/slides/slides-92-acme-1.pdf
 // https://community.letsencrypt.org/t/list-of-client-implementations/2103
 
-function Acme2(options) {
-    assert.strictEqual(typeof options, 'object');
+function Acme2(fqdn, domainObject, email) {
+    assert.strictEqual(typeof fqdn, 'string');
+    assert.strictEqual(typeof domainObject, 'object');
+    assert.strictEqual(typeof email, 'string');
 
-    this.accountKeyPem = null; // Buffer .
-    this.email = options.email;
+    this.fqdn = fqdn;
+    this.accountKey = null;
+    this.email = email;
     this.keyId = null;
-    this.caDirectory = options.prod ? CA_PROD_DIRECTORY_URL : CA_STAGING_DIRECTORY_URL;
+    const prod = domainObject.tlsConfig.provider.match(/.*-prod/) !== null; // matches 'le-prod' or 'letsencrypt-prod'
+    this.caDirectory = prod ? CA_PROD_DIRECTORY_URL : CA_STAGING_DIRECTORY_URL;
     this.directory = {};
-    this.performHttpAuthorization = !!options.performHttpAuthorization;
-    this.wildcard = !!options.wildcard;
+    this.performHttpAuthorization = domainObject.provider.match(/noop|manual|wildcard/) !== null;
+    this.wildcard = !!domainObject.tlsConfig.wildcard;
+    this.domain = domainObject.domain;
+
+    this.cn = fqdn !== this.domain && this.wildcard ? dns.makeWildcard(fqdn) : fqdn; // bare domain is not part of wildcard SAN
+    this.certName = this.cn.replace('*.', '_.');
+
+    debug(`Acme2: will get cert for fqdn: ${this.fqdn} cn: ${this.cn} certName: ${this.certName} wildcard: ${this.wildcard} http: ${this.performHttpAuthorization}`);
 }
 
 // urlsafe base64 encoding (jose)
@@ -52,7 +64,7 @@ function b64(str) {
 }
 
 function getModulus(pem) {
-    assert(Buffer.isBuffer(pem));
+    assert.strictEqual(typeof pem, 'string');
 
     const stdout = safe.child_process.execSync('openssl rsa -modulus -noout', { input: pem, encoding: 'utf8' });
     if (!stdout) return null;
@@ -64,8 +76,7 @@ function getModulus(pem) {
 Acme2.prototype.sendSignedRequest = async function (url, payload) {
     assert.strictEqual(typeof url, 'string');
     assert.strictEqual(typeof payload, 'string');
-
-    assert(Buffer.isBuffer(this.accountKeyPem));
+    assert.strictEqual(typeof this.accountKey, 'string');
 
     const that = this;
     let header = {
@@ -80,7 +91,7 @@ Acme2.prototype.sendSignedRequest = async function (url, payload) {
         header.jwk = {
             e: b64(Buffer.from([0x01, 0x00, 0x01])), // exponent - 65537
             kty: 'RSA',
-            n: b64(getModulus(this.accountKeyPem))
+            n: b64(getModulus(this.accountKey))
         };
     }
 
@@ -99,7 +110,7 @@ Acme2.prototype.sendSignedRequest = async function (url, payload) {
 
     const signer = crypto.createSign('RSA-SHA256');
     signer.update(protected64 + '.' + payload64, 'utf8');
-    const signature64 = urlBase64Encode(signer.sign(that.accountKeyPem, 'base64'));
+    const signature64 = urlBase64Encode(signer.sign(that.accountKey, 'base64'));
 
     const data = {
         protected: protected64,
@@ -135,7 +146,7 @@ Acme2.prototype.updateContact = async function (registrationUri) {
 };
 
 async function generateAccountKey() {
-    const acmeAccountKey = safe.child_process.execSync('openssl genrsa 4096');
+    const acmeAccountKey = safe.child_process.execSync('openssl genrsa 4096', { encoding: 'utf8' });
     if (!acmeAccountKey) throw new BoxError(BoxError.OPENSSL_ERROR, `Could not generate acme account key: ${safe.error.message}`);
     return acmeAccountKey;
 }
@@ -147,18 +158,18 @@ Acme2.prototype.ensureAccount = async function () {
 
     debug('ensureAccount: registering user');
 
-    this.accountKeyPem = await blobs.get(blobs.ACME_ACCOUNT_KEY);
-    if (!this.accountKeyPem) {
+    this.accountKey = await blobs.getString(blobs.ACME_ACCOUNT_KEY);
+    if (!this.accountKey) {
         debug('ensureAccount: generating new account keys');
-        this.accountKeyPem = await generateAccountKey();
-        await blobs.set(blobs.ACME_ACCOUNT_KEY, this.accountKeyPem);
+        this.accountKey = await generateAccountKey();
+        await blobs.setString(blobs.ACME_ACCOUNT_KEY, this.accountKey);
     }
 
     let result = await this.sendSignedRequest(this.directory.newAccount, JSON.stringify(payload));
     if (result.status === 403 && result.body.type === 'urn:ietf:params:acme:error:unauthorized') {
         debug(`ensureAccount: key was revoked. ${result.status} ${JSON.stringify(result.body)}. generating new account key`);
-        this.accountKeyPem = await generateAccountKey();
-        await blobs.set(blobs.ACME_ACCOUNT_KEY, this.accountKeyPem);
+        this.accountKey = await generateAccountKey();
+        await blobs.setString(blobs.ACME_ACCOUNT_KEY, this.accountKey);
         result = await this.sendSignedRequest(this.directory.newAccount, JSON.stringify(payload));
     }
 
@@ -172,23 +183,21 @@ Acme2.prototype.ensureAccount = async function () {
     await this.updateContact(result.headers.location);
 };
 
-Acme2.prototype.newOrder = async function (domain) {
-    assert.strictEqual(typeof domain, 'string');
-
+Acme2.prototype.newOrder = async function () {
     const payload = {
         identifiers: [{
             type: 'dns',
-            value: domain
+            value: this.cn
         }]
     };
 
-    debug(`newOrder: ${domain}`);
+    debug(`newOrder: ${this.cn}`);
 
     const result = await this.sendSignedRequest(this.directory.newOrder, JSON.stringify(payload));
     if (result.status === 403) throw new BoxError(BoxError.ACCESS_DENIED, `Forbidden sending new order: ${result.body.detail}`);
     if (result.status !== 201) throw new BoxError(BoxError.ACME_ERROR, `Failed to send new order. Expecting 201, got ${result.statusCode} ${JSON.stringify(result.body)}`);
 
-    debug('newOrder: created order %s %j', domain, result.body);
+    debug(`newOrder: created order ${this.cn} %j`, result.body);
 
     const order = result.body, orderUrl = result.headers.location;
 
@@ -222,12 +231,12 @@ Acme2.prototype.waitForOrder = async function (orderUrl) {
 };
 
 Acme2.prototype.getKeyAuthorization = function (token) {
-    assert(Buffer.isBuffer(this.accountKeyPem));
+    assert(typeof this.accountKey, 'string');
 
     let jwk = {
         e: b64(Buffer.from([0x01, 0x00, 0x01])), // Exponent - 65537
         kty: 'RSA',
-        n: b64(getModulus(this.accountKeyPem))
+        n: b64(getModulus(this.accountKey))
     };
 
     let shasum = crypto.createHash('sha256');
@@ -275,10 +284,12 @@ Acme2.prototype.waitForChallenge = async function (challenge) {
 };
 
 // https://community.letsencrypt.org/t/public-beta-rate-limits/4772 for rate limits
-Acme2.prototype.signCertificate = async function (domain, finalizationUrl, csrDer) {
-    assert.strictEqual(typeof domain, 'string');
+Acme2.prototype.signCertificate = async function (finalizationUrl, csrPem) {
     assert.strictEqual(typeof finalizationUrl, 'string');
-    assert(Buffer.isBuffer(csrDer));
+    assert.strictEqual(typeof csrPem, 'string');
+
+    const csrDer = safe.child_process.execSync('openssl req -inform pem -outform der', { input: csrPem });
+    if (!csrDer) throw new BoxError(BoxError.OPENSSL_ERROR, safe.error);
 
     const payload = {
         csr: b64(csrDer)
@@ -291,22 +302,28 @@ Acme2.prototype.signCertificate = async function (domain, finalizationUrl, csrDe
     if (result.status !== 200) throw new BoxError(BoxError.ACME_ERROR, `Failed to sign certificate. Expecting 200, got ${result.status} ${JSON.stringify(result.body)}`);
 };
 
-Acme2.prototype.createKeyAndCsr = async function (hostname, keyFilePath, csrFilePath) {
-    assert.strictEqual(typeof hostname, 'string');
-
-    if (safe.fs.existsSync(keyFilePath)) {
-        debug('createKeyAndCsr: reuse the key for renewal at %s', keyFilePath);
-    } else {
-        let key = safe.child_process.execSync('openssl ecparam -genkey -name secp384r1'); // openssl ecparam -list_curves
-        if (!key) throw new BoxError(BoxError.OPENSSL_ERROR, safe.error);
-        if (!safe.fs.writeFileSync(keyFilePath, key)) throw new BoxError(BoxError.FS_ERROR, safe.error);
-
-        debug('createKeyAndCsr: key file saved at %s', keyFilePath);
+Acme2.prototype.ensureKey = async function () {
+    const key = await blobs.getString(`${blobs.CERT_PREFIX}-${this.certName}.key`);
+    if (key) {
+        debug(`ensureKey: reuse existing key for ${this.cn}`);
+        return key;
     }
 
+    debug(`ensureKey: generating new key for ${this.cn}`);
+    const newKey = safe.child_process.execSync('openssl ecparam -genkey -name secp384r1', { encoding: 'utf8' }); // openssl ecparam -list_curves
+    if (!newKey) throw new BoxError(BoxError.OPENSSL_ERROR, safe.error);
+    return newKey;
+};
+
+Acme2.prototype.createCsr = async function (key) {
+    assert.strictEqual(typeof key, 'string');
+
     const [error, tmpdir] = await safe(fs.promises.mkdtemp(path.join(os.tmpdir(), 'acme-')));
     if (error) throw new BoxError(BoxError.FS_ERROR, `Error creating temporary directory for openssl config: ${error.message}`);
 
+    const keyFilePath = path.join(tmpdir, 'key');
+    if (!safe.fs.writeFileSync(keyFilePath, key)) throw new BoxError(BoxError.FS_ERROR, `Failed to write key file: ${safe.error.message}`);
+
     // OCSP must-staple is currently disabled because nginx does not provide staple on the first request (https://forum.cloudron.io/topic/4917/ocsp-stapling-for-tls-ssl/)
     // ' -addext "tlsfeature = status_request"'; // this adds OCSP must-staple
     // we used to use -addext to the CLI to add these but that arg doesn't work on Ubuntu 16.04
@@ -314,47 +331,37 @@ Acme2.prototype.createKeyAndCsr = async function (hostname, keyFilePath, csrFile
     const conf = '[req]\nreq_extensions = v3_req\ndistinguished_name = req_distinguished_name\n'
         + '[req_distinguished_name]\n\n'
         + '[v3_req]\nbasicConstraints = CA:FALSE\nkeyUsage = nonRepudiation, digitalSignature, keyEncipherment\nsubjectAltName = @alt_names\n'
-        + `[alt_names]\nDNS.1 = ${hostname}\n`;
+        + `[alt_names]\nDNS.1 = ${this.cn}\n`;
 
     const opensslConfigFile = path.join(tmpdir, 'openssl.conf');
     if (!safe.fs.writeFileSync(opensslConfigFile, conf)) throw new BoxError(BoxError.FS_ERROR, `Failed to write openssl config: ${safe.error.message}`);
 
     // while we pass the CN anyways, subjectAltName takes precedence
-    const csrDer = safe.child_process.execSync(`openssl req -new -key ${keyFilePath} -outform DER -subj /CN=${hostname} -config ${opensslConfigFile}`);
-    if (!csrDer) throw new BoxError(BoxError.OPENSSL_ERROR, safe.error);
-    if (!safe.fs.writeFileSync(csrFilePath, csrDer)) throw new BoxError(BoxError.FS_ERROR, safe.error); // bookkeeping. inspect with openssl req -text -noout -in hostname.csr -inform der
+    const csrPem = safe.child_process.execSync(`openssl req -new -key ${keyFilePath} -outform PEM -subj /CN=${this.cn} -config ${opensslConfigFile}`, { encoding: 'utf8' });
+    if (!csrPem) throw new BoxError(BoxError.OPENSSL_ERROR, safe.error);
 
     await safe(fs.promises.rm(tmpdir, { recursive: true, force: true }));
-
-    debug('createKeyAndCsr: csr file (DER) saved at %s', csrFilePath);
-
-    return csrDer;
+    debug(`createCsr: csr file created for ${this.cn}`);
+    return csrPem; // inspect with openssl req -text -noout -in hostname.csr -inform pem
 };
 
-Acme2.prototype.downloadCertificate = async function (hostname, certUrl, certFilePath) {
-    assert.strictEqual(typeof hostname, 'string');
+Acme2.prototype.downloadCertificate = async function (certUrl) {
     assert.strictEqual(typeof certUrl, 'string');
 
-    await promiseRetry({ times: 5, interval: 20000, debug }, async () => {
-        debug(`downloadCertificate: downloading certificate of ${hostname}`);
+    return await promiseRetry({ times: 5, interval: 20000, debug }, async () => {
+        debug(`downloadCertificate: downloading certificate of ${this.cn}`);
 
         const result = await this.postAsGet(certUrl);
         if (result.statusCode === 202) throw new BoxError(BoxError.ACME_ERROR, 'Retry downloading certificate');
         if (result.statusCode !== 200) throw new BoxError(BoxError.ACME_ERROR, `Failed to get cert. Expecting 200, got ${result.statusCode} ${JSON.stringify(result.body)}`);
 
-        const fullChainPem = result.body; // buffer
-
-        if (!safe.fs.writeFileSync(certFilePath, fullChainPem)) throw new BoxError(BoxError.FS_ERROR, safe.error);
-
-        debug(`downloadCertificate: cert file for ${hostname} saved at ${certFilePath}`);
+        const fullChainPem = result.body.toString('utf8'); // buffer
+        return fullChainPem;
     });
 };
 
-Acme2.prototype.prepareHttpChallenge = async function (hostname, domain, authorization, acmeChallengesDir) {
-    assert.strictEqual(typeof hostname, 'string');
-    assert.strictEqual(typeof domain, 'string');
+Acme2.prototype.prepareHttpChallenge = async function (authorization) {
     assert.strictEqual(typeof authorization, 'object');
-    assert.strictEqual(typeof acmeChallengesDir, 'string');
 
     debug('prepareHttpChallenge: challenges: %j', authorization);
     let httpChallenges = authorization.challenges.filter(function(x) { return x.type === 'http-01'; });
@@ -365,44 +372,39 @@ Acme2.prototype.prepareHttpChallenge = async function (hostname, domain, authori
 
     let keyAuthorization = this.getKeyAuthorization(challenge.token);
 
-    debug('prepareHttpChallenge: writing %s to %s', keyAuthorization, path.join(acmeChallengesDir, challenge.token));
+    debug('prepareHttpChallenge: writing %s to %s', keyAuthorization, path.join(paths.ACME_CHALLENGES_DIR, challenge.token));
 
-    if (!safe.fs.writeFileSync(path.join(acmeChallengesDir, challenge.token), keyAuthorization)) throw new BoxError(BoxError.FS_ERROR, `Error writing challenge: ${safe.error.message}`);
+    if (!safe.fs.writeFileSync(path.join(paths.ACME_CHALLENGES_DIR, challenge.token), keyAuthorization)) throw new BoxError(BoxError.FS_ERROR, `Error writing challenge: ${safe.error.message}`);
 
     return challenge;
 };
 
-Acme2.prototype.cleanupHttpChallenge = async function (hostname, domain, challenge, acmeChallengesDir) {
-    assert.strictEqual(typeof hostname, 'string');
-    assert.strictEqual(typeof domain, 'string');
+Acme2.prototype.cleanupHttpChallenge = async function (challenge) {
     assert.strictEqual(typeof challenge, 'object');
-    assert.strictEqual(typeof acmeChallengesDir, 'string');
 
-    debug('cleanupHttpChallenge: unlinking %s', path.join(acmeChallengesDir, challenge.token));
+    debug('cleanupHttpChallenge: unlinking %s', path.join(paths.ACME_CHALLENGES_DIR, challenge.token));
 
-    if (!safe.fs.unlinkSync(path.join(acmeChallengesDir, challenge.token))) throw new BoxError(BoxError.FS_ERROR, `Error unlinking challenge: ${safe.error.message}`);
+    if (!safe.fs.unlinkSync(path.join(paths.ACME_CHALLENGES_DIR, challenge.token))) throw new BoxError(BoxError.FS_ERROR, `Error unlinking challenge: ${safe.error.message}`);
 };
 
-function getChallengeSubdomain(hostname, domain) {
+function getChallengeSubdomain(cn, domain) {
     let challengeSubdomain;
 
-    if (hostname === domain) {
+    if (cn === domain) {
         challengeSubdomain = '_acme-challenge';
-    } else if (hostname.includes('*')) { // wildcard
-        let subdomain = hostname.slice(0, -domain.length - 1);
+    } else if (cn.includes('*')) { // wildcard
+        let subdomain = cn.slice(0, -domain.length - 1);
         challengeSubdomain = subdomain ? subdomain.replace('*', '_acme-challenge') : '_acme-challenge';
     } else {
-        challengeSubdomain = '_acme-challenge.' + hostname.slice(0, -domain.length - 1);
+        challengeSubdomain = '_acme-challenge.' + cn.slice(0, -domain.length - 1);
     }
 
-    debug(`getChallengeSubdomain: challenge subdomain for hostname ${hostname} at domain ${domain} is ${challengeSubdomain}`);
+    debug(`getChallengeSubdomain: challenge subdomain for cn ${cn} at domain ${domain} is ${challengeSubdomain}`);
 
     return challengeSubdomain;
 }
 
-Acme2.prototype.prepareDnsChallenge = async function (hostname, domain, authorization) {
-    assert.strictEqual(typeof hostname, 'string');
-    assert.strictEqual(typeof domain, 'string');
+Acme2.prototype.prepareDnsChallenge = async function (authorization) {
     assert.strictEqual(typeof authorization, 'object');
 
     debug('prepareDnsChallenge: challenges: %j', authorization);
@@ -415,39 +417,34 @@ Acme2.prototype.prepareDnsChallenge = async function (hostname, domain, authoriz
     shasum.update(keyAuthorization);
 
     const txtValue = urlBase64Encode(shasum.digest('base64'));
-    const challengeSubdomain = getChallengeSubdomain(hostname, domain);
+    const challengeSubdomain = getChallengeSubdomain(this.cn, this.domain);
 
     debug(`prepareDnsChallenge: update ${challengeSubdomain} with ${txtValue}`);
 
-    await dns.upsertDnsRecords(challengeSubdomain, domain, 'TXT', [ `"${txtValue}"` ]);
+    await dns.upsertDnsRecords(challengeSubdomain, this.domain, 'TXT', [ `"${txtValue}"` ]);
 
-    await dns.waitForDnsRecord(challengeSubdomain, domain, 'TXT', txtValue, { times: 200 });
+    await dns.waitForDnsRecord(challengeSubdomain, this.domain, 'TXT', txtValue, { times: 200 });
 
     return challenge;
 };
 
-Acme2.prototype.cleanupDnsChallenge = async function (hostname, domain, challenge) {
-    assert.strictEqual(typeof hostname, 'string');
-    assert.strictEqual(typeof domain, 'string');
+Acme2.prototype.cleanupDnsChallenge = async function (challenge) {
     assert.strictEqual(typeof challenge, 'object');
 
     const keyAuthorization = this.getKeyAuthorization(challenge.token);
-    let shasum = crypto.createHash('sha256');
+    const shasum = crypto.createHash('sha256');
     shasum.update(keyAuthorization);
 
     const txtValue = urlBase64Encode(shasum.digest('base64'));
-    let challengeSubdomain = getChallengeSubdomain(hostname, domain);
+    const challengeSubdomain = getChallengeSubdomain(this.cn, this.domain);
 
     debug(`cleanupDnsChallenge: remove ${challengeSubdomain} with ${txtValue}`);
 
-    await dns.removeDnsRecords(challengeSubdomain, domain, 'TXT', [ `"${txtValue}"` ]);
+    await dns.removeDnsRecords(challengeSubdomain, this.domain, 'TXT', [ `"${txtValue}"` ]);
 };
 
-Acme2.prototype.prepareChallenge = async function (hostname, domain, authorizationUrl, acmeChallengesDir) {
-    assert.strictEqual(typeof hostname, 'string');
-    assert.strictEqual(typeof domain, 'string');
+Acme2.prototype.prepareChallenge = async function (authorizationUrl) {
     assert.strictEqual(typeof authorizationUrl, 'string');
-    assert.strictEqual(typeof acmeChallengesDir, 'string');
 
     debug(`prepareChallenge: http: ${this.performHttpAuthorization}`);
 
@@ -457,55 +454,49 @@ Acme2.prototype.prepareChallenge = async function (hostname, domain, authorizati
     const authorization = response.body;
 
     if (this.performHttpAuthorization) {
-        return await this.prepareHttpChallenge(hostname, domain, authorization, acmeChallengesDir);
+        return await this.prepareHttpChallenge(authorization);
     } else {
-        return await this.prepareDnsChallenge(hostname, domain, authorization);
+        return await this.prepareDnsChallenge(authorization);
     }
 };
 
-Acme2.prototype.cleanupChallenge = async function (hostname, domain, challenge, acmeChallengesDir) {
-    assert.strictEqual(typeof hostname, 'string');
-    assert.strictEqual(typeof domain, 'string');
+Acme2.prototype.cleanupChallenge = async function (challenge) {
     assert.strictEqual(typeof challenge, 'object');
-    assert.strictEqual(typeof acmeChallengesDir, 'string');
 
     debug(`cleanupChallenge: http: ${this.performHttpAuthorization}`);
 
     if (this.performHttpAuthorization) {
-        await this.cleanupHttpChallenge(hostname, domain, challenge, acmeChallengesDir);
+        await this.cleanupHttpChallenge(challenge);
     } else {
-        await this.cleanupDnsChallenge(hostname, domain, challenge);
+        await this.cleanupDnsChallenge(challenge);
     }
 };
 
-Acme2.prototype.acmeFlow = async function (hostname, domain, paths) {
-    assert.strictEqual(typeof hostname, 'string');
-    assert.strictEqual(typeof domain, 'string');
-    assert.strictEqual(typeof paths, 'object');
-
-    const { certFilePath, keyFilePath, csrFilePath, acmeChallengesDir } = paths;
-
+Acme2.prototype.acmeFlow = async function () {
     await this.ensureAccount();
-    const { order, orderUrl } = await this.newOrder(hostname);
+    const { order, orderUrl } = await this.newOrder();
+
+    const certificates = [];
 
     for (let i = 0; i < order.authorizations.length; i++) {
         const authorizationUrl = order.authorizations[i];
         debug(`acmeFlow: authorizing ${authorizationUrl}`);
 
-        const challenge = await this.prepareChallenge(hostname, domain, authorizationUrl, acmeChallengesDir);
+        const challenge = await this.prepareChallenge(authorizationUrl);
         await this.notifyChallengeReady(challenge);
         await this.waitForChallenge(challenge);
-        const csrDer = await this.createKeyAndCsr(hostname, keyFilePath, csrFilePath);
-        await this.signCertificate(hostname, order.finalize, csrDer);
+        const key = await this.ensureKey();
+        const csr = await this.createCsr(key);
+        await this.signCertificate(order.finalize, csr);
         const certUrl = await this.waitForOrder(orderUrl);
-        await this.downloadCertificate(hostname, certUrl, certFilePath);
+        const cert = await this.downloadCertificate(certUrl);
 
-        try {
-            await this.cleanupChallenge(hostname, domain, challenge, acmeChallengesDir);
-        } catch (cleanupError) {
-            debug('acmeFlow: ignoring error when cleaning up challenge:', cleanupError);
-        }
+        await safe(this.cleanupChallenge(challenge), { debug });
+
+        certificates.push({ cert, key, csr });
     }
+
+    return certificates;
 };
 
 Acme2.prototype.loadDirectory = async function () {
@@ -522,32 +513,36 @@ Acme2.prototype.loadDirectory = async function () {
     });
 };
 
-Acme2.prototype.getCertificate = async function (vhost, domain, paths) {
-    assert.strictEqual(typeof vhost, 'string');
-    assert.strictEqual(typeof domain, 'string');
-    assert.strictEqual(typeof paths, 'object');
-
-    debug(`getCertificate: start acme flow for ${vhost} from ${this.caDirectory}`);
-
-    if (vhost !== domain && this.wildcard) { // bare domain is not part of wildcard SAN
-        vhost = dns.makeWildcard(vhost);
-        debug(`getCertificate: will get wildcard cert for ${vhost}`);
-    }
+Acme2.prototype.getCertificate = async function () {
+    debug(`getCertificate: start acme flow for ${this.cn} from ${this.caDirectory}`);
 
     await this.loadDirectory();
-    await this.acmeFlow(vhost, domain, paths);
+    const result = await this.acmeFlow();
+
+    debug(`getCertificate: acme flow completed for ${this.cn}. result: ${result.length}`);
+
+    await blobs.setString(`${blobs.CERT_PREFIX}-${this.certName}.key`, result[0].key);
+    await blobs.setString(`${blobs.CERT_PREFIX}-${this.certName}.cert`, result[0].cert);
+    await blobs.setString(`${blobs.CERT_PREFIX}-${this.certName}.csr`, result[0].csr);
+
+    return result[0];
 };
 
-async function getCertificate(vhost, domain, paths, options) {
-    assert.strictEqual(typeof vhost, 'string'); // this can also be a wildcard domain (for alias domains)
-    assert.strictEqual(typeof domain, 'string');
-    assert.strictEqual(typeof paths, 'object');
-    assert.strictEqual(typeof options, 'object');
+async function getCertificate(fqdn, domainObject) {
+    assert.strictEqual(typeof fqdn, 'string'); // this can also be a wildcard domain (for alias domains)
+    assert.strictEqual(typeof domainObject, 'object');
 
-    await promiseRetry({ times: 3, interval: 0, debug }, async function () {
-        debug(`getCertificate: for vhost ${vhost} and domain ${domain}`);
+    // registering user with an email requires A or MX record (https://github.com/letsencrypt/boulder/issues/1197)
+    // we cannot use admin@fqdn because the user might not have set it up.
+    // we simply update the account with the latest email we have each time when getting letsencrypt certs
+    // https://github.com/ietf-wg-acme/acme/issues/30
+    const owner = await users.getOwner();
+    const email = owner?.email || 'webmaster@cloudron.io'; // can error if not activated yet
 
-        const acme = new Acme2(options || { });
-        return await acme.getCertificate(vhost, domain, paths);
+    return await promiseRetry({ times: 3, interval: 0, debug }, async function () {
+        debug(`getCertificate: for fqdn ${fqdn} and domain ${domainObject.domain}`);
+
+        const acme = new Acme2(fqdn, domainObject, email);
+        return await acme.getCertificate();
     });
 }

src/apphealthmonitor.js

@@ -70,25 +70,36 @@ async function checkAppHealth(app, options) {
 
     const manifest = app.manifest;
 
-    const [error, data] = await safe(docker.inspect(app.containerId));
-    if (error || !data || !data.State) return await setHealth(app, apps.HEALTH_ERROR);
-    if (data.State.Running !== true) return await setHealth(app, apps.HEALTH_DEAD);
+    let healthCheckUrl, host;
+    if (app.manifest.id === constants.PROXY_APP_APPSTORE_ID) {
+        healthCheckUrl = app.upstreamUri;
+        host = new URL(app.upstreamUri).host; // includes port
+    } else {
+        const [error, data] = await safe(docker.inspect(app.containerId));
+        if (error || !data || !data.State) return await setHealth(app, apps.HEALTH_ERROR);
+        if (data.State.Running !== true) return await setHealth(app, apps.HEALTH_DEAD);
 
-    // non-appstore apps may not have healthCheckPath
-    if (!manifest.healthCheckPath) return await setHealth(app, apps.HEALTH_HEALTHY);
+        // non-appstore apps may not have healthCheckPath
+        if (!manifest.healthCheckPath) return await setHealth(app, apps.HEALTH_HEALTHY);
+
+        healthCheckUrl = `http://${app.containerIp}:${manifest.httpPort}${manifest.healthCheckPath}`;
+        host = app.fqdn;
+    }
 
-    const healthCheckUrl = `http://${app.containerIp}:${manifest.httpPort}${manifest.healthCheckPath}`;
     const [healthCheckError, response] = await safe(superagent
         .get(healthCheckUrl)
-        .set('Host', app.fqdn) // required for some apache configs with rewrite rules
+        .disableTLSCerts() // for app proxy
+        .set('Host', host) // required for some apache configs with rewrite rules
         .set('User-Agent', 'Mozilla (CloudronHealth)') // required for some apps (e.g. minio)
         .redirects(0)
         .ok(() => true)
         .timeout(options.timeout * 1000));
 
     if (healthCheckError) {
+        await apps.appendLogLine(app, `=> Healtheck error: ${healthCheckError}`);
         await setHealth(app, apps.HEALTH_UNHEALTHY);
     } else if (response.status > 403) { // 2xx and 3xx are ok. even 401 and 403 are ok for now (for WP sites)
+        await apps.appendLogLine(app, `=> Healtheck error got response status ${response.status}`);
         await setHealth(app, apps.HEALTH_UNHEALTHY);
     } else {
         await setHealth(app, apps.HEALTH_HEALTHY);
@@ -129,9 +140,7 @@ async function processDockerEvents(options) {
         const [error, info] = await safe(getContainerInfo(containerId));
         const program = error ? containerId : (info.addonName || info.app.fqdn);
         const now = Date.now();
-
-        // do not send mails for dev apps
-        const notifyUser = !(info.app && info.app.debugMode) && ((now - gLastOomMailTime) > OOM_EVENT_LIMIT);
+        const notifyUser = !info?.app?.debugMode && ((now - gLastOomMailTime) > OOM_EVENT_LIMIT);
 
         debug(`OOM ${program} notifyUser: ${notifyUser}. lastOomTime: ${gLastOomMailTime} (now: ${now})`);
 
@@ -163,10 +172,10 @@ async function processApp(options) {
 
     await Promise.allSettled(healthChecks); // wait for all promises to finish
 
-    const alive = allApps
-        .filter(function (a) { return a.installationState === apps.ISTATE_INSTALLED && a.runState === apps.RSTATE_RUNNING && a.health === apps.HEALTH_HEALTHY; });
+    const stopped = allApps.filter(app => app.runState === apps.RSTATE_STOPPED);
+    const running = allApps.filter(function (a) { return a.installationState === apps.ISTATE_INSTALLED && a.runState === apps.RSTATE_RUNNING && a.health === apps.HEALTH_HEALTHY; });
 
-    debug(`app health: ${alive.length} alive / ${allApps.length - alive.length} dead.`);
+    debug(`app health: ${running.length} running / ${stopped.length} stopped / ${allApps.length - running.length - stopped.length} unresponsive`);
 }
 
 async function run(intervalSecs) {

src/applinks.js

@@ -0,0 +1,213 @@
+'use strict';
+
+exports = module.exports = {
+    list,
+    listByUser,
+    add,
+    get,
+    update,
+    remove,
+    getIcon
+};
+
+const assert = require('assert'),
+    apps = require('./apps.js'),
+    BoxError = require('./boxerror.js'),
+    database = require('./database.js'),
+    debug = require('debug')('box:applinks'),
+    jsdom = require('jsdom'),
+    safe = require('safetydance'),
+    superagent = require('superagent'),
+    uuid = require('uuid'),
+    validator = require('validator');
+
+const APPLINKS_FIELDS= [ 'id', 'accessRestrictionJson', 'creationTime', 'updateTime', 'ts', 'label', 'tagsJson', 'icon', 'upstreamUri' ].join(',');
+
+function postProcess(result) {
+    assert.strictEqual(typeof result, 'object');
+
+    assert(result.tagsJson === null || typeof result.tagsJson === 'string');
+    result.tags = safe.JSON.parse(result.tagsJson) || [];
+    delete result.tagsJson;
+
+    assert(result.accessRestrictionJson === null || typeof result.accessRestrictionJson === 'string');
+    result.accessRestriction = safe.JSON.parse(result.accessRestrictionJson);
+    if (result.accessRestriction && !result.accessRestriction.users) result.accessRestriction.users = [];
+    delete result.accessRestrictionJson;
+
+    result.ts = new Date(result.ts).getTime();
+
+    result.icon = result.icon ? result.icon : null;
+
+}
+
+function validateUpstreamUri(upstreamUri) {
+    assert.strictEqual(typeof upstreamUri, 'string');
+
+    if (!upstreamUri) return new BoxError(BoxError.BAD_FIELD, 'upstreamUri cannot be empty');
+
+    if (!upstreamUri.includes('://')) return new BoxError(BoxError.BAD_FIELD, 'upstreamUri has no schema');
+
+    const uri = safe(() => new URL(upstreamUri));
+    if (!uri) return new BoxError(BoxError.BAD_FIELD, `upstreamUri is invalid: ${safe.error.message}`);
+    if (uri.protocol !== 'http:' && uri.protocol !== 'https:') return new BoxError(BoxError.BAD_FIELD, 'upstreamUri has an unsupported scheme');
+
+    return null;
+}
+
+async function list() {
+    const results = await database.query(`SELECT ${APPLINKS_FIELDS} FROM applinks ORDER BY upstreamUri`);
+
+    results.forEach(postProcess);
+
+    return results;
+}
+
+async function listByUser(user) {
+    assert.strictEqual(typeof user, 'object');
+
+    const result = await list();
+    return result.filter((app) => apps.canAccess(app, user));
+}
+
+async function detectMetaInfo(applink) {
+    assert.strictEqual(typeof applink, 'object');
+
+    const [error, response] = await safe(superagent.get(applink.upstreamUri).set('User-Agent', 'Mozilla'));
+    if (error || !response.text) {
+        debug('detectMetaInfo: Unable to fetch upstreamUri to detect icon and title', error.statusCode);
+        return;
+    }
+
+    if (applink.favicon && applink.label) return;
+
+    // set redirected URI if any for favicon url
+    const redirectUri = (response.redirects && response.redirects.length) ? response.redirects[0] : null;
+
+    const dom = new jsdom.JSDOM(response.text);
+    if (!applink.icon) {
+        let favicon = '';
+        if (dom.window.document.querySelector('link[rel="apple-touch-icon"]')) favicon = dom.window.document.querySelector('link[rel="apple-touch-icon"]').href ;
+        if (!favicon.endsWith('.png') && dom.window.document.querySelector('meta[name="msapplication-TileImage"]')) favicon = dom.window.document.querySelector('meta[name="msapplication-TileImage"]').content ;
+        if (!favicon.endsWith('.png') && dom.window.document.querySelector('link[rel="shortcut icon"]')) favicon = dom.window.document.querySelector('link[rel="shortcut icon"]').href ;
+        if (!favicon.endsWith('.png') && dom.window.document.querySelector('link[rel="icon"]')) {
+            let iconElements = dom.window.document.querySelectorAll('link[rel="icon"]');
+            if (iconElements.length) {
+                favicon = iconElements[0].href; // choose first one for a start
+
+                // check if we have sizes attributes and then choose the largest one
+                iconElements = Array.from(iconElements).filter(function (e) {
+                    return e.attributes.getNamedItem('sizes') && e.attributes.getNamedItem('sizes').value;
+                }).sort(function (a, b) {
+                    return parseInt(b.attributes.getNamedItem('sizes').value.split('x')[0]) - parseInt(a.attributes.getNamedItem('sizes').value.split('x')[0]);
+                });
+                if (iconElements.length) favicon = iconElements[0].href;
+            }
+        }
+        if (!favicon.endsWith('.png') && dom.window.document.querySelector('meta[itemprop="image"]')) favicon = dom.window.document.querySelector('meta[itemprop="image"]').content;
+
+        if (favicon) {
+            if (favicon.startsWith('/')) favicon = (redirectUri || applink.upstreamUri) + favicon;
+
+            debug(`detectMetaInfo: found icon: ${favicon}`);
+
+            const [error, response] = await safe(superagent.get(favicon));
+            if (error) console.error(`Failed to fetch icon ${favicon}: `, error);
+            else if (response.ok && response.headers['content-type'] === 'image/png') applink.icon = response.body;
+            else console.error(`Failed to fetch icon ${favicon}: statusCode=${response.status}`);
+        } else {
+            console.error(`Unable to find a suitable icon for ${applink.upstreamUri}`);
+        }
+    }
+
+    if (!applink.label) {
+        if (dom.window.document.querySelector('meta[property="og:title"]')) applink.label = dom.window.document.querySelector('meta[property="og:title"]').content;
+        else if (dom.window.document.querySelector('meta[property="og:site_name"]')) applink.label = dom.window.document.querySelector('meta[property="og:site_name"]').content;
+        else if (dom.window.document.title) applink.label = dom.window.document.title;
+    }
+}
+
+async function add(applink) {
+    assert.strictEqual(typeof applink, 'object');
+    assert.strictEqual(typeof applink.upstreamUri, 'string');
+
+    debug(`add: ${applink.upstreamUri}`, applink);
+
+    let error = validateUpstreamUri(applink.upstreamUri);
+    if (error) throw error;
+
+    if (applink.icon) {
+        if (!validator.isBase64(applink.icon)) throw new BoxError(BoxError.BAD_FIELD, 'icon is not base64');
+        applink.icon = Buffer.from(applink.icon, 'base64');
+    }
+
+    await detectMetaInfo(applink);
+
+    const data = {
+        id: uuid.v4(),
+        accessRestrictionJson: applink.accessRestriction ? JSON.stringify(applink.accessRestriction) : null,
+        label: applink.label || '',
+        tagsJson: applink.tags ? JSON.stringify(applink.tags) : null,
+        icon: applink.icon || null,
+        upstreamUri: applink.upstreamUri
+    };
+
+    const query = 'INSERT INTO applinks (id, accessRestrictionJson, label, tagsJson, icon, upstreamUri) VALUES (?, ?, ?, ?, ?, ?)';
+    const args = [ data.id, data.accessRestrictionJson, data.label, data.tagsJson, data.icon, data.upstreamUri ];
+
+    [error] = await safe(database.query(query, args));
+    if (error) throw error;
+
+    return data.id;
+}
+
+async function get(applinkId) {
+    assert.strictEqual(typeof applinkId, 'string');
+
+    const result = await database.query(`SELECT ${APPLINKS_FIELDS} FROM applinks WHERE id = ?`, [ applinkId ]);
+    if (result.length === 0) return null;
+
+    postProcess(result[0]);
+
+    return result[0];
+}
+
+async function update(applinkId, applink) {
+    assert.strictEqual(typeof applinkId, 'string');
+    assert.strictEqual(typeof applink, 'object');
+    assert.strictEqual(typeof applink.upstreamUri, 'string');
+
+    debug(`update: ${applink.upstreamUri}`, applink);
+
+    let error = validateUpstreamUri(applink.upstreamUri);
+    if (error) throw error;
+
+    if (applink.icon) {
+        if (!validator.isBase64(applink.icon)) throw new BoxError(BoxError.BAD_FIELD, 'icon is not base64');
+        applink.icon = Buffer.from(applink.icon, 'base64');
+    }
+
+    await detectMetaInfo(applink);
+
+    const query = 'UPDATE applinks SET label=?, icon=?, upstreamUri=?, tagsJson=?, accessRestrictionJson=? WHERE id = ?';
+    const args = [ applink.label, applink.icon || null, applink.upstreamUri, applink.tags ? JSON.stringify(applink.tags) : null, applink.accessRestriction ? JSON.stringify(applink.accessRestriction) : null, applinkId ];
+
+    const result = await database.query(query, args);
+    if (result.affectedRows !== 1) throw new BoxError(BoxError.NOT_FOUND, 'Applink not found');
+}
+
+async function remove(applinkId) {
+    assert.strictEqual(typeof applinkId, 'string');
+
+    const result = await database.query('DELETE FROM applinks WHERE id = ?', [ applinkId ]);
+    if (result.affectedRows !== 1) throw new BoxError(BoxError.NOT_FOUND, 'Applink not found');
+}
+
+async function getIcon(applinkId) {
+    assert.strictEqual(typeof applinkId, 'string');
+
+    const applink = await get(applinkId);
+    if (!applink) throw new BoxError(BoxError.NOT_FOUND, 'Applink not found');
+
+    return applink.icon;
+}

src/apps.js

@@ -27,6 +27,7 @@ exports = module.exports = {
     setAccessRestriction,
     setOperators,
     setCrontab,
+    setUpstreamUri,
     setLabel,
     setIcon,
     setTags,
@@ -42,7 +43,7 @@ exports = module.exports = {
     setMailbox,
     setInbox,
     setLocation,
-    setDataDir,
+    setStorage,
     repair,
 
     restore,
@@ -55,12 +56,13 @@ exports = module.exports = {
     backup,
     listBackups,
     updateBackup,
+    getBackupDownloadStream,
 
     getTask,
     getLogPaths,
     getLogs,
 
-    getCertificate,
+    appendLogLine,
 
     start,
     stop,
@@ -81,7 +83,7 @@ exports = module.exports = {
     schedulePendingTasks,
     restartAppsUsingAddons,
 
-    getDataDir,
+    getStorageDir,
     getIcon,
     getMemoryLimit,
     getLimits,
@@ -134,9 +136,19 @@ exports = module.exports = {
     LOCATION_TYPE_REDIRECT: 'redirect',
     LOCATION_TYPE_ALIAS: 'alias',
 
+    // should probably be in table as well
+    LOCATION_TYPE_DASHBOARD: 'dashboard',
+    LOCATION_TYPE_MAIL: 'mail',
+    LOCATION_TYPE_DIRECTORY_SERVER: 'directoryserver',
+
+    // respositories, match with appstore
+    REPOSITORY_CORE: 'core',
+    REPOSITORY_COMMUNITY: 'community',
+
     // exported for testing
     _validatePortBindings: validatePortBindings,
     _validateAccessRestriction: validateAccessRestriction,
+    _validateUpstreamUri: validateUpstreamUri,
     _translatePortBindings: translatePortBindings,
     _parseCrontab: parseCrontab,
     _clear: clear
@@ -156,9 +168,11 @@ const appstore = require('./appstore.js'),
     domains = require('./domains.js'),
     eventlog = require('./eventlog.js'),
     fs = require('fs'),
+    LogStream = require('./log-stream.js'),
     mail = require('./mail.js'),
     manifestFormat = require('cloudron-manifestformat'),
     mounts = require('./mounts.js'),
+    notifications = require('./notifications.js'),
     once = require('./once.js'),
     os = require('os'),
     path = require('path'),
@@ -168,27 +182,33 @@ const appstore = require('./appstore.js'),
     semver = require('semver'),
     services = require('./services.js'),
     settings = require('./settings.js'),
+    shell = require('./shell.js'),
     spawn = require('child_process').spawn,
-    split = require('split'),
+    storage = require('./storage.js'),
     superagent = require('superagent'),
     system = require('./system.js'),
     tasks = require('./tasks.js'),
+    tgz = require('./backupformat/tgz.js'),
     TransformStream = require('stream').Transform,
     users = require('./users.js'),
     util = require('util'),
     uuid = require('uuid'),
     validator = require('validator'),
+    volumes = require('./volumes.js'),
     _ = require('underscore');
 
 const APPS_FIELDS_PREFIXED = [ 'apps.id', 'apps.appStoreId', 'apps.installationState', 'apps.errorJson', 'apps.runState',
     'apps.health', 'apps.containerId', 'apps.manifestJson', 'apps.accessRestrictionJson', 'apps.memoryLimit', 'apps.cpuShares',
     'apps.label', 'apps.tagsJson', 'apps.taskId', 'apps.reverseProxyConfigJson', 'apps.servicesConfigJson', 'apps.operatorsJson',
     'apps.sso', 'apps.debugModeJson', 'apps.enableBackup', 'apps.proxyAuth', 'apps.containerIp', 'apps.crontab',
-    'apps.creationTime', 'apps.updateTime', 'apps.enableAutomaticUpdate',
-    'apps.enableMailbox', 'apps.mailboxName', 'apps.mailboxDomain', 'apps.enableInbox', 'apps.inboxName', 'apps.inboxDomain',
-    'apps.dataDir', 'apps.ts', 'apps.healthTime', '(apps.icon IS NOT NULL) AS hasIcon', '(apps.appStoreIcon IS NOT NULL) AS hasAppStoreIcon' ].join(',');
+    'apps.creationTime', 'apps.updateTime', 'apps.enableAutomaticUpdate', 'apps.upstreamUri',
+    'apps.enableMailbox', 'apps.mailboxDisplayName', 'apps.mailboxName', 'apps.mailboxDomain', 'apps.enableInbox', 'apps.inboxName', 'apps.inboxDomain',
+    'apps.storageVolumeId', 'apps.storageVolumePrefix', 'apps.ts', 'apps.healthTime', '(apps.icon IS NOT NULL) AS hasIcon', '(apps.appStoreIcon IS NOT NULL) AS hasAppStoreIcon' ].join(',');
 
 // const PORT_BINDINGS_FIELDS = [ 'hostPort', 'type', 'environmentVariable', 'appId' ].join(',');
+const LOCATION_FIELDS = [ 'appId', 'subdomain', 'domain', 'type', 'certificateJson' ];
+
+const CHECKVOLUME_CMD = path.join(__dirname, 'scripts/checkvolume.sh');
 
 function validatePortBindings(portBindings, manifest) {
     assert.strictEqual(typeof portBindings, 'object');
@@ -210,7 +230,6 @@ function validatePortBindings(portBindings, manifest) {
         993, /* imaps */
         995, /* pop3s */
         2003, /* graphite (lo) */
-        2004, /* graphite (lo) */
         2514, /* cloudron-syslog (lo) */
         constants.PORT, /* app server (lo) */
         constants.AUTHWALL_PORT, /* protected sites */
@@ -221,7 +240,6 @@ function validatePortBindings(portBindings, manifest) {
         4190, /* managesieve */
         5349, /* turn,stun TLS */
         8000, /* ESXi monitoring */
-        8417, /* graphite (lo) */
     ];
 
     const RESERVED_PORT_RANGES = [
@@ -235,7 +253,10 @@ function validatePortBindings(portBindings, manifest) {
 
     if (!portBindings) return null;
 
-    for (let portName in portBindings) {
+    const tcpPorts = manifest.tcpPorts || { };
+    const udpPorts = manifest.udpPorts || { };
+
+    for (const portName in portBindings) {
         if (!/^[a-zA-Z0-9_]+$/.test(portName)) return new BoxError(BoxError.BAD_FIELD, `${portName} is not a valid environment variable in portBindings`);
 
         const hostPort = portBindings[portName];
@@ -243,14 +264,11 @@ function validatePortBindings(portBindings, manifest) {
         if (RESERVED_PORTS.indexOf(hostPort) !== -1) return new BoxError(BoxError.BAD_FIELD, `Port ${hostPort} for ${portName} is reserved in portBindings`);
         if (RESERVED_PORT_RANGES.find(range => (hostPort >= range[0] && hostPort <= range[1]))) return new BoxError(BoxError.BAD_FIELD, `Port ${hostPort} for ${portName} is reserved in portBindings`);
         if (ALLOWED_PORTS.indexOf(hostPort) === -1 && (hostPort <= 1023 || hostPort > 65535)) return new BoxError(BoxError.BAD_FIELD, `${hostPort} for ${portName} is not in permitted range in portBindings`);
-    }
 
-    // it is OK if there is no 1-1 mapping between values in manifest.tcpPorts and portBindings. missing values implies
-    // that the user wants the service disabled
-    const tcpPorts = manifest.tcpPorts || { };
-    const udpPorts = manifest.udpPorts || { };
-    for (let portName in portBindings) {
-        if (!(portName in tcpPorts) && !(portName in udpPorts)) return new BoxError(BoxError.BAD_FIELD, `Invalid portBindings ${portName}`);
+        // it is OK if there is no 1-1 mapping between values in manifest.tcpPorts and portBindings. missing values implies the service is disabled
+        const portSpec = tcpPorts[portName] || udpPorts[portName];
+        if (!portSpec) return new BoxError(BoxError.BAD_FIELD, `Invalid portBinding ${portName}`);
+        if (portSpec.readOnly && portSpec.defaultValue !== hostPort) return new BoxError(BoxError.BAD_FIELD, `portBinding ${portName} is readOnly and cannot have a different value that the default`);
     }
 
     return null;
@@ -450,6 +468,23 @@ function validateBackupFormat(format) {
     return new BoxError(BoxError.BAD_FIELD, 'Invalid backup format');
 }
 
+function validateUpstreamUri(upstreamUri) {
+    assert.strictEqual(typeof upstreamUri, 'string');
+
+    if (!upstreamUri) return new BoxError(BoxError.BAD_FIELD, 'upstreamUri cannot be empty');
+
+    const uri = safe(() => new URL(upstreamUri));
+    if (!uri) return new BoxError(BoxError.BAD_FIELD, `upstreamUri is invalid: ${safe.error.message}`);
+    if (uri.protocol !== 'http:' && uri.protocol !== 'https:') return new BoxError(BoxError.BAD_FIELD, 'upstreamUri has an unsupported scheme');
+    if (uri.search || uri.hash) return new BoxError(BoxError.BAD_FIELD, 'upstreamUri cannot have search or hash');
+    if (uri.pathname !== '/') return new BoxError(BoxError.BAD_FIELD, 'upstreamUri cannot have a path');
+
+    // we use the uri in a named location @wellknown-upstream. nginx does not support having paths in it
+    if (upstreamUri.endsWith('/')) return new BoxError(BoxError.BAD_FIELD, 'upstreamUri cannot have a path');
+
+    return null;
+}
+
 function validateLabel(label) {
     if (label === null) return null;
 
@@ -477,36 +512,36 @@ function validateEnv(env) {
     return null;
 }
 
-function validateDataDir(dataDir) {
-    if (dataDir === null) return null;
+async function checkStorage(app, volumeId, prefix) {
+    assert.strictEqual(typeof app, 'object');
+    assert.strictEqual(typeof volumeId, 'string');
+    assert.strictEqual(typeof prefix, 'string');
 
-    if (!path.isAbsolute(dataDir)) return new BoxError(BoxError.BAD_FIELD, `${dataDir} is not an absolute path`);
-    if (dataDir.endsWith('/')) return new BoxError(BoxError.BAD_FIELD, `${dataDir} contains trailing slash`);
-    if (path.normalize(dataDir) !== dataDir) return new BoxError(BoxError.BAD_FIELD, `${dataDir} is not a normalized path`);
+    const volume = await volumes.get(volumeId);
+    if (volume === null) throw new BoxError(BoxError.BAD_FIELD, 'Storage volume not found');
 
-    // nfs shares will have the directory mounted already
-    let stat = safe.fs.lstatSync(dataDir);
-    if (stat) {
-        if (!stat.isDirectory()) return new BoxError(BoxError.BAD_FIELD, `${dataDir} is not a directory`);
-        let entries = safe.fs.readdirSync(dataDir);
-        if (!entries) return new BoxError(BoxError.BAD_FIELD, `${dataDir} could not be listed`);
-        if (entries.length !== 0) return new BoxError(BoxError.BAD_FIELD, `${dataDir} is not empty. If this is the root of a mounted volume, provide a subdirectory.`);
-    }
+    const status = await volumes.getStatus(volume);
+    if (status.state !== 'active') throw new BoxError(BoxError.BAD_FIELD, 'Volume is not active');
 
-    // backup logic relies on paths not overlapping (because it recurses)
-    if (dataDir.startsWith(paths.APPS_DATA_DIR)) return new BoxError(BoxError.BAD_FIELD, `${dataDir} cannot be inside apps data`);
+    if (path.isAbsolute(prefix)) throw new BoxError(BoxError.BAD_FIELD, `prefix "${prefix}" must be a relative path`);
+    if (prefix.endsWith('/')) throw new BoxError(BoxError.BAD_FIELD, `prefix "${prefix}" contains trailing slash`);
+    if (prefix !== '' && path.normalize(prefix) !== prefix) throw new BoxError(BoxError.BAD_FIELD, `prefix "${prefix}" is not a normalized path`);
 
-    // 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 BoxError(BoxError.BAD_FIELD, `${dataDir} cannot be placed inside this location`);
+    const sourceDir = await getStorageDir(app);
+    const targetDir = path.join(volume.hostPath, prefix);
+    const rel = path.relative(sourceDir, targetDir);
+    if (!rel.startsWith('../') && rel.split('/').length > 1) throw new BoxError(BoxError.BAD_FIELD, 'Only one level subdirectory moves are supported');
+
+    const [error] = await safe(shell.promises.sudo('checkStorage', [ CHECKVOLUME_CMD, targetDir, sourceDir ], {}));
+    if (error && error.code === 2) throw new BoxError(BoxError.BAD_FIELD, `Target directory ${targetDir} is not empty`);
+    if (error && error.code === 3) throw new BoxError(BoxError.BAD_FIELD, `Target directory ${targetDir} does not support chown`);
 
     return null;
 }
 
-function getDuplicateErrorDetails(errorMessage, locations, domainObjectMap, portBindings) {
+function getDuplicateErrorDetails(errorMessage, locations, portBindings) {
     assert.strictEqual(typeof errorMessage, 'string');
     assert(Array.isArray(locations));
-    assert.strictEqual(typeof domainObjectMap, 'object');
     assert.strictEqual(typeof portBindings, 'object');
 
     const match = errorMessage.match(/ER_DUP_ENTRY: Duplicate entry '(.*)' for key '(.*)'/);
@@ -521,7 +556,7 @@ function getDuplicateErrorDetails(errorMessage, locations, domainObjectMap, port
             const { subdomain, domain, type } = locations[i];
             if  (match[1] !== `${subdomain}-${domain}`) continue;
 
-            return new BoxError(BoxError.ALREADY_EXISTS, `${type} location '${dns.fqdn(subdomain, domainObjectMap[domain])}' is in use`);
+            return new BoxError(BoxError.ALREADY_EXISTS, `${type} location '${dns.fqdn(subdomain, domain)}' is in use`);
         }
     }
 
@@ -530,34 +565,52 @@ function getDuplicateErrorDetails(errorMessage, locations, domainObjectMap, port
         if (portBindings[portName] === parseInt(match[1])) return new BoxError(BoxError.ALREADY_EXISTS, `Port ${match[1]} is in use`);
     }
 
-    if (match[2] === 'dataDir') {
-        return new BoxError(BoxError.BAD_FIELD, `Data directory ${match[1]} is in use`);
+    if (match[2] === 'apps_storageVolume') {
+        return new BoxError(BoxError.BAD_FIELD, `Storage directory ${match[1]} is in use`);
     }
 
     return new BoxError(BoxError.ALREADY_EXISTS, `${match[2]} '${match[1]}' is in use`);
 }
 
-function getDataDir(app, dataDir) {
-    assert(dataDir === null || typeof dataDir === 'string');
+async function getStorageDir(app) {
+    assert.strictEqual(typeof app, 'object');
 
-    return dataDir || path.join(paths.APPS_DATA_DIR, app.id, 'data');
+    if (!app.storageVolumeId) return path.join(paths.APPS_DATA_DIR, app.id, 'data');
+    const volume = await volumes.get(app.storageVolumeId);
+    if (!volume) throw new BoxError(BoxError.NOT_FOUND, 'Volume not found'); // not possible
+    return path.join(volume.hostPath, app.storageVolumePrefix);
+}
+
+function removeCertificateKeys(app) {
+    if (app.certificate) delete app.certificate.key;
+    app.secondaryDomains.forEach(sd => { if (sd.certificate) delete sd.certificate.key; });
+    app.aliasDomains.forEach(ad => { if (ad.certificate) delete ad.certificate.key; });
+    app.redirectDomains.forEach(rd => { if (rd.certificate) delete rd.certificate.key; });
 }
 
 function removeInternalFields(app) {
-    return _.pick(app,
+    const result = _.pick(app,
         'id', 'appStoreId', 'installationState', 'error', 'runState', 'health', 'taskId',
-        'subdomain', 'domain', 'fqdn', 'crontab',
+        'subdomain', 'domain', 'fqdn', 'certificate', 'crontab', 'upstreamUri',
         'accessRestriction', 'manifest', 'portBindings', 'iconUrl', 'memoryLimit', 'cpuShares', 'operators',
         'sso', 'debugMode', 'reverseProxyConfig', 'enableBackup', 'creationTime', 'updateTime', 'ts', 'tags',
-        'label', 'secondaryDomains', 'redirectDomains', 'aliasDomains', 'env', 'enableAutomaticUpdate', 'dataDir', 'mounts',
-        'enableMailbox', 'mailboxName', 'mailboxDomain', 'enableInbox', 'inboxName', 'inboxDomain');
+        'label', 'secondaryDomains', 'redirectDomains', 'aliasDomains', 'env', 'enableAutomaticUpdate',
+        'storageVolumeId', 'storageVolumePrefix', 'mounts', 'repository',
+        'enableMailbox', 'mailboxDisplayName', 'mailboxName', 'mailboxDomain', 'enableInbox', 'inboxName', 'inboxDomain');
+
+    removeCertificateKeys(result);
+    return result;
 }
 
 // non-admins can only see these
 function removeRestrictedFields(app) {
-    return _.pick(app,
-        'id', 'appStoreId', 'installationState', 'error', 'runState', 'health', 'taskId', 'accessRestriction', 'secondaryDomains', 'redirectDomains', 'aliasDomains', 'sso',
-        'subdomain', 'domain', 'fqdn', 'manifest', 'portBindings', 'iconUrl', 'creationTime', 'ts', 'tags', 'label', 'enableBackup');
+    const result = _.pick(app,
+        'id', 'appStoreId', 'installationState', 'error', 'runState', 'health', 'taskId', 'accessRestriction', 'repository',
+        'secondaryDomains', 'redirectDomains', 'aliasDomains', 'sso', 'subdomain', 'domain', 'fqdn', 'certificate',
+        'manifest', 'portBindings', 'iconUrl', 'creationTime', 'ts', 'tags', 'label', 'enableBackup', 'upstreamUri');
+
+    removeCertificateKeys(result);
+    return result;
 }
 
 async function getIcon(app, options) {
@@ -655,30 +708,35 @@ function postProcess(result) {
     const subdomains = JSON.parse(result.subdomains),
         domains = JSON.parse(result.domains),
         subdomainTypes = JSON.parse(result.subdomainTypes),
-        subdomainEnvironmentVariables = JSON.parse(result.subdomainEnvironmentVariables);
+        subdomainEnvironmentVariables = JSON.parse(result.subdomainEnvironmentVariables),
+        subdomainCertificateJsons = JSON.parse(result.subdomainCertificateJsons);
 
     delete result.subdomains;
     delete result.domains;
     delete result.subdomainTypes;
     delete result.subdomainEnvironmentVariables;
+    delete result.subdomainCertificateJsons;
 
     result.secondaryDomains = [];
     result.redirectDomains = [];
     result.aliasDomains = [];
     for (let i = 0; i < subdomainTypes.length; i++) {
+        const subdomain = subdomains[i], domain = domains[i], certificate = safe.JSON.parse(subdomainCertificateJsons[i]);
+
         if (subdomainTypes[i] === exports.LOCATION_TYPE_PRIMARY) {
-            result.subdomain = subdomains[i];
-            result.domain = domains[i];
+            result.subdomain = subdomain;
+            result.domain = domain;
+            result.certificate = certificate;
         } else if (subdomainTypes[i] === exports.LOCATION_TYPE_SECONDARY) {
-            result.secondaryDomains.push({ domain: domains[i], subdomain: subdomains[i], environmentVariable: subdomainEnvironmentVariables[i] });
+            result.secondaryDomains.push({ domain, subdomain, certificate, environmentVariable: subdomainEnvironmentVariables[i] });
         } else if (subdomainTypes[i] === exports.LOCATION_TYPE_REDIRECT) {
-            result.redirectDomains.push({ domain: domains[i], subdomain: subdomains[i] });
+            result.redirectDomains.push({ domain, subdomain, certificate });
         } else if (subdomainTypes[i] === exports.LOCATION_TYPE_ALIAS) {
-            result.aliasDomains.push({ domain: domains[i], subdomain: subdomains[i] });
+            result.aliasDomains.push({ domain, subdomain, certificate });
         }
     }
 
-    let envNames = JSON.parse(result.envNames), envValues = JSON.parse(result.envValues);
+    const envNames = JSON.parse(result.envNames), envValues = JSON.parse(result.envValues);
     delete result.envNames;
     delete result.envValues;
     result.env = {};
@@ -686,7 +744,7 @@ function postProcess(result) {
         if (envNames[i]) result.env[envNames[i]] = envValues[i];
     }
 
-    let volumeIds = JSON.parse(result.volumeIds);
+    const volumeIds = JSON.parse(result.volumeIds);
     delete result.volumeIds;
     let volumeReadOnlys = JSON.parse(result.volumeReadOnlys);
     delete result.volumeReadOnlys;
@@ -697,6 +755,11 @@ function postProcess(result) {
     delete result.errorJson;
 
     result.taskId = result.taskId ? String(result.taskId) : null;
+
+    // package repository is currently determined by dockerImage
+    if (!result.manifest.dockerImage) result.repository = '';
+    else if (result.manifest.dockerImage.startsWith('cloudron/')) result.repository = exports.REPOSITORY_CORE;
+    else result.repository = exports.REPOSITORY_COMMUNITY;
 }
 
 function attachProperties(app, domainObjectMap) {
@@ -709,10 +772,10 @@ function attachProperties(app, domainObjectMap) {
     }
     app.portBindings = result;
     app.iconUrl = app.hasIcon || app.hasAppStoreIcon  ? `/api/v1/apps/${app.id}/icon` : null;
-    app.fqdn = dns.fqdn(app.subdomain, domainObjectMap[app.domain]);
-    app.secondaryDomains.forEach(function (ad) { ad.fqdn = dns.fqdn(ad.subdomain, domainObjectMap[ad.domain]); });
-    app.redirectDomains.forEach(function (ad) { ad.fqdn = dns.fqdn(ad.subdomain, domainObjectMap[ad.domain]); });
-    app.aliasDomains.forEach(function (ad) { ad.fqdn = dns.fqdn(ad.subdomain, domainObjectMap[ad.domain]); });
+    app.fqdn = dns.fqdn(app.subdomain, app.domain);
+    app.secondaryDomains.forEach(function (ad) { ad.fqdn = dns.fqdn(ad.subdomain, ad.domain); });
+    app.redirectDomains.forEach(function (ad) { ad.fqdn = dns.fqdn(ad.subdomain, ad.domain); });
+    app.aliasDomains.forEach(function (ad) { ad.fqdn = dns.fqdn(ad.subdomain, ad.domain); });
 }
 
 function isAdmin(user) {
@@ -722,7 +785,7 @@ function isAdmin(user) {
 }
 
 function isOperator(app, user) {
-    assert.strictEqual(typeof app, 'object');
+    assert.strictEqual(typeof app, 'object');  // IMPORTANT: can also be applink
     assert.strictEqual(typeof user, 'object');
 
     if (!app.operators) return isAdmin(user);
@@ -735,7 +798,7 @@ function isOperator(app, user) {
 }
 
 function canAccess(app, user) {
-    assert.strictEqual(typeof app, 'object');
+    assert.strictEqual(typeof app, 'object'); // IMPORTANT: can also be applink
     assert.strictEqual(typeof user, 'object');
 
     if (app.accessRestriction === null) return true;
@@ -779,9 +842,11 @@ async function add(id, appStoreId, manifest, subdomain, domain, portBindings, da
         tagsJson = data.tags ? JSON.stringify(data.tags) : null,
         mailboxName = data.mailboxName || null,
         mailboxDomain = data.mailboxDomain || null,
+        mailboxDisplayName = data.mailboxDisplayName || '',
         reverseProxyConfigJson = data.reverseProxyConfig ? JSON.stringify(data.reverseProxyConfig) : null,
         servicesConfigJson = data.servicesConfig ? JSON.stringify(data.servicesConfig) : null,
         enableMailbox = data.enableMailbox || false,
+        upstreamUri = data.upstreamUri || '',
         icon = data.icon || null;
 
     const queries = [];
@@ -789,10 +854,11 @@ async function add(id, appStoreId, manifest, subdomain, domain, portBindings, da
     queries.push({
         query: 'INSERT INTO apps (id, appStoreId, manifestJson, installationState, runState, accessRestrictionJson, memoryLimit, cpuShares, '
             + 'sso, debugModeJson, mailboxName, mailboxDomain, label, tagsJson, reverseProxyConfigJson, servicesConfigJson, icon, '
-            + 'enableMailbox) '
-            + ' VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)',
+            + 'enableMailbox, mailboxDisplayName, upstreamUri) '
+            + ' VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)',
         args: [ id, appStoreId, manifestJson, installationState, runState, accessRestrictionJson, memoryLimit, cpuShares,
-            sso, debugModeJson, mailboxName, mailboxDomain, label, tagsJson, reverseProxyConfigJson, servicesConfigJson, icon, enableMailbox ]
+            sso, debugModeJson, mailboxName, mailboxDomain, label, tagsJson, reverseProxyConfigJson, servicesConfigJson, icon,
+            enableMailbox, mailboxDisplayName, upstreamUri ]
     });
 
     queries.push({
@@ -1005,19 +1071,12 @@ async function clear() {
     await database.query('DELETE FROM apps');
 }
 
-async function getDomainObjectMap() {
-    const domainObjects = await domains.list();
-    let domainObjectMap = {};
-    for (let d of domainObjects) { domainObjectMap[d.domain] = d; }
-    return domainObjectMap;
-}
-
 // each query simply join apps table with another table by id. we then join the full result together
 const PB_QUERY = 'SELECT id, GROUP_CONCAT(CAST(appPortBindings.hostPort AS CHAR(6))) AS hostPorts, GROUP_CONCAT(appPortBindings.environmentVariable) AS environmentVariables, GROUP_CONCAT(appPortBindings.type) AS portTypes FROM apps LEFT JOIN appPortBindings ON apps.id = appPortBindings.appId GROUP BY apps.id';
 const ENV_QUERY = 'SELECT id, JSON_ARRAYAGG(appEnvVars.name) AS envNames, JSON_ARRAYAGG(appEnvVars.value) AS envValues FROM apps LEFT JOIN appEnvVars ON apps.id = appEnvVars.appId GROUP BY apps.id';
-const SUBDOMAIN_QUERY = 'SELECT id, JSON_ARRAYAGG(locations.subdomain) AS subdomains, JSON_ARRAYAGG(locations.domain) AS domains, JSON_ARRAYAGG(locations.type) AS subdomainTypes, JSON_ARRAYAGG(locations.environmentVariable) AS subdomainEnvironmentVariables FROM apps LEFT JOIN locations ON apps.id = locations.appId GROUP BY apps.id';
+const SUBDOMAIN_QUERY = 'SELECT id, JSON_ARRAYAGG(locations.subdomain) AS subdomains, JSON_ARRAYAGG(locations.domain) AS domains, JSON_ARRAYAGG(locations.type) AS subdomainTypes, JSON_ARRAYAGG(locations.environmentVariable) AS subdomainEnvironmentVariables, JSON_ARRAYAGG(locations.certificateJson) AS subdomainCertificateJsons FROM apps LEFT JOIN locations ON apps.id = locations.appId GROUP BY apps.id';
 const MOUNTS_QUERY = 'SELECT id, JSON_ARRAYAGG(appMounts.volumeId) AS volumeIds, JSON_ARRAYAGG(appMounts.readOnly) AS volumeReadOnlys FROM apps LEFT JOIN appMounts ON apps.id = appMounts.appId GROUP BY apps.id';
-const APPS_QUERY = `SELECT ${APPS_FIELDS_PREFIXED}, hostPorts, environmentVariables, portTypes, envNames, envValues, subdomains, domains, subdomainTypes, subdomainEnvironmentVariables, volumeIds, volumeReadOnlys FROM apps`
+const APPS_QUERY = `SELECT ${APPS_FIELDS_PREFIXED}, hostPorts, environmentVariables, portTypes, envNames, envValues, subdomains, domains, subdomainTypes, subdomainEnvironmentVariables, subdomainCertificateJsons, volumeIds, volumeReadOnlys FROM apps`
     + ` LEFT JOIN (${PB_QUERY}) AS q1 on q1.id = apps.id`
     + ` LEFT JOIN (${ENV_QUERY}) AS q2 on q2.id = apps.id`
     + ` LEFT JOIN (${SUBDOMAIN_QUERY}) AS q3 on q3.id = apps.id`
@@ -1026,7 +1085,7 @@ const APPS_QUERY = `SELECT ${APPS_FIELDS_PREFIXED}, hostPorts, environmentVariab
 async function get(id) {
     assert.strictEqual(typeof id, 'string');
 
-    const domainObjectMap = await getDomainObjectMap();
+    const domainObjectMap = await domains.getDomainObjectMap();
 
     const result = await database.query(`${APPS_QUERY} WHERE apps.id = ?`, [ id ]);
     if (result.length === 0) return null;
@@ -1041,7 +1100,7 @@ async function get(id) {
 async function getByIpAddress(ip) {
     assert.strictEqual(typeof ip, 'string');
 
-    const domainObjectMap = await getDomainObjectMap();
+    const domainObjectMap = await domains.getDomainObjectMap();
 
     const result = await database.query(`${APPS_QUERY} WHERE apps.containerIp = ?`, [ ip ]);
     if (result.length === 0) return null;
@@ -1052,7 +1111,7 @@ async function getByIpAddress(ip) {
 }
 
 async function list() {
-    const domainObjectMap = await getDomainObjectMap();
+    const domainObjectMap = await domains.getDomainObjectMap();
 
     const results = await database.query(`${APPS_QUERY} ORDER BY apps.id`, [ ]);
     results.forEach(postProcess);
@@ -1228,10 +1287,10 @@ function checkAppState(app, state) {
 async function validateLocations(locations) {
     assert(Array.isArray(locations));
 
-    const domainObjectMap = await getDomainObjectMap();
+    const domainObjectMap = await domains.getDomainObjectMap();
 
-    for (let location of locations) {
-        if (!(location.domain in domainObjectMap)) throw new BoxError(BoxError.BAD_FIELD, `No such domain in ${location.type} location`);
+    for (const location of locations) {
+        if (!(location.domain in domainObjectMap)) return new BoxError(BoxError.BAD_FIELD, `No such domain in ${location.type} location`);
 
         let subdomain = location.subdomain;
         if (location.type === exports.LOCATION_TYPE_ALIAS && subdomain.startsWith('*')) {
@@ -1239,11 +1298,11 @@ async function validateLocations(locations) {
             subdomain = subdomain.replace(/^\*\./, ''); // remove *.
         }
 
-        const error = dns.validateHostname(subdomain, domainObjectMap[location.domain]);
-        if (error) throw new BoxError(BoxError.BAD_FIELD, `Bad ${location.type} location: ${error.message}`);
+        const error = dns.validateHostname(subdomain, location.domain);
+        if (error) return new BoxError(BoxError.BAD_FIELD, `Bad ${location.type} location: ${error.message}`);
     }
 
-    return domainObjectMap;
+    return null;
 }
 
 async function getCount() {
@@ -1273,6 +1332,7 @@ async function install(data, auditSource) {
         overwriteDns = 'overwriteDns' in data ? data.overwriteDns : false,
         skipDnsSetup = 'skipDnsSetup' in data ? data.skipDnsSetup : false,
         appStoreId = data.appStoreId,
+        upstreamUri = data.upstreamUri || '',
         manifest = data.manifest;
 
     let error = manifestFormat.parse(manifest);
@@ -1296,6 +1356,9 @@ async function install(data, auditSource) {
     error = validateLabel(label);
     if (error) throw error;
 
+    if ('upstreamUri' in data) error = validateUpstreamUri(upstreamUri);
+    if (error) throw error;
+
     error = validateTags(tags);
     if (error) throw error;
 
@@ -1324,12 +1387,13 @@ async function install(data, auditSource) {
         icon = Buffer.from(icon, 'base64');
     }
 
-    const locations = [{ subdomain: subdomain, domain, type: exports.LOCATION_TYPE_PRIMARY }]
+    const locations = [{ subdomain, domain, type: exports.LOCATION_TYPE_PRIMARY }]
         .concat(secondaryDomains.map(ad => _.extend(ad, { type: exports.LOCATION_TYPE_SECONDARY })))
         .concat(redirectDomains.map(ad => _.extend(ad, { type: exports.LOCATION_TYPE_REDIRECT })))
         .concat(aliasDomains.map(ad => _.extend(ad, { type: exports.LOCATION_TYPE_ALIAS })));
 
-    const domainObjectMap = await validateLocations(locations);
+    error = await validateLocations(locations);
+    if (error) throw error;
 
     if (settings.isDemo() && (await getCount() >= constants.DEMO_APP_LIMIT)) throw new BoxError(BoxError.BAD_STATE, 'Too many installed apps, please uninstall a few and try again');
 
@@ -1353,12 +1417,13 @@ async function install(data, auditSource) {
         tags,
         icon,
         enableMailbox,
+        upstreamUri,
         runState: exports.RSTATE_RUNNING,
         installationState: exports.ISTATE_PENDING_INSTALL
     };
 
     const [addError] = await safe(add(appId, appStoreId, manifest, subdomain, domain, translatePortBindings(portBindings, manifest), app));
-    if (addError && addError.reason === BoxError.ALREADY_EXISTS) throw getDuplicateErrorDetails(addError.message, locations, domainObjectMap, portBindings);
+    if (addError && addError.reason === BoxError.ALREADY_EXISTS) throw getDuplicateErrorDetails(addError.message, locations, portBindings);
     if (addError) throw addError;
 
     await purchaseApp({ appId, appstoreId: appStoreId, manifestId: manifest.id || 'customapp' });
@@ -1372,10 +1437,10 @@ async function install(data, auditSource) {
     const taskId = await addTask(appId, app.installationState, task, auditSource);
 
     const newApp = _.extend({}, _.omit(app, 'icon'), { appStoreId, manifest, subdomain, domain, portBindings });
-    newApp.fqdn = dns.fqdn(newApp.subdomain, domainObjectMap[newApp.domain]);
-    newApp.secondaryDomains.forEach(function (ad) { ad.fqdn = dns.fqdn(ad.subdomain, domainObjectMap[ad.domain]); });
-    newApp.redirectDomains.forEach(function (ad) { ad.fqdn = dns.fqdn(ad.subdomain, domainObjectMap[ad.domain]); });
-    newApp.aliasDomains.forEach(function (ad) { ad.fqdn = dns.fqdn(ad.subdomain, domainObjectMap[ad.domain]); });
+    newApp.fqdn = dns.fqdn(newApp.subdomain, newApp.domain);
+    newApp.secondaryDomains.forEach(function (ad) { ad.fqdn = dns.fqdn(ad.subdomain, ad.domain); });
+    newApp.redirectDomains.forEach(function (ad) { ad.fqdn = dns.fqdn(ad.subdomain, ad.domain); });
+    newApp.aliasDomains.forEach(function (ad) { ad.fqdn = dns.fqdn(ad.subdomain, ad.domain); });
 
     await eventlog.add(eventlog.ACTION_APP_INSTALL, auditSource, { appId, app: newApp, taskId });
 
@@ -1420,6 +1485,22 @@ async function setCrontab(app, crontab, auditSource) {
     await eventlog.add(eventlog.ACTION_APP_CONFIGURE, auditSource, { appId, app, crontab });
 }
 
+async function setUpstreamUri(app, upstreamUri, auditSource) {
+    assert.strictEqual(typeof app, 'object');
+    assert.strictEqual(typeof upstreamUri, 'string');
+    assert.strictEqual(typeof auditSource, 'object');
+
+    const appId = app.id;
+    const error = validateUpstreamUri(upstreamUri);
+    if (error) throw error;
+
+    await reverseProxy.writeAppConfigs(_.extend({}, app, { upstreamUri }));
+
+    await update(appId, { upstreamUri });
+
+    await eventlog.add(eventlog.ACTION_APP_CONFIGURE, auditSource, { appId, app, upstreamUri });
+}
+
 async function setLabel(app, label, auditSource) {
     assert.strictEqual(typeof app, 'object');
     assert.strictEqual(typeof label, 'string');
@@ -1593,6 +1674,7 @@ async function setMailbox(app, data, auditSource) {
     const optional = 'optional' in app.manifest.addons.sendmail ? app.manifest.addons.sendmail.optional : false;
     if (!optional && !enableMailbox) throw new BoxError(BoxError.BAD_FIELD, 'App requires sendmail to be enabled');
 
+    const mailboxDisplayName = data.mailboxDisplayName || '';
     let mailboxName = data.mailboxName || null;
     const mailboxDomain = data.mailboxDomain || null;
 
@@ -1605,15 +1687,20 @@ async function setMailbox(app, data, auditSource) {
         } else {
             mailboxName = mailboxNameForSubdomain(app.subdomain, app.domain, app.manifest);
         }
+
+        if (mailboxDisplayName) {
+            error = mail.validateDisplayName(mailboxDisplayName);
+            if (error) throw new BoxError(BoxError.BAD_FIELD, error.message);
+        }
     }
 
     const task = {
         args: {},
-        values: { enableMailbox, mailboxName, mailboxDomain }
+        values: { enableMailbox, mailboxName, mailboxDomain, mailboxDisplayName }
     };
     const taskId = await addTask(appId, exports.ISTATE_PENDING_RECREATE_CONTAINER, task, auditSource);
 
-    await eventlog.add(eventlog.ACTION_APP_CONFIGURE, auditSource, { appId, app, mailboxName, mailboxDomain, taskId });
+    await eventlog.add(eventlog.ACTION_APP_CONFIGURE, auditSource, { appId, app, mailboxName, mailboxDomain, mailboxDisplayName, taskId });
 
     return { taskId };
 }
@@ -1687,7 +1774,7 @@ async function setReverseProxyConfig(app, reverseProxyConfig, auditSource) {
     error = validateRobotsTxt(reverseProxyConfig.robotsTxt);
     if (error) throw error;
 
-    await reverseProxy.writeAppConfig(_.extend({}, app, { reverseProxyConfig }));
+    await reverseProxy.writeAppConfigs(_.extend({}, app, { reverseProxyConfig }));
 
     await update(appId, { reverseProxyConfig });
 
@@ -1699,18 +1786,35 @@ async function setCertificate(app, data, auditSource) {
     assert(data && typeof data === 'object');
     assert.strictEqual(typeof auditSource, 'object');
 
-    const appId = app.id;
-    const { location, domain, cert, key } = data;
+    const { subdomain, domain, cert, key } = data;
 
     const domainObject = await domains.get(domain);
+    if (domainObject === null) throw new BoxError(BoxError.NOT_FOUND, 'Domain not found');
 
     if (cert && key) {
-        const error = reverseProxy.validateCertificate(location, domainObject, { cert, key });
+        const error = reverseProxy.validateCertificate(subdomain, domain, { cert, key });
         if (error) throw error;
     }
 
-    await reverseProxy.setAppCertificate(location, domainObject, { cert, key });
-    await eventlog.add(eventlog.ACTION_APP_CONFIGURE, auditSource, { appId, app, cert, key });
+    const certificate = cert && key ? { cert, key } : null;
+    const result = await database.query('UPDATE locations SET certificateJson=? WHERE location=? AND domain=?', [ certificate ? JSON.stringify(certificate) : null, subdomain, domain ]);
+    if (result.affectedRows === 0) throw new BoxError(BoxError.NOT_FOUND, 'Location not found');
+
+    const location = await getLocation(subdomain, domain); // fresh location object
+    await reverseProxy.setUserCertificate(app, location);
+    await eventlog.add(eventlog.ACTION_APP_CONFIGURE, auditSource, { appId: app.id, app, subdomain, domain, cert });
+}
+
+async function getLocation(subdomain, domain) {
+    assert.strictEqual(typeof subdomain, 'string');
+    assert.strictEqual(typeof domain, 'string');
+
+    const result = await database.query(`SELECT ${LOCATION_FIELDS} FROM locations WHERE subdomain=? AND domain=?`, [ subdomain, domain ]);
+    if (result.length === 0) return null;
+
+    result[0].certificate = safe.JSON.parse(result[0].certificateJson);
+    result[0].fqdn = dns.fqdn(subdomain, domain);
+    return result[0];
 }
 
 async function setLocation(app, data, auditSource) {
@@ -1762,7 +1866,8 @@ async function setLocation(app, data, auditSource) {
         .concat(values.redirectDomains.map(ad => _.extend(ad, { type: exports.LOCATION_TYPE_REDIRECT })))
         .concat(values.aliasDomains.map(ad => _.extend(ad, { type: exports.LOCATION_TYPE_ALIAS })));
 
-    const domainObjectMap = await validateLocations(locations);
+    error = await validateLocations(locations);
+    if (error) throw error;
 
     const task = {
         args: {
@@ -1773,38 +1878,42 @@ async function setLocation(app, data, auditSource) {
         values
     };
     let [taskError, taskId] = await safe(addTask(appId, exports.ISTATE_PENDING_LOCATION_CHANGE, task, auditSource));
-    if (taskError && taskError.reason === BoxError.ALREADY_EXISTS) taskError = getDuplicateErrorDetails(taskError.message, locations, domainObjectMap, data.portBindings);
+    if (taskError && taskError.reason === BoxError.ALREADY_EXISTS) taskError = getDuplicateErrorDetails(taskError.message, locations, data.portBindings);
     if (taskError) throw taskError;
 
-    values.fqdn = dns.fqdn(values.subdomain, domainObjectMap[values.domain]);
-    values.secondaryDomains.forEach(function (ad) { ad.fqdn = dns.fqdn(ad.subdomain, domainObjectMap[ad.domain]); });
-    values.redirectDomains.forEach(function (ad) { ad.fqdn = dns.fqdn(ad.subdomain, domainObjectMap[ad.domain]); });
-    values.aliasDomains.forEach(function (ad) { ad.fqdn = dns.fqdn(ad.subdomain, domainObjectMap[ad.domain]); });
+    values.fqdn = dns.fqdn(values.subdomain, values.domain);
+    values.secondaryDomains.forEach(function (ad) { ad.fqdn = dns.fqdn(ad.subdomain, ad.domain); });
+    values.redirectDomains.forEach(function (ad) { ad.fqdn = dns.fqdn(ad.subdomain, ad.domain); });
+    values.aliasDomains.forEach(function (ad) { ad.fqdn = dns.fqdn(ad.subdomain, ad.domain); });
 
     await eventlog.add(eventlog.ACTION_APP_CONFIGURE, auditSource, _.extend({ appId, app, taskId }, values));
 
     return { taskId };
 }
 
-async function setDataDir(app, dataDir, auditSource) {
+async function setStorage(app, volumeId, volumePrefix, auditSource) {
     assert.strictEqual(typeof app, 'object');
-    assert(dataDir === null || typeof dataDir === 'string');
+    assert(volumeId === null || typeof volumeId === 'string');
+    assert(volumePrefix === null || typeof volumePrefix === 'string');
     assert.strictEqual(typeof auditSource, 'object');
 
     const appId = app.id;
     let error = checkAppState(app, exports.ISTATE_PENDING_DATA_DIR_MIGRATION);
     if (error) throw error;
 
-    error = validateDataDir(dataDir);
-    if (error) throw error;
+    if (volumeId) {
+        await checkStorage(app, volumeId, volumePrefix);
+    } else {
+        volumeId = volumePrefix = null;
+    }
 
     const task = {
-        args: { newDataDir: dataDir },
+        args: { newStorageVolumeId: volumeId, newStorageVolumePrefix: volumePrefix },
         values: {}
     };
     const taskId = await addTask(appId, exports.ISTATE_PENDING_DATA_DIR_MIGRATION, task, auditSource);
 
-    await eventlog.add(eventlog.ACTION_APP_CONFIGURE, auditSource, { appId, app, dataDir, taskId });
+    await eventlog.add(eventlog.ACTION_APP_CONFIGURE, auditSource, { appId, app, volumeId, volumePrefix, taskId });
 
     return { taskId };
 }
@@ -1937,38 +2046,22 @@ async function getLogs(app, options) {
     const logPaths = await getLogPaths(app);
     const cp = spawn('/usr/bin/tail', args.concat(logPaths));
 
-    const transformStream = split(function mapper(line) {
-        if (format !== 'json') return line + '\n';
+    const logStream = new LogStream({ format, source: appId });
+    logStream.close = cp.kill.bind(cp, 'SIGKILL'); // hook for caller. closing stream kills the child process
 
-        const data = line.split(' '); // logs are <ISOtimestamp> <msg>
-        let timestamp = (new Date(data[0])).getTime();
-        if (isNaN(timestamp)) timestamp = 0;
-        const message = line.slice(data[0].length+1);
+    cp.stdout.pipe(logStream);
 
-        // ignore faulty empty logs
-        if (!timestamp && !message) return;
-
-        return JSON.stringify({
-            realtimeTimestamp: timestamp * 1000,
-            message: message,
-            source: appId
-        }) + '\n';
-    });
-
-    transformStream.close = cp.kill.bind(cp, 'SIGKILL'); // closing stream kills the child process
-
-    cp.stdout.pipe(transformStream);
-
-    return transformStream;
+    return logStream;
 }
 
-async function getCertificate(subdomain, domain) {
-    assert.strictEqual(typeof subdomain, 'string');
-    assert.strictEqual(typeof domain, 'string');
+// never fails just prints error
+async function appendLogLine(app, line) {
+    assert.strictEqual(typeof app, 'object');
+    assert.strictEqual(typeof line, 'string');
 
-    const result = await database.query('SELECT certificateJson FROM locations WHERE subdomain=? AND domain=?', [ subdomain, domain ]);
-    if (result.length === 0) return null;
-    return JSON.parse(result[0].certificateJson);
+    const logFilePath = path.join(paths.LOG_DIR, app.id, 'app.log');
+
+    if (!safe.fs.appendFileSync(logFilePath, line)) console.error(`Could not append log line for app ${app.id} at ${logFilePath}: ${safe.error.message}`);
 }
 
 // does a re-configure when called from most states. for install/clone errors, it re-installs with an optional manifest
@@ -2076,20 +2169,18 @@ async function importApp(app, data, auditSource) {
 
     const appId = app.id;
 
-    // all fields are optional
-    data.remotePath = data.remotePath || null;
-    data.backupFormat = data.backupFormat || null;
-    data.backupConfig = data.backupConfig || null;
     const { remotePath, backupFormat, backupConfig } = data;
 
-    let error = backupFormat ? validateBackupFormat(backupFormat) : null;
+    let error = checkAppState(app, exports.ISTATE_PENDING_IMPORT);
     if (error) throw error;
 
-    error = checkAppState(app, exports.ISTATE_PENDING_IMPORT);
-    if (error) throw error;
+    let restoreConfig;
 
-    // TODO: make this smarter to do a read-only test and check if the file exists in the storage backend
-    if (backupConfig) {
+    if (data.remotePath) { // if not provided, we import in-place
+        error = validateBackupFormat(backupFormat);
+        if (error) throw error;
+
+        // TODO: make this smarter to do a read-only test and check if the file exists in the storage backend
         if (mounts.isManagedProvider(backupConfig.provider)) {
             error = mounts.validateMountOptions(backupConfig.provider, backupConfig.mountOptions);
             if (error) throw error;
@@ -2105,18 +2196,18 @@ async function importApp(app, data, auditSource) {
         }
         error = await backups.testProviderConfig(backupConfig);
         if (error) throw error;
-    }
 
-    if (backupConfig) {
         if ('password' in backupConfig) {
             backupConfig.encryption = backups.generateEncryptionKeysSync(backupConfig.password);
             delete backupConfig.password;
         } else {
             backupConfig.encryption = null;
         }
-    }
 
-    const restoreConfig = { remotePath, backupFormat, backupConfig };
+        restoreConfig = { remotePath, backupFormat, backupConfig };
+    } else {
+        restoreConfig = { remotePath: null };
+    }
 
     const task = {
         args: {
@@ -2195,10 +2286,11 @@ async function clone(app, data, user, auditSource) {
     if (error) throw error;
     const secondaryDomains = translateSecondaryDomains(data.secondaryDomains || {});
 
-    const locations = [{ subdomain: subdomain, domain, type: exports.LOCATION_TYPE_PRIMARY }]
+    const locations = [{ subdomain, domain, type: exports.LOCATION_TYPE_PRIMARY }]
         .concat(secondaryDomains.map(ad => _.extend(ad, { type: exports.LOCATION_TYPE_SECONDARY })));
 
-    const domainObjectMap = await validateLocations(locations);
+    error = await validateLocations(locations);
+    if (error) throw error;
 
     // re-validate because this new box version may not accept old configs
     error = checkManifestConstraints(manifest);
@@ -2235,11 +2327,12 @@ async function clone(app, data, user, auditSource) {
         tags: app.tags,
         enableAutomaticUpdate: app.enableAutomaticUpdate,
         icon: icons.icon,
-        enableMailbox: app.enableMailbox
+        enableMailbox: app.enableMailbox,
+        mailboxDisplayName: app.mailboxDisplayName
     };
 
     const [addError] = await safe(add(newAppId, appStoreId, manifest, subdomain, domain, translatePortBindings(portBindings, manifest), obj));
-    if (addError && addError.reason === BoxError.ALREADY_EXISTS) throw getDuplicateErrorDetails(addError.message, locations, domainObjectMap, portBindings);
+    if (addError && addError.reason === BoxError.ALREADY_EXISTS) throw getDuplicateErrorDetails(addError.message, locations, portBindings);
     if (addError) throw addError;
 
     await purchaseApp({ appId: newAppId, appstoreId: app.appStoreId, manifestId: manifest.id || 'customapp' });
@@ -2253,10 +2346,10 @@ async function clone(app, data, user, auditSource) {
     const taskId = await addTask(newAppId, exports.ISTATE_PENDING_CLONE, task, auditSource);
 
     const newApp = _.extend({}, _.omit(obj, 'icon'), { appStoreId, manifest, subdomain, domain, portBindings });
-    newApp.fqdn = dns.fqdn(newApp.subdomain, domainObjectMap[newApp.domain]);
-    newApp.secondaryDomains.forEach(function (ad) { ad.fqdn = dns.fqdn(ad.subdomain, domainObjectMap[ad.domain]); });
-    newApp.redirectDomains.forEach(function (ad) { ad.fqdn = dns.fqdn(ad.subdomain, domainObjectMap[ad.domain]); });
-    newApp.aliasDomains.forEach(function (ad) { ad.fqdn = dns.fqdn(ad.subdomain, domainObjectMap[ad.domain]); });
+    newApp.fqdn = dns.fqdn(newApp.subdomain, newApp.domain);
+    newApp.secondaryDomains.forEach(function (ad) { ad.fqdn = dns.fqdn(ad.subdomain, ad.domain); });
+    newApp.redirectDomains.forEach(function (ad) { ad.fqdn = dns.fqdn(ad.subdomain, ad.domain); });
+    newApp.aliasDomains.forEach(function (ad) { ad.fqdn = dns.fqdn(ad.subdomain, ad.domain); });
 
     await eventlog.add(eventlog.ACTION_APP_CLONE, auditSource, { appId: newAppId, oldAppId: appId, backupId, remotePath: backupInfo.remotePath, oldApp: app, newApp, taskId });
 
@@ -2380,6 +2473,9 @@ async function createExec(app, options) {
         Cmd: cmd
     };
 
+    // currently the webterminal and cli sets C.UTF-8
+    if (options.lang) createOptions.Env = [ 'LANG=' + options.lang ];
+
     return await docker.createExec(app.containerId, createOptions);
 }
 
@@ -2469,6 +2565,7 @@ async function autoupdateApps(updateInfo, auditSource) { // updateInfo is { appI
 
         if (!canAutoupdateApp(app, updateInfo[appId])) {
             debug(`app ${app.fqdn} requires manual update`);
+            notifications.alert(notifications.ALERT_MANUAL_APP_UPDATE, `${app.manifest.title} at ${app.fqdn} requires manual update to version ${updateInfo[appId].manifest.version}`, `Changelog:\n${updateInfo[appId].manifest.changelog}\n`);
             continue;
         }
 
@@ -2521,6 +2618,25 @@ async function updateBackup(app, backupId, data) {
     await backups.update(backupId, data);
 }
 
+async function getBackupDownloadStream(app, backupId) {
+    assert.strictEqual(typeof app, 'object');
+    assert.strictEqual(typeof backupId, 'string');
+
+    const backup = await backups.get(backupId);
+    if (!backup) throw new BoxError(BoxError.NOT_FOUND, 'Backup not found');
+    if (backup.identifier !== app.id) throw new BoxError(BoxError.NOT_FOUND, 'Backup not found'); // some other app's backup
+    if (backup.format !== 'tgz') throw new BoxError(BoxError.BAD_STATE, 'only tgz backups can be downloaded');
+
+    const backupConfig = await settings.getBackupConfig();
+
+    return new Promise((resolve, reject) => {
+        storage.api(backupConfig.provider).download(backupConfig, tgz.getBackupFilePath(backupConfig, backup.remotePath), function (error, sourceStream) {
+            if (error) return reject(error);
+            resolve(sourceStream);
+        });
+    });
+}
+
 async function restoreInstalledApps(options, auditSource) {
     assert.strictEqual(typeof options, 'object');
     assert.strictEqual(typeof auditSource, 'object');

src/appstore.js

@@ -89,8 +89,8 @@ async function login(email, password, totpToken) {
 
     if (error) throw new BoxError(BoxError.NETWORK_ERROR, error.message);
     if (response.status === 401) throw new BoxError(BoxError.INVALID_CREDENTIALS);
-    if (response.status !== 200) throw new BoxError(BoxError.EXTERNAL_ERROR, `login status code: ${response.status}`);
-    if (!response.body.accessToken) throw new BoxError(BoxError.EXTERNAL_ERROR, `login invalid response: ${response.text}`);
+    if (response.status !== 200) throw new BoxError(BoxError.EXTERNAL_ERROR, `Login error. status code: ${response.status}`);
+    if (!response.body.accessToken) throw new BoxError(BoxError.EXTERNAL_ERROR, `Login error. invalid response: ${response.text}`);
 
     return response.body; // { userId, accessToken }
 }
@@ -105,8 +105,8 @@ async function registerUser(email, password) {
         .ok(() => true));
 
     if (error) throw new BoxError(BoxError.NETWORK_ERROR, error.message);
-    if (response.status === 409) throw new BoxError(BoxError.ALREADY_EXISTS, 'account already exists');
-    if (response.status !== 201) throw new BoxError(BoxError.EXTERNAL_ERROR, `register status code: ${response.status}`);
+    if (response.status === 409) throw new BoxError(BoxError.ALREADY_EXISTS, 'Registration error: account already exists');
+    if (response.status !== 201) throw new BoxError(BoxError.EXTERNAL_ERROR, `Registration error. invalid response: ${response.status}`);
 }
 
 async function getWebToken() {
@@ -129,7 +129,6 @@ async function getSubscription() {
 
     if (error) throw new BoxError(BoxError.NETWORK_ERROR, error.message);
     if (response.status === 401) throw new BoxError(BoxError.INVALID_CREDENTIALS);
-    if (response.status === 402) throw new BoxError(BoxError.LICENSE_ERROR);
     if (response.status === 502) throw new BoxError(BoxError.EXTERNAL_ERROR, `Stripe error: ${error.message}`);
     if (response.status !== 200) throw new BoxError(BoxError.EXTERNAL_ERROR, `Unknown error: ${error.message}`);
 
@@ -185,8 +184,7 @@ async function unpurchaseApp(appId, data) {
     if (error) throw new BoxError(BoxError.NETWORK_ERROR, error.message);
     if (response.status === 404) return;   // was never purchased
     if (response.status === 401) throw new BoxError(BoxError.INVALID_CREDENTIALS);
-    if (response.status === 402) throw new BoxError(BoxError.LICENSE_ERROR, response.body.message);
-    if (response.status !== 201 && response.status !== 200) throw new BoxError(BoxError.EXTERNAL_ERROR, util.format('App unpurchase failed. %s %j', response.status, response.body));
+    if (response.status !== 200) throw new BoxError(BoxError.EXTERNAL_ERROR, `App unpurchase failed to get app. status:${response.status}`);
 
     [error, response] = await safe(superagent.del(url)
         .send(data)
@@ -196,7 +194,7 @@ async function unpurchaseApp(appId, data) {
 
     if (error) throw new BoxError(BoxError.NETWORK_ERROR, error.message);
     if (response.status === 401) throw new BoxError(BoxError.INVALID_CREDENTIALS);
-    if (response.status !== 204) throw new BoxError(BoxError.EXTERNAL_ERROR, util.format('App unpurchase failed. %s %j', response.status, response.body));
+    if (response.status !== 204) throw new BoxError(BoxError.EXTERNAL_ERROR, `App unpurchase failed. status:${response.status}`);
 }
 
 async function getBoxUpdate(options) {
@@ -218,7 +216,6 @@ async function getBoxUpdate(options) {
 
     if (error) throw new BoxError(BoxError.NETWORK_ERROR, error.message);
     if (response.status === 401) throw new BoxError(BoxError.INVALID_CREDENTIALS);
-    if (response.status === 402) throw new BoxError(BoxError.LICENSE_ERROR, response.body.message);
     if (response.status === 204) return; // no update
     if (response.status !== 200 || !response.body) throw new BoxError(BoxError.EXTERNAL_ERROR, util.format('Bad response: %s %s', response.status, response.text));
 
@@ -261,7 +258,6 @@ async function getAppUpdate(app, options) {
 
     if (error) throw new BoxError(BoxError.NETWORK_ERROR, error);
     if (response.status === 401) throw new BoxError(BoxError.INVALID_CREDENTIALS);
-    if (response.status === 402) throw new BoxError(BoxError.LICENSE_ERROR, response.body.message);
     if (response.status === 204) return; // no update
     if (response.status !== 200 || !response.body) throw new BoxError(BoxError.EXTERNAL_ERROR, util.format('Bad response: %s %s', response.status, response.text));
 
@@ -285,10 +281,10 @@ async function getAppUpdate(app, options) {
 async function registerCloudron(data) {
     assert.strictEqual(typeof data, 'object');
 
-    const { domain, accessToken, version } = data;
+    const { domain, accessToken, version, existingApps } = data;
 
     const [error, response] = await safe(superagent.post(`${settings.apiServerOrigin()}/api/v1/register_cloudron`)
-        .send({ domain, accessToken, version })
+        .send({ domain, accessToken, version, existingApps })
         .timeout(30 * 1000)
         .ok(() => true));
 
@@ -326,7 +322,6 @@ async function updateCloudron(data) {
 
     if (error) throw new BoxError(BoxError.NETWORK_ERROR, error);
     if (response.status === 401) throw new BoxError(BoxError.INVALID_CREDENTIALS);
-    if (response.status === 402) throw new BoxError(BoxError.LICENSE_ERROR, response.body.message);
     if (response.status !== 200) throw new BoxError(BoxError.EXTERNAL_ERROR, util.format('Bad response: %s %s', response.status, response.text));
 
     debug(`updateCloudron: Cloudron updated with data ${JSON.stringify(data)}`);
@@ -335,13 +330,14 @@ async function updateCloudron(data) {
 async function registerWithLoginCredentials(options) {
     assert.strictEqual(typeof options, 'object');
 
-    const token = await settings.getAppstoreApiToken();
-    if (token) throw new BoxError(BoxError.CONFLICT, 'Cloudron is already registered');
-
     if (options.signup) await registerUser(options.email, options.password);
 
     const result = await login(options.email, options.password, options.totpToken || '');
     await registerCloudron({ domain: settings.dashboardDomain(), accessToken: result.accessToken, version: constants.VERSION });
+
+    for (const app of await apps.list()) {
+        await purchaseApp({ appId: app.id, appstoreId: app.appStoreId, manifestId: app.manifest.id || 'customapp' });
+    }
 }
 
 async function unregister() {
@@ -391,7 +387,6 @@ async function createTicket(info, auditSource) {
     const [error, response] = await safe(request);
     if (error) throw new BoxError(BoxError.NETWORK_ERROR, error.message);
     if (response.status === 401) throw new BoxError(BoxError.INVALID_CREDENTIALS);
-    if (response.status === 402) throw new BoxError(BoxError.LICENSE_ERROR, response.body.message);
     if (response.status !== 201) throw new BoxError(BoxError.EXTERNAL_ERROR, util.format('Bad response: %s %s', response.status, response.text));
 
     await eventlog.add(eventlog.ACTION_SUPPORT_TICKET, auditSource, info);
@@ -399,20 +394,19 @@ async function createTicket(info, auditSource) {
     return { message: `An email was sent to ${constants.SUPPORT_EMAIL}. We will get back shortly!` };
 }
 
-async function getApps() {
+async function getApps(repository = 'core') {
     const token = await settings.getAppstoreApiToken();
     if (!token) throw new BoxError(BoxError.LICENSE_ERROR, 'Missing token');
 
     const unstable = await settings.getUnstableAppsConfig();
 
     const [error, response] = await safe(superagent.get(`${settings.apiServerOrigin()}/api/v1/apps`)
-        .query({ accessToken: token, boxVersion: constants.VERSION, unstable: unstable })
+        .query({ accessToken: token, boxVersion: constants.VERSION, unstable, repository })
         .timeout(30 * 1000)
         .ok(() => true));
 
     if (error) throw new BoxError(BoxError.NETWORK_ERROR, error.message);
     if (response.status === 403 || response.status === 401) throw new BoxError(BoxError.INVALID_CREDENTIALS);
-    if (response.status === 402) throw new BoxError(BoxError.LICENSE_ERROR, response.body.message);
     if (response.status !== 200) throw new BoxError(BoxError.EXTERNAL_ERROR, util.format('App listing failed. %s %j', response.status, response.body));
     if (!response.body.apps) throw new BoxError(BoxError.EXTERNAL_ERROR, util.format('Bad response: %s %s', response.status, response.text));
 
@@ -443,7 +437,6 @@ async function getAppVersion(appId, version) {
     if (error) throw new BoxError(BoxError.NETWORK_ERROR, error.message);
     if (response.status === 403 || response.statusCode === 401) throw new BoxError(BoxError.INVALID_CREDENTIALS);
     if (response.status === 404) throw new BoxError(BoxError.NOT_FOUND);
-    if (response.status === 402) throw new BoxError(BoxError.LICENSE_ERROR, response.body.message);
     if (response.status !== 200) throw new BoxError(BoxError.EXTERNAL_ERROR, util.format('App fetch failed. %s %j', response.status, response.body));
 
     return response.body;

src/apptask.js

@@ -17,10 +17,9 @@ const apps = require('./apps.js'),
     AuditSource = require('./auditsource.js'),
     backuptask = require('./backuptask.js'),
     BoxError = require('./boxerror.js'),
-    collectd = require('./collectd.js'),
     constants = require('./constants.js'),
     debug = require('debug')('box:apptask'),
-    df = require('@sindresorhus/df'),
+    df = require('./df.js'),
     dns = require('./dns.js'),
     docker = require('./docker.js'),
     ejs = require('ejs'),
@@ -45,12 +44,8 @@ const MV_VOLUME_CMD = path.join(__dirname, 'scripts/mvvolume.sh'),
     LOGROTATE_CONFIG_EJS = fs.readFileSync(__dirname + '/logrotate.ejs', { encoding: 'utf8' }),
     CONFIGURE_LOGROTATE_CMD = path.join(__dirname, 'scripts/configurelogrotate.sh');
 
-// https://rootlesscontaine.rs/getting-started/common/cgroup2/#checking-whether-cgroup-v2-is-already-enabled
-const CGROUP_VERSION = fs.existsSync('/sys/fs/cgroup/cgroup.controllers') ? '2' : '1';
-const COLLECTD_CONFIG_EJS = fs.readFileSync(`${__dirname}/collectd/app_cgroup_v${CGROUP_VERSION}.ejs`, { encoding: 'utf8' });
-
 function makeTaskError(error, app) {
-    assert.strictEqual(typeof error, 'object');
+    assert(error instanceof BoxError);
     assert.strictEqual(typeof app, 'object');
 
     // track a few variables which helps 'repair' restart the task (see also scheduleTask in apps.js)
@@ -74,6 +69,8 @@ async function updateApp(app, values) {
 async function allocateContainerIp(app) {
     assert.strictEqual(typeof app, 'object');
 
+    if (app.manifest.id === constants.PROXY_APP_APPSTORE_ID) return;
+
     await promiseRetry({ times: 10, interval: 0, debug }, async function () {
         const iprange = iputils.intFromIp('172.18.20.255') - iputils.intFromIp('172.18.16.1');
         let rnd = Math.floor(Math.random() * iprange);
@@ -86,6 +83,8 @@ async function createContainer(app) {
     assert.strictEqual(typeof app, 'object');
     assert(!app.containerId); // otherwise, it will trigger volumeFrom
 
+    if (app.manifest.id === constants.PROXY_APP_APPSTORE_ID) return;
+
     debug('createContainer: creating container');
 
     const container = await docker.createContainer(app);
@@ -94,7 +93,6 @@ async function createContainer(app) {
 
     // re-generate configs that rely on container id
     await addLogrotateConfig(app);
-    await addCollectdProfile(app);
 }
 
 async function deleteContainers(app, options) {
@@ -104,7 +102,6 @@ async function deleteContainers(app, options) {
     debug('deleteContainer: deleting app containers (app, scheduler)');
 
     // remove configs that rely on container id
-    await removeCollectdProfile(app);
     await removeLogrotateConfig(app);
     await docker.stopContainers(app.id);
     await docker.deleteContainers(app.id, options);
@@ -157,19 +154,6 @@ async function deleteAppDir(app, options) {
     }
 }
 
-async function addCollectdProfile(app) {
-    assert.strictEqual(typeof app, 'object');
-
-    const collectdConf = ejs.render(COLLECTD_CONFIG_EJS, { appId: app.id, containerId: app.containerId, appDataDir: apps.getDataDir(app, app.dataDir) });
-    await collectd.addProfile(app.id, collectdConf);
-}
-
-async function removeCollectdProfile(app) {
-    assert.strictEqual(typeof app, 'object');
-
-    await collectd.removeProfile(app.id);
-}
-
 async function addLogrotateConfig(app) {
     assert.strictEqual(typeof app, 'object');
 
@@ -268,24 +252,30 @@ async function waitForDnsPropagation(app) {
     }
 }
 
-async function moveDataDir(app, targetDir) {
+async function moveDataDir(app, targetVolumeId, targetVolumePrefix) {
     assert.strictEqual(typeof app, 'object');
-    assert(targetDir === null || typeof targetDir === 'string');
+    assert(targetVolumeId === null || typeof targetVolumeId === 'string');
+    assert(targetVolumePrefix === null || typeof targetVolumePrefix === 'string');
 
-    const resolvedSourceDir = apps.getDataDir(app, app.dataDir);
-    const resolvedTargetDir = apps.getDataDir(app, targetDir);
+    const resolvedSourceDir = await apps.getStorageDir(app);
+    const resolvedTargetDir = await apps.getStorageDir(_.extend({}, app, { storageVolumeId: targetVolumeId, storageVolumePrefix: targetVolumePrefix }));
 
     debug(`moveDataDir: migrating data from ${resolvedSourceDir} to ${resolvedTargetDir}`);
 
-    if (resolvedSourceDir === resolvedTargetDir) return;
+    if (resolvedSourceDir !== resolvedTargetDir) {
+        const [error] = await safe(shell.promises.sudo('moveDataDir', [ MV_VOLUME_CMD, resolvedSourceDir, resolvedTargetDir ], {}));
+        if (error) throw new BoxError(BoxError.EXTERNAL_ERROR, `Error migrating data directory: ${error.message}`);
+    }
 
-    const [error] = await safe(shell.promises.sudo('moveDataDir', [ MV_VOLUME_CMD, resolvedSourceDir, resolvedTargetDir ], {}));
-    if (error) throw new BoxError(BoxError.EXTERNAL_ERROR, `Error migrating data directory: ${error.message}`);
+    await updateApp(app, { storageVolumeId: targetVolumeId, storageVolumePrefix: targetVolumePrefix });
 }
 
 async function downloadImage(manifest) {
     assert.strictEqual(typeof manifest, 'object');
 
+    // skip for relay app
+    if (manifest.id === constants.PROXY_APP_APPSTORE_ID) return;
+
     const info = await docker.info();
     const [dfError, diskUsage] = await safe(df.file(info.DockerRootDir));
     if (dfError) throw new BoxError(BoxError.FS_ERROR, `Error getting file system info: ${dfError.message}`);
@@ -300,6 +290,9 @@ async function startApp(app) {
 
     if (app.runState === apps.RSTATE_STOPPED) return;
 
+    // skip for relay app
+    if (app.manifest.id === constants.PROXY_APP_APPSTORE_ID) return;
+
     await docker.startContainer(app.id);
 }
 
@@ -520,8 +513,9 @@ async function migrateDataDir(app, args, progressCallback) {
     assert.strictEqual(typeof args, 'object');
     assert.strictEqual(typeof progressCallback, 'function');
 
-    const newDataDir = args.newDataDir;
-    assert(newDataDir === null || typeof newDataDir === 'string');
+    const { newStorageVolumeId, newStorageVolumePrefix } = args;
+    assert(newStorageVolumeId === null || typeof newStorageVolumeId === 'string');
+    assert(newStorageVolumePrefix === null || typeof newStorageVolumePrefix === 'string');
 
     await progressCallback({ percent: 10, message: 'Cleaning up old install' });
     await deleteContainers(app, { managedOnly: true });
@@ -529,12 +523,12 @@ async function migrateDataDir(app, args, progressCallback) {
     await progressCallback({ percent: 45, message: 'Ensuring app data directory' });
     await createAppDir(app);
 
-    // re-setup addons since this creates the localStorage volume
+    // re-setup addons since this creates the localStorage destination
     await progressCallback({ percent: 50, message: 'Setting up addons' });
-    await services.setupAddons(_.extend({}, app, { dataDir: newDataDir }), app.manifest.addons);
+    await services.setupAddons(_.extend({}, app, { storageVolumeId: newStorageVolumeId, storageVolumePrefix: newStorageVolumePrefix }), app.manifest.addons);
 
     await progressCallback({ percent: 60, message: 'Moving data dir' });
-    await moveDataDir(app, newDataDir);
+    await moveDataDir(app, newStorageVolumeId, newStorageVolumePrefix);
 
     await progressCallback({ percent: 90, message: 'Creating container' });
     await createContainer(app);
@@ -542,7 +536,7 @@ async function migrateDataDir(app, args, progressCallback) {
     await startApp(app);
 
     await progressCallback({ percent: 100, message: 'Done' });
-    await updateApp(app, { installationState: apps.ISTATE_INSTALLED, error: null, health: null, dataDir: newDataDir });
+    await updateApp(app, { installationState: apps.ISTATE_INSTALLED, error: null, health: null });
 }
 
 // configure is called for an infra update and repair to re-create container, reverseproxy config. it's all "local"
@@ -670,11 +664,10 @@ async function start(app, args, progressCallback) {
     await progressCallback({ percent: 10, message: 'Starting app services' });
     await services.startAppServices(app);
 
-    await progressCallback({ percent: 35, message: 'Starting container' });
-    await docker.startContainer(app.id);
-
-    await progressCallback({ percent: 60, message: 'Adding collectd profile' });
-    await addCollectdProfile(app);
+    if (app.manifest.id !== constants.PROXY_APP_APPSTORE_ID) {
+        await progressCallback({ percent: 35, message: 'Starting container' });
+        await docker.startContainer(app.id);
+    }
 
     // stopped apps do not renew certs. currently, we don't do DNS to not overwrite existing user settings
     await progressCallback({ percent: 80, message: 'Configuring reverse proxy' });
@@ -696,9 +689,6 @@ async function stop(app, args, progressCallback) {
     await progressCallback({ percent: 50, message: 'Stopping app services' });
     await services.stopAppServices(app);
 
-    await progressCallback({ percent: 80, message: 'Removing collectd profile' });
-    await removeCollectdProfile(app);
-
     await progressCallback({ percent: 100, message: 'Done' });
     await updateApp(app, { installationState: apps.ISTATE_INSTALLED, error: null, health: null });
 }
@@ -708,8 +698,17 @@ async function restart(app, args, progressCallback) {
     assert.strictEqual(typeof args, 'object');
     assert.strictEqual(typeof progressCallback, 'function');
 
-    await progressCallback({ percent: 20, message: 'Restarting container' });
-    await docker.restartContainer(app.id);
+    if (app.manifest.id !== constants.PROXY_APP_APPSTORE_ID) {
+        await progressCallback({ percent: 10, message: 'Starting app services' });
+        await services.startAppServices(app);
+
+        await progressCallback({ percent: 20, message: 'Restarting container' });
+        await docker.restartContainer(app.id);
+    }
+
+    // stopped apps do not renew certs. currently, we don't do DNS to not overwrite existing user settings
+    await progressCallback({ percent: 80, message: 'Configuring reverse proxy' });
+    await reverseProxy.configureApp(app, AuditSource.APPTASK);
 
     await progressCallback({ percent: 100, message: 'Done' });
     await updateApp(app, { installationState: apps.ISTATE_INSTALLED, error: null, health: null });

src/backupcleaner.js

@@ -15,7 +15,6 @@ const apps = require('./apps.js'),
     constants = require('./constants.js'),
     debug = require('debug')('box:backupcleaner'),
     moment = require('moment'),
-    mounts = require('./mounts.js'),
     path = require('path'),
     paths = require('./paths.js'),
     safe = require('safetydance'),
@@ -243,11 +242,11 @@ async function cleanupSnapshots(backupConfig) {
     const info = safe.JSON.parse(contents);
     if (!info) return;
 
-    delete info.box;
-
     const progressCallback = (progress) => { debug(`cleanupSnapshots: ${progress.message}`); };
 
     for (const appId of Object.keys(info)) {
+        if (appId === 'box' || appId === 'mail') continue;
+
         const app = await apps.get(appId);
         if (app) continue; // app is still installed
 
@@ -272,12 +271,9 @@ async function run(progressCallback) {
 
     const backupConfig = await settings.getBackupConfig();
 
-    if (mounts.isManagedProvider(backupConfig.provider) || backupConfig.provider === 'mountpoint') {
-        const hostPath = mounts.isManagedProvider(backupConfig.provider) ? paths.MANAGED_BACKUP_MOUNT_DIR : backupConfig.mountPoint;
-        const status = await mounts.getStatus(backupConfig.provider, hostPath); // { state, message }
-        debug(`clean: mount point status is ${JSON.stringify(status)}`);
-        if (status.state !== 'active') throw new BoxError(BoxError.MOUNT_ERROR, `Backup endpoint is not mounted: ${status.message}`);
-    }
+    const status = await storage.api(backupConfig.provider).getBackupProviderStatus(backupConfig);
+    debug(`clean: mount point status is ${JSON.stringify(status)}`);
+    if (status.state !== 'active') throw new BoxError(BoxError.MOUNT_ERROR, `Backup endpoint is not mounted: ${status.message}`);
 
     if (backupConfig.retentionPolicy.keepWithinSecs < 0) {
         debug('cleanup: keeping all backups');
@@ -293,7 +289,7 @@ async function run(progressCallback) {
     await progressCallback({ percent: 40, message: 'Cleaning app backups' });
     const removedAppBackupPaths = await cleanupAppBackups(backupConfig, referencedBackupIds, progressCallback);
 
-    await progressCallback({ percent: 70, message: 'Cleaning missing backups' });
+    await progressCallback({ percent: 70, message: 'Checking storage backend and removing stale entries in database' });
     const missingBackupPaths = await cleanupMissingBackups(backupConfig, progressCallback);
 
     await progressCallback({ percent: 90, message: 'Cleaning snapshots' });

src/backupformat/rsync.js

@@ -27,7 +27,7 @@ function getBackupFilePath(backupConfig, remotePath) {
     assert.strictEqual(typeof backupConfig, 'object');
     assert.strictEqual(typeof remotePath, 'string');
 
-    const rootPath = storage.api(backupConfig.provider).getRootPath(backupConfig);
+    const rootPath = storage.api(backupConfig.provider).getBackupRootPath(backupConfig);
     return path.join(rootPath, remotePath);
 }
 
@@ -46,7 +46,7 @@ function sync(backupConfig, remotePath, dataLayout, progressCallback, callback)
     syncer.sync(dataLayout, function processTask(task, iteratorCallback) {
         debug('sync: processing task: %j', task);
         // the empty task.path is special to signify the directory
-        const destPath = task.path && backupConfig.encryption ? hush.encryptFilePath(task.path, backupConfig.encryption) : task.path;
+        const destPath = task.path && backupConfig.encryptedFilenames ? hush.encryptFilePath(task.path, backupConfig.encryption) : task.path;
         const backupFilePath = path.join(getBackupFilePath(backupConfig, remotePath), destPath);
 
         if (task.operation === 'removedir') {
@@ -164,7 +164,7 @@ function downloadDir(backupConfig, backupFilePath, dataLayout, progressCallback,
 
     function downloadFile(entry, done) {
         let relativePath = path.relative(backupFilePath, entry.fullPath);
-        if (backupConfig.encryption) {
+        if (backupConfig.encryptedFilenames) {
             const { error, result } = hush.decryptFilePath(relativePath, backupConfig.encryption);
             if (error) return done(new BoxError(BoxError.CRYPTO_ERROR, 'Unable to decrypt file'));
             relativePath = result;

src/backupformat/tgz.js

@@ -14,7 +14,7 @@ const assert = require('assert'),
     { DecryptStream, EncryptStream } = require('../hush.js'),
     once = require('../once.js'),
     path = require('path'),
-    progressStream = require('progress-stream'),
+    ProgressStream = require('../progress-stream.js'),
     storage = require('../storage.js'),
     tar = require('tar-fs'),
     zlib = require('zlib');
@@ -23,7 +23,7 @@ function getBackupFilePath(backupConfig, remotePath) {
     assert.strictEqual(typeof backupConfig, 'object');
     assert.strictEqual(typeof remotePath, 'string');
 
-    const rootPath = storage.api(backupConfig.provider).getRootPath(backupConfig);
+    const rootPath = storage.api(backupConfig.provider).getBackupRootPath(backupConfig);
 
     const fileType = backupConfig.encryption ? '.tar.gz.enc' : '.tar.gz';
     return path.join(rootPath, remotePath + fileType);
@@ -51,7 +51,7 @@ function tarPack(dataLayout, encryption) {
     });
 
     const gzip = zlib.createGzip({});
-    const ps = progressStream({ time: 10000 }); // emit 'progress' every 10 seconds
+    const ps = new ProgressStream({ interval: 10000 }); // emit 'progress' every 10 seconds
 
     pack.on('error', function (error) {
         debug('tarPack: tar stream error.', error);
@@ -84,7 +84,7 @@ function tarExtract(inStream, dataLayout, encryption) {
     assert.strictEqual(typeof encryption, 'object');
 
     const gunzip = zlib.createGunzip({});
-    const ps = progressStream({ time: 10000 }); // display a progress every 10 seconds
+    const ps = new ProgressStream({ interval: 10000 }); // display a progress every 10 seconds
     const extract = tar.extract('/', {
         map: function (header) {
             header.name = dataLayout.toLocalPath(header.name);
@@ -173,6 +173,8 @@ async function upload(backupConfig, remotePath, dataLayout, progressCallback) {
     assert.strictEqual(typeof dataLayout, 'object');
     assert.strictEqual(typeof progressCallback, 'function');
 
+    debug(`upload: Uploading ${dataLayout.toString()} to ${remotePath}`);
+
     return new Promise((resolve, reject) => {
         async.retry({ times: 5, interval: 20000 }, function (retryCallback) {
             retryCallback = once(retryCallback); // protect again upload() erroring much later after tar stream error

src/backups.js

@@ -18,8 +18,6 @@ exports = module.exports = {
     injectPrivateFields,
     removePrivateFields,
 
-    configureCollectd,
-
     generateEncryptionKeysSync,
 
     getSnapshotInfo,
@@ -44,15 +42,12 @@ exports = module.exports = {
 
 const assert = require('assert'),
     BoxError = require('./boxerror.js'),
-    collectd = require('./collectd.js'),
     constants = require('./constants.js'),
     CronJob = require('cron').CronJob,
     crypto = require('crypto'),
     database = require('./database.js'),
     debug = require('debug')('box:backups'),
-    ejs = require('ejs'),
     eventlog = require('./eventlog.js'),
-    fs = require('fs'),
     hat = require('./hat.js'),
     locker = require('./locker.js'),
     path = require('path'),
@@ -62,8 +57,6 @@ const assert = require('assert'),
     storage = require('./storage.js'),
     tasks = require('./tasks.js');
 
-const COLLECTD_CONFIG_EJS = fs.readFileSync(__dirname + '/collectd/cloudron-backup.ejs', { encoding: 'utf8' });
-
 const BACKUPS_FIELDS = [ 'id', 'remotePath', 'label', 'identifier', 'creationTime', 'packageVersion', 'type', 'dependsOnJson', 'state', 'manifestJson', 'format', 'preserveSecs', 'encryptionVersion' ];
 
 function postProcess(result) {
@@ -127,7 +120,8 @@ async function add(data) {
 
     const creationTime = data.creationTime || new Date(); // allow tests to set the time
     const manifestJson = JSON.stringify(data.manifest);
-    const id = `${data.type}_${data.identifier}_v${data.packageVersion}_${hat(256)}`; // id is used by the UI to derive dependent packages. making this a UUID will require a lot of db querying
+    const prefixId = data.type === exports.BACKUP_TYPE_APP ? `${data.type}_${data.identifier}` : data.type; // type and identifier are same for other types
+    const id = `${prefixId}_v${data.packageVersion}_${hat(256)}`; // id is used by the UI to derive dependent packages. making this a UUID will require a lot of db querying
 
     const [error] = await safe(database.query('INSERT INTO backups (id, remotePath, identifier, encryptionVersion, packageVersion, type, creationTime, state, dependsOnJson, manifestJson, format, preserveSecs) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)',
         [ id, data.remotePath, data.identifier, data.encryptionVersion, data.packageVersion, data.type, creationTime, data.state, JSON.stringify(data.dependsOn), manifestJson, data.format, data.preserveSecs ]));
@@ -176,7 +170,7 @@ function validateLabel(label) {
     assert.strictEqual(typeof label, 'string');
 
     if (label.length >= 200) return new BoxError(BoxError.BAD_FIELD, 'label too long');
-    if (/[^a-zA-Z0-9._()-]/.test(label)) return new BoxError(BoxError.BAD_FIELD, 'label can only contain alphanumerals, dot, hyphen, brackets or underscore');
+    if (/[^a-zA-Z0-9._() -]/.test(label)) return new BoxError(BoxError.BAD_FIELD, 'label can only contain alphanumerals, space, dot, hyphen, brackets or underscore');
 
     return null;
 }
@@ -241,7 +235,7 @@ async function startBackupTask(auditSource) {
         const errorMessage = error ? error.message : '';
         const timedOut = error ? error.code === tasks.ETIMEOUT : false;
 
-        const backup = await get(backupId);
+        const backup = backupId ? await get(backupId) : null;
         await safe(eventlog.add(eventlog.ACTION_BACKUP_FINISH, auditSource, { taskId, errorMessage, timedOut, backupId, remotePath: backup?.remotePath }), { debug });
     });
 
@@ -319,17 +313,6 @@ async function startCleanupTask(auditSource) {
     return taskId;
 }
 
-async function configureCollectd(backupConfig) {
-    assert.strictEqual(typeof backupConfig, 'object');
-
-    if (backupConfig.provider === 'filesystem') {
-        const collectdConf = ejs.render(COLLECTD_CONFIG_EJS, { backupDir: backupConfig.backupFolder });
-        await collectd.addProfile('cloudron-backup', collectdConf);
-    } else {
-        await collectd.removeProfile('cloudron-backup');
-    }
-}
-
 async function testConfig(backupConfig) {
     assert.strictEqual(typeof backupConfig, 'object');
 

src/backuptask.js

@@ -47,6 +47,41 @@ function canBackupApp(app) {
             app.installationState === apps.ISTATE_PENDING_UPDATE; // called from apptask
 }
 
+// binary units (non SI) 1024 based
+function prettyBytes(bytes) {
+    assert.strictEqual(typeof bytes, 'number');
+
+    const i = Math.floor(Math.log(bytes) / Math.log(1024)),
+        sizes = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
+
+    return (bytes / Math.pow(1024, i)).toFixed(2) * 1 + '' + sizes[i];
+}
+
+async function checkPreconditions(backupConfig, dataLayout) {
+    assert.strictEqual(typeof backupConfig, 'object');
+    assert(dataLayout instanceof DataLayout, 'dataLayout must be a DataLayout');
+
+    // check mount status before uploading
+    const status = await storage.api(backupConfig.provider).getBackupProviderStatus(backupConfig);
+    debug(`upload: mount point status is ${JSON.stringify(status)}`);
+    if (status.state !== 'active') throw new BoxError(BoxError.MOUNT_ERROR, `Backup endpoint is not active: ${status.message}`);
+
+    // check availabe size. this requires root for df to work
+    const df = await storage.api(backupConfig.provider).getAvailableSize(backupConfig);
+    let used = 0;
+    for (const localPath of dataLayout.localPaths()) {
+        debug(`checkPreconditions: getting disk usage of ${localPath}`);
+        const result = safe.child_process.execSync(`du -Dsb ${localPath}`, { encoding: 'utf8' });
+        if (!result) throw new BoxError(BoxError.FS_ERROR, `du error: ${safe.error.message}`);
+        used += parseInt(result, 10);
+    }
+
+    debug(`checkPreconditions: total required =${used} available=${df.available}`);
+
+    const needed = 0.6 * used + (1024 * 1024 * 1024); // check if there is atleast 1GB left afterwards. aim for 60% because rsync/tgz won't need full 100%
+    if (df.available <= needed) throw new BoxError(BoxError.FS_ERROR, `Not enough disk space for backup. Needed: ${prettyBytes(needed)} Available: ${prettyBytes(df.available)}`);
+}
+
 // this function is called via backupupload (since it needs root to traverse app's directory)
 async function upload(remotePath, format, dataLayoutString, progressCallback) {
     assert.strictEqual(typeof remotePath, 'string');
@@ -58,7 +93,8 @@ async function upload(remotePath, format, dataLayoutString, progressCallback) {
 
     const dataLayout = DataLayout.fromString(dataLayoutString);
     const backupConfig = await settings.getBackupConfig();
-    await safe(storage.api(backupConfig.provider).checkPreconditions(backupConfig, dataLayout));
+
+    await checkPreconditions(backupConfig, dataLayout);
 
     await backupFormat.api(format).upload(backupConfig, remotePath, dataLayout, progressCallback);
 }
@@ -102,7 +138,7 @@ async function downloadApp(app, restoreConfig, progressCallback) {
 
     const appDataDir = safe.fs.realpathSync(path.join(paths.APPS_DATA_DIR, app.id));
     if (!appDataDir) throw new BoxError(BoxError.FS_ERROR, safe.error.message);
-    const dataLayout = new DataLayout(appDataDir, app.dataDir ? [{ localDir: app.dataDir, remoteDir: 'data' }] : []);
+    const dataLayout = new DataLayout(appDataDir, app.storageVolumeId ? [{ localDir: await apps.getStorageDir(app), remoteDir: 'data' }] : []);
 
     const startTime = new Date();
     const backupConfig = restoreConfig.backupConfig || await settings.getBackupConfig();
@@ -193,7 +229,11 @@ async function copy(backupConfig, srcRemotePath, destRemotePath, progressCallbac
     const newFilePath = backupFormat.api(format).getBackupFilePath(backupConfig, destRemotePath);
 
     const startTime = new Date();
-    await safe(storage.api(provider).copy(backupConfig, oldFilePath, newFilePath, progressCallback));
+    const [copyError] = await safe(storage.api(provider).copy(backupConfig, oldFilePath, newFilePath, progressCallback));
+    if (copyError) {
+        debug(`copy: copied to ${destRemotePath} errored. error: ${copyError.message}`);
+        throw copyError;
+    }
     debug(`copy: copied successfully to ${destRemotePath}. Took ${(new Date() - startTime)/1000} seconds`);
 }
 
@@ -318,7 +358,7 @@ async function uploadAppSnapshot(backupConfig, app, progressCallback) {
     const appDataDir = safe.fs.realpathSync(path.join(paths.APPS_DATA_DIR, app.id));
     if (!appDataDir) throw new BoxError(BoxError.FS_ERROR, `Error resolving appsdata: ${safe.error.message}`);
 
-    const dataLayout = new DataLayout(appDataDir, app.dataDir ? [{ localDir: app.dataDir, remoteDir: 'data' }] : []);
+    const dataLayout = new DataLayout(appDataDir, app.storageVolumeId ? [{ localDir: await apps.getStorageDir(app), remoteDir: 'data' }] : []);
 
     progressCallback({ message: `Uploading app snapshot ${app.fqdn}`});
 

src/blobs.js

@@ -9,6 +9,8 @@ exports = module.exports = {
     setString,
     del,
 
+    listCertIds,
+
     ACME_ACCOUNT_KEY: 'acme_account_key',
     ADDON_TURN_SECRET: 'addon_turn_secret',
     SFTP_PUBLIC_KEY: 'sftp_public_key',
@@ -16,6 +18,7 @@ exports = module.exports = {
     PROXY_AUTH_TOKEN_SECRET: 'proxy_auth_token_secret',
 
     CERT_PREFIX: 'cert',
+    CERT_SUFFIX: 'cert',
 
     _clear: clear
 };
@@ -62,3 +65,8 @@ async function del(id) {
 async function clear() {
     await database.query('DELETE FROM blobs');
 }
+
+async function listCertIds() {
+    const result = await database.query('SELECT id FROM blobs WHERE id LIKE ?', [ `${exports.CERT_PREFIX}-%.${exports.CERT_SUFFIX}` ]);
+    return result.map(r => r.id);
+}

src/cloudron.js

@@ -19,6 +19,8 @@ exports = module.exports = {
     renewCerts,
     syncDnsRecords,
 
+    updateDiskUsage,
+
     runSystemChecks
 };
 
@@ -26,7 +28,6 @@ const apps = require('./apps.js'),
     appstore = require('./appstore.js'),
     assert = require('assert'),
     AuditSource = require('./auditsource.js'),
-    backups = require('./backups.js'),
     BoxError = require('./boxerror.js'),
     branding = require('./branding.js'),
     constants = require('./constants.js'),
@@ -35,9 +36,9 @@ const apps = require('./apps.js'),
     delay = require('./delay.js'),
     dns = require('./dns.js'),
     dockerProxy = require('./dockerproxy.js'),
-    domains = require('./domains.js'),
     eventlog = require('./eventlog.js'),
     fs = require('fs'),
+    LogStream = require('./log-stream.js'),
     mail = require('./mail.js'),
     notifications = require('./notifications.js'),
     path = require('path'),
@@ -49,7 +50,6 @@ const apps = require('./apps.js'),
     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');
@@ -108,18 +108,11 @@ async function runStartupTasks() {
     // stop all the systemd tasks
     tasks.push(platform.stopAllTasks);
 
-    // this configures collectd to collect backup storage metrics if filesystem is used. This is also triggerd when the settings change with the rest api
-    tasks.push(async function () {
-        const backupConfig = await settings.getBackupConfig();
-        await backups.configureCollectd(backupConfig);
-    });
-
     // always generate webadmin config since we have no versioning mechanism for the ejs
     tasks.push(async function () {
         if (!settings.dashboardDomain()) return;
 
-        const domainObject = await domains.get(settings.dashboardDomain());
-        await reverseProxy.writeDashboardConfig(domainObject);
+        await reverseProxy.writeDashboardConfig(settings.dashboardDomain());
     });
 
     tasks.push(async function () {
@@ -140,7 +133,7 @@ async function runStartupTasks() {
     // we used to run tasks in parallel but simultaneous nginx reloads was causing issues
     for (let i = 0; i < tasks.length; i++) {
         const [error] = await safe(tasks[i]());
-        if (error) debug(`Startup task at index ${i} failed: ${error.message}`);
+        if (error) debug(`Startup task at index ${i} failed: ${error.message} ${error.stack}`);
     }
 }
 
@@ -166,7 +159,7 @@ async function getConfig() {
         footer: branding.renderFooter(allSettings[settings.FOOTER_KEY] || constants.FOOTER),
         features: appstore.getFeatures(),
         profileLocked: allSettings[settings.PROFILE_CONFIG_KEY].lockUserProfiles,
-        mandatory2FA: allSettings[settings.PROFILE_CONFIG_KEY].mandatory2FA
+        mandatory2FA: allSettings[settings.PROFILE_CONFIG_KEY].mandatory2FA,
     };
 }
 
@@ -235,25 +228,12 @@ async function getLogs(unit, options) {
 
     const cp = spawn('/usr/bin/tail', args);
 
-    const transformStream = split(function mapper(line) {
-        if (format !== 'json') return line + '\n';
+    const logStream = new LogStream({ format, source: unit });
+    logStream.close = cp.kill.bind(cp, 'SIGKILL'); // hook for caller. closing stream kills the child process
 
-        const data = line.split(' '); // logs are <ISOtimestamp> <msg>
-        let timestamp = (new Date(data[0])).getTime();
-        if (isNaN(timestamp)) timestamp = 0;
+    cp.stdout.pipe(logStream);
 
-        return JSON.stringify({
-            realtimeTimestamp: timestamp * 1000,
-            message: line.slice(data[0].length+1),
-            source: unit
-        }) + '\n';
-    });
-
-    transformStream.close = cp.kill.bind(cp, 'SIGKILL'); // closing stream kills the child process
-
-    cp.stdout.pipe(transformStream);
-
-    return transformStream;
+    return logStream;
 }
 
 async function prepareDashboardDomain(domain, auditSource) {
@@ -264,15 +244,12 @@ async function prepareDashboardDomain(domain, auditSource) {
 
     if (settings.isDemo()) throw new BoxError(BoxError.CONFLICT, 'Not allowed in demo mode');
 
-    const domainObject = await domains.get(domain);
-    if (!domain) throw new BoxError(BoxError.NOT_FOUND, 'No such domain');
-
-    const fqdn = dns.fqdn(constants.DASHBOARD_LOCATION, domainObject);
+    const fqdn = dns.fqdn(constants.DASHBOARD_SUBDOMAIN, domain);
 
     const result = await apps.list();
     if (result.some(app => app.fqdn === fqdn)) throw new BoxError(BoxError.BAD_STATE, 'Dashboard location conflicts with an existing app');
 
-    const taskId = await tasks.add(tasks.TASK_SETUP_DNS_AND_CERT, [ constants.DASHBOARD_LOCATION, domain, auditSource ]);
+    const taskId = await tasks.add(tasks.TASK_SETUP_DNS_AND_CERT, [ constants.DASHBOARD_SUBDOMAIN, domain, auditSource ]);
 
     tasks.startTask(taskId, {});
 
@@ -286,11 +263,8 @@ async function setDashboardDomain(domain, auditSource) {
 
     debug(`setDashboardDomain: ${domain}`);
 
-    const domainObject = await domains.get(domain);
-    if (!domain) throw new BoxError(BoxError.NOT_FOUND, 'No such domain');
-
-    await reverseProxy.writeDashboardConfig(domainObject);
-    const fqdn = dns.fqdn(constants.DASHBOARD_LOCATION, domainObject);
+    await reverseProxy.writeDashboardConfig(domain);
+    const fqdn = dns.fqdn(constants.DASHBOARD_SUBDOMAIN, domain);
 
     await settings.setDashboardLocation(domain, fqdn);
 
@@ -328,8 +302,7 @@ async function setupDnsAndCert(subdomain, domain, auditSource, progressCallback)
     assert.strictEqual(typeof auditSource, 'object');
     assert.strictEqual(typeof progressCallback, 'function');
 
-    const domainObject = await domains.get(domain);
-    const dashboardFqdn = dns.fqdn(subdomain, domainObject);
+    const dashboardFqdn = dns.fqdn(subdomain, domain);
 
     const ipv4 = await sysinfo.getServerIPv4();
     const ipv6 = await sysinfo.getServerIPv6();
@@ -341,7 +314,8 @@ async function setupDnsAndCert(subdomain, domain, auditSource, progressCallback)
     await dns.waitForDnsRecord(subdomain, domain, 'A', ipv4, { interval: 30000, times: 50000 });
     if (ipv6) await dns.waitForDnsRecord(subdomain, domain, 'AAAA', ipv6, { interval: 30000, times: 50000 });
     progressCallback({ percent: 60, message: `Getting certificate of ${dashboardFqdn}` });
-    await reverseProxy.ensureCertificate(dns.fqdn(subdomain, domainObject), domain, auditSource);
+    const location = { subdomain, domain, fqdn: dashboardFqdn, type: apps.LOCATION_TYPE_DASHBOARD, certificate: null };
+    await reverseProxy.ensureCertificate(location, {}, auditSource);
 }
 
 async function syncDnsRecords(options) {
@@ -351,3 +325,9 @@ async function syncDnsRecords(options) {
     tasks.startTask(taskId, {});
     return taskId;
 }
+
+async function updateDiskUsage() {
+    const taskId = await tasks.add(tasks.TASK_UPDATE_DISK_USAGE, []);
+    tasks.startTask(taskId, {});
+    return taskId;
+}

src/collectd.js

@@ -1,43 +0,0 @@
-'use strict';
-
-exports = module.exports = {
-    addProfile,
-    removeProfile
-};
-
-const assert = require('assert'),
-    BoxError = require('./boxerror.js'),
-    debug = require('debug')('collectd'),
-    path = require('path'),
-    paths = require('./paths.js'),
-    safe = require('safetydance'),
-    shell = require('./shell.js');
-
-const CONFIGURE_COLLECTD_CMD = path.join(__dirname, 'scripts/configurecollectd.sh');
-
-async function addProfile(name, profile) {
-    assert.strictEqual(typeof name, 'string');
-    assert.strictEqual(typeof profile, 'string');
-
-    const configFilePath = path.join(paths.COLLECTD_APPCONFIG_DIR, `${name}.conf`);
-
-    // skip restarting collectd if the profile already exists with the same contents
-    const currentProfile = safe.fs.readFileSync(configFilePath, 'utf8') || '';
-    if (currentProfile === profile) return;
-
-    if (!safe.fs.writeFileSync(configFilePath, profile)) throw new BoxError(BoxError.FS_ERROR, `Error writing collectd config: ${safe.error.message}`);
-
-    const [error] = await safe(shell.promises.sudo('addCollectdProfile', [ CONFIGURE_COLLECTD_CMD, 'add', name ], {}));
-    if (error) throw new BoxError(BoxError.COLLECTD_ERROR, 'Could not add collectd config');
-}
-
-async function removeProfile(name) {
-    assert.strictEqual(typeof name, 'string');
-
-    if (!safe.fs.unlinkSync(path.join(paths.COLLECTD_APPCONFIG_DIR, `${name}.conf`))) {
-        if (safe.error.code !== 'ENOENT') debug('Error removing collectd profile', safe.error);
-    }
-
-    const [error] = await safe(shell.promises.sudo('removeCollectdProfile', [ CONFIGURE_COLLECTD_CMD, 'remove', name ], {}));
-    if (error) throw new BoxError(BoxError.COLLECTD_ERROR, 'Could not remove collectd config');
-}

src/collectd/app_cgroup_v1.ejs

@@ -1,42 +0,0 @@
-LoadPlugin "table"
-<Plugin table>
-  <Table "/sys/fs/cgroup/memory/docker/<%= containerId %>/memory.stat">
-    Instance "<%= appId %>-memory"
-    Separator " \\n"
-    <Result>
-      Type gauge
-      InstancesFrom 0
-      ValuesFrom 1
-    </Result>
-  </Table>
-
-  <Table "/sys/fs/cgroup/memory/docker/<%= containerId %>/memory.max_usage_in_bytes">
-    Instance "<%= appId %>-memory"
-    Separator "\\n"
-    <Result>
-      Type gauge
-      InstancePrefix "max_usage_in_bytes"
-      ValuesFrom 0
-    </Result>
-  </Table>
-
-  <Table "/sys/fs/cgroup/cpuacct/docker/<%= containerId %>/cpuacct.stat">
-    Instance "<%= appId %>-cpu"
-    Separator " \\n"
-    <Result>
-      Type gauge
-      InstancesFrom 0
-      ValuesFrom 1
-    </Result>
-  </Table>
-</Plugin>
-
-<Plugin python>
-  <Module du>
-    <Path>
-        Instance "<%= appId %>"
-        Dir "<%= appDataDir %>"
-    </Path>
-  </Module>
-</Plugin>
-

src/collectd/app_cgroup_v2.ejs

@@ -1,42 +0,0 @@
-LoadPlugin "table"
-<Plugin table>
-  <Table "/sys/fs/cgroup/docker/<%= containerId %>/memory.stat">
-    Instance "<%= appId %>-memory"
-    Separator " \\n"
-    <Result>
-      Type gauge
-      InstancesFrom 0
-      ValuesFrom 1
-    </Result>
-  </Table>
-
-  <Table "/sys/fs/cgroup/docker/<%= containerId %>/memory.max">
-    Instance "<%= appId %>-memory"
-    Separator "\\n"
-    <Result>
-      Type gauge
-      InstancePrefix "max_usage_in_bytes"
-      ValuesFrom 0
-    </Result>
-  </Table>
-
-  <Table "/sys/fs/cgroup/docker/<%= containerId %>/cpu.stat">
-    Instance "<%= appId %>-cpu"
-    Separator " \\n"
-    <Result>
-      Type gauge
-      InstancesFrom 0
-      ValuesFrom 1
-    </Result>
-  </Table>
-</Plugin>
-
-<Plugin python>
-  <Module du>
-    <Path>
-        Instance "<%= appId %>"
-        Dir "<%= appDataDir %>"
-    </Path>
-  </Module>
-</Plugin>
-

src/constants.js

@@ -7,8 +7,8 @@ const CLOUDRON = process.env.BOX_ENV === 'cloudron',
     TEST = process.env.BOX_ENV === 'test';
 
 exports = module.exports = {
-    SMTP_LOCATION: 'smtp',
-    IMAP_LOCATION: 'imap',
+    SMTP_SUBDOMAIN: 'smtp',
+    IMAP_SUBDOMAIN: 'imap',
 
     // These are combined into one array because users and groups become mailboxes
     RESERVED_NAMES: [
@@ -22,7 +22,7 @@ exports = module.exports = {
         'admins', 'users'         // ldap code uses 'users' pseudo group
     ],
 
-    DASHBOARD_LOCATION: 'my',
+    DASHBOARD_SUBDOMAIN: 'my',
 
     PORT: CLOUDRON ? 3000 : 5454,
     INTERNAL_SMTP_PORT: 2525, // this value comes from the mail container
@@ -40,6 +40,7 @@ exports = module.exports = {
 
     DEMO_USERNAME: 'cloudron',
     DEMO_BLACKLISTED_APPS: [
+        'org.jupyter.cloudronapp',
         'com.github.cloudtorrent',
         'net.alltubedownload.cloudronapp',
         'com.adguard.home.cloudronapp',
@@ -49,6 +50,8 @@ exports = module.exports = {
     ],
     DEMO_APP_LIMIT: 20,
 
+    PROXY_APP_APPSTORE_ID: 'io.cloudron.builtin.appproxy',
+
     AUTOUPDATE_PATTERN_NEVER: 'never',
 
     // the db field is a blob so we make this explicit
@@ -72,6 +75,6 @@ exports = module.exports = {
 
     FOOTER: '&copy; %YEAR%  &nbsp;  [Cloudron](https://cloudron.io) &nbsp; &nbsp; &nbsp;  [Forum <i class="fa fa-comments"></i>](https://forum.cloudron.io)',
 
-    VERSION: process.env.BOX_ENV === 'cloudron' ? fs.readFileSync(path.join(__dirname, '../VERSION'), 'utf8').trim() : '7.0.0-test'
+    VERSION: process.env.BOX_ENV === 'cloudron' ? fs.readFileSync(path.join(__dirname, '../VERSION'), 'utf8').trim() : '7.3.0-test'
 };
 

src/cron.js

@@ -28,13 +28,13 @@ const appHealthMonitor = require('./apphealthmonitor.js'),
     dyndns = require('./dyndns.js'),
     eventlog = require('./eventlog.js'),
     janitor = require('./janitor.js'),
+    paths = require('./paths.js'),
     safe = require('safetydance'),
     scheduler = require('./scheduler.js'),
     settings = require('./settings.js'),
     system = require('./system.js'),
     updater = require('./updater.js'),
     updateChecker = require('./updatechecker.js'),
-    userdirectory = require('./userdirectory.js'),
     _ = require('underscore');
 
 const gJobs = {
@@ -50,7 +50,8 @@ const gJobs = {
     dockerVolumeCleaner: null,
     dynamicDns: null,
     schedulerSync: null,
-    appHealthMonitor: null
+    appHealthMonitor: null,
+    diskUsage: null
 };
 
 // cron format
@@ -61,16 +62,46 @@ const gJobs = {
 // Months: 0-11
 // Day of Week: 0-6
 
-async function startJobs() {
-    debug('startJobs: starting cron jobs');
+function getCronSeed() {
+    let hour = null;
+    let minute = null;
+
+    const seedData = safe.fs.readFileSync(paths.CRON_SEED_FILE, 'utf8') || '';
+    const parts = seedData.split(':');
+    if (parts.length === 2) {
+        hour = parseInt(parts[0]) || null;
+        minute = parseInt(parts[1]) || null;
+    }
+
+    if ((hour == null || hour < 0 || hour > 23) || (minute == null || minute < 0 || minute > 60)) {
+        hour = Math.floor(24 * Math.random());
+        minute = Math.floor(60 * Math.random());
+
+        debug(`getCronSeed: writing new cron seed file with ${hour}:${minute} to ${paths.CRON_SEED_FILE}`);
+
+        safe.fs.writeFileSync(paths.CRON_SEED_FILE, `${hour}:${minute}`);
+    }
+
+    return { hour, minute };
+}
+
+async function startJobs() {
+    const { hour, minute } = getCronSeed();
+
+    debug(`startJobs: starting cron jobs with hour ${hour} and minute ${minute}`);
 
-    const randomTick = Math.floor(60*Math.random());
     gJobs.systemChecks = new CronJob({
-        cronTime: `${randomTick} ${randomTick} 2 * * *`, // once a day. if you change this interval, change the notification messages with correct duration
+        cronTime: `00 ${minute} 2 * * *`, // once a day. if you change this interval, change the notification messages with correct duration
         onTick: async () => await safe(cloudron.runSystemChecks(), { debug }),
         start: true
     });
 
+    gJobs.diskUsage = new CronJob({
+        cronTime: `00 ${minute} 3 * * *`, // once a day
+        onTick: async () => await safe(cloudron.updateDiskUsage(), { debug }),
+        start: true
+    });
+
     gJobs.diskSpaceChecker = new CronJob({
         cronTime: '00 30 * * * *', // every 30 minutes. if you change this interval, change the notification messages with correct duration
         onTick: async () => await safe(system.checkDiskSpace(), { debug }),
@@ -79,7 +110,7 @@ async function startJobs() {
 
     // this is run separately from the update itself so that the user can disable automatic updates but can still get a notification
     gJobs.updateCheckerJob = new CronJob({
-        cronTime: `${randomTick} ${randomTick} 1,5,9,13,17,21,23 * * *`,
+        cronTime: `00 ${minute} 1,5,9,13,17,21,23 * * *`,
         onTick: async () => await safe(updateChecker.checkForUpdates({ automatic: true }), { debug }),
         start: true
     });
@@ -98,7 +129,7 @@ async function startJobs() {
 
     gJobs.cleanupEventlog = new CronJob({
         cronTime: '00 */30 * * * *', // every 30 minutes
-        onTick: async () => await safe(eventlog.cleanup({ creationTime: new Date(Date.now() - 60 * 60 * 24 * 10 * 1000) }), { debug }), // 10 days ago
+        onTick: async () => await safe(eventlog.cleanup({ creationTime: new Date(Date.now() - 60 * 60 * 24 * 60 * 1000) }), { debug }), // 60 days ago
         start: true
     });
 
@@ -114,8 +145,9 @@ async function startJobs() {
         start: true
     });
 
+    // randomized per Cloudron based on hourlySeed
     gJobs.certificateRenew = new CronJob({
-        cronTime: '00 00 */12 * * *', // every 12 hours
+        cronTime: `00 10 ${hour} * * *`,
         onTick: async () => await safe(cloudron.renewCerts({}, AuditSource.CRON), { debug }),
         start: true
     });
@@ -148,10 +180,6 @@ async function handleSettingsChanged(key, value) {
         await stopJobs();
         await startJobs();
         break;
-    case settings.USER_DIRECTORY_KEY:
-        if (value.enabled) await userdirectory.start();
-        else await userdirectory.stop();
-        break;
     default:
         break;
     }

src/database.js

@@ -61,8 +61,9 @@ async function initialize() {
         // note the pool also has an 'acquire' event but that is called whenever we do a getConnection()
         connection.on('error', (error) => debug(`Connection ${connection.threadId} error: ${error.message} ${error.code}`));
 
-        connection.query('USE ' + gDatabase.name);
+        connection.query(`USE ${gDatabase.name}`);
         connection.query('SET SESSION sql_mode = \'strict_all_tables\'');
+        connection.query('SET SESSION group_concat_max_len = 65536'); // GROUP_CONCAT has only 1024 default
     });
 }
 

src/df.js

@@ -0,0 +1,46 @@
+'use strict';
+
+exports = module.exports = {
+    disks,
+    file
+};
+
+const assert = require('assert'),
+    BoxError = require('./boxerror.js'),
+    safe = require('safetydance');
+
+function parseLine(line) {
+    const parts = line.split(/\s+/, 7); // this way the mountpoint can have spaces in it
+
+    return {
+        filesystem: parts[0],
+        type: parts[1],
+        size: Number.parseInt(parts[2], 10),
+        used: Number.parseInt(parts[3], 10),
+        available: Number.parseInt(parts[4], 10),
+        capacity: Number.parseInt(parts[5], 10) / 100, // note: this has a trailing %
+        mountpoint: parts[6]
+    };
+}
+
+async function disks() {
+    const output = safe.child_process.execSync('df -B1 --output=source,fstype,size,used,avail,pcent,target', { encoding: 'utf8' });
+    if (!output) throw new BoxError(BoxError.FS_ERROR, `Error running df: ${safe.error.message}`);
+
+    const lines = output.trim().split('\n').slice(1); // discard header
+    const result = [];
+    for (const line of lines) {
+        result.push(parseLine(line));
+    }
+    return result;
+}
+
+async function file(filename) {
+    assert.strictEqual(typeof filename, 'string');
+
+    const output = safe.child_process.execSync(`df -B1 --output=source,fstype,size,used,avail,pcent,target ${filename}`, { encoding: 'utf8' });
+    if (!output) throw new BoxError(BoxError.FS_ERROR, `Error running df: ${safe.error.message}`);
+
+    const lines = output.trim().split('\n').slice(1); // discard header
+    return parseLine(lines[0]);
+}

src/directoryserver.js

@@ -4,6 +4,8 @@ exports = module.exports = {
     start,
     stop,
 
+    checkCertificate,
+
     validateConfig,
     applyConfig
 };
@@ -11,29 +13,25 @@ exports = module.exports = {
 const assert = require('assert'),
     BoxError = require('./boxerror.js'),
     constants = require('./constants.js'),
-    debug = require('debug')('box:userdirectory'),
-    dns = require('./dns.js'),
-    domains = require('./domains.js'),
+    debug = require('debug')('box:directoryserver'),
     eventlog = require('./eventlog.js'),
-    fs = require('fs'),
     groups = require('./groups.js'),
     ldap = require('ldapjs'),
     path = require('path'),
     paths = require('./paths.js'),
-    reverseproxy = require('./reverseproxy.js'),
+    reverseProxy = require('./reverseproxy.js'),
     safe = require('safetydance'),
     settings = require('./settings.js'),
+    speakeasy = require('speakeasy'),
     shell = require('./shell.js'),
     users = require('./users.js'),
     util = require('util'),
     validator = require('validator');
 
-let gServer = null;
+let gServer = null, gCertificate = null;
 
 const NOOP = function () {};
 
-const GROUP_USERS_DN = 'cn=users,ou=groups,dc=cloudron';
-const GROUP_ADMINS_DN = 'cn=admins,ou=groups,dc=cloudron';
 const SET_LDAP_ALLOWLIST_CMD = path.join(__dirname, 'scripts/setldapallowlist.sh');
 
 async function validateConfig(config) {
@@ -68,6 +66,8 @@ async function applyConfig(config) {
 
     const [error] = await safe(shell.promises.sudo('setLdapAllowlist', [ SET_LDAP_ALLOWLIST_CMD ], {}));
     if (error) throw new BoxError(BoxError.IPTABLES_ERROR, `Error setting ldap allowlist: ${error.message}`);
+
+    if (config.enabled) await start(); else await stop();
 }
 
 // helper function to deal with pagination
@@ -142,23 +142,43 @@ async function authorize(req, res, next) {
     return next();
 }
 
+// https://ldapwiki.com/wiki/RootDSE / RFC 4512 - ldapsearch -x -h "${CLOUDRON_LDAP_SERVER}" -p "${CLOUDRON_LDAP_PORT}" -b  "" -s base
+// ldapjs seems to call this handler for everything when search === ''
+async function maybeRootDSE(req, res, next) {
+    debug(`maybeRootDSE: requested with scope:${req.scope} dn:${req.dn.toString()}`);
+
+    if (req.scope !== 'base') return next(new ldap.NoSuchObjectError()); // per the spec, rootDSE search require base scope
+    if (!req.dn || req.dn.toString() !== '') return next(new ldap.NoSuchObjectError());
+
+    res.send({
+        dn: '',
+        attributes: {
+            objectclass: [ 'RootDSE', 'top', 'OpenLDAProotDSE' ],
+            supportedLDAPVersion: '3',
+            vendorName: 'Cloudron LDAP',
+            vendorVersion: '1.0.0'
+        }
+    });
+    res.end();
+}
+
 async function userSearch(req, res, next) {
     debug('user search: dn %s, scope %s, filter %s (from %s)', req.dn.toString(), req.scope, req.filter.toString(), req.connection.ldap.id);
 
-    const [error, result] = await safe(users.list());
+    const [error, allUsers] = await safe(users.list());
     if (error) return next(new ldap.OperationsError(error.toString()));
 
+    const [groupsError, allGroups] = await safe(groups.listWithMembers());
+    if (groupsError) return next(new ldap.OperationsError(error.toString()));
+
     let results = [];
 
     // send user objects
-    result.forEach(function (user) {
+    for (const user of allUsers) {
         // skip entries with empty username. Some apps like owncloud can't deal with this
-        if (!user.username) return;
+        if (!user.username) continue;
 
-        const dn = ldap.parseDN('cn=' + user.id + ',ou=users,dc=cloudron');
-
-        const memberof = [ GROUP_USERS_DN ];
-        if (users.compareRoles(user.role, users.ROLE_ADMIN) >= 0) memberof.push(GROUP_ADMINS_DN);
+        const dn = ldap.parseDN(`cn=${user.id},ou=users,dc=cloudron`);
 
         const displayName = user.displayName || user.username || ''; // displayName can be empty and username can be null
         const nameParts = displayName.split(' ');
@@ -179,10 +199,12 @@ async function userSearch(req, res, next) {
                 givenName: firstName,
                 username: user.username,
                 samaccountname: user.username,      // to support ActiveDirectory clients
-                memberof: memberof
+                memberof: allGroups.filter(function (g) { return g.userIds.indexOf(user.id) !== -1; }).map(function (g) { return `cn=${g.name},ou=groups,dc=cloudron`; })
             }
         };
 
+        if (user.twoFactorAuthenticationEnabled) obj.attributes.twoFactorAuthenticationEnabled = true;
+
         // http://www.zytrax.com/books/ldap/ape/core-schema.html#sn has 'name' as SUP which is a DirectoryString
         // which is required to have atleast one character if present
         if (lastName.length !== 0) obj.attributes.sn = lastName;
@@ -194,7 +216,7 @@ async function userSearch(req, res, next) {
         if ((req.dn.equals(dn) || req.dn.parentOf(dn)) && lowerCaseFilter.matches(obj.attributes)) {
             results.push(obj);
         }
-    });
+    }
 
     finalSend(results, req, res, next);
 }
@@ -202,54 +224,24 @@ async function userSearch(req, res, next) {
 async function groupSearch(req, res, next) {
     debug('group search: dn %s, scope %s, filter %s (from %s)', req.dn.toString(), req.scope, req.filter.toString(), req.connection.ldap.id);
 
-    const [error, result] = await safe(users.list());
+    const [error, allUsers] = await safe(users.list());
     if (error) return next(new ldap.OperationsError(error.toString()));
 
     const results = [];
 
-    // those are the old virtual groups for backwards compat
-    const virtualGroups = [{
-        name: 'users',
-        admin: false
-    }, {
-        name: 'admins',
-        admin: true
-    }];
-
-    virtualGroups.forEach(function (group) {
-        const dn = ldap.parseDN('cn=' + group.name + ',ou=groups,dc=cloudron');
-        const members = group.admin ? result.filter(function (user) { return users.compareRoles(user.role, users.ROLE_ADMIN) >= 0; }) : result;
-
-        const obj = {
-            dn: dn.toString(),
-            attributes: {
-                objectclass: ['group'],
-                cn: group.name,
-                memberuid: members.map(function(entry) { return entry.id; }).sort()
-            }
-        };
-
-        // ensure all filter values are also lowercase
-        const lowerCaseFilter = safe(function () { return ldap.parseFilter(req.filter.toString().toLowerCase()); }, null);
-        if (!lowerCaseFilter) return next(new ldap.OperationsError(safe.error.toString()));
-
-        if ((req.dn.equals(dn) || req.dn.parentOf(dn)) && lowerCaseFilter.matches(obj.attributes)) {
-            results.push(obj);
-        }
-    });
-
-    let [errorGroups, resultGroups] = await safe(groups.listWithMembers());
+    let [errorGroups, allGroups] = await safe(groups.listWithMembers());
     if (errorGroups) return next(new ldap.OperationsError(errorGroups.toString()));
 
-    resultGroups.forEach(function (group) {
-        const dn = ldap.parseDN('cn=' + group.name + ',ou=groups,dc=cloudron');
-        const members = group.userIds.filter(function (uid) { return result.map(function (u) { return u.id; }).indexOf(uid) !== -1; });
+    for (const group of allGroups) {
+        const dn = ldap.parseDN(`cn=${group.name},ou=groups,dc=cloudron`);
+        const members = group.userIds.filter(function (uid) { return allUsers.map(function (u) { return u.id; }).indexOf(uid) !== -1; });
 
         const obj = {
             dn: dn.toString(),
             attributes: {
                 objectclass: ['group'],
                 cn: group.name,
+                gidnumber: group.id,
                 memberuid: members
             }
         };
@@ -261,7 +253,7 @@ async function groupSearch(req, res, next) {
         if ((req.dn.equals(dn) || req.dn.parentOf(dn)) && lowerCaseFilter.matches(obj.attributes)) {
             results.push(obj);
         }
-    });
+    }
 
     finalSend(results, req, res, next);
 }
@@ -269,12 +261,15 @@ async function groupSearch(req, res, next) {
 // Will attach req.user if successful
 async function userAuth(req, res, next) {
     // extract the common name which might have different attribute names
-    const attributeName = Object.keys(req.dn.rdns[0].attrs)[0];
-    const commonName = req.dn.rdns[0].attrs[attributeName].value;
+    const cnAttributeName = Object.keys(req.dn.rdns[0].attrs)[0];
+    const commonName = req.dn.rdns[0].attrs[cnAttributeName].value;
     if (!commonName) return next(new ldap.NoSuchObjectError(req.dn.toString()));
 
+    const TOTPTOKEN_ATTRIBUTE_NAME = 'totptoken'; // This has to be in-sync with externalldap.js
+    const totpToken = req.dn.rdns[0].attrs[TOTPTOKEN_ATTRIBUTE_NAME] ? req.dn.rdns[0].attrs[TOTPTOKEN_ATTRIBUTE_NAME].value : null;
+
     let verifyFunc;
-    if (attributeName === 'mail') {
+    if (cnAttributeName === 'mail') {
         verifyFunc = users.verifyWithEmail;
     } else if (commonName.indexOf('@') !== -1) { // if mail is specified, enforce mail check
         verifyFunc = users.verifyWithEmail;
@@ -289,12 +284,17 @@ async function userAuth(req, res, next) {
     if (error && error.reason === BoxError.INVALID_CREDENTIALS) return next(new ldap.InvalidCredentialsError(req.dn.toString()));
     if (error) return next(new ldap.OperationsError(error.message));
 
+    // currently this is only optional if totpToken is provided and user has 2fa enabled
+    if (totpToken && user.twoFactorAuthenticationEnabled) {
+        const verified = speakeasy.totp.verify({ secret: user.twoFactorAuthenticationSecret, encoding: 'base32', token: totpToken, window: 2 });
+        if (!verified) return next(new ldap.InvalidCredentialsError(req.dn.toString()));
+    }
+
     req.user = user;
 
     next();
 }
 
-// FIXME this needs to be restarted if settings changes or dashboard cert got renewed
 async function start() {
     if (gServer) return; // already running
 
@@ -307,13 +307,11 @@ async function start() {
         fatal: debug
     };
 
-    const domainObject = await domains.get(settings.dashboardDomain());
-    const dashboardFqdn = dns.fqdn(constants.DASHBOARD_LOCATION, domainObject);
-    const bundle = await reverseproxy.getCertificatePath(dashboardFqdn, domainObject.domain);
+    gCertificate = await reverseProxy.getDirectoryServerCertificate();
 
     gServer = ldap.createServer({
-        certificate: fs.readFileSync(bundle.certFilePath, 'utf8'),
-        key: fs.readFileSync(bundle.keyFilePath, 'utf8'),
+        certificate: gCertificate.cert,
+        key: gCertificate.key,
         log: logger
     });
 
@@ -324,12 +322,12 @@ async function start() {
     gServer.bind('ou=system,dc=cloudron', async function(req, res, next) {
         debug('system bind: %s (from %s)', req.dn.toString(), req.connection.ldap.id);
 
-        const tmp = await settings.getUserDirectoryConfig();
+        const tmp = await settings.getDirectoryServerConfig();
 
         if (!req.dn.equals(constants.USER_DIRECTORY_LDAP_DN)) return next(new ldap.InvalidCredentialsError(req.dn.toString()));
         if (req.credentials !== tmp.secret) return next(new ldap.InvalidCredentialsError(req.dn.toString()));
 
-        req.user = { user: 'userDirectoryAdmin' };
+        req.user = { user: 'directoryServerAdmin' };
 
         res.end();
 
@@ -342,11 +340,13 @@ async function start() {
     gServer.bind('ou=users,dc=cloudron', userAuth, async function (req, res) {
         assert.strictEqual(typeof req.user, 'object');
 
-        await eventlog.upsertLoginEvent(eventlog.ACTION_USER_LOGIN, { authType: 'userdirectory', id: req.connection.ldap.id }, { userId: req.user.id, user: users.removePrivateFields(req.user) });
+        await eventlog.upsertLoginEvent(req.user.ghost ? eventlog.ACTION_USER_LOGIN_GHOST : eventlog.ACTION_USER_LOGIN, { authType: 'directoryserver', id: req.connection.ldap.id }, { userId: req.user.id, user: users.removePrivateFields(req.user) });
 
         res.end();
     });
 
+    gServer.search('', maybeRootDSE); // when '', it seems the callback is called for everything else
+
     // just log that an attempt was made to unknown route, this helps a lot during app packaging
     gServer.use(function(req, res, next) {
         debug('not handled: dn %s, scope %s, filter %s (from %s)', req.dn ? req.dn.toString() : '-', req.scope, req.filter ? req.filter.toString() : '-', req.connection.ldap.id);
@@ -365,3 +365,15 @@ async function stop() {
     gServer.close();
     gServer = null;
 }
+
+async function checkCertificate() {
+    const certificate = await reverseProxy.getDirectoryServerCertificate();
+    if (certificate.cert === gCertificate.cert) {
+        debug('checkCertificate: certificate has not changed');
+        return;
+    }
+
+    debug('checkCertificate: certificate changed. restarting');
+    await stop();
+    await start();
+}

src/dns.js

@@ -59,28 +59,28 @@ function api(provider) {
     }
 }
 
-function fqdn(subdomain, domainObject) {
+function fqdn(subdomain, domain) {
     assert.strictEqual(typeof subdomain, 'string');
-    assert.strictEqual(typeof domainObject, 'object');
+    assert.strictEqual(typeof domain, 'string');
 
-    return subdomain + (subdomain ? '.' : '') + domainObject.domain;
+    return subdomain + (subdomain ? '.' : '') + domain;
 }
 
 // Hostname validation comes from RFC 1123 (section 2.1)
 // Domain name validation comes from RFC 2181 (Name syntax)
 // https://en.wikipedia.org/wiki/Hostname#Restrictions_on_valid_host_names
 // We are validating the validity of the location-fqdn as host name (and not dns name)
-function validateHostname(subdomain, domainObject) {
+function validateHostname(subdomain, domain) {
     assert.strictEqual(typeof subdomain, 'string');
-    assert.strictEqual(typeof domainObject, 'object');
+    assert.strictEqual(typeof domain, 'string');
 
-    const hostname = fqdn(subdomain, domainObject);
+    const hostname = fqdn(subdomain, domain);
 
-    const RESERVED_LOCATIONS = [
-        constants.SMTP_LOCATION,
-        constants.IMAP_LOCATION
+    const RESERVED_SUBDOMAINS = [
+        constants.SMTP_SUBDOMAIN,
+        constants.IMAP_SUBDOMAIN
     ];
-    if (RESERVED_LOCATIONS.indexOf(subdomain) !== -1) return new BoxError(BoxError.BAD_FIELD, `subdomain '${subdomain}' is reserved`);
+    if (RESERVED_SUBDOMAINS.indexOf(subdomain) !== -1) return new BoxError(BoxError.BAD_FIELD, `subdomain '${subdomain}' is reserved`);
 
     if (hostname === settings.dashboardFqdn()) return new BoxError(BoxError.BAD_FIELD, `subdomain '${subdomain}' is reserved`);
 
@@ -184,11 +184,11 @@ async function waitForDnsRecord(subdomain, domain, type, value, options) {
     await api(domainObject.provider).wait(domainObject, subdomain, type, value, options);
 }
 
-function makeWildcard(vhost) {
-    assert.strictEqual(typeof vhost, 'string');
+function makeWildcard(fqdn) {
+    assert.strictEqual(typeof fqdn, 'string');
 
-    // if the vhost is like *.example.com, this function will do nothing
-    let parts = vhost.split('.');
+    // if the fqdn is like *.example.com, this function will do nothing
+    const parts = fqdn.split('.');
     parts[0] = '*';
     return parts.join('.');
 }
@@ -295,7 +295,7 @@ async function syncDnsRecords(options, progressCallback) {
         progress += Math.round(100/(1+allDomains.length));
 
         let locations = [];
-        if (domain.domain === settings.dashboardDomain()) locations.push({ subdomain: constants.DASHBOARD_LOCATION, domain: settings.dashboardDomain() });
+        if (domain.domain === settings.dashboardDomain()) locations.push({ subdomain: constants.DASHBOARD_SUBDOMAIN, domain: settings.dashboardDomain() });
         if (domain.domain === settings.mailDomain() && settings.mailFqdn() !== settings.dashboardFqdn()) locations.push({ subdomain: mailSubdomain, domain: settings.mailDomain() });
 
         for (const app of allApps) {

src/dns/cloudflare.js

@@ -105,7 +105,7 @@ async function upsert(domainObject, location, type, values) {
 
     const domainConfig = domainObject.config,
         zoneName = domainObject.zoneName,
-        fqdn = dns.fqdn(location, domainObject);
+        fqdn = dns.fqdn(location, domainObject.domain);
 
     debug('upsert: %s for zone %s of type %s with values %j', fqdn, zoneName, type, values);
 
@@ -166,7 +166,7 @@ async function get(domainObject, location, type) {
 
     const domainConfig = domainObject.config,
         zoneName = domainObject.zoneName,
-        fqdn = dns.fqdn(location, domainObject);
+        fqdn = dns.fqdn(location, domainObject.domain);
 
     const zone = await getZoneByName(domainConfig, zoneName);
     const result = await getDnsRecords(domainConfig, zone.id, fqdn, type);
@@ -182,7 +182,7 @@ async function del(domainObject, location, type, values) {
 
     const domainConfig = domainObject.config,
         zoneName = domainObject.zoneName,
-        fqdn = dns.fqdn(location, domainObject);
+        fqdn = dns.fqdn(location, domainObject.domain);
 
     const zone = await getZoneByName(domainConfig, zoneName);
 
@@ -212,7 +212,7 @@ async function wait(domainObject, subdomain, type, value, options) {
 
     const domainConfig = domainObject.config,
         zoneName = domainObject.zoneName,
-        fqdn = dns.fqdn(subdomain, domainObject);
+        fqdn = dns.fqdn(subdomain, domainObject.domain);
 
     debug('wait: %s for zone %s of type %s', fqdn, zoneName, type);
 

src/dns/digitalocean.js

@@ -200,11 +200,17 @@ async function wait(domainObject, subdomain, type, value, options) {
     assert.strictEqual(typeof value, 'string');
     assert(options && typeof options === 'object'); // { interval: 5000, times: 50000 }
 
-    const fqdn = dns.fqdn(subdomain, domainObject);
+    const fqdn = dns.fqdn(subdomain, domainObject.domain);
 
     await waitForDns(fqdn, domainObject.zoneName, type, value, options);
 }
 
+// https://stackoverflow.com/questions/14313183/javascript-regex-how-do-i-check-if-the-string-is-ascii-only
+function isASCII(str) {
+    // eslint-disable-next-line no-control-regex
+    return /^[\x00-\x7F]*$/.test(str);
+}
+
 async function verifyDomainConfig(domainObject) {
     assert.strictEqual(typeof domainObject, 'object');
 
@@ -212,6 +218,7 @@ async function verifyDomainConfig(domainObject) {
         zoneName = domainObject.zoneName;
 
     if (!domainConfig.token || typeof domainConfig.token !== 'string') throw new BoxError(BoxError.BAD_FIELD, 'token must be a non-empty string');
+    if (!isASCII(domainConfig.token)) throw new BoxError(BoxError.BAD_FIELD, 'token contains invalid characters');
 
     const ip = '127.0.0.1';
 

src/dns/gandi.js

@@ -119,7 +119,7 @@ async function wait(domainObject, subdomain, type, value, options) {
     assert.strictEqual(typeof value, 'string');
     assert(options && typeof options === 'object'); // { interval: 5000, times: 50000 }
 
-    const fqdn = dns.fqdn(subdomain, domainObject);
+    const fqdn = dns.fqdn(subdomain, domainObject.domain);
 
     await waitForDns(fqdn, domainObject.zoneName, type, value, options);
 }

src/dns/gcdns.js

@@ -76,7 +76,7 @@ async function upsert(domainObject, location, type, values) {
 
     const domainConfig = domainObject.config,
         zoneName = domainObject.zoneName,
-        fqdn = dns.fqdn(location, domainObject);
+        fqdn = dns.fqdn(location, domainObject.domain);
 
     debug('add: %s for zone %s of type %s with values %j', fqdn, zoneName, type, values);
 
@@ -105,7 +105,7 @@ async function get(domainObject, location, type) {
 
     const domainConfig = domainObject.config,
         zoneName = domainObject.zoneName,
-        fqdn = dns.fqdn(location, domainObject);
+        fqdn = dns.fqdn(location, domainObject.domain);
 
     const zone = await getZoneByName(getDnsCredentials(domainConfig), zoneName);
 
@@ -130,7 +130,7 @@ async function del(domainObject, location, type, values) {
 
     const domainConfig = domainObject.config,
         zoneName = domainObject.zoneName,
-        fqdn = dns.fqdn(location, domainObject);
+        fqdn = dns.fqdn(location, domainObject.domain);
 
     const zone = await getZoneByName(getDnsCredentials(domainConfig), zoneName);
 
@@ -151,7 +151,7 @@ async function wait(domainObject, subdomain, type, value, options) {
     assert.strictEqual(typeof value, 'string');
     assert(options && typeof options === 'object'); // { interval: 5000, times: 50000 }
 
-    const fqdn = dns.fqdn(subdomain, domainObject);
+    const fqdn = dns.fqdn(subdomain, domainObject.domain);
 
     await waitForDns(fqdn, domainObject.zoneName, type, value, options);
 }

src/dns/godaddy.js

@@ -151,7 +151,7 @@ async function wait(domainObject, subdomain, type, value, options) {
     assert.strictEqual(typeof value, 'string');
     assert(options && typeof options === 'object'); // { interval: 5000, times: 50000 }
 
-    const fqdn = dns.fqdn(subdomain, domainObject);
+    const fqdn = dns.fqdn(subdomain, domainObject.domain);
 
     await waitForDns(fqdn, domainObject.zoneName, type, value, options);
 }
@@ -178,7 +178,7 @@ async function verifyDomainConfig(domainObject) {
     if (error && error.code === 'ENOTFOUND') throw new BoxError(BoxError.BAD_FIELD, 'Unable to resolve nameservers for this domain');
     if (error || !nameservers) throw new BoxError(BoxError.BAD_FIELD, error ? error.message : 'Unable to get nameservers');
 
-    if (!nameservers.every(function (n) { return n.toLowerCase().indexOf('.domaincontrol.com') !== -1; })) {
+    if (!nameservers.every(function (n) { return n.toLowerCase().indexOf('.domaincontrol.com') !== -1 || n.toLowerCase().indexOf('.secureserver.net') !== -1; })) {
         debug('verifyDomainConfig: %j does not contain GoDaddy NS', nameservers);
         throw new BoxError(BoxError.BAD_FIELD, 'Domain nameservers are not set to GoDaddy');
     }

src/dns/hetzner.js

@@ -13,7 +13,7 @@ exports = module.exports = {
 const assert = require('assert'),
     BoxError = require('../boxerror.js'),
     constants = require('../constants.js'),
-    debug = require('debug')('box:dns/digitalocean'),
+    debug = require('debug')('box:dns/hetzner'),
     dig = require('../dig.js'),
     dns = require('../dns.js'),
     safe = require('safetydance'),
@@ -216,7 +216,7 @@ async function wait(domainObject, subdomain, type, value, options) {
     assert.strictEqual(typeof value, 'string');
     assert(options && typeof options === 'object'); // { interval: 5000, times: 50000 }
 
-    const fqdn = dns.fqdn(subdomain, domainObject);
+    const fqdn = dns.fqdn(subdomain, domainObject.domain);
 
     await waitForDns(fqdn, domainObject.zoneName, type, value, options);
 }

src/dns/linode.js

@@ -225,7 +225,7 @@ async function wait(domainObject, subdomain, type, value, options) {
     assert.strictEqual(typeof value, 'string');
     assert(options && typeof options === 'object'); // { interval: 5000, times: 50000 }
 
-    const fqdn = dns.fqdn(subdomain, domainObject);
+    const fqdn = dns.fqdn(subdomain, domainObject.domain);
 
     await waitForDns(fqdn, domainObject.zoneName, type, value, options);
 }

src/dns/manual.js

@@ -62,7 +62,7 @@ async function wait(domainObject, subdomain, type, value, options) {
     assert.strictEqual(typeof value, 'string');
     assert(options && typeof options === 'object'); // { interval: 5000, times: 50000 }
 
-    const fqdn = dns.fqdn(subdomain, domainObject);
+    const fqdn = dns.fqdn(subdomain, domainObject.domain);
 
     await waitForDns(fqdn, domainObject.zoneName, type, value, options);
 }

src/dns/namecheap.js

@@ -237,7 +237,7 @@ async function wait(domainObject, subdomain, type, value, options) {
     assert.strictEqual(typeof value, 'string');
     assert(options && typeof options === 'object'); // { interval: 5000, times: 50000 }
 
-    const fqdn = dns.fqdn(subdomain, domainObject);
+    const fqdn = dns.fqdn(subdomain, domainObject.domain);
 
     await waitForDns(fqdn, domainObject.zoneName, type, value, options);
 }

src/dns/namecom.js

@@ -206,7 +206,7 @@ async function wait(domainObject, subdomain, type, value, options) {
     assert.strictEqual(typeof value, 'string');
     assert(options && typeof options === 'object'); // { interval: 5000, times: 50000 }
 
-    const fqdn = dns.fqdn(subdomain, domainObject);
+    const fqdn = dns.fqdn(subdomain, domainObject.domain);
 
     await waitForDns(fqdn, domainObject.zoneName, type, value, options);
 }

src/dns/netcup.js

@@ -217,7 +217,7 @@ async function wait(domainObject, subdomain, type, value, options) {
     assert.strictEqual(typeof value, 'string');
     assert(options && typeof options === 'object'); // { interval: 5000, times: 50000 }
 
-    const fqdn = dns.fqdn(subdomain, domainObject);
+    const fqdn = dns.fqdn(subdomain, domainObject.domain);
 
     await waitForDns(fqdn, domainObject.zoneName, type, value, options);
 }

src/dns/route53.js

@@ -95,7 +95,7 @@ async function upsert(domainObject, location, type, values) {
 
     const domainConfig = domainObject.config,
         zoneName = domainObject.zoneName,
-        fqdn = dns.fqdn(location, domainObject);
+        fqdn = dns.fqdn(location, domainObject.domain);
 
     debug('add: %s for zone %s of type %s with values %j', fqdn, zoneName, type, values);
 
@@ -134,7 +134,7 @@ async function get(domainObject, location, type) {
 
     const domainConfig = domainObject.config,
         zoneName = domainObject.zoneName,
-        fqdn = dns.fqdn(location, domainObject);
+        fqdn = dns.fqdn(location, domainObject.domain);
 
     const zone = await getZoneByName(domainConfig, zoneName);
 
@@ -165,7 +165,7 @@ async function del(domainObject, location, type, values) {
 
     const domainConfig = domainObject.config,
         zoneName = domainObject.zoneName,
-        fqdn = dns.fqdn(location, domainObject);
+        fqdn = dns.fqdn(location, domainObject.domain);
 
     const zone = await getZoneByName(domainConfig, zoneName);
 
@@ -212,7 +212,7 @@ async function wait(domainObject, subdomain, type, value, options) {
     assert.strictEqual(typeof value, 'string');
     assert(options && typeof options === 'object'); // { interval: 5000, times: 50000 }
 
-    const fqdn = dns.fqdn(subdomain, domainObject);
+    const fqdn = dns.fqdn(subdomain, domainObject.domain);
 
     await waitForDns(fqdn, domainObject.zoneName, type, value, options);
 }

src/dns/vultr.js

@@ -195,7 +195,7 @@ async function wait(domainObject, subdomain, type, value, options) {
     assert.strictEqual(typeof value, 'string');
     assert(options && typeof options === 'object'); // { interval: 5000, times: 50000 }
 
-    const fqdn = dns.fqdn(subdomain, domainObject);
+    const fqdn = dns.fqdn(subdomain, domainObject.domain);
 
     await waitForDns(fqdn, domainObject.zoneName, type, value, options);
 }

src/dns/waitfordns.js

@@ -7,7 +7,8 @@ const assert = require('assert'),
     debug = require('debug')('box:dns/waitfordns'),
     dig = require('../dig.js'),
     promiseRetry = require('../promise-retry.js'),
-    safe = require('safetydance');
+    safe = require('safetydance'),
+    _ = require('underscore');
 
 async function resolveIp(hostname, type, options) {
     assert.strictEqual(typeof hostname, 'string');
@@ -20,13 +21,13 @@ async function resolveIp(hostname, type, options) {
     if (!error && results.length !== 0) return results;
 
     // try CNAME record at authoritative server
-    debug(`resolveIp: Checking if ${hostname} has CNAME record at ${options.server}`);
+    debug(`resolveIp: No A record. Checking if ${hostname} has CNAME record at ${options.server}`);
     const cnameResults = await dig.resolve(hostname, 'CNAME', options);
     if (cnameResults.length === 0) return cnameResults;
 
     // recurse lookup the CNAME record
-    debug(`resolveIp: Resolving ${hostname}'s CNAME record ${cnameResults[0]}`);
-    return await dig.resolve(cnameResults[0], type, options);
+    debug(`resolveIp: CNAME record found. Resolving ${hostname}'s CNAME record ${cnameResults[0]} using unbound`);
+    return await dig.resolve(cnameResults[0], type, _.omit(options, 'server'));
 }
 
 async function isChangeSynced(hostname, type, value, nameserver) {

src/dns/wildcard.js

@@ -62,7 +62,7 @@ async function wait(domainObject, subdomain, type, value, options) {
     assert.strictEqual(typeof value, 'string');
     assert(options && typeof options === 'object'); // { interval: 5000, times: 50000 }
 
-    const fqdn = dns.fqdn(subdomain, domainObject);
+    const fqdn = dns.fqdn(subdomain, domainObject.domain);
 
     await waitForDns(fqdn, domainObject.zoneName, type, value, options);
 }
@@ -77,7 +77,7 @@ async function verifyDomainConfig(domainObject) {
     if (error || !nameservers) throw new BoxError(BoxError.BAD_FIELD, error ? error.message : 'Unable to get nameservers');
 
     const location = 'cloudrontestdns';
-    const fqdn = dns.fqdn(location, domainObject);
+    const fqdn = dns.fqdn(location, domainObject.domain);
 
     const [ipv4Error, ipv4Result] = await safe(dig.resolve(fqdn, 'A', { server: '127.0.0.1', timeout: 5000 }));
     if (ipv4Error && (ipv4Error.code === 'ENOTFOUND' || ipv4Error.code === 'ENODATA')) throw new BoxError(BoxError.BAD_FIELD, `Unable to resolve IPv4 of ${fqdn}. Please check if you have set up *.${domainObject.domain} to point to this server's IP`);

src/docker.js

@@ -8,6 +8,7 @@ exports = module.exports = {
     ping,
 
     info,
+    df,
     downloadImage,
     createContainer,
     startContainer,
@@ -23,10 +24,6 @@ exports = module.exports = {
     getEvents,
     memoryUsage,
 
-    createVolume,
-    removeVolume,
-    clearVolume,
-
     update,
 
     createExec,
@@ -42,8 +39,7 @@ const apps = require('./apps.js'),
     debug = require('debug')('box:docker'),
     delay = require('./delay.js'),
     Docker = require('dockerode'),
-    path = require('path'),
-    reverseProxy = require('./reverseproxy.js'),
+    paths = require('./paths.js'),
     services = require('./services.js'),
     settings = require('./settings.js'),
     shell = require('./shell.js'),
@@ -52,9 +48,6 @@ const apps = require('./apps.js'),
     volumes = require('./volumes.js'),
     _ = require('underscore');
 
-const CLEARVOLUME_CMD = path.join(__dirname, 'scripts/clearvolume.sh'),
-    MKDIRVOLUME_CMD = path.join(__dirname, 'scripts/mkdirvolume.sh');
-
 const DOCKER_SOCKET_PATH = '/var/run/docker.sock';
 const gConnection = new Docker({ socketPath: DOCKER_SOCKET_PATH });
 
@@ -200,28 +193,23 @@ async function getAddonMounts(app) {
 
     for (const addon of Object.keys(addons)) {
         switch (addon) {
-        case 'localstorage':
+        case 'localstorage': {
+            const storageDir = await apps.getStorageDir(app);
             mounts.push({
                 Target: '/app/data',
-                Source: `${app.id}-localstorage`,
-                Type: 'volume',
+                Source: storageDir,
+                Type: 'bind',
                 ReadOnly: false
             });
 
             break;
+        }
         case 'tls': {
-            const bundle = await reverseProxy.getCertificatePath(app.fqdn, app.domain);
+            const certificateDir = `${paths.PLATFORM_DATA_DIR}/tls/${app.id}`;
 
             mounts.push({
-                Target: '/etc/certs/tls_cert.pem',
-                Source: bundle.certFilePath,
-                Type: 'bind',
-                ReadOnly: true
-            });
-
-            mounts.push({
-                Target: '/etc/certs/tls_key.pem',
-                Source: bundle.keyFilePath,
+                Target: '/etc/certs',
+                Source: certificateDir,
                 Type: 'bind',
                 ReadOnly: true
             });
@@ -320,6 +308,15 @@ async function createSubcontainer(app, name, cmd, options) {
     const mounts = await getMounts(app);
 
     const addonEnv = await services.getEnvironment(app);
+    const runtimeVolumes = {
+        '/tmp': {},
+        '/run': {},
+        '/home/cloudron/.cache': {},
+        '/root/.cache': {}
+    };
+    if (app.manifest.runtimeDirs) {
+        app.manifest.runtimeDirs.forEach(dir => runtimeVolumes[dir] = {});
+    }
 
     let containerOptions = {
         name: name, // for referencing containers
@@ -328,10 +325,7 @@ async function createSubcontainer(app, name, cmd, options) {
         Cmd: (isAppContainer && app.debugMode && app.debugMode.cmd) ? app.debugMode.cmd : cmd,
         Env: stdEnv.concat(addonEnv).concat(portEnv).concat(appEnv).concat(secondaryDomainsEnv),
         ExposedPorts: isAppContainer ? exposedPorts : { },
-        Volumes: { // see also ReadonlyRootfs
-            '/tmp': {},
-            '/run': {}
-        },
+        Volumes: runtimeVolumes,
         Labels: {
             'fqdn': app.fqdn,
             'appId': app.id,
@@ -348,7 +342,7 @@ async function createSubcontainer(app, name, cmd, options) {
                     'syslog-format': 'rfc5424'
                 }
             },
-            Memory: system.getMemoryAllocation(memoryLimit),
+            Memory: await system.getMemoryAllocation(memoryLimit),
             MemorySwap: memoryLimit, // Memory + Swap
             PortBindings: isAppContainer ? dockerPortBindings : { },
             PublishAllPorts: false,
@@ -630,59 +624,18 @@ async function memoryUsage(containerId) {
     return result;
 }
 
-async function createVolume(name, volumeDataDir, labels) {
-    assert.strictEqual(typeof name, 'string');
-    assert.strictEqual(typeof volumeDataDir, 'string');
-    assert.strictEqual(typeof labels, 'object');
-
-    const volumeOptions = {
-        Name: name,
-        Driver: 'local',
-        DriverOpts: { // https://github.com/moby/moby/issues/19990#issuecomment-248955005
-            type: 'none',
-            device: volumeDataDir,
-            o: 'bind'
-        },
-        Labels: labels
-    };
-
-    // requires sudo because the path can be outside appsdata
-    let [error] = await safe(shell.promises.sudo('createVolume', [ MKDIRVOLUME_CMD, volumeDataDir ], {}));
-    if (error) throw new BoxError(BoxError.FS_ERROR, `Error creating app data dir: ${error.message}`);
-
-    [error] = await safe(gConnection.createVolume(volumeOptions));
-    if (error) throw new BoxError(BoxError.DOCKER_ERROR, error);
-}
-
-async function clearVolume(name, options) {
-    assert.strictEqual(typeof name, 'string');
-    assert.strictEqual(typeof options, 'object');
-
-    let volume = gConnection.getVolume(name);
-    let [error, v] = await safe(volume.inspect());
-    if (error && error.statusCode === 404) return;
-    if (error) throw new BoxError(BoxError.DOCKER_ERROR, error);
-
-    const volumeDataDir = v.Options.device;
-    [error] = await shell.promises.sudo('clearVolume', [ CLEARVOLUME_CMD, options.removeDirectory ? 'rmdir' : 'clear', volumeDataDir ], {});
-    if (error) throw new BoxError(BoxError.FS_ERROR, error);
-}
-
-// this only removes the volume and not the data
-async function removeVolume(name) {
-    assert.strictEqual(typeof name, 'string');
-
-    let volume = gConnection.getVolume(name);
-    const [error] = await safe(volume.remove());
-    if (error && error.statusCode !== 404) throw new BoxError(BoxError.DOCKER_ERROR, `removeVolume: Error removing volume: ${error.message}`);
-}
-
 async function info() {
     const [error, result] = await safe(gConnection.info());
     if (error) throw new BoxError(BoxError.DOCKER_ERROR, 'Error connecting to docker');
     return result;
 }
 
+async function df() {
+    const [error, result] = await safe(gConnection.df());
+    if (error) throw new BoxError(BoxError.DOCKER_ERROR, 'Error connecting to docker');
+    return result;
+}
+
 async function update(name, memory, memorySwap) {
     assert.strictEqual(typeof name, 'string');
     assert.strictEqual(typeof memory, 'number');

src/domains.js

@@ -9,6 +9,8 @@ module.exports = exports = {
     del,
     clear,
 
+    getDomainObjectMap,
+
     removePrivateFields,
     removeRestrictedFields,
 };
@@ -17,6 +19,7 @@ const assert = require('assert'),
     BoxError = require('./boxerror.js'),
     crypto = require('crypto'),
     database = require('./database.js'),
+    debug = require('debug')('box:domains'),
     eventlog = require('./eventlog.js'),
     mail = require('./mail.js'),
     reverseProxy = require('./reverseproxy.js'),
@@ -77,13 +80,13 @@ async function verifyDomainConfig(domainConfig, domain, zoneName, provider) {
     if (!backend) throw new BoxError(BoxError.BAD_FIELD, 'Invalid provider');
 
     const domainObject = { config: domainConfig, domain: domain, zoneName: zoneName };
-    const [error, result] = await safe(api(provider).verifyDomainConfig(domainObject));
-    if (error && error.reason === BoxError.ACCESS_DENIED) return { error: new BoxError(BoxError.BAD_FIELD, `Access denied: ${error.message}`) };
-    if (error && error.reason === BoxError.NOT_FOUND) return { error: new BoxError(BoxError.BAD_FIELD, `Zone not found: ${error.message}`) };
-    if (error && error.reason === BoxError.EXTERNAL_ERROR) return { error: new BoxError(BoxError.BAD_FIELD, `Configuration error: ${error.message}`) };
-    if (error) return { error };
+    const [error, sanitizedConfig] = await safe(api(provider).verifyDomainConfig(domainObject));
+    if (error && error.reason === BoxError.ACCESS_DENIED) throw new BoxError(BoxError.BAD_FIELD, `Access denied: ${error.message}`);
+    if (error && error.reason === BoxError.NOT_FOUND) throw new BoxError(BoxError.BAD_FIELD, `Zone not found: ${error.message}`);
+    if (error && error.reason === BoxError.EXTERNAL_ERROR) throw new BoxError(BoxError.BAD_FIELD, `Configuration error: ${error.message}`);
+    if (error) throw error;
 
-    return { error: null, sanitizedConfig: result };
+    return sanitizedConfig;
 }
 
 function validateTlsConfig(tlsConfig, dnsProvider) {
@@ -134,7 +137,7 @@ async function add(domain, data, auditSource) {
     }
 
     if (fallbackCertificate) {
-        let error = reverseProxy.validateCertificate('test', { domain, config }, fallbackCertificate);
+        let error = reverseProxy.validateCertificate('test', domain, fallbackCertificate);
         if (error) throw error;
     } else {
         fallbackCertificate = await reverseProxy.generateFallbackCertificate(domain);
@@ -151,12 +154,11 @@ async function add(domain, data, auditSource) {
         dkimSelector = `cloudron-${suffix}`;
     }
 
-    const result = await verifyDomainConfig(config, domain, zoneName, provider);
-    if (result.error) throw result.error;
+    const sanitizedConfig = await verifyDomainConfig(config, domain, zoneName, provider);
 
-    let queries = [
+    const queries = [
         { query: 'INSERT INTO domains (domain, zoneName, provider, configJson, tlsConfigJson, fallbackCertificateJson) VALUES (?, ?, ?, ?, ?, ?)',
-            args: [ domain, zoneName, provider, JSON.stringify(result.sanitizedConfig), JSON.stringify(tlsConfig), JSON.stringify(fallbackCertificate) ] },
+            args: [ domain, zoneName, provider, JSON.stringify(sanitizedConfig), JSON.stringify(tlsConfig), JSON.stringify(fallbackCertificate) ] },
         { query: 'INSERT INTO mail (domain, dkimKeyJson, dkimSelector) VALUES (?, ?, ?)', args: [ domain, JSON.stringify(dkimKey), dkimSelector || 'cloudron' ] },
     ];
 
@@ -168,7 +170,7 @@ async function add(domain, data, auditSource) {
 
     await eventlog.add(eventlog.ACTION_DOMAIN_ADD, auditSource, { domain, zoneName, provider });
 
-    safe(mail.onDomainAdded(domain)); // background
+    safe(mail.onDomainAdded(domain), { debug }); // background
 }
 
 async function get(domain) {
@@ -195,7 +197,6 @@ async function setConfig(domain, data, auditSource) {
     assert.strictEqual(typeof auditSource, 'object');
 
     let { zoneName, provider, config, fallbackCertificate, tlsConfig } = data;
-    let error;
 
     if (settings.isDemo() && (domain === settings.dashboardDomain())) throw new BoxError(BoxError.CONFLICT, 'Not allowed in demo mode');
 
@@ -207,20 +208,19 @@ async function setConfig(domain, data, auditSource) {
     }
 
     if (fallbackCertificate) {
-        let error = reverseProxy.validateCertificate('test', domainObject, fallbackCertificate);
+        let error = reverseProxy.validateCertificate('test', domain, fallbackCertificate);
         if (error) throw error;
     }
 
-    error = validateTlsConfig(tlsConfig, provider);
-    if (error) throw error;
+    const tlsConfigError = validateTlsConfig(tlsConfig, provider);
+    if (tlsConfigError) throw tlsConfigError;
 
     if (provider === domainObject.provider) api(provider).injectPrivateFields(config, domainObject.config);
 
-    const result = await verifyDomainConfig(config, domain, zoneName, provider);
-    if (result.error) throw result.error;
+    const sanitizedConfig = await verifyDomainConfig(config, domain, zoneName, provider);
 
     const newData = {
-        config: result.sanitizedConfig,
+        config: sanitizedConfig,
         zoneName,
         provider,
         tlsConfig,
@@ -228,7 +228,7 @@ async function setConfig(domain, data, auditSource) {
 
     if (fallbackCertificate) newData.fallbackCertificate = fallbackCertificate;
 
-    let args = [ ], fields = [ ];
+    const args = [], fields = [];
     for (const k in newData) {
         if (k === 'config' || k === 'tlsConfig' || k === 'fallbackCertificate') { // json fields
             fields.push(`${k}Json = ?`);
@@ -240,13 +240,11 @@ async function setConfig(domain, data, auditSource) {
     }
     args.push(domain);
 
-    [error] = await safe(database.query('UPDATE domains SET ' + fields.join(', ') + ' WHERE domain=?', args));
-    if (error && error.reason === BoxError.NOT_FOUND) throw new BoxError(BoxError.NOT_FOUND, 'Domain not found');
-    if (error) throw new BoxError(BoxError.DATABASE_ERROR, error);
+    const result = await database.query('UPDATE domains SET ' + fields.join(', ') + ' WHERE domain=?', args);
+    if (result.affectedRows === 0) throw new BoxError(BoxError.NOT_FOUND, 'Domain not found');
 
-    if (!fallbackCertificate) return;
-
-    await reverseProxy.setFallbackCertificate(domain, fallbackCertificate);
+    if (fallbackCertificate) await reverseProxy.setFallbackCertificate(domain, fallbackCertificate);
+    if (!_.isEqual(domainObject.tlsConfig, tlsConfig.provider)) await reverseProxy.handleCertificateProviderChanged(domain);
 
     await eventlog.add(eventlog.ACTION_DOMAIN_UPDATE, auditSource, { domain, zoneName, provider });
 }
@@ -256,12 +254,11 @@ async function setWellKnown(domain, wellKnown, auditSource) {
     assert.strictEqual(typeof wellKnown, 'object');
     assert.strictEqual(typeof auditSource, 'object');
 
-    let error = validateWellKnown(wellKnown);
-    if (error) throw error;
+    const wellKnownError = validateWellKnown(wellKnown);
+    if (wellKnownError) throw wellKnownError;
 
-    [error] = await safe(database.query('UPDATE domains SET wellKnownJson = ? WHERE domain=?', [ JSON.stringify(wellKnown), domain ]));
-    if (error && error.reason === BoxError.NOT_FOUND) throw new BoxError(BoxError.NOT_FOUND, 'Domain not found');
-    if (error) throw new BoxError(BoxError.DATABASE_ERROR, error);
+    const result = await database.query('UPDATE domains SET wellKnownJson = ? WHERE domain=?', [ JSON.stringify(wellKnown), domain ]);
+    if (result.affectedRows === 0) throw new BoxError(BoxError.NOT_FOUND, 'Domain not found');
 
     await eventlog.add(eventlog.ACTION_DOMAIN_UPDATE, auditSource, { domain, wellKnown });
 }
@@ -311,3 +308,10 @@ function removeRestrictedFields(domain) {
 
     return result;
 }
+
+async function getDomainObjectMap() {
+    const domainObjects = await list();
+    let domainObjectMap = {};
+    for (let d of domainObjects) { domainObjectMap[d.domain] = d; }
+    return domainObjectMap;
+}

src/dyndns.js

@@ -36,8 +36,8 @@ async function sync(auditSource) {
     }
 
     debug(`refreshDNS: updating IP from ${info.ipv4} to ipv4: ${ipv4} (changed: ${ipv4Changed}) ipv6: ${ipv6} (changed: ${ipv6Changed})`);
-    if (ipv4Changed) await dns.upsertDnsRecords(constants.DASHBOARD_LOCATION, settings.dashboardDomain(), 'A', [ ipv4 ]);
-    if (ipv6Changed) await dns.upsertDnsRecords(constants.DASHBOARD_LOCATION, settings.dashboardDomain(), 'AAAA', [ ipv6 ]);
+    if (ipv4Changed) await dns.upsertDnsRecords(constants.DASHBOARD_SUBDOMAIN, settings.dashboardDomain(), 'A', [ ipv4 ]);
+    if (ipv6Changed) await dns.upsertDnsRecords(constants.DASHBOARD_SUBDOMAIN, settings.dashboardDomain(), 'AAAA', [ ipv6 ]);
 
     const result = await apps.list();
     for (const app of result) {

src/eventlog.js

@@ -35,7 +35,7 @@ exports = module.exports = {
     ACTION_BACKUP_CLEANUP_FINISH: 'backup.cleanup.finish',
 
     ACTION_CERTIFICATE_NEW: 'certificate.new',
-    ACTION_CERTIFICATE_RENEWAL: 'certificate.renew',
+    ACTION_CERTIFICATE_RENEWAL: 'certificate.renew', // obsolete
     ACTION_CERTIFICATE_CLEANUP: 'certificate.cleanup',
 
     ACTION_DASHBOARD_DOMAIN_UPDATE: 'dashboard.domain.update',
@@ -69,6 +69,7 @@ exports = module.exports = {
 
     ACTION_USER_ADD: 'user.add',
     ACTION_USER_LOGIN: 'user.login',
+    ACTION_USER_LOGIN_GHOST: 'user.login.ghost',
     ACTION_USER_LOGOUT: 'user.logout',
     ACTION_USER_REMOVE: 'user.remove',
     ACTION_USER_UPDATE: 'user.update',

src/externalldap.js

@@ -2,6 +2,7 @@
 
 exports = module.exports = {
     verifyPassword,
+    verifyPasswordAndTotpToken,
     maybeCreateUser,
 
     testConfig,
@@ -44,6 +45,7 @@ function translateUser(ldapConfig, ldapUser) {
     return {
         username: ldapUser[ldapConfig.usernameField].toLowerCase(),
         email: ldapUser.mail || ldapUser.mailPrimaryAddress,
+        twoFactorAuthenticationEnabled: !!ldapUser.twoFactorAuthenticationEnabled,
         displayName: ldapUser.displayName || ldapUser.cn // user.giveName + ' ' + user.sn
     };
 }
@@ -254,8 +256,11 @@ async function maybeCreateUser(identifier) {
         throw error;
     }
 
-    // fetch the full record
-    return await users.get(userId);
+    // fetch the full record and amend potential twoFA settings
+    const newUser = await users.get(userId);
+    if (user.twoFactorAuthenticationEnabled) newUser.twoFactorAuthenticationEnabled = true;
+
+    return newUser;
 }
 
 async function verifyPassword(user, password) {
@@ -279,6 +284,32 @@ async function verifyPassword(user, password) {
     return translateUser(externalLdapConfig, ldapUsers[0]);
 }
 
+async function verifyPasswordAndTotpToken(user, password, totpToken) {
+    assert.strictEqual(typeof user, 'object');
+    assert.strictEqual(typeof password, 'string');
+    assert.strictEqual(typeof totpToken, 'string');
+
+    const externalLdapConfig = await settings.getExternalLdapConfig();
+    if (externalLdapConfig.provider === 'noop') throw new BoxError(BoxError.BAD_STATE, 'not enabled');
+
+    const ldapUsers = await ldapUserSearch(externalLdapConfig, { filter: `${externalLdapConfig.usernameField}=${user.username}` });
+    if (ldapUsers.length === 0) throw new BoxError(BoxError.NOT_FOUND);
+    if (ldapUsers.length > 1) throw new BoxError(BoxError.CONFLICT);
+
+    const client = await getClient(externalLdapConfig, { bind: false });
+
+    // inject totptoken into first attribute
+    const rdns = ldapUsers[0].dn.split(',');
+    const totpTokenDn = `${rdns[0]}+totptoken=${totpToken},` + rdns.slice(1).join(',');
+
+    const [error] = await safe(util.promisify(client.bind.bind(client))(totpTokenDn, password));
+    client.unbind();
+    if (error instanceof ldap.InvalidCredentialsError) throw new BoxError(BoxError.INVALID_CREDENTIALS);
+    if (error) throw new BoxError(BoxError.EXTERNAL_ERROR, error);
+
+    return translateUser(externalLdapConfig, ldapUsers[0]);
+}
+
 async function startSyncer() {
     const externalLdapConfig = await settings.getExternalLdapConfig();
     if (externalLdapConfig.provider === 'noop') throw new BoxError(BoxError.BAD_STATE, 'not enabled');

src/graphs.js

@@ -0,0 +1,125 @@
+'use strict';
+
+exports = module.exports = {
+    getSystem,
+    getContainerStats
+};
+
+const apps = require('./apps.js'),
+    assert = require('assert'),
+    BoxError = require('./boxerror.js'),
+    docker = require('./docker.js'),
+    os = require('os'),
+    safe = require('safetydance'),
+    services = require('./services.js'),
+    superagent = require('superagent');
+
+// for testing locally: curl 'http://${graphite-ip}:8000/graphite-web/render?format=json&from=-1min&target=absolute(collectd.localhost.du-docker.capacity-usage)'
+// the datapoint is (value, timestamp) https://graphite.readthedocs.io/en/latest/
+async function getGraphiteUrl() {
+    const [error, result] = await safe(docker.inspect('graphite'));
+    if (error && error.reason === BoxError.NOT_FOUND) return { status: exports.SERVICE_STATUS_STOPPED };
+    if (error) throw error;
+
+    const ip = safe.query(result, 'NetworkSettings.Networks.cloudron.IPAddress', null);
+    if (!ip) throw new BoxError(BoxError.INACTIVE, 'Error getting IP of graphite service');
+
+    return `http://${ip}:8000/graphite-web/render`;
+}
+
+async function getContainerStats(name, fromMinutes, noNullPoints) {
+    assert.strictEqual(typeof name, 'string');
+    assert.strictEqual(typeof fromMinutes, 'number');
+    assert.strictEqual(typeof noNullPoints, 'boolean');
+
+    const timeBucketSize = fromMinutes > (24 * 60) ? (6*60) : 5;
+    const graphiteUrl = await getGraphiteUrl();
+
+    // https://collectd.org/wiki/index.php/Data_source . the gauge is point in time value. counter is the change of value
+    const targets = [
+        `summarize(collectd.localhost.docker-stats-${name}.gauge-cpu-perc, "${timeBucketSize}min", "avg")`,
+        `summarize(collectd.localhost.docker-stats-${name}.gauge-mem-used, "${timeBucketSize}min", "avg")`,
+        // `summarize(collectd.localhost.docker-stats-${name}.gauge-mem-max, "${timeBucketSize}min", "avg")`,
+        `summarize(collectd.localhost.docker-stats-${name}.counter-blockio-read, "${timeBucketSize}min", "sum")`,
+        `summarize(collectd.localhost.docker-stats-${name}.counter-blockio-write, "${timeBucketSize}min", "sum")`,
+        `summarize(collectd.localhost.docker-stats-${name}.counter-network-read, "${timeBucketSize}min", "sum")`,
+        `summarize(collectd.localhost.docker-stats-${name}.counter-network-write, "${timeBucketSize}min", "sum")`,
+        `summarize(collectd.localhost.docker-stats-${name}.gauge-blockio-read, "${fromMinutes}min", "max")`,
+        `summarize(collectd.localhost.docker-stats-${name}.gauge-blockio-write, "${fromMinutes}min", "max")`,
+        `summarize(collectd.localhost.docker-stats-${name}.gauge-network-read, "${fromMinutes}min", "max")`,
+        `summarize(collectd.localhost.docker-stats-${name}.gauge-network-write, "${fromMinutes}min", "max")`,
+    ];
+
+    const results = [];
+
+    for (const target of targets) {
+        const query = {
+            target: target,
+            format: 'json',
+            from: `-${fromMinutes}min`,
+            until: 'now',
+            noNullPoints: !!noNullPoints
+        };
+
+        const [error, response] = await safe(superagent.get(graphiteUrl).query(query).timeout(30 * 1000).ok(() => true));
+        if (error) throw new BoxError(BoxError.NETWORK_ERROR, error.message);
+        if (response.status !== 200) throw new BoxError(BoxError.EXTERNAL_ERROR, `Unknown error with ${target}: ${response.status} ${response.text}`);
+
+        results.push(response.body[0] && response.body[0].datapoints ? response.body[0].datapoints : []);
+    }
+
+    // results are datapoints[[value, ts], [value, ts], ...];
+    return {
+        cpu: results[0],
+        memory: results[1],
+        blockRead: results[2],
+        blockWrite: results[3],
+        networkRead: results[4],
+        networkWrite: results[5],
+        blockReadTotal: results[6][0] && results[6][0][0] ? results[6][0][0] : 0,
+        blockWriteTotal: results[7][0] && results[7][0][0] ? results[7][0][0] : 0,
+        networkReadTotal: results[8][0] && results[8][0][0] ? results[8][0][0] : 0,
+        networkWriteTotal: results[9][0] && results[9][0][0] ? results[9][0][0] : 0,
+        cpuCount: os.cpus().length
+    };
+}
+
+async function getSystem(fromMinutes, noNullPoints) {
+    assert.strictEqual(typeof fromMinutes, 'number');
+    assert.strictEqual(typeof noNullPoints, 'boolean');
+
+    const timeBucketSize = fromMinutes > (24 * 60) ? (6*60) : 5;
+    const graphiteUrl = await getGraphiteUrl();
+
+    const cpuQuery = `summarize(sum(collectd.localhost.aggregation-cpu-sum.cpu-system, collectd.localhost.aggregation-cpu-sum.cpu-user), "${timeBucketSize}min", "avg")`;
+    const memoryQuery = `summarize(collectd.localhost.memory.memory-used, "${timeBucketSize}min", "avg")`;
+
+    const query = {
+        target: [ cpuQuery, memoryQuery ],
+        format: 'json',
+        from: `-${fromMinutes}min`,
+        until: 'now'
+    };
+
+    const [memCpuError, memCpuResponse] = await safe(superagent.get(graphiteUrl).query(query).timeout(30 * 1000).ok(() => true));
+    if (memCpuError) throw new BoxError(BoxError.NETWORK_ERROR, memCpuError.message);
+    if (memCpuResponse.status !== 200) throw new BoxError(BoxError.EXTERNAL_ERROR, `Unknown error: ${memCpuResponse.status} ${memCpuResponse.text}`);
+
+    const appResponses = {};
+    for (const app of await apps.list()) {
+        appResponses[app.id] = await getContainerStats(app.id, fromMinutes, noNullPoints);
+    }
+
+    const serviceResponses = {};
+    for (const serviceId of await services.listServices()) {
+        serviceResponses[serviceId] = await getContainerStats(serviceId, fromMinutes, noNullPoints);
+    }
+
+    return {
+        cpu: memCpuResponse.body[0] && memCpuResponse.body[0].datapoints ? memCpuResponse.body[0].datapoints : [],
+        memory: memCpuResponse.body[1] && memCpuResponse.body[1].datapoints ? memCpuResponse.body[1].datapoints : [],
+        apps: appResponses,
+        services: serviceResponses,
+        cpuCount: os.cpus().length
+    };
+}

src/hush.js

@@ -5,7 +5,7 @@ const assert = require('assert'),
     crypto = require('crypto'),
     debug = require('debug')('box:hush'),
     fs = require('fs'),
-    progressStream = require('progress-stream'),
+    ProgressStream = require('./progress-stream.js'),
     TransformStream = require('stream').Transform;
 
 class EncryptStream extends TransformStream {
@@ -157,7 +157,7 @@ function createReadStream(sourceFile, encryption) {
     assert.strictEqual(typeof encryption, 'object');
 
     const stream = fs.createReadStream(sourceFile);
-    const ps = progressStream({ time: 10000 }); // display a progress every 10 seconds
+    const ps = new ProgressStream({ interval: 10000 }); // display a progress every 10 seconds
 
     stream.on('error', function (error) {
         debug(`createReadStream: read stream error at ${sourceFile}`, error);
@@ -185,7 +185,7 @@ function createWriteStream(destFile, encryption) {
     assert.strictEqual(typeof encryption, 'object');
 
     const stream = fs.createWriteStream(destFile);
-    const ps = progressStream({ time: 10000 }); // display a progress every 10 seconds
+    const ps = new ProgressStream({ interval: 10000 }); // display a progress every 10 seconds
 
     stream.on('error', function (error) {
         debug(`createWriteStream: write stream error ${destFile}`, error);

src/infra_version.js

@@ -6,7 +6,7 @@
 
 exports = module.exports = {
     // a version change recreates all containers with latest docker config
-    'version': '49.0.0',
+    'version': '49.4.0',
 
     'baseImages': [
         { repo: 'cloudron/base', tag: 'cloudron/base:3.2.0@sha256:ba1d566164a67c266782545ea9809dc611c4152e27686fd14060332dd88263ea' }
@@ -16,12 +16,12 @@ exports = module.exports = {
     // docker inspect --format='{{index .RepoDigests 0}}' $IMAGE to get the sha256
     'images': {
         'turn': { repo: 'cloudron/turn', tag: 'cloudron/turn:1.4.0@sha256:45817f1631992391d585f171498d257487d872480fd5646723a2b956cc4ef15d' },
-        'mysql': { repo: 'cloudron/mysql', tag: 'cloudron/mysql:3.2.1@sha256:75cef64ba4917ba9ec68bc0c9d9ba3a9eeae00a70173cd6d81cc6118038737d9' },
-        'postgresql': { repo: 'cloudron/postgresql', tag: 'cloudron/postgresql:4.3.1@sha256:b0c564d097b765d4a639330843e2e813d2c87fc8ed34b7df7550bf2c6df0012c' },
-        'mongodb': { repo: 'cloudron/mongodb', tag: 'cloudron/mongodb:4.2.1@sha256:f7f689beea07b1c6a9503a48f6fb38ef66e5b22f59fc585a92842a6578b33d46' },
-        'redis': { repo: 'cloudron/redis', tag: 'cloudron/redis:3.3.0@sha256:89c4e8083631b6d16b5d630d9b27f8ecf301c62f81219d77bd5948a1f4a4375c' },
-        'mail': { repo: 'cloudron/mail', tag: 'cloudron/mail:3.6.1@sha256:b8b93f007105080d4812a05648e6bc5e15c95c63f511c829cbc14a163d9ea029' },
-        'graphite': { repo: 'cloudron/graphite', tag: 'cloudron/graphite:3.1.0@sha256:30ec3a01964a1e01396acf265183997c3e17fb07eac1a82b979292cc7719ff4b' },
+        'mysql': { repo: 'cloudron/mysql', tag: 'cloudron/mysql:3.2.2@sha256:8648ca5a16fcdec72799b919c5f62419fd19e922e3d98d02896b921ae6127ef4' },
+        'postgresql': { repo: 'cloudron/postgresql', tag: 'cloudron/postgresql:4.3.5@sha256:bc8cb91cbd48ee9a2f5a609b6131cd21a0210c15aaf127ee77963d90a125530a' },
+        'mongodb': { repo: 'cloudron/mongodb', tag: 'cloudron/mongodb:4.2.2@sha256:df928d7dce1ac6454fc584787fa863f6d5e7ee0abb775dde5916a555fc94c3c7' },
+        'redis': { repo: 'cloudron/redis', tag: 'cloudron/redis:3.3.1@sha256:383e11a5c7a54d17eb6bbceb0ffa92f486167be6ea9978ec745c8c8e9b7dfb19' },
+        'mail': { repo: 'cloudron/mail', tag: 'cloudron/mail:3.7.4@sha256:8ddbf13ee3fd479e18923c7bf1370d9d8aa5f12a94cbbda5afac8b5a4af72a28' },
+        'graphite': { repo: 'cloudron/graphite', tag: 'cloudron/graphite:3.2.0@sha256:182e5cae69fbddc703cb9f91be909452065c7ae159e9836cc88317c7a00f0e62' },
         'sftp': { repo: 'cloudron/sftp', tag: 'cloudron/sftp:3.6.1@sha256:ba4b9a1fe274c0ef0a900e5d0deeb8f3da08e118798d1d90fbf995cc0cf6e3a3' }
     }
 };

src/janitor.js

@@ -28,7 +28,7 @@ async function cleanupTmpVolume(containerInfo) {
 
     const cmd = 'find /tmp -type f -mtime +10 -exec rm -rf {} +'.split(' '); // 10 day old files
 
-    debug('cleanupTmpVolume %j', containerInfo.Names);
+    debug(`cleanupTmpVolume ${JSON.stringify(containerInfo.Names)}`);
 
     const [error, execContainer] = await safe(gConnection.getContainer(containerInfo.Id).exec({ Cmd: cmd, AttachStdout: true, AttachStderr: true, Tty: false }));
     if (error) throw new BoxError(BoxError.DOCKER_ERROR, `Failed to exec container: ${error.message}`);
@@ -53,4 +53,6 @@ async function cleanupDockerVolumes() {
     for (const container of containers) {
         await safe(cleanupTmpVolume(container), { debug }); // intentionally ignore error
     }
+
+    debug('Cleaned up docker volumes');
 }

src/ldap.js

@@ -25,9 +25,6 @@ let gServer = null;
 
 const NOOP = function () {};
 
-const GROUP_USERS_DN = 'cn=users,ou=groups,dc=cloudron';
-const GROUP_ADMINS_DN = 'cn=admins,ou=groups,dc=cloudron';
-
 // Will attach req.app if successful
 async function authenticateApp(req, res, next) {
     const sourceIp = req.connection.ldap.id.split(':')[0];
@@ -150,6 +147,9 @@ async function userSearch(req, res, next) {
     const [error, result] = await safe(getUsersWithAccessToApp(req));
     if (error) return next(new ldap.OperationsError(error.toString()));
 
+    const [groupsError, allGroups] = await safe(groups.listWithMembers());
+    if (groupsError) return next(new ldap.OperationsError(error.toString()));
+
     let results = [];
 
     // send user objects
@@ -159,9 +159,6 @@ async function userSearch(req, res, next) {
 
         const dn = ldap.parseDN('cn=' + user.id + ',ou=users,dc=cloudron');
 
-        const memberof = [ GROUP_USERS_DN ];
-        if (users.compareRoles(user.role, users.ROLE_ADMIN) >= 0) memberof.push(GROUP_ADMINS_DN);
-
         const displayName = user.displayName || user.username || ''; // displayName can be empty and username can be null
         const nameParts = displayName.split(' ');
         const firstName = nameParts[0];
@@ -181,7 +178,7 @@ async function userSearch(req, res, next) {
                 givenName: firstName,
                 username: user.username,
                 samaccountname: user.username,      // to support ActiveDirectory clients
-                memberof: memberof
+                memberof: allGroups.filter(function (g) { return g.userIds.indexOf(user.id) !== -1; }).map(function (g) { return `cn=${g.name},ou=groups,dc=cloudron`; })
             }
         };
 
@@ -204,42 +201,8 @@ async function userSearch(req, res, next) {
 async function groupSearch(req, res, next) {
     debug('group search: dn %s, scope %s, filter %s (from %s)', req.dn.toString(), req.scope, req.filter.toString(), req.connection.ldap.id);
 
-    const [error, usersWithAccess] = await safe(getUsersWithAccessToApp(req));
-    if (error) return next(new ldap.OperationsError(error.toString()));
-
     const results = [];
 
-    // those are the old virtual groups for backwards compat
-    const virtualGroups = [{
-        name: 'users',
-        admin: false
-    }, {
-        name: 'admins',
-        admin: true
-    }];
-
-    virtualGroups.forEach(function (group) {
-        const dn = ldap.parseDN('cn=' + group.name + ',ou=groups,dc=cloudron');
-        const members = group.admin ? usersWithAccess.filter(function (user) { return users.compareRoles(user.role, users.ROLE_ADMIN) >= 0; }) : usersWithAccess;
-
-        const obj = {
-            dn: dn.toString(),
-            attributes: {
-                objectclass: ['group'],
-                cn: group.name,
-                memberuid: members.map(function(entry) { return entry.id; }).sort()
-            }
-        };
-
-        // ensure all filter values are also lowercase
-        const lowerCaseFilter = safe(function () { return ldap.parseFilter(req.filter.toString().toLowerCase()); }, null);
-        if (!lowerCaseFilter) return next(new ldap.OperationsError(safe.error.toString()));
-
-        if ((req.dn.equals(dn) || req.dn.parentOf(dn)) && lowerCaseFilter.matches(obj.attributes)) {
-            results.push(obj);
-        }
-    });
-
     let [errorGroups, resultGroups] = await safe(groups.listWithMembers());
     if (errorGroups) return next(new ldap.OperationsError(errorGroups.toString()));
 
@@ -248,15 +211,15 @@ async function groupSearch(req, res, next) {
     }
 
     resultGroups.forEach(function (group) {
-        const dn = ldap.parseDN('cn=' + group.name + ',ou=groups,dc=cloudron');
-        const members = group.userIds.filter(function (uid) { return usersWithAccess.map(function (u) { return u.id; }).indexOf(uid) !== -1; });
+        const dn = ldap.parseDN(`cn=${group.name},ou=groups,dc=cloudron`);
 
         const obj = {
             dn: dn.toString(),
             attributes: {
                 objectclass: ['group'],
                 cn: group.name,
-                memberuid: members
+                gidnumber: group.id,
+                memberuid: group.userIds
             }
         };
 
@@ -305,25 +268,35 @@ async function groupAdminsCompare(req, res, next) {
 async function mailboxSearch(req, res, next) {
     debug('mailbox search: dn %s, scope %s, filter %s (from %s)', req.dn.toString(), req.scope, req.filter.toString(), req.connection.ldap.id);
 
-    // if cn is set we only search for one mailbox specifically
+    // if cn is set OR filter is mail= we only search for one mailbox specifically
+    let email, dn;
     if (req.dn.rdns[0].attrs.cn) {
-        const email = req.dn.rdns[0].attrs.cn.value.toLowerCase();
+        email = req.dn.rdns[0].attrs.cn.value.toLowerCase();
+        dn = req.dn.toString();
+    } else if (req.filter instanceof ldap.EqualityFilter && req.filter.attribute === 'mail') {
+        email = req.filter.value.toLowerCase();
+        dn = `cn=${email},${req.dn.toString()}`;
+    }
+
+    if (email) {
         const parts = email.split('@');
-        if (parts.length !== 2) return next(new ldap.NoSuchObjectError(req.dn.toString()));
+        if (parts.length !== 2) return next(new ldap.NoSuchObjectError(dn.toString()));
 
         const [error, mailbox] = await safe(mail.getMailbox(parts[0], parts[1]));
         if (error) return next(new ldap.OperationsError(error.toString()));
-        if (!mailbox) return next(new ldap.NoSuchObjectError(req.dn.toString()));
-        if (!mailbox.active) return next(new ldap.NoSuchObjectError(req.dn.toString()));
+        if (!mailbox) return next(new ldap.NoSuchObjectError(dn.toString()));
+        if (!mailbox.active) return next(new ldap.NoSuchObjectError(dn.toString()));
 
         const obj = {
-            dn: req.dn.toString(),
+            dn: dn.toString(),
             attributes: {
                 objectclass: ['mailbox'],
                 objectcategory: 'mailbox',
                 cn: `${mailbox.name}@${mailbox.domain}`,
                 uid: `${mailbox.name}@${mailbox.domain}`,
-                mail: `${mailbox.name}@${mailbox.domain}`
+                mail: `${mailbox.name}@${mailbox.domain}`,
+                storagequota: mailbox.storageQuota,
+                messagesquota: mailbox.messagesQuota,
             }
         };
 
@@ -336,7 +309,7 @@ async function mailboxSearch(req, res, next) {
         } else {
             res.end();
         }
-    } else { // new sogo
+    } else { // new sogo and dovecot listing (doveadm -A)
         // TODO figure out how proper pagination here could work
         let [error, mailboxes] = await safe(mail.listAllMailboxes(1, 100000));
         if (error) return next(new ldap.OperationsError(error.toString()));
@@ -360,7 +333,9 @@ async function mailboxSearch(req, res, next) {
                     displayname: mailbox.ownerType === mail.OWNERTYPE_USER ? ownerObject.displayName : ownerObject.name,
                     cn: `${mailbox.name}@${mailbox.domain}`,
                     uid: `${mailbox.name}@${mailbox.domain}`,
-                    mail: `${mailbox.name}@${mailbox.domain}`
+                    mail: `${mailbox.name}@${mailbox.domain}`,
+                    storagequota: mailbox.storageQuota,
+                    messagesquota: mailbox.messagesQuota,
                 }
             };
 
@@ -390,7 +365,7 @@ async function mailAliasSearch(req, res, next) {
     const parts = email.split('@');
     if (parts.length !== 2) return next(new ldap.NoSuchObjectError(req.dn.toString()));
 
-    const [error, alias] = await safe(mail.getAlias(parts[0], parts[1]));
+    const [error, alias] = await safe(mail.searchAlias(parts[0], parts[1]));
     if (error) return next(new ldap.OperationsError(error.toString()));
     if (!alias) return next(new ldap.NoSuchObjectError(req.dn.toString()));
 
@@ -404,7 +379,7 @@ async function mailAliasSearch(req, res, next) {
         attributes: {
             objectclass: ['nisMailAlias'],
             objectcategory: 'nisMailAlias',
-            cn: `${alias.name}@${alias.domain}`,
+            cn: `${parts[0]}@${alias.domain}`, // alias.name can contain wildcard character
             rfc822MailMember: `${alias.aliasName}@${alias.aliasDomain}`
         }
     };
@@ -480,7 +455,7 @@ async function authorizeUserForApp(req, res, next) {
     // we return no such object, to avoid leakage of a users existence
     if (!canAccess) return next(new ldap.NoSuchObjectError(req.dn.toString()));
 
-    await eventlog.upsertLoginEvent(eventlog.ACTION_USER_LOGIN, { authType: 'ldap', appId: req.app.id }, { userId: req.user.id, user: users.removePrivateFields(req.user) });
+    await eventlog.upsertLoginEvent(req.user.ghost ? eventlog.ACTION_USER_LOGIN_GHOST : eventlog.ACTION_USER_LOGIN, { authType: 'ldap', appId: req.app.id }, { userId: req.user.id, user: users.removePrivateFields(req.user) });
 
     res.end();
 }
@@ -558,7 +533,7 @@ async function userSearchSftp(req, res, next) {
     const obj = {
         dn: ldap.parseDN(`cn=${username}@${appFqdn},ou=sftp,dc=cloudron`).toString(),
         attributes: {
-            homeDirectory: app.dataDir ? `/mnt/app-${app.id}` : `/mnt/appsdata/${app.id}/data`, // see also sftp.js
+            homeDirectory: app.storageVolumeId ? `/mnt/app-${app.id}` : `/mnt/appsdata/${app.id}/data`, // see also sftp.js
             objectclass: ['user'],
             objectcategory: 'person',
             cn: user.id,
@@ -625,7 +600,7 @@ async function authenticateService(serviceId, dn, req, res, next) {
     if (verifyError && verifyError.reason === BoxError.INVALID_CREDENTIALS) return next(new ldap.InvalidCredentialsError(dn.toString()));
     if (verifyError) return next(new ldap.OperationsError(verifyError.message));
 
-    eventlog.upsertLoginEvent(eventlog.ACTION_USER_LOGIN, { authType: 'ldap', mailboxId: email }, { userId: result.id, user: users.removePrivateFields(result) });
+    eventlog.upsertLoginEvent(result.ghost ? eventlog.ACTION_USER_LOGIN_GHOST : eventlog.ACTION_USER_LOGIN, { authType: 'ldap', mailboxId: email }, { userId: result.id, user: users.removePrivateFields(result) });
 
     res.end();
 }

src/log-stream.js

@@ -0,0 +1,52 @@
+'use strict';
+
+const stream = require('stream'),
+    { StringDecoder } = require('string_decoder'),
+    TransformStream = stream.Transform;
+
+class LogStream extends TransformStream {
+    constructor(options) {
+        super();
+        this._options = Object.assign({ source: 'unknown', format: 'json' }, options);
+        this._decoder = new StringDecoder();
+        this._soFar = '';
+    }
+
+    _format(line) {
+        if (this._options.format !== 'json') return line + '\n';
+
+        const data = line.split(' '); // logs are <ISOtimestamp> <msg>
+        let timestamp = (new Date(data[0])).getTime();
+        if (isNaN(timestamp)) timestamp = 0;
+        const message = line.slice(data[0].length+1);
+
+        // ignore faulty empty logs
+        if (!timestamp && !message) return;
+
+        return JSON.stringify({
+            realtimeTimestamp: timestamp * 1000,
+            message: message,
+            source: this._options.source
+        }) + '\n';
+    }
+
+    _transform(chunk, encoding, callback) {
+        const data = this._soFar + this._decoder.write(chunk);
+        let start = this._soFar.length, end = -1;
+        while ((end = data.indexOf('\n', start)) !== -1) {
+            const line = data.slice(start, end); // does not include end
+            this.push(this._format(line));
+            start = end + 1;
+        }
+        this._soFar = data.slice(start);
+        callback(null);
+    }
+
+    _flush(callback) {
+        const line = this._soFar + this._decoder.end();
+        this.push(this._format(line));
+        callback(null);
+    }
+}
+
+exports = module.exports = LogStream;

src/logrotate.ejs

@@ -1,11 +1,12 @@
 # Generated by apptask
 
-# keep upto 7 rotated logs. rotation triggered daily or ahead of time if size is > 1M
+# keep upto 5 rotated logs. rotation triggered weekly or ahead of time if size is > 10M
 <%= volumePath %>/*.log <%= volumePath %>/*/*.log <%= volumePath %>/*/*/*.log {
-    rotate 7
-    daily
+    rotate 5
+    weekly
+    maxage 14
     compress
-    maxsize 1M
+    maxsize 10M
     missingok
     delaycompress
     # this truncates the original log file and not the rotated one
@@ -15,7 +16,9 @@
 /home/yellowtent/platformdata/logs/<%= appId %>/*.log {
     # only keep one rotated file, we currently do not send that over the api
     rotate 1
-    size 10M
+    weekly
+    maxage 14
+    maxsize 10M
     missingok
     # we never compress so we can simply tail the files
     nocompress

src/mail.js

@@ -22,6 +22,7 @@ exports = module.exports = {
     setDnsRecords,
 
     validateName,
+    validateDisplayName,
 
     setMailFromValidation,
     setCatchAllAddress,
@@ -31,7 +32,7 @@ exports = module.exports = {
 
     startMail,
     restartMail,
-    handleCertChanged,
+    checkCertificate,
     getMailAuth,
 
     sendTestMail,
@@ -47,6 +48,7 @@ exports = module.exports = {
     getAlias,
     getAliases,
     setAliases,
+    searchAlias,
 
     getLists,
     getList,
@@ -65,7 +67,6 @@ exports = module.exports = {
     TYPE_LIST: 'list',
     TYPE_ALIAS: 'alias',
 
-    _validateName: validateName,
     _delByDomain: delByDomain,
     _updateDomain: updateDomain
 };
@@ -96,13 +97,11 @@ const assert = require('assert'),
     services = require('./services.js'),
     settings = require('./settings.js'),
     shell = require('./shell.js'),
-    smtpTransport = require('nodemailer-smtp-transport'),
     superagent = require('superagent'),
     sysinfo = require('./sysinfo.js'),
     system = require('./system.js'),
     tasks = require('./tasks.js'),
     users = require('./users.js'),
-    util = require('util'),
     validator = require('validator'),
     _ = require('underscore');
 
@@ -112,7 +111,7 @@ const REMOVE_MAILBOX_CMD = path.join(__dirname, 'scripts/rmmailbox.sh');
 const OWNERTYPES = [ exports.OWNERTYPE_USER, exports.OWNERTYPE_GROUP, exports.OWNERTYPE_APP ];
 
 // if you add a field here, listMailboxes has to be updated
-const MAILBOX_FIELDS = [ 'name', 'type', 'ownerId', 'ownerType', 'aliasName', 'aliasDomain', 'creationTime', 'membersJson', 'membersOnly', 'domain', 'active', 'enablePop3' ].join(',');
+const MAILBOX_FIELDS = [ 'name', 'type', 'ownerId', 'ownerType', 'aliasName', 'aliasDomain', 'creationTime', 'membersJson', 'membersOnly', 'domain', 'active', 'enablePop3', 'storageQuota', 'messagesQuota' ].join(',');
 const MAILDB_FIELDS = [ 'domain', 'enabled', 'mailFromValidation', 'catchAllJson', 'relayJson', 'dkimKeyJson', 'dkimSelector', 'bannerJson' ].join(',');
 
 function postProcessMailbox(data) {
@@ -169,6 +168,30 @@ function validateName(name) {
     return null;
 }
 
+function validateAlias(name) {
+    assert.strictEqual(typeof name, 'string');
+
+    if (name.length < 1) return new BoxError(BoxError.BAD_FIELD, 'mailbox name must be atleast 1 char');
+    if (name.length >= 200) return new BoxError(BoxError.BAD_FIELD, 'mailbox name too long');
+
+    // also need to consider valid LDAP characters here (e.g '+' is reserved). keep hyphen at the end so it doesn't become a range.
+    if (/[^a-zA-Z0-9._*-]/.test(name)) return new BoxError(BoxError.BAD_FIELD, 'mailbox name can only contain alphanumerals, dot, hyphen, asterisk or underscore');
+
+    return null;
+}
+
+function validateDisplayName(name) {
+    assert.strictEqual(typeof name, 'string');
+
+    if (name.length < 1) return new BoxError(BoxError.BAD_FIELD, 'mailbox display name must be atleast 1 char');
+    if (name.length >= 100) return new BoxError(BoxError.BAD_FIELD, 'mailbox display name too long');
+    // technically only ":" is disallowed it seems (https://www.rfc-editor.org/rfc/rfc5322#section-2.2)
+    // in https://www.rfc-editor.org/rfc/rfc2822.html, display-name is a "phrase"
+    if (/["<>)(,;\\@:]/.test(name)) return new BoxError(BoxError.BAD_FIELD, 'mailbox display name is not valid');
+
+    return null;
+}
+
 async function checkOutboundPort25() {
     const relay = {
         value: 'OK',
@@ -214,7 +237,8 @@ async function checkSmtpRelay(relay) {
         connectionTimeout: 5000,
         greetingTimeout: 5000,
         host: relay.host,
-        port: relay.port
+        port: relay.port,
+        secure: false // haraka relay only supports STARTTLS
     };
 
     // only set auth if either username or password is provided, some relays auth based on IP (range)
@@ -227,9 +251,9 @@ async function checkSmtpRelay(relay) {
 
     if (relay.acceptSelfSignedCerts) options.tls = { rejectUnauthorized: false };
 
-    const transporter = nodemailer.createTransport(smtpTransport(options));
+    const transporter = nodemailer.createTransport(options);
 
-    const [error] = await safe(util.promisify(transporter.verify)());
+    const [error] = await safe(transporter.verify());
     result.status = !error;
     if (error) {
         result.value = result.errorMessage = error.message;
@@ -494,7 +518,11 @@ const RBL_LIST = [
 
 // this function currently only looks for black lists based on IP. TODO: also look up by domain
 async function checkRblStatus(domain) {
-    const ip = await sysinfo.getServerIPv4();
+    const [error, ip] = await safe(sysinfo.getServerIPv4());
+    if (error) {
+        debug(`checkRblStatus: unable to determine server IPv4: ${error.message}`);
+        return { status: false, ip: null, servers: [] };
+    }
 
     const flippedIp = ip.split('.').reverse().join('.');
 
@@ -511,7 +539,7 @@ async function checkRblStatus(domain) {
         const [error2, txtRecords] = await safe(dig.resolve(flippedIp + '.' + rblServer.dns, 'TXT', DNS_OPTIONS));
         result.txtRecords = error2 || !txtRecords ? 'No txt record' : txtRecords.map(x => x.join(''));
 
-        debug(`checkRblStatus: ${domain} (error: ${error2.message}) (txtRecords: ${JSON.stringify(txtRecords)})`);
+        debug(`checkRblStatus: ${domain} (error: ${error2?.message || null}) (txtRecords: ${JSON.stringify(txtRecords)})`);
 
         blacklistedServers.push(result);
     }
@@ -562,7 +590,7 @@ async function getStatus(domain) {
     for (let i = 0; i < checks.length; i++) {
         const response = responses[i], check = checks[i];
         if (response.status !== 'fulfilled') {
-            debug(`check ${check.what} was rejected. This is not expected`);
+            debug(`check ${check.what} was rejected. This is not expected. reason: ${response.reason}`);
             continue;
         }
 
@@ -632,7 +660,7 @@ async function createMailConfig(mailFqdn) {
 
     // create sections for per-domain configuration
     for (const domain of mailDomains) {
-        const catchAll = domain.catchAll.map(function (c) { return `${c}@${domain.domain}`; }).join(',');
+        const catchAll = domain.catchAll.join(',');
         const mailFromValidation = domain.mailFromValidation;
 
         if (!safe.fs.appendFileSync(`${paths.MAIL_CONFIG_DIR}/mail.ini`,
@@ -656,7 +684,8 @@ async function createMailConfig(mailFqdn) {
         const enableRelay = relay.provider !== 'cloudron-smtp' && relay.provider !== 'noop',
             host = relay.host || '',
             port = relay.port || 25,
-            authType = relay.username ? 'plain' : '',
+            // office365 removed plain auth (https://support.microsoft.com/en-us/office/outlook-com-no-longer-supports-auth-plain-authentication-07f7d5e9-1697-465f-84d2-4513d4ff0145)
+            authType = relay.username ? (relay.provider === 'office365-legacy-smtp' ? 'login' : 'plain') : '',
             username = relay.username || '',
             password = relay.password || '',
             forceFromAddress = relay.forceFromAddress ? 'true' : 'false';
@@ -685,18 +714,18 @@ async function configureMail(mailFqdn, mailDomain, serviceConfig) {
 
     const tag = infra.images.mail.tag;
     const memoryLimit = serviceConfig.memoryLimit || exports.DEFAULT_MEMORY_LIMIT;
-    const memory = system.getMemoryAllocation(memoryLimit);
+    const memory = await system.getMemoryAllocation(memoryLimit);
     const cloudronToken = hat(8 * 128), relayToken = hat(8 * 128);
 
-    const bundle = await reverseProxy.getCertificatePath(mailFqdn, mailDomain);
+    const certificate = await reverseProxy.getMailCertificate();
 
     const dhparamsFilePath = `${paths.MAIL_CONFIG_DIR}/dhparams.pem`;
     const mailCertFilePath = `${paths.MAIL_CONFIG_DIR}/tls_cert.pem`;
     const mailKeyFilePath =  `${paths.MAIL_CONFIG_DIR}/tls_key.pem`;
 
-    if (!safe.child_process.execSync(`cp ${paths.DHPARAMS_FILE} ${dhparamsFilePath}`)) throw new BoxError(BoxError.FS_ERROR, 'Could not copy dhparams:' + safe.error.message);
-    if (!safe.child_process.execSync(`cp ${bundle.certFilePath} ${mailCertFilePath}`)) throw new BoxError(BoxError.FS_ERROR, 'Could not create cert file:' + safe.error.message);
-    if (!safe.child_process.execSync(`cp ${bundle.keyFilePath} ${mailKeyFilePath}`)) throw new BoxError(BoxError.FS_ERROR, 'Could not create key file:' + safe.error.message);
+    if (!safe.child_process.execSync(`cp ${paths.DHPARAMS_FILE} ${dhparamsFilePath}`)) throw new BoxError(BoxError.FS_ERROR, `Could not copy dhparams: ${safe.error.message}`);
+    if (!safe.fs.writeFileSync(mailCertFilePath, certificate.cert)) throw new BoxError(BoxError.FS_ERROR, `Could not create cert file: ${safe.error.message}`);
+    if (!safe.fs.writeFileSync(mailKeyFilePath, certificate.key)) throw new BoxError(BoxError.FS_ERROR, `Could not create key file: ${safe.error.message}`);
 
     // 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(mailKeyFilePath, 0o644)) throw new BoxError(BoxError.FS_ERROR, `Could not chmod key file: ${safe.error.message}`);
@@ -767,6 +796,7 @@ async function restartMail() {
 async function startMail(existingInfra) {
     assert.strictEqual(typeof existingInfra, 'object');
 
+    debug('startMail: starting');
     await restartMail();
 }
 
@@ -778,11 +808,19 @@ async function restartMailIfActivated() {
         return; // not provisioned yet, do not restart container after dns setup
     }
 
+    debug('restartMailIfActivated: restarting on activated');
     await restartMail();
 }
 
-async function handleCertChanged() {
-    debug('handleCertChanged: will restart if activated');
+async function checkCertificate() {
+    const certificate = await reverseProxy.getMailCertificate();
+    const cert = safe.fs.readFileSync(`${paths.MAIL_CONFIG_DIR}/tls_cert.pem`, { encoding: 'utf8' });
+    if (cert === certificate.cert) {
+        debug('checkCertificate: certificate has not changed');
+        return;
+    }
+    debug('checkCertificate: certificate has changed');
+
     await restartMailIfActivated();
 }
 
@@ -956,8 +994,7 @@ async function setLocation(subdomain, domain, auditSource) {
     assert.strictEqual(typeof domain, 'string');
     assert.strictEqual(typeof auditSource, 'object');
 
-    const domainObject = await domains.get(domain);
-    const fqdn = dns.fqdn(subdomain, domainObject);
+    const fqdn = dns.fqdn(subdomain, domain);
 
     await settings.setMailLocation(domain, fqdn);
 
@@ -973,6 +1010,7 @@ async function onDomainAdded(domain) {
 
     if (!settings.mailFqdn()) return; // mail domain is not set yet (when provisioning)
 
+    debug(`onDomainAdded: configuring mail for added domain ${domain}`);
     await upsertDnsRecords(domain, settings.mailFqdn());
     await restartMailIfActivated();
 }
@@ -980,6 +1018,7 @@ async function onDomainAdded(domain) {
 async function onDomainRemoved(domain) {
     assert.strictEqual(typeof domain, 'string');
 
+    debug(`onDomainRemoved: configuring mail for removed domain ${domain}`);
     await restartMail();
 }
 
@@ -1019,6 +1058,10 @@ async function setCatchAllAddress(domain, addresses) {
     assert.strictEqual(typeof domain, 'string');
     assert(Array.isArray(addresses));
 
+    for (const address of addresses) {
+        if (!validator.isEmail(address)) throw new BoxError(BoxError.BAD_FIELD, `Invalid catch all address: ${address}`);
+    }
+
     await updateDomain(domain, { catchAll: addresses });
 
     safe(restartMail(), { debug }); // have to restart mail container since haraka cannot watch symlinked config files (mail.ini)
@@ -1079,7 +1122,7 @@ async function listMailboxes(domain, search, page, perPage) {
     const escapedSearch = mysql.escape('%' + search + '%'); // this also quotes the string
     const searchQuery = search ? ` HAVING (name LIKE ${escapedSearch} OR aliasNames LIKE ${escapedSearch} OR aliasDomains LIKE ${escapedSearch})` : ''; // having instead of where because of aggregated columns use
 
-    const query = 'SELECT m1.name AS name, m1.domain AS domain, m1.ownerId AS ownerId, m1.ownerType as ownerType, m1.active as active, JSON_ARRAYAGG(m2.name) AS aliasNames, JSON_ARRAYAGG(m2.domain) AS aliasDomains, m1.enablePop3 AS enablePop3 '
+    const query = 'SELECT m1.name AS name, m1.domain AS domain, m1.ownerId AS ownerId, m1.ownerType as ownerType, m1.active as active, JSON_ARRAYAGG(m2.name) AS aliasNames, JSON_ARRAYAGG(m2.domain) AS aliasDomains, m1.enablePop3 AS enablePop3, m1.storageQuota AS storageQuota, m1.messagesQuota AS messagesQuota '
         + ` FROM (SELECT * FROM mailboxes WHERE type='${exports.TYPE_MAILBOX}') AS m1`
         + ` LEFT JOIN (SELECT * FROM mailboxes WHERE type='${exports.TYPE_ALIAS}') AS m2`
         + '     ON m1.name=m2.aliasName AND m1.domain=m2.aliasDomain AND m1.ownerId=m2.ownerId'
@@ -1100,7 +1143,7 @@ async function listAllMailboxes(page, perPage) {
     assert.strictEqual(typeof page, 'number');
     assert.strictEqual(typeof perPage, 'number');
 
-    const query = 'SELECT m1.name AS name, m1.domain AS domain, m1.ownerId AS ownerId, m1.ownerType as ownerType, m1.active as active, JSON_ARRAYAGG(m2.name) AS aliasNames, JSON_ARRAYAGG(m2.domain) AS aliasDomains, m1.enablePop3 AS enablePop3 '
+    const query = 'SELECT m1.name AS name, m1.domain AS domain, m1.ownerId AS ownerId, m1.ownerType as ownerType, m1.active as active, JSON_ARRAYAGG(m2.name) AS aliasNames, JSON_ARRAYAGG(m2.domain) AS aliasDomains, m1.enablePop3 AS enablePop3, m1.storageQuota AS storageQuota, m1.messagesQuota AS messagesQuota '
         + ` FROM (SELECT * FROM mailboxes WHERE type='${exports.TYPE_MAILBOX}') AS m1`
         + ` LEFT JOIN (SELECT * FROM mailboxes WHERE type='${exports.TYPE_ALIAS}') AS m2`
         + '     ON m1.name=m2.aliasName AND m1.domain=m2.aliasDomain AND m1.ownerId=m2.ownerId'
@@ -1154,10 +1197,12 @@ async function addMailbox(name, domain, data, auditSource) {
     assert.strictEqual(typeof data, 'object');
     assert.strictEqual(typeof auditSource, 'object');
 
-    const { ownerId, ownerType, active } = data;
+    const { ownerId, ownerType, active, storageQuota, messagesQuota } = data;
     assert.strictEqual(typeof ownerId, 'string');
     assert.strictEqual(typeof ownerType, 'string');
     assert.strictEqual(typeof active, 'boolean');
+    assert(Number.isInteger(storageQuota) && storageQuota >= 0);
+    assert(Number.isInteger(messagesQuota) && messagesQuota >= 0);
 
     name = name.toLowerCase();
 
@@ -1166,12 +1211,13 @@ async function addMailbox(name, domain, data, auditSource) {
 
     if (!OWNERTYPES.includes(ownerType)) throw new BoxError(BoxError.BAD_FIELD, 'bad owner type');
 
-    [error] = await safe(database.query('INSERT INTO mailboxes (name, type, domain, ownerId, ownerType, active) VALUES (?, ?, ?, ?, ?, ?)', [ name, exports.TYPE_MAILBOX, domain, ownerId, ownerType, active ]));
+    [error] = await safe(database.query('INSERT INTO mailboxes (name, type, domain, ownerId, ownerType, active, storageQuota, messagesQuota) VALUES (?, ?, ?, ?, ?, ?, ?, ?)',
+        [ name, exports.TYPE_MAILBOX, domain, ownerId, ownerType, active, storageQuota, messagesQuota ]));
     if (error && error.code === 'ER_DUP_ENTRY') throw new BoxError(BoxError.ALREADY_EXISTS, 'mailbox already exists');
     if (error && error.code === 'ER_NO_REFERENCED_ROW_2' && error.sqlMessage.includes('mailboxes_domain_constraint')) throw new BoxError(BoxError.NOT_FOUND, `no such domain '${domain}'`);
     if (error) throw error;
 
-    await eventlog.add(eventlog.ACTION_MAIL_MAILBOX_ADD, auditSource, { name, domain, ownerId, ownerType, active });
+    await eventlog.add(eventlog.ACTION_MAIL_MAILBOX_ADD, auditSource, { name, domain, ownerId, ownerType, active, storageQuota, messageQuota: messagesQuota });
 }
 
 async function updateMailbox(name, domain, data, auditSource) {
@@ -1180,23 +1226,30 @@ async function updateMailbox(name, domain, data, auditSource) {
     assert.strictEqual(typeof data, 'object');
     assert.strictEqual(typeof auditSource, 'object');
 
-    const { ownerId, ownerType, active, enablePop3 } = data;
-    assert.strictEqual(typeof ownerId, 'string');
-    assert.strictEqual(typeof ownerType, 'string');
-    assert.strictEqual(typeof active, 'boolean');
-    assert.strictEqual(typeof enablePop3, 'boolean');
+    const args = [];
+    const fields = [];
+    for (const k in data) {
+        if (k === 'enablePop3' || k === 'active') {
+            fields.push(k + ' = ?');
+            args.push(data[k] ? 1 : 0);
+            continue;
+        }
 
-    name = name.toLowerCase();
+        if (k === 'ownerType' && !OWNERTYPES.includes(data[k])) throw new BoxError(BoxError.BAD_FIELD, 'bad owner type');
 
-    if (!OWNERTYPES.includes(ownerType)) throw new BoxError(BoxError.BAD_FIELD, 'bad owner type');
+        fields.push(k + ' = ?');
+        args.push(data[k]);
+    }
+    args.push(name.toLowerCase());
+    args.push(domain);
 
     const mailbox = await getMailbox(name, domain);
     if (!mailbox) throw new BoxError(BoxError.NOT_FOUND, 'No such mailbox');
 
-    const result = await database.query('UPDATE mailboxes SET ownerId = ?, ownerType = ?, active = ?, enablePop3 = ? WHERE name = ? AND domain = ?', [ ownerId, ownerType, active, enablePop3, name, domain ]);
+    const result = await safe(database.query('UPDATE mailboxes SET ' + fields.join(', ') + ' WHERE name = ? AND domain = ?', args));
     if (result.affectedRows === 0) throw new BoxError(BoxError.NOT_FOUND, 'Mailbox not found');
 
-    await eventlog.add(eventlog.ACTION_MAIL_MAILBOX_UPDATE, auditSource, { name, domain, oldUserId: mailbox.userId, ownerId, ownerType, active });
+    await eventlog.add(eventlog.ACTION_MAIL_MAILBOX_UPDATE, auditSource, Object.assign(data, { name, domain, oldUserId: mailbox.userId }) );
 }
 
 async function removeSolrIndex(mailbox) {
@@ -1248,6 +1301,18 @@ async function getAlias(name, domain) {
     return results[0];
 }
 
+async function searchAlias(name, domain) {
+    assert.strictEqual(typeof name, 'string');
+    assert.strictEqual(typeof domain, 'string');
+
+    const results = await database.query(`SELECT ${MAILBOX_FIELDS} FROM mailboxes WHERE ? LIKE REPLACE(REPLACE(name, '*', '%'), '_', '\\_') AND type = ? AND domain = ?`, [ name, exports.TYPE_ALIAS, domain ]);
+    if (results.length === 0) return null;
+
+    results.forEach(function (result) { postProcessMailbox(result); });
+
+    return results[0];
+}
+
 async function getAliases(name, domain) {
     assert.strictEqual(typeof name, 'string');
     assert.strictEqual(typeof domain, 'string');
@@ -1267,7 +1332,7 @@ async function setAliases(name, domain, aliases, auditSource) {
         const name = aliases[i].name.toLowerCase();
         const domain = aliases[i].domain.toLowerCase();
 
-        const error = validateName(name);
+        const error = validateAlias(name);
         if (error) throw error;
 
         const mailDomain = await getDomain(domain);

src/mail_templates/password_reset-html.ejs

@@ -6,10 +6,11 @@
 
 <p>{{ passwordResetEmail.description }}</p>
 
-<p>
-  <a href="<%= resetLink %>">{{ passwordResetEmail.resetAction }}</a>
-</p>
+<br/>
 
+<a style="border-radius: 2px; background-color: #2196f3; color: white; padding: 6px 12px; text-decoration: none;" href="<%= resetLink %>">{{ passwordResetEmail.resetAction }}</a>
+
+<br/>
 <br/>
 
 {{ passwordResetEmail.expireNote }}

src/mail_templates/welcome_user-html.ejs

@@ -5,9 +5,9 @@
 <h3>{{ welcomeEmail.salutation }}</h3>
 <h2>{{ welcomeEmail.welcomeTo }}</h2>
 
-<p>
-  <a href="<%= inviteLink %>">{{ welcomeEmail.inviteLinkAction }}</a>
-</p>
+<br/>
+
+<a style="border-radius: 2px; background-color: #2196f3; color: white; padding: 6px 12px; text-decoration: none;" href="<%= inviteLink %>">{{ welcomeEmail.inviteLinkAction }}</a>
 
 <br/>
 <br/>

src/mailer.js

@@ -25,7 +25,6 @@ const assert = require('assert'),
     safe = require('safetydance'),
     settings = require('./settings.js'),
     translation = require('./translation.js'),
-    smtpTransport = require('nodemailer-smtp-transport'),
     util = require('util');
 
 const MAIL_TEMPLATES_DIR = path.join(__dirname, 'mail_templates');
@@ -52,14 +51,14 @@ async function sendMail(mailOptions) {
 
     const data = await mail.getMailAuth();
 
-    const transport = nodemailer.createTransport(smtpTransport({
+    const transport = nodemailer.createTransport({
         host: data.ip,
         port: data.port,
         auth: {
             user: mailOptions.authUser || `no-reply@${settings.dashboardDomain()}`,
             pass: data.relayToken
         }
-    }));
+    });
 
     const transportSendMail = util.promisify(transport.sendMail.bind(transport));
     const [error] = await safe(transportSendMail(mailOptions));

src/mounts.js

@@ -54,6 +54,7 @@ function validateMountOptions(type, options) {
         if (typeof options.remoteDir !== 'string') return new BoxError(BoxError.BAD_FIELD, 'remoteDir is not a string');
         return null;
     case 'ext4':
+    case 'xfs':
         if (typeof options.diskPath !== 'string') return new BoxError(BoxError.BAD_FIELD, 'diskPath is not a string');
         return null;
     default:
@@ -62,7 +63,7 @@ function validateMountOptions(type, options) {
 }
 
 function isManagedProvider(provider) {
-    return provider === 'sshfs' || provider === 'cifs' || provider === 'nfs' || provider === 'ext4';
+    return provider === 'sshfs' || provider === 'cifs' || provider === 'nfs' || provider === 'ext4' || provider === 'xfs';
 }
 
 function mountObjectFromBackupConfig(backupConfig) {
@@ -108,6 +109,11 @@ function renderMountFile(mount) {
         what = mountOptions.diskPath; // like /dev/disk/by-uuid/uuid or /dev/disk/by-id/scsi-id
         options = 'discard,defaults,noatime';
         break;
+    case 'xfs':
+        type = 'xfs';
+        what = mountOptions.diskPath; // like /dev/disk/by-uuid/uuid or /dev/disk/by-id/scsi-id
+        options = 'discard,defaults,noatime';
+        break;
     case 'sshfs': {
         const keyFilePath = path.join(paths.SSHFS_KEYS_DIR, `id_rsa_${mountOptions.host}`);
         if (!safe.fs.writeFileSync(keyFilePath, `${mount.mountOptions.privateKey}\n`, { mode: 0o600 })) throw new BoxError(BoxError.FS_ERROR, `Could not write private key: ${safe.error.message}`);
@@ -178,7 +184,7 @@ async function getStatus(mountType, hostPath) {
 
             if (end !== -1) message = lines.slice(start, end+1).map(line => line['MESSAGE']).join('\n');
         }
-        if (!message) message = `Could not determine failure reason. ${safe.error ? safe.error.message : ''}`;
+        if (!message) message = `Could not determine mount failure reason. ${safe.error ? safe.error.message : ''}`;
     } else {
         message = 'Mounted';
     }
@@ -190,7 +196,7 @@ async function tryAddMount(mount, options) {
     assert.strictEqual(typeof mount, 'object'); // { name, hostPath, mountType, mountOptions }
     assert.strictEqual(typeof options, 'object'); // { timeout, skipCleanup }
 
-    if (mount.mountType === 'mountpoint') return;
+    if (mount.mountType === 'mountpoint' || mount.mountType === 'filesystem') return;
 
     if (constants.TEST) return;
 
@@ -209,7 +215,7 @@ async function tryAddMount(mount, options) {
 async function remount(mount) {
     assert.strictEqual(typeof mount, 'object'); // { name, hostPath, mountType, mountOptions }
 
-    if (mount.mountType === 'mountpoint') return;
+    if (mount.mountType === 'mountpoint' || mount.mountType === 'filesystem') return;
 
     if (constants.TEST) return;
 

src/nginxconfig.ejs

@@ -45,7 +45,7 @@ server {
     location / {
 <% if ( endpoint === 'dashboard' || endpoint === 'setup' ) { %>
         return 301 https://$host$request_uri;
-<% } else if ( endpoint === 'app' ) { %>
+<% } else if ( endpoint === 'app' || endpoint === 'external' ) { %>
         return 301 https://$host$request_uri;
 <% } else if ( endpoint === 'redirect' ) { %>
         return 301 https://<%= redirectTo %>$request_uri;
@@ -147,7 +147,9 @@ server {
     proxy_read_timeout       3500;
     proxy_connect_timeout    3250;
 
+<% if ( endpoint !== 'external' ) { %>
     proxy_set_header   Host               $host;
+<% } %>
     proxy_set_header   X-Forwarded-For    $remote_addr;
     proxy_set_header   X-Forwarded-Host   $host;
     proxy_set_header   X-Forwarded-Port   $server_port;
@@ -175,6 +177,12 @@ server {
         proxy_pass http://127.0.0.1:3000;
 <% } else if ( endpoint === 'app' ) { %>
         proxy_pass http://<%= ip %>:<%= port %>;
+<% } else if ( endpoint === 'external' ) { %>
+        # without a variable, nginx will not start if upstream is down or
+        resolver 127.0.0.1 valid=30s;
+        set $upstream <%= upstreamUri %>;
+        proxy_ssl_verify off;
+        proxy_pass $upstream;
 <% } else if ( endpoint === 'redirect' ) { %>
         return 302 https://<%= redirectTo %>$request_uri;
 <% } %>
@@ -241,10 +249,10 @@ server {
         client_max_body_size 0;
     }
 
-    # graphite paths (uncomment block below and visit /graphite-web/dashboard)
+    # graphite paths (uncomment block below and visit /graphite-web/)
     # remember to comment out the CSP policy as well to access the graphite dashboard
     # location ~ ^/graphite-web/ {
-    #     proxy_pass   http://127.0.0.1:8417;
+    #     proxy_pass http://172.18.0.6:8000;
     #     client_max_body_size 1m;
     # }
 
@@ -326,6 +334,14 @@ server {
         # to clear a permanent redirect on the browser
         return 302 https://<%= redirectTo %>$request_uri;
     }
+<% } else if ( endpoint === 'external' ) { %>
+    location / {
+        # without a variable, nginx will not start if upstream is down or unavailable
+        resolver 127.0.0.1 valid=30s;
+        set $upstream <%= upstreamUri %>;
+        proxy_ssl_verify off;
+        proxy_pass $upstream;
+    }
 <% } else if ( endpoint === 'ip' ) { %>
     location /notfound.html {
         root <%= sourceDir %>/dashboard/dist;

src/notifications.js

@@ -14,6 +14,7 @@ exports = module.exports = {
     ALERT_REBOOT: 'reboot',
     ALERT_BOX_UPDATE: 'boxUpdate',
     ALERT_UPDATE_UBUNTU: 'ubuntuUpdate',
+    ALERT_MANUAL_APP_UPDATE: 'manualAppUpdate',
 
     alert,
 
@@ -189,16 +190,16 @@ async function boxUpdateError(eventId, errorMessage) {
     await add(eventId, 'Cloudron update failed', `Failed to update Cloudron: ${errorMessage}.`);
 }
 
-async function certificateRenewalError(eventId, vhost, errorMessage) {
+async function certificateRenewalError(eventId, fqdn, errorMessage) {
     assert.strictEqual(typeof eventId, 'string');
-    assert.strictEqual(typeof vhost, 'string');
+    assert.strictEqual(typeof fqdn, 'string');
     assert.strictEqual(typeof errorMessage, 'string');
 
-    await add(eventId, `Certificate renewal of ${vhost} failed`, `Failed to renew certs of ${vhost}: ${errorMessage}. Renewal will be retried in 12 hours.`);
+    await add(eventId, `Certificate renewal of ${fqdn} failed`, `Failed to renew certs of ${fqdn}: ${errorMessage}. Renewal will be retried in 12 hours.`);
 
     const admins = await users.getAdmins();
     for (const admin of admins) {
-        await mailer.certificateRenewalError(admin.email, vhost, errorMessage);
+        await mailer.certificateRenewalError(admin.email, fqdn, errorMessage);
     }
 }
 

src/once.js

@@ -2,10 +2,15 @@
 
 exports = module.exports = once;
 
+const debug = require('debug')('box:once');
+
 // https://github.com/isaacs/once/blob/main/LICENSE (ISC)
 function once (fn) {
     const f = function () {
-        if (f.called) return f.value;
+        if (f.called) {
+            debug(`${f.name} was already called, returning previous return value`);
+            return f.value;
+        }
         f.called = true;
         return f.value = fn.apply(this, arguments);
     };

src/paths.js

@@ -16,6 +16,7 @@ exports = module.exports = {
 
     CLOUDRON_DEFAULT_AVATAR_FILE: path.join(__dirname + '/../assets/avatar.png'),
     INFRA_VERSION_FILE: path.join(baseDir(), 'platformdata/INFRA_VERSION'),
+    CRON_SEED_FILE: path.join(baseDir(), 'platformdata/CRON_SEED'),
     DASHBOARD_DIR: constants.TEST ? path.join(__dirname, '../../dashboard/src') : path.join(baseDir(), 'box/dashboard/dist'),
 
     PROVIDER_FILE: '/etc/cloudron/PROVIDER',
@@ -30,7 +31,6 @@ exports = module.exports = {
     ACME_CHALLENGES_DIR: path.join(baseDir(), 'platformdata/acme'),
     ADDON_CONFIG_DIR: path.join(baseDir(), 'platformdata/addons'),
     MAIL_CONFIG_DIR: path.join(baseDir(), 'platformdata/addons/mail'),
-    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'),
@@ -38,6 +38,7 @@ exports = module.exports = {
     BACKUP_INFO_DIR: path.join(baseDir(), 'platformdata/backup'),
     UPDATE_DIR: path.join(baseDir(), 'platformdata/update'),
     UPDATE_CHECKER_FILE: path.join(baseDir(), 'platformdata/update/updatechecker.json'),
+    DISK_USAGE_FILE: path.join(baseDir(), 'platformdata/diskusage.json'),
     SNAPSHOT_INFO_FILE: path.join(baseDir(), 'platformdata/backup/snapshot-info.json'),
     DYNDNS_INFO_FILE: path.join(baseDir(), 'platformdata/dyndns-info.json'),
     DHPARAMS_FILE: path.join(baseDir(), 'platformdata/dhparams.pem'),
@@ -50,6 +51,7 @@ exports = module.exports = {
     SFTP_PRIVATE_KEY_FILE: path.join(baseDir(), 'platformdata/sftp/ssh/ssh_host_rsa_key'),
     FIREWALL_BLOCKLIST_FILE: path.join(baseDir(), 'platformdata/firewall/blocklist.txt'),
     LDAP_ALLOWLIST_FILE: path.join(baseDir(), 'platformdata/firewall/ldap_allowlist.txt'),
+    REVERSE_PROXY_REBUILD_FILE: path.join(baseDir(), 'platformdata/nginx/rebuild-needed'),
 
     BOX_DATA_DIR: path.join(baseDir(), 'boxdata/box'),
     MAIL_DATA_DIR: path.join(baseDir(), 'boxdata/mail'),

src/platform.js

@@ -4,8 +4,7 @@ exports = module.exports = {
     start,
     stopAllTasks,
 
-    // exported for testing
-    _isReady: false
+    getStatus
 };
 
 const apps = require('./apps.js'),
@@ -26,10 +25,16 @@ const apps = require('./apps.js'),
     volumes = require('./volumes.js'),
     _ = require('underscore');
 
+let gStatusMessage = 'Initializing';
+
+function getStatus() {
+    return { message: gStatusMessage };
+}
+
 async function start(options) {
     if (process.env.BOX_ENV === 'test' && !process.env.TEST_CREATE_INFRA) return;
 
-    debug('initializing addon infrastructure');
+    debug('initializing platform');
 
     let existingInfra = { version: 'none' };
     if (fs.existsSync(paths.INFRA_VERSION_FILE)) {
@@ -52,11 +57,13 @@ async function start(options) {
     for (let attempt = 0; attempt < 5; attempt++) {
         try {
             if (existingInfra.version !== infra.version) {
+                gStatusMessage = 'Removing containers for upgrade';
                 await removeAllContainers();
                 await createDockerNetwork();
             }
             if (existingInfra.version === 'none') await volumes.mountAll(); // when restoring, mount all volumes
             await markApps(existingInfra, options); // mark app state before we start addons. this gives the db import logic a chance to mark an app as errored
+            gStatusMessage = 'Starting services, this can take a while';
             await services.startServices(existingInfra);
             await fs.promises.writeFile(paths.INFRA_VERSION_FILE, JSON.stringify(infra, null, 4));
             break;
@@ -81,7 +88,7 @@ async function stopAllTasks() {
 
 async function onPlatformReady(infraChanged) {
     debug(`onPlatformReady: platform is ready. infra changed: ${infraChanged}`);
-    exports._isReady = true;
+    gStatusMessage = 'Ready';
 
     if (infraChanged) await safe(pruneInfraImages(), { debug }); // ignore error
 
@@ -95,20 +102,22 @@ async function pruneInfraImages() {
     const images = infra.baseImages.concat(Object.keys(infra.images).map(function (addon) { return infra.images[addon]; }));
 
     for (const image of images) {
-        let output = safe.child_process.execSync(`docker images --digests ${image.repo} --format "{{.ID}} {{.Repository}}:{{.Tag}}@{{.Digest}}"`, { encoding: 'utf8' });
+        const output = safe.child_process.execSync(`docker images --digests ${image.repo} --format "{{.ID}} {{.Repository}}:{{.Tag}}@{{.Digest}}"`, { encoding: 'utf8' });
         if (output === null) {
             debug(`Failed to list images of ${image}`, safe.error);
             throw safe.error;
         }
 
-        let lines = output.trim().split('\n');
-        for (let line of lines) {
+        const lines = output.trim().split('\n');
+        for (const line of lines) {
             if (!line) continue;
-            let parts = line.split(' '); // [ ID, Repo:Tag@Digest ]
-            if (image.tag === parts[1]) continue; // keep
+            const parts = line.split(' '); // [ ID, Repo:Tag@Digest ]
+            const normalizedTag = parts[1].replace('registry.ipv6.docker.com/', '').replace('registry-1.docker.io/', '');
+
+            if (image.tag === normalizedTag) continue; // keep
             debug(`pruneInfraImages: removing unused image of ${image.repo}: tag: ${parts[1]} id: ${parts[0]}`);
 
-            let result = safe.child_process.execSync(`docker rmi ${parts[0]}`, { encoding: 'utf8' });
+            let result = safe.child_process.execSync(`docker rmi ${parts[1].replace(':<none>', '')}`, { encoding: 'utf8' }); // the none tag has to be removed
             if (result === null) debug(`Error removing image ${parts[0]}: ${safe.error.mesage}`);
         }
     }

src/progress-stream.js

@@ -0,0 +1,44 @@
+'use strict';
+
+const stream = require('stream'),
+    TransformStream = stream.Transform;
+
+class ProgressStream extends TransformStream {
+    constructor(options) {
+        super();
+        this._options = Object.assign({ interval: 10 * 1000 }, options);
+        this._transferred = 0;
+        this._delta = 0;
+        this._started = false;
+        this._startTime = null;
+        this._interval = null;
+    }
+
+    _start() {
+        this._startTime = Date.now();
+        this._started = true;
+        this._interval = setInterval(() => {
+            const speed = this._delta * 1000 / this._options.interval;
+            this._delta = 0;
+            this.emit('progress', { speed, transferred: this._transferred });
+        }, this._options.interval);
+    }
+
+    _stop() {
+        clearInterval(this._interval);
+    }
+
+    _transform(chunk, encoding, callback) {
+        if (!this._started) this._start();
+        this._transferred += chunk.length;
+        this._delta += chunk.length;
+        callback(null, chunk);
+    }
+
+    _flush(callback) {
+        this._stop();
+        callback(null);
+    }
+}
+
+exports = module.exports = ProgressStream;

src/provision.js

@@ -70,7 +70,7 @@ async function setupTask(domain, auditSource) {
     assert.strictEqual(typeof auditSource, 'object');
 
     try {
-        await cloudron.setupDnsAndCert(constants.DASHBOARD_LOCATION, domain, auditSource, (progress) => setProgress('setup', progress.message));
+        await cloudron.setupDnsAndCert(constants.DASHBOARD_SUBDOMAIN, domain, auditSource, (progress) => setProgress('setup', progress.message));
         await ensureDhparams();
         await cloudron.setDashboardDomain(domain, auditSource);
         setProgress('setup', 'Done'),
@@ -111,7 +111,7 @@ async function setup(domainConfig, sysinfoConfig, auditSource) {
             dkimSelector: 'cloudron'
         };
 
-        await settings.setMailLocation(domain, `${constants.DASHBOARD_LOCATION}.${domain}`); // default mail location. do this before we add the domain for upserting mail DNS
+        await settings.setMailLocation(domain, `${constants.DASHBOARD_SUBDOMAIN}.${domain}`); // default mail location. do this before we add the domain for upserting mail DNS
         await domains.add(domain, data, auditSource);
         await settings.setSysinfoConfig(sysinfoConfig);
 
@@ -174,7 +174,7 @@ async function restoreTask(backupConfig, remotePath, sysinfoConfig, options, aud
         await reverseProxy.restoreFallbackCertificates();
 
         const dashboardDomain = settings.dashboardDomain(); // load this fresh from after the backup.restore
-        if (!options.skipDnsSetup) await cloudron.setupDnsAndCert(constants.DASHBOARD_LOCATION, dashboardDomain, auditSource, (progress) => setProgress('restore', progress.message));
+        if (!options.skipDnsSetup) await cloudron.setupDnsAndCert(constants.DASHBOARD_SUBDOMAIN, dashboardDomain, auditSource, (progress) => setProgress('restore', progress.message));
         await cloudron.setDashboardDomain(dashboardDomain, auditSource);
         await settings.setBackupCredentials(backupConfig); // update just the credentials and not the policy and flags
         await eventlog.add(eventlog.ACTION_RESTORE, auditSource, { remotePath });

src/proxyauth.js

@@ -50,15 +50,23 @@ function jwtVerify(req, res, next) {
     });
 }
 
-async function basicAuthVerify(req, res, next) {
+async function authorizationHeader(req, res, next) {
     const appId = req.headers['x-app-id'] || '';
-    const credentials = basicAuth(req);
-    if (!appId || !credentials) return next();
+    if (!appId) return next();
+
+    if (!req.headers.authorization) return next();
 
     const [error, app] = await safe(apps.get(appId));
     if (error) return next(new HttpError(503, error.message));
+    if (!app) return next(new HttpError(503, 'Error getting app'));
 
-    if (!app.manifest.addons.proxyAuth.basicAuth) return next();
+    // only if the app supports bearer auth, pass it through to the app. without this flag, anyone can access the app with Bearer auth!
+    if (req.headers.authorization.startsWith('Bearer ') && app.manifest.addons.proxyAuth.supportsBearerAuth) return next(new HttpSuccess(200, {}));
+
+    const credentials = basicAuth(req);
+    if (!credentials) return next();
+
+    if (!app.manifest.addons.proxyAuth.basicAuth) return next(); // this is a flag because this allows auth to bypass 2FA
 
     const verifyFunc = credentials.name.indexOf('@') !== -1 ? users.verifyWithEmail : users.verifyWithUsername;
     const [verifyError, user] = await safe(verifyFunc(credentials.name, credentials.pass, appId));
@@ -139,7 +147,7 @@ function auth(req, res, next) {
     res.set('x-remote-email', req.user.email);
     res.set('x-remote-name', req.user.displayName);
 
-    return next(new HttpSuccess(200, {}));
+    next(new HttpSuccess(200, {}));
 }
 
 // endpoint called by login page, username and password posted as JSON body
@@ -243,7 +251,7 @@ function initializeAuthwallExpressSync() {
         .use(middleware.lastMile());
 
     router.get ('/login',     loginPage);
-    router.get ('/auth',      jwtVerify, basicAuthVerify, auth); // called by nginx before accessing protected page
+    router.get ('/auth',      jwtVerify, authorizationHeader, auth); // called by nginx before accessing protected page
     router.post('/login',     json, passwordAuth, authorize);
     router.get ('/logout',    logoutPage);
     router.post('/logout',    json, logoutPage);

src/reverseproxy.js

@@ -1,32 +1,33 @@
 'use strict';
 
 exports = module.exports = {
-    setAppCertificate,
-    setFallbackCertificate,
+    setUserCertificate, // per location certificate
+    setFallbackCertificate, // per domain certificate
 
     generateFallbackCertificate,
 
     validateCertificate,
 
-    getCertificatePath,
+    getMailCertificate,
+    getDirectoryServerCertificate,
+
     ensureCertificate,
 
     checkCerts,
 
-    // the 'configure' ensure a certificate and generate nginx config
+    // the 'configure' functions ensure a certificate and generate nginx config
     configureApp,
     unconfigureApp,
 
     // these only generate nginx config
     writeDefaultConfig,
     writeDashboardConfig,
-    writeAppConfig,
+    writeAppConfigs,
 
     removeAppConfigs,
     restoreFallbackCertificates,
 
-    // exported for testing
-    _getAcmeApi: getAcmeApi
+    handleCertificateProviderChanged
 };
 
 const acme2 = require('./acme2.js'),
@@ -38,6 +39,7 @@ const acme2 = require('./acme2.js'),
     crypto = require('crypto'),
     debug = require('debug')('box:reverseproxy'),
     dns = require('./dns.js'),
+    docker = require('./docker.js'),
     domains = require('./domains.js'),
     ejs = require('ejs'),
     eventlog = require('./eventlog.js'),
@@ -50,7 +52,6 @@ const acme2 = require('./acme2.js'),
     settings = require('./settings.js'),
     shell = require('./shell.js'),
     sysinfo = require('./sysinfo.js'),
-    users = require('./users.js'),
     util = require('util');
 
 const NGINX_APPCONFIG_EJS = fs.readFileSync(__dirname + '/nginxconfig.ejs', { encoding: 'utf8' });
@@ -59,46 +60,27 @@ const RESTART_SERVICE_CMD = path.join(__dirname, 'scripts/restartservice.sh');
 function nginxLocation(s) {
     if (!s.startsWith('!')) return s;
 
-    let re = s.replace(/[\^$\\.*+?()[\]{}|]/g, '\\$&'); // https://github.com/es-shims/regexp.escape/blob/master/implementation.js
-
+    const re = s.replace(/[\^$\\.*+?()[\]{}|]/g, '\\$&'); // https://github.com/es-shims/regexp.escape/blob/master/implementation.js
     return `~ ^(?!(${re.slice(1)}))`; // negative regex assertion - https://stackoverflow.com/questions/16302897/nginx-location-not-equal-to-regex
 }
 
-async function getAcmeApi(domainObject) {
-    assert.strictEqual(typeof domainObject, 'object');
+function getCertificateDatesSync(cert) {
+    assert.strictEqual(typeof cert, 'string');
 
-    const acmeApi = acme2;
+    const result = safe.child_process.spawnSync('/usr/bin/openssl', [ 'x509', '-startdate', '-enddate', '-subject', '-noout' ], { input: cert, encoding: 'utf8' });
+    if (!result) return { startDate: null, endDate: null } ; // some error
 
-    let apiOptions = { prod: false, performHttpAuthorization: false, wildcard: false, email: '' };
-    apiOptions.prod = domainObject.tlsConfig.provider.match(/.*-prod/) !== null; // matches 'le-prod' or 'letsencrypt-prod'
-    apiOptions.performHttpAuthorization = domainObject.provider.match(/noop|manual|wildcard/) !== null;
-    apiOptions.wildcard = !!domainObject.tlsConfig.wildcard;
+    const lines = result.stdout.trim().split('\n');
+    const notBefore = lines[0].split('=')[1];
+    const notBeforeDate = new Date(notBefore);
 
-    // registering user with an email requires A or MX record (https://github.com/letsencrypt/boulder/issues/1197)
-    // we cannot use admin@fqdn because the user might not have set it up.
-    // we simply update the account with the latest email we have each time when getting letsencrypt certs
-    // https://github.com/ietf-wg-acme/acme/issues/30
-    const [error, owner] = await safe(users.getOwner());
-    apiOptions.email = (error || !owner) ? 'webmaster@cloudron.io' : owner.email; // can error if not activated yet
-
-    return { acmeApi, apiOptions };
-}
-
-function getExpiryDate(certFilePath) {
-    assert.strictEqual(typeof certFilePath, 'string');
-
-    if (!fs.existsSync(certFilePath)) return null; // not found
-
-    const result = safe.child_process.spawnSync('/usr/bin/openssl', [ 'x509', '-enddate', '-noout', '-in', certFilePath ]);
-    if (!result) return null; // some error
-
-    const notAfter = result.stdout.toString('utf8').trim().split('=')[1];
+    const notAfter = lines[1].split('=')[1];
     const notAfterDate = new Date(notAfter);
 
     const daysLeft = (notAfterDate - new Date())/(24 * 60 * 60 * 1000);
-    debug(`expiryDate: ${certFilePath} notAfter=${notAfter} daysLeft=${daysLeft}`);
+    debug(`expiryDate: ${lines[2]} notBefore=${notBefore} notAfter=${notAfter} daysLeft=${daysLeft}`);
 
-    return notAfterDate;
+    return { startDate: notBeforeDate, endDate: notAfterDate };
 }
 
 async function isOcspEnabled(certFilePath) {
@@ -113,14 +95,11 @@ async function isOcspEnabled(certFilePath) {
 }
 
 // checks if the certificate matches the options provided by user (like wildcard, le-staging etc)
-function providerMatchesSync(domainObject, certFilePath, apiOptions) {
+function providerMatchesSync(domainObject, cert) {
     assert.strictEqual(typeof domainObject, 'object');
-    assert.strictEqual(typeof certFilePath, 'string');
-    assert.strictEqual(typeof apiOptions, 'object');
+    assert.strictEqual(typeof cert, 'string');
 
-    if (!fs.existsSync(certFilePath)) return false; // not found
-
-    const subjectAndIssuer = safe.child_process.execSync(`/usr/bin/openssl x509 -noout -subject -issuer -in "${certFilePath}"`, { encoding: 'utf8' });
+    const subjectAndIssuer = safe.child_process.execSync('/usr/bin/openssl x509 -noout -subject -issuer', { encoding: 'utf8', input: cert });
     if (!subjectAndIssuer) return false; // something bad happenned
 
     const subject = subjectAndIssuer.match(/^subject=(.*)$/m)[1];
@@ -129,14 +108,17 @@ function providerMatchesSync(domainObject, certFilePath, apiOptions) {
     const isWildcardCert = domain.includes('*');
     const isLetsEncryptProd = issuer.includes('Let\'s Encrypt') && !issuer.includes('STAGING');
 
-    const issuerMismatch = (apiOptions.prod && !isLetsEncryptProd) || (!apiOptions.prod && isLetsEncryptProd);
+    const prod = domainObject.tlsConfig.provider.match(/.*-prod/) !== null; // matches 'le-prod' or 'letsencrypt-prod'
+    const wildcard = !!domainObject.tlsConfig.wildcard;
+
+    const issuerMismatch = (prod && !isLetsEncryptProd) || (!prod && isLetsEncryptProd);
     // bare domain is not part of wildcard SAN
-    const wildcardMismatch = (domain !== domainObject.domain) && (apiOptions.wildcard && !isWildcardCert) || (!apiOptions.wildcard && isWildcardCert);
+    const wildcardMismatch = (domain !== domainObject.domain) && (wildcard && !isWildcardCert) || (!wildcard && isWildcardCert);
 
     const mismatch = issuerMismatch || wildcardMismatch;
 
-    debug(`providerMatchesSync: ${certFilePath} subject=${subject} domain=${domain} issuer=${issuer} `
-        + `wildcard=${isWildcardCert}/${apiOptions.wildcard} prod=${isLetsEncryptProd}/${apiOptions.prod} `
+    debug(`providerMatchesSync: subject=${subject} domain=${domain} issuer=${issuer} `
+        + `wildcard=${isWildcardCert}/${wildcard} prod=${isLetsEncryptProd}/${prod} `
         + `issuerMismatch=${issuerMismatch} wildcardMismatch=${wildcardMismatch} match=${!mismatch}`);
 
     return !mismatch;
@@ -144,19 +126,19 @@ function providerMatchesSync(domainObject, certFilePath, apiOptions) {
 
 // note: https://tools.ietf.org/html/rfc4346#section-7.4.2 (certificate_list) requires that the
 // servers certificate appears first (and not the intermediate cert)
-function validateCertificate(location, domainObject, certificate) {
-    assert.strictEqual(typeof location, 'string');
-    assert.strictEqual(typeof domainObject, 'object');
+function validateCertificate(subdomain, domain, certificate) {
+    assert.strictEqual(typeof subdomain, 'string');
+    assert.strictEqual(typeof domain, 'string');
     assert(certificate && typeof certificate, 'object');
 
-    const cert = certificate.cert, key = certificate.key;
+    const { cert, key } = certificate;
 
     // check for empty cert and key strings
     if (!cert && key) return new BoxError(BoxError.BAD_FIELD, 'missing cert');
     if (cert && !key) return new BoxError(BoxError.BAD_FIELD, 'missing key');
 
     // -checkhost checks for SAN or CN exclusively. SAN takes precedence and if present, ignores the CN.
-    const fqdn = dns.fqdn(location, domainObject);
+    const fqdn = dns.fqdn(subdomain, domain);
 
     let result = safe.child_process.execSync(`openssl x509 -noout -checkhost "${fqdn}"`, { encoding: 'utf8', input: cert });
     if (result === null) return new BoxError(BoxError.BAD_FIELD, 'Unable to get certificate subject:' + safe.error.message);
@@ -179,6 +161,15 @@ function validateCertificate(location, domainObject, certificate) {
     return null;
 }
 
+async function notifyCertChange() {
+    await mail.checkCertificate();
+    await shell.promises.sudo('notifyCertChange', [ RESTART_SERVICE_CMD, 'box' ], {}); // directory server
+    const allApps = (await apps.list()).filter(app => app.runState !== apps.RSTATE_STOPPED);
+    for (const app of allApps) {
+        if (app.manifest.addons?.tls) await setupTlsAddon(app);
+    }
+}
+
 async function reload() {
     if (constants.TEST) return;
 
@@ -198,7 +189,7 @@ async function generateFallbackCertificate(domain) {
     let opensslConfWithSan;
     const cn = domain;
 
-    debug(`generateFallbackCertificateSync: domain=${domain} cn=${cn}`);
+    debug(`generateFallbackCertificate: domain=${domain} cn=${cn}`);
 
     opensslConfWithSan = `${opensslConf}\n[SAN]\nsubjectAltName=DNS:${domain},DNS:*.${cn}\n`;
     const configFile = path.join(os.tmpdir(), 'openssl-' + crypto.randomBytes(4).readUInt32LE(0) + '.conf');
@@ -219,17 +210,16 @@ async function generateFallbackCertificate(domain) {
     return { cert, key };
 }
 
-async function setFallbackCertificate(domain, fallback) {
+async function setFallbackCertificate(domain, certificate) {
     assert.strictEqual(typeof domain, 'string');
-    assert(fallback && typeof fallback === 'object');
-    assert.strictEqual(typeof fallback, 'object');
+    assert(certificate && typeof certificate === 'object');
 
     debug(`setFallbackCertificate: setting certs for domain ${domain}`);
-    if (!safe.fs.writeFileSync(path.join(paths.NGINX_CERT_DIR, `${domain}.host.cert`), fallback.cert)) throw new BoxError(BoxError.FS_ERROR, safe.error.message);
-    if (!safe.fs.writeFileSync(path.join(paths.NGINX_CERT_DIR, `${domain}.host.key`), fallback.key)) throw new BoxError(BoxError.FS_ERROR, safe.error.message);
+    if (!safe.fs.writeFileSync(path.join(paths.NGINX_CERT_DIR, `${domain}.host.cert`), certificate.cert)) throw new BoxError(BoxError.FS_ERROR, safe.error.message);
+    if (!safe.fs.writeFileSync(path.join(paths.NGINX_CERT_DIR, `${domain}.host.key`), certificate.key)) throw new BoxError(BoxError.FS_ERROR, safe.error.message);
 
-    // TODO: maybe the cert is being used by the mail container
     await reload();
+    await notifyCertChange(); // if domain uses fallback certs, propagate immediately
 }
 
 async function restoreFallbackCertificates() {
@@ -241,271 +231,272 @@ async function restoreFallbackCertificates() {
     }
 }
 
-function getFallbackCertificatePathSync(domain) {
-    assert.strictEqual(typeof domain, 'string');
+function getAppLocationsSync(app) {
+    assert.strictEqual(typeof app, 'object');
 
-    const certFilePath = path.join(paths.NGINX_CERT_DIR, `${domain}.host.cert`);
-    const keyFilePath = path.join(paths.NGINX_CERT_DIR, `${domain}.host.key`);
-
-    return { certFilePath, keyFilePath };
+    return [{ domain: app.domain, fqdn: app.fqdn, certificate: app.certificate, type: apps.LOCATION_TYPE_PRIMARY }]
+        .concat(app.secondaryDomains.map(sd => { return { domain: sd.domain, certificate: sd.certificate, fqdn: sd.fqdn, type: apps.LOCATION_TYPE_SECONDARY }; }))
+        .concat(app.redirectDomains.map(rd => { return { domain: rd.domain, certificate: rd.certificate, fqdn: rd.fqdn, type: apps.LOCATION_TYPE_REDIRECT }; }))
+        .concat(app.aliasDomains.map(ad => { return { domain: ad.domain, certificate: ad.certificate, fqdn: ad.fqdn, type: apps.LOCATION_TYPE_ALIAS }; }));
 }
 
-function getAppCertificatePathSync(vhost) {
-    assert.strictEqual(typeof vhost, 'string');
-
-    const certFilePath = path.join(paths.NGINX_CERT_DIR, `${vhost}.user.cert`);
-    const keyFilePath = path.join(paths.NGINX_CERT_DIR, `${vhost}.user.key`);
-
-    return { certFilePath, keyFilePath };
-}
-
-function getAcmeCertificatePathSync(vhost, domainObject) {
-    assert.strictEqual(typeof vhost, 'string'); // this can contain wildcard domain (for alias domains)
+function getAcmeCertificateNameSync(fqdn, domainObject) {
+    assert.strictEqual(typeof fqdn, 'string'); // this can contain wildcard domain (for alias domains)
     assert.strictEqual(typeof domainObject, 'object');
 
-    let certName, certFilePath, keyFilePath, csrFilePath, acmeChallengesDir = paths.ACME_CHALLENGES_DIR;
-
-    if (vhost !== domainObject.domain && domainObject.tlsConfig.wildcard) { // bare domain is not part of wildcard SAN
-        certName = dns.makeWildcard(vhost).replace('*.', '_.');
-        certFilePath = path.join(paths.NGINX_CERT_DIR, `${certName}.cert`);
-        keyFilePath = path.join(paths.NGINX_CERT_DIR, `${certName}.key`);
-        csrFilePath = path.join(paths.NGINX_CERT_DIR, `${certName}.csr`);
+    if (fqdn !== domainObject.domain && domainObject.tlsConfig.wildcard) { // bare domain is not part of wildcard SAN
+        return dns.makeWildcard(fqdn).replace('*.', '_.');
+    } else if (fqdn.includes('*')) { // alias domain with non-wildcard cert
+        return fqdn.replace('*.', '_.');
     } else {
-        certName = vhost;
-        certFilePath = path.join(paths.NGINX_CERT_DIR, `${vhost}.cert`);
-        keyFilePath = path.join(paths.NGINX_CERT_DIR, `${vhost}.key`);
-        csrFilePath = path.join(paths.NGINX_CERT_DIR, `${vhost}.csr`);
+        return fqdn;
+    }
+}
+
+function needsRenewalSync(cert, options) {
+    assert.strictEqual(typeof cert, 'string');
+    assert.strictEqual(typeof options, 'object');
+
+    const { startDate, endDate } = getCertificateDatesSync(cert);
+    const now = new Date();
+
+    let isExpiring;
+    if (options.forceRenewal) {
+        isExpiring = (now - startDate) > (65 * 60 * 1000); // was renewed 5 minutes ago. LE backdates issue date by 1 hour for clock skew
+    } else {
+        isExpiring = (endDate - now) <= (30 * 24 * 60 * 60 * 1000); // expiring in a month
     }
 
-    return { certName, certFilePath, keyFilePath, csrFilePath, acmeChallengesDir };
+    debug(`needsRenewal: ${isExpiring}. force: ${!!options.forceRenewal}`);
+    return isExpiring;
 }
 
-async function setAppCertificate(location, domainObject, certificate) {
-    assert.strictEqual(typeof location, 'string');
-    assert.strictEqual(typeof domainObject, 'object');
-    assert.strictEqual(typeof certificate, 'object');
+async function getCertificate(location) {
+    assert.strictEqual(typeof location, 'object');
 
-    const fqdn = dns.fqdn(location, domainObject);
-    const { certFilePath, keyFilePath } = getAppCertificatePathSync(fqdn);
+    const { domain, fqdn } = location;
+    const domainObject = await domains.get(domain);
+    if (!domainObject) throw new BoxError(BoxError.NOT_FOUND, `${domain} not found`);
 
-    if (certificate.cert && certificate.key) {
-        if (!safe.fs.writeFileSync(certFilePath, certificate.cert)) throw safe.error;
-        if (!safe.fs.writeFileSync(keyFilePath, certificate.key)) throw safe.error;
-    } else { // remove existing cert/key
-        if (!safe.fs.unlinkSync(certFilePath)) debug(`Error removing cert: ${safe.error.message}`);
-        if (!safe.fs.unlinkSync(keyFilePath)) debug(`Error removing key: ${safe.error.message}`);
+    if (location.certificate) return location.certificate;
+    if (domainObject.tlsConfig.provider === 'fallback') return domainObject.fallbackCertificate;
+
+    const certName = getAcmeCertificateNameSync(fqdn, domainObject);
+    const cert = await blobs.getString(`${blobs.CERT_PREFIX}-${certName}.cert`);
+    const key = await blobs.getString(`${blobs.CERT_PREFIX}-${certName}.key`);
+    if (!key || !cert) return domainObject.fallbackCertificate;
+
+    return { key, cert };
+}
+
+async function getMailCertificate() {
+    return await getCertificate({ domain: settings.mailDomain(), fqdn: settings.mailFqdn(), certificate: null, type: apps.LOCATION_TYPE_MAIL });
+}
+
+async function getDirectoryServerCertificate() {
+    return await getCertificate({ domain: settings.dashboardDomain(), fqdn: settings.dashboardFqdn(), certificate: null, type: apps.LOCATION_TYPE_DIRECTORY_SERVER });
+}
+
+// write if contents mismatch (thus preserving mtime)
+function writeFileSync(filePath, data) {
+    assert.strictEqual(typeof filePath, 'string');
+    assert.strictEqual(typeof data, 'string');
+
+    const curData = safe.fs.readFileSync(filePath, { encoding: 'utf8' });
+    if (curData === data) return false;
+    if (!safe.fs.writeFileSync(filePath, data)) throw new BoxError(BoxError.FS_ERROR, safe.error.message);
+    return true;
+}
+
+async function setupTlsAddon(app) {
+    assert.strictEqual(typeof app, 'object');
+
+    const certificateDir = `${paths.PLATFORM_DATA_DIR}/tls/${app.id}`;
+    const contents = [];
+    for (const location of getAppLocationsSync(app)) {
+        const certificate = await getCertificate(location);
+        contents.push({ filename: `${location.fqdn}.cert`, data: certificate.cert });
+        contents.push({ filename: `${location.fqdn}.key`, data: certificate.key });
+
+        if (location.type === apps.LOCATION_TYPE_PRIMARY) { // backward compat
+            contents.push({ filename: 'tls_cert.pem', data: certificate.cert });
+            contents.push({ filename: 'tls_key.pem', data: certificate.key });
+        }
     }
 
-    await reload();
+    let changed = 0;
+    for (const content of contents) {
+        if (writeFileSync(`${certificateDir}/${content.filename}`, content.data)) ++changed;
+    }
+    debug(`setupTlsAddon: ${changed} files changed`);
+
+    // clean up any certs of old locations
+    const filenamesInUse = new Set(contents.map(c => c.filename));
+    const filenames = safe.fs.readdirSync(certificateDir) || [];
+    let removed = 0;
+    for (const filename of filenames) {
+        if (filenamesInUse.has(filename)) continue;
+        safe.fs.unlinkSync(path.join(certificateDir, filename));
+        ++removed;
+    }
+    debug(`setupTlsAddon: ${removed} files removed`);
+
+    if (changed || removed) await docker.restartContainer(app.id);
 }
 
-async function getCertificatePath(fqdn, domain) {
-    assert.strictEqual(typeof fqdn, 'string');
-    assert.strictEqual(typeof domain, 'string');
-
-    // 1. user cert always wins
-    // 2. if using fallback provider, return that cert
-    // 3. look for LE certs
+// writes latest certificate to disk and returns the path
+async function writeCertificate(location) {
+    assert.strictEqual(typeof location, 'object');
 
+    const { domain, fqdn } = location;
     const domainObject = await domains.get(domain);
+    if (!domainObject) throw new BoxError(BoxError.NOT_FOUND, `${domain} not found`);
 
-    const appCertPath = getAppCertificatePathSync(fqdn); // user cert always wins
-    if (fs.existsSync(appCertPath.certFilePath) && fs.existsSync(appCertPath.keyFilePath)) return appCertPath;
+    if (location.certificate) {
+        const certFilePath = path.join(paths.NGINX_CERT_DIR, `${fqdn}.user.cert`);
+        const keyFilePath = path.join(paths.NGINX_CERT_DIR, `${fqdn}.user.key`);
 
-    if (domainObject.tlsConfig.provider === 'fallback') return getFallbackCertificatePathSync(domain);
+        writeFileSync(certFilePath, location.certificate.cert);
+        writeFileSync(keyFilePath, location.certificate.key);
 
-    const acmeCertPath = getAcmeCertificatePathSync(fqdn, domainObject);
-    if (fs.existsSync(acmeCertPath.certFilePath) && fs.existsSync(acmeCertPath.keyFilePath)) return acmeCertPath;
-
-    return getFallbackCertificatePathSync(domain);
-}
-
-async function checkAppCertificate(vhost, domainObject) {
-    assert.strictEqual(typeof vhost, 'string'); // this can contain wildcard domain (for alias domains)
-    assert.strictEqual(typeof domainObject, 'object');
-
-    const subdomain = vhost.substr(0, vhost.length - domainObject.domain.length - 1);
-    const certificate = await apps.getCertificate(subdomain, domainObject.domain);
-    if (!certificate) return null;
-
-    const { certFilePath, keyFilePath } = getAppCertificatePathSync(vhost);
-
-    if (!safe.fs.writeFileSync(certFilePath, certificate.cert)) throw new BoxError(BoxError.FS_ERROR, `Failed to write certificate: ${safe.error.message}`);
-    if (!safe.fs.writeFileSync(keyFilePath, certificate.key)) throw new BoxError(BoxError.FS_ERROR, `Failed to write key: ${safe.error.message}`);
-
-    return { certFilePath, keyFilePath };
-}
-
-async function checkAcmeCertificate(vhost, domainObject) {
-    assert.strictEqual(typeof vhost, 'string'); // this can contain wildcard domain (for alias domains)
-    assert.strictEqual(typeof domainObject, 'object');
-
-    const { certName, certFilePath, keyFilePath, csrFilePath } = getAcmeCertificatePathSync(vhost, domainObject);
-
-    const privateKey = await blobs.get(`${blobs.CERT_PREFIX}-${certName}.key`);
-    const cert = await blobs.get(`${blobs.CERT_PREFIX}-${certName}.cert`);
-    const csr = await blobs.get(`${blobs.CERT_PREFIX}-${certName}.csr`);
-
-    if (!privateKey || !cert) return null;
-
-    if (!safe.fs.writeFileSync(keyFilePath, privateKey)) throw new BoxError(BoxError.FS_ERROR, `Failed to write private key: ${safe.error.message}`);
-    if (!safe.fs.writeFileSync(certFilePath, cert)) throw new BoxError(BoxError.FS_ERROR, `Failed to write certificate: ${safe.error.message}`);
-
-    if (csr) safe.fs.writeFileSync(csrFilePath, csr);
-
-    return { certFilePath, keyFilePath };
-}
-
-async function updateCertBlobs(vhost, domainObject) {
-    assert.strictEqual(typeof vhost, 'string'); // this can contain wildcard domain (for alias domains)
-    assert.strictEqual(typeof domainObject, 'object');
-
-    const { certName, certFilePath, keyFilePath, csrFilePath } = getAcmeCertificatePathSync(vhost, domainObject);
-
-    const privateKey = safe.fs.readFileSync(keyFilePath);
-    if (!privateKey) throw new BoxError(BoxError.FS_ERROR, `Failed to read private key: ${safe.error.message}`);
-
-    const cert = safe.fs.readFileSync(certFilePath);
-    if (!cert) throw new BoxError(BoxError.FS_ERROR, `Failed to read cert: ${safe.error.message}`);
-
-    const csr = safe.fs.readFileSync(csrFilePath);
-    if (!csr) throw new BoxError(BoxError.FS_ERROR, `Failed to read csr: ${safe.error.message}`);
-
-    await blobs.set(`${blobs.CERT_PREFIX}-${certName}.key`, privateKey);
-    await blobs.set(`${blobs.CERT_PREFIX}-${certName}.cert`, cert);
-    await blobs.set(`${blobs.CERT_PREFIX}-${certName}.csr`, csr);
-}
-
-async function ensureCertificate(vhost, domain, auditSource) {
-    assert.strictEqual(typeof vhost, 'string');
-    assert.strictEqual(typeof domain, 'string');
-    assert.strictEqual(typeof auditSource, 'object');
-
-    const domainObject = await domains.get(domain);
-
-    let bundle = await checkAppCertificate(vhost, domainObject);
-    if (bundle) return { bundle, renewed: false };
+        return { certFilePath, keyFilePath };
+    }
 
     if (domainObject.tlsConfig.provider === 'fallback') {
-        debug(`ensureCertificate: ${vhost} will use fallback certs`);
+        const certFilePath = path.join(paths.NGINX_CERT_DIR, `${domain}.host.cert`);
+        const keyFilePath = path.join(paths.NGINX_CERT_DIR, `${domain}.host.key`);
 
-        return { bundle: getFallbackCertificatePathSync(domain), renewed: false };
+        debug(`writeCertificate: ${fqdn} will use fallback certs`);
+        writeFileSync(certFilePath, domainObject.fallbackCertificate.cert);
+        writeFileSync(keyFilePath, domainObject.fallbackCertificate.key);
+
+        return { certFilePath, keyFilePath };
     }
 
-    const { acmeApi, apiOptions } = await getAcmeApi(domainObject);
-    let notAfter = null;
+    const certName = getAcmeCertificateNameSync(fqdn, domainObject);
+    let cert = await blobs.getString(`${blobs.CERT_PREFIX}-${certName}.cert`);
+    let key = await blobs.getString(`${blobs.CERT_PREFIX}-${certName}.key`);
 
-    const [, currentBundle] = await safe(checkAcmeCertificate(vhost, domainObject));
-    if (currentBundle) {
-        debug(`ensureCertificate: ${vhost} certificate already exists at ${currentBundle.keyFilePath}`);
-        notAfter = getExpiryDate(currentBundle.certFilePath);
-        const isExpiring = (notAfter - new Date()) <= (30 * 24 * 60 * 60 * 1000); // expiring in a month
-        if (!isExpiring && providerMatchesSync(domainObject, currentBundle.certFilePath, apiOptions)) return { bundle: currentBundle, renewed: false };
-        debug(`ensureCertificate: ${vhost} cert requires renewal`);
-    } else {
-        debug(`ensureCertificate: ${vhost} cert does not exist`);
+    if (!key || !cert) { // use fallback certs if we didn't manage to get acme certs
+        debug(`writeCertificate: ${fqdn} will use fallback certs because acme is missing`);
+        cert = domainObject.fallbackCertificate.cert;
+        key = domainObject.fallbackCertificate.key;
     }
+    const certFilePath = path.join(paths.NGINX_CERT_DIR, `${certName}.cert`);
+    const keyFilePath = path.join(paths.NGINX_CERT_DIR, `${certName}.key`);
 
-    debug('ensureCertificate: getting certificate for %s with options %j', vhost, apiOptions);
+    writeFileSync(certFilePath, cert);
+    writeFileSync(keyFilePath, key);
 
-    const acmePaths = getAcmeCertificatePathSync(vhost, domainObject);
-    let [error] = await safe(acmeApi.getCertificate(vhost, domain, acmePaths, apiOptions));
-    debug(`ensureCertificate: error: ${error ? error.message : 'null'} cert: ${acmePaths.certFilePath || 'null'}`);
-
-    await safe(eventlog.add(currentBundle ? eventlog.ACTION_CERTIFICATE_RENEWAL : eventlog.ACTION_CERTIFICATE_NEW, auditSource, { domain: vhost, errorMessage: error ? error.message : '', notAfter }));
-
-    if (error && currentBundle && (notAfter - new Date() > 0)) { // still some life left in this certificate
-        debug('ensureCertificate: continue using existing bundle since renewal failed');
-        return { bundle: currentBundle, renewed: false };
-    }
-
-    if (!error) {
-        [error] = await safe(updateCertBlobs(vhost, domainObject));
-        if (!error) return { bundle: { certFilePath: acmePaths.certFilePath, keyFilePath: acmePaths.keyFilePath }, renewed: true };
-    }
-
-    debug(`ensureCertificate: renewal of ${vhost} failed. using fallback certificates for ${domain}`);
-
-    return { bundle: getFallbackCertificatePathSync(domain), renewed: false };
+    return { certFilePath, keyFilePath };
 }
 
-async function writeDashboardNginxConfig(vhost, bundle) {
+async function ensureCertificate(location, options, auditSource) {
+    assert.strictEqual(typeof location, 'object');
+    assert.strictEqual(typeof options, 'object');
+    assert.strictEqual(typeof auditSource, 'object');
+
+    const domainObject = await domains.get(location.domain);
+    if (!domainObject) throw new BoxError(BoxError.NOT_FOUND, `${location.domain} not found`);
+
+    const fqdn = location.fqdn;
+
+    if (location.certificate) { // user certificate
+        debug(`ensureCertificate: ${fqdn} will use user certs`);
+        return;
+    }
+
+    if (domainObject.tlsConfig.provider === 'fallback') {
+        debug(`ensureCertificate: ${fqdn} will use fallback certs`);
+        return;
+    }
+
+    const certName = getAcmeCertificateNameSync(fqdn, domainObject);
+    const key = await blobs.getString(`${blobs.CERT_PREFIX}-${certName}.key`);
+    const cert = await blobs.getString(`${blobs.CERT_PREFIX}-${certName}.cert`);
+
+    if (key && cert) {
+        if (providerMatchesSync(domainObject, cert) && !needsRenewalSync(cert, options)) {
+            debug(`ensureCertificate: ${fqdn} acme cert exists and is up to date`);
+            return;
+        }
+        debug(`ensureCertificate: ${fqdn} acme cert exists but provider mismatch or needs renewal`);
+    }
+
+    debug(`ensureCertificate: ${fqdn} needs acme cert`);
+    const [error] = await safe(acme2.getCertificate(fqdn, domainObject));
+    debug(`ensureCertificate: error: ${error ? error.message : 'null'}`);
+
+    await safe(eventlog.add(eventlog.ACTION_CERTIFICATE_NEW, auditSource, { domain: fqdn, errorMessage: error?.message || '' }));
+}
+
+async function writeDashboardNginxConfig(vhost, certificatePath) {
     assert.strictEqual(typeof vhost, 'string');
-    assert.strictEqual(typeof bundle, 'object');
+    assert.strictEqual(typeof certificatePath, 'object');
 
     const data = {
         sourceDir: path.resolve(__dirname, '..'),
-        vhost: vhost,
+        vhost,
         hasIPv6: sysinfo.hasIPv6(),
         endpoint: 'dashboard',
-        certFilePath: bundle.certFilePath,
-        keyFilePath: bundle.keyFilePath,
+        certFilePath: certificatePath.certFilePath,
+        keyFilePath: certificatePath.keyFilePath,
         robotsTxtQuoted: JSON.stringify('User-agent: *\nDisallow: /\n'),
         proxyAuth: { enabled: false, id: null, location: nginxLocation('/') },
-        ocsp: await isOcspEnabled(bundle.certFilePath)
+        ocsp: await isOcspEnabled(certificatePath.certFilePath)
     };
     const nginxConf = ejs.render(NGINX_APPCONFIG_EJS, data);
-    const nginxConfigFilename = path.join(paths.NGINX_APPCONFIG_DIR, `${vhost}.conf`);
+    const nginxConfigFilename = path.join(paths.NGINX_APPCONFIG_DIR, `dashboard/${vhost}.conf`);
 
-    if (!safe.fs.writeFileSync(nginxConfigFilename, nginxConf)) throw new BoxError(BoxError.FS_ERROR, safe.error);
+    writeFileSync(nginxConfigFilename, nginxConf);
+}
 
+// also syncs the certs to disk
+async function writeDashboardConfig(domain) {
+    assert.strictEqual(typeof domain, 'string');
+
+    debug(`writeDashboardConfig: writing admin config for ${domain}`);
+
+    const dashboardFqdn = dns.fqdn(constants.DASHBOARD_SUBDOMAIN, domain);
+    const location = { domain, fqdn: dashboardFqdn, certificate: null };
+    const certificatePath = await writeCertificate(location);
+    await writeDashboardNginxConfig(dashboardFqdn, certificatePath);
     await reload();
 }
 
-async function writeDashboardConfig(domainObject) {
-    assert.strictEqual(typeof domainObject, 'object');
-
-    debug(`writeDashboardConfig: writing admin config for ${domainObject.domain}`);
-
-    const dashboardFqdn = dns.fqdn(constants.DASHBOARD_LOCATION, domainObject);
-    const bundle = await getCertificatePath(dashboardFqdn, domainObject.domain);
-
-    await writeDashboardNginxConfig(dashboardFqdn, bundle);
-}
-
-function getNginxConfigFilename(app, fqdn, type) {
+async function writeAppLocationNginxConfig(app, location, certificatePath) {
     assert.strictEqual(typeof app, 'object');
-    assert.strictEqual(typeof fqdn, 'string');
-    assert.strictEqual(typeof type, 'string');
+    assert.strictEqual(typeof location, 'object');
+    assert.strictEqual(typeof certificatePath, 'object');
 
-    let nginxConfigFilenameSuffix = '';
-
-    if (type === apps.LOCATION_TYPE_ALIAS) {
-        nginxConfigFilenameSuffix = `-alias-${fqdn.replace('*', '_')}`;
-    } else if (type === apps.LOCATION_TYPE_SECONDARY) {
-        nginxConfigFilenameSuffix = `-secondary-${fqdn}`;
-    } else if (type === apps.LOCATION_TYPE_REDIRECT) {
-        nginxConfigFilenameSuffix = `-redirect-${fqdn}`;
-    }
-
-    return path.join(paths.NGINX_APPCONFIG_DIR, `${app.id}${nginxConfigFilenameSuffix}.conf`);
-}
-
-async function writeAppNginxConfig(app, fqdn, type, bundle) {
-    assert.strictEqual(typeof app, 'object');
-    assert.strictEqual(typeof fqdn, 'string');
-    assert.strictEqual(typeof type, 'string');
-    assert.strictEqual(typeof bundle, 'object');
+    const type = location.type, vhost = location.fqdn;
 
     const data = {
         sourceDir: path.resolve(__dirname, '..'),
-        vhost: fqdn,
+        vhost,
         hasIPv6: sysinfo.hasIPv6(),
         ip: null,
         port: null,
         endpoint: null,
         redirectTo: null,
-        certFilePath: bundle.certFilePath,
-        keyFilePath: bundle.keyFilePath,
+        certFilePath: certificatePath.certFilePath,
+        keyFilePath: certificatePath.keyFilePath,
         robotsTxtQuoted: null,
         cspQuoted: null,
         hideHeaders: [],
         proxyAuth: { enabled: false },
-        ocsp: await isOcspEnabled(bundle.certFilePath)
+        upstreamUri: '', // only for endpoint === external
+        ocsp: await isOcspEnabled(certificatePath.certFilePath)
     };
 
     if (type === apps.LOCATION_TYPE_PRIMARY || type === apps.LOCATION_TYPE_ALIAS || type === apps.LOCATION_TYPE_SECONDARY) {
         data.endpoint = 'app';
+
+        if (app.manifest.id === constants.PROXY_APP_APPSTORE_ID) {
+            data.endpoint = 'external';
+            data.upstreamUri = app.upstreamUri;
+        }
+
         // maybe these should become per domain at some point
         const reverseProxyConfig = app.reverseProxyConfig || {}; // some of our code uses fake app objects
         if (reverseProxyConfig.robotsTxt) data.robotsTxtQuoted = JSON.stringify(app.reverseProxyConfig.robotsTxt);
@@ -524,7 +515,7 @@ async function writeAppNginxConfig(app, fqdn, type, bundle) {
             data.port = app.manifest.httpPort;
         } else if (type === apps.LOCATION_TYPE_SECONDARY) {
             data.ip = app.containerIp;
-            const secondaryDomain = app.secondaryDomains.find(sd => sd.fqdn === fqdn);
+            const secondaryDomain = app.secondaryDomains.find(sd => sd.fqdn === vhost);
             data.port = app.manifest.httpPorts[secondaryDomain.environmentVariable].containerPort;
         }
     } else if (type === apps.LOCATION_TYPE_REDIRECT) {
@@ -534,163 +525,98 @@ async function writeAppNginxConfig(app, fqdn, type, bundle) {
     }
 
     const nginxConf = ejs.render(NGINX_APPCONFIG_EJS, data);
-    const filename = getNginxConfigFilename(app, fqdn, type);
-    debug(`writeAppNginxConfig: writing config for "${fqdn}" to ${filename} with options ${JSON.stringify(data)}`);
-    if (!safe.fs.writeFileSync(filename, nginxConf)) {
-        debug(`Error creating nginx config for "${app.fqdn}" : ${safe.error.message}`);
-        throw new BoxError(BoxError.FS_ERROR, safe.error);
+    const filename = path.join(paths.NGINX_APPCONFIG_DIR, app.id, `${vhost.replace('*', '_')}.conf`);
+    debug(`writeAppLocationNginxConfig: writing config for "${vhost}" to ${filename} with options ${JSON.stringify(data)}`);
+    writeFileSync(filename, nginxConf);
+}
+
+async function writeAppConfigs(app) {
+    assert.strictEqual(typeof app, 'object');
+
+    const locations = getAppLocationsSync(app);
+
+    if (!safe.fs.mkdirSync(path.join(paths.NGINX_APPCONFIG_DIR, app.id), { recursive: true })) throw new BoxError(BoxError.FS_ERROR, `Could not create nginx config directory: ${safe.error.message}`);
+
+    for (const location of locations) {
+        const certificatePath = await writeCertificate(location);
+        await writeAppLocationNginxConfig(app, location, certificatePath);
     }
 
     await reload();
 }
 
-async function writeAppConfig(app) {
+async function setUserCertificate(app, location) {
     assert.strictEqual(typeof app, 'object');
+    assert.strictEqual(typeof location, 'object');
 
-    const appDomains = [{ domain: app.domain, fqdn: app.fqdn, type: apps.LOCATION_TYPE_PRIMARY }]
-        .concat(app.secondaryDomains.map(sd => { return { domain: sd.domain, fqdn: sd.fqdn, type: apps.LOCATION_TYPE_SECONDARY }; }))
-        .concat(app.redirectDomains.map(rd => { return { domain: rd.domain, fqdn: rd.fqdn, type: apps.LOCATION_TYPE_REDIRECT }; }))
-        .concat(app.aliasDomains.map(ad => { return { domain: ad.domain, fqdn: ad.fqdn, type: apps.LOCATION_TYPE_ALIAS }; }));
-
-    for (const appDomain of appDomains) {
-        const bundle = await getCertificatePath(appDomain.fqdn, appDomain.domain);
-        await writeAppNginxConfig(app, appDomain.fqdn, appDomain.type, bundle);
-    }
+    const certificatePath = await writeCertificate(location);
+    await writeAppLocationNginxConfig(app, location, certificatePath);
+    await reload();
 }
 
 async function configureApp(app, auditSource) {
     assert.strictEqual(typeof app, 'object');
     assert.strictEqual(typeof auditSource, 'object');
 
-    const appDomains = [{ domain: app.domain, fqdn: app.fqdn }]
-        .concat(app.secondaryDomains.map(sd => { return { domain: sd.domain, fqdn: sd.fqdn }; }))
-        .concat(app.redirectDomains.map(rd => { return { domain: rd.domain, fqdn: rd.fqdn }; }))
-        .concat(app.aliasDomains.map(ad => { return { domain: ad.domain, fqdn: ad.fqdn }; }));
+    const locations = getAppLocationsSync(app);
 
-    for (const appDomain of appDomains) {
-        await ensureCertificate(appDomain.fqdn, appDomain.domain, auditSource);
+    for (const location of locations) {
+        await ensureCertificate(location, {}, auditSource);
     }
 
-    await writeAppConfig(app);
+    await writeAppConfigs(app);
+
+    if (app.manifest.addons?.tls) await setupTlsAddon(app);
 }
 
 async function unconfigureApp(app) {
     assert.strictEqual(typeof app, 'object');
 
-    const configFilenames = safe.fs.readdirSync(paths.NGINX_APPCONFIG_DIR);
-    if (!configFilenames) throw new BoxError(BoxError.FS_ERROR, `Error loading nginx config files: ${safe.error.message}`);
-
-    for (const filename of configFilenames) {
-        if (!filename.startsWith(app.id)) continue;
-
-        safe.fs.unlinkSync(path.join(paths.NGINX_APPCONFIG_DIR, filename));
-    }
-
+    if (!safe.fs.rmSync(path.join(paths.NGINX_APPCONFIG_DIR, app.id), { recursive: true, force: true })) throw new BoxError(BoxError.FS_ERROR, `Could not remove nginx config directory: ${safe.error.message}`);
     await reload();
 }
 
-async function renewCerts(options, auditSource, progressCallback) {
-    assert.strictEqual(typeof options, 'object');
+async function cleanupCerts(locations, auditSource, progressCallback) {
+    assert(Array.isArray(locations));
     assert.strictEqual(typeof auditSource, 'object');
     assert.strictEqual(typeof progressCallback, 'function');
 
-    const allApps = await apps.list();
+    progressCallback({ message: 'Checking expired certs for removal' });
 
-    let appDomains = [];
-
-    // add webadmin and mail domain
-    if (settings.mailFqdn() === settings.dashboardFqdn()) {
-        appDomains.push({ domain: settings.dashboardDomain(), fqdn: settings.dashboardFqdn(), type: 'webadmin+mail', nginxConfigFilename: path.join(paths.NGINX_APPCONFIG_DIR, `${settings.dashboardFqdn()}.conf`) });
-    } else {
-        appDomains.push({ domain: settings.dashboardDomain(), fqdn: settings.dashboardFqdn(), type: 'webadmin', nginxConfigFilename: path.join(paths.NGINX_APPCONFIG_DIR, `${settings.dashboardFqdn()}.conf`) });
-        appDomains.push({ domain: settings.mailDomain(), fqdn: settings.mailFqdn(), type: 'mail' });
+    const domainObjectMap = await domains.getDomainObjectMap();
+    const certNamesInUse = new Set();
+    for (const location of locations) {
+        certNamesInUse.add(await getAcmeCertificateNameSync(location.fqdn, domainObjectMap[location.domain]));
     }
 
-    for (const app of allApps) {
-        if (app.runState === apps.RSTATE_STOPPED) continue; // do not renew certs of stopped apps
-
-        appDomains = appDomains.concat([{ app, domain: app.domain, fqdn: app.fqdn, type: apps.LOCATION_TYPE_PRIMARY, nginxConfigFilename: getNginxConfigFilename(app, app.fqdn, apps.LOCATION_TYPE_PRIMARY) }])
-            .concat(app.secondaryDomains.map(sd => { return { app, domain: sd.domain, fqdn: sd.fqdn, type: apps.LOCATION_TYPE_SECONDARY, nginxConfigFilename: getNginxConfigFilename(app, sd.fqdn, apps.LOCATION_TYPE_SECONDARY) }; }))
-            .concat(app.redirectDomains.map(rd => { return { app, domain: rd.domain, fqdn: rd.fqdn, type: apps.LOCATION_TYPE_REDIRECT, nginxConfigFilename: getNginxConfigFilename(app, rd.fqdn, apps.LOCATION_TYPE_REDIRECT) }; }))
-            .concat(app.aliasDomains.map(ad => { return { app, domain: ad.domain, fqdn: ad.fqdn, type: apps.LOCATION_TYPE_ALIAS, nginxConfigFilename: getNginxConfigFilename(app, ad.fqdn, apps.LOCATION_TYPE_ALIAS) }; }));
-    }
-
-    if (options.domain) appDomains = appDomains.filter(function (appDomain) { return appDomain.domain === options.domain; });
-
-    let progress = 1, renewedCerts = [];
-
-    for (const appDomain of appDomains) {
-        progressCallback({ percent: progress, message: `Ensuring certs of ${appDomain.fqdn}` });
-        progress += Math.round(100/appDomains.length);
-
-        const { bundle, renewed } = await ensureCertificate(appDomain.fqdn, appDomain.domain, auditSource);
-
-        if (renewed) renewedCerts.push(appDomain.fqdn);
-
-        if (appDomain.type === 'mail') continue; // mail has no nginx config to check current cert
-
-        // hack to check if the app's cert changed or not. this doesn't handle prod/staging le change since they use same file name
-        let currentNginxConfig = safe.fs.readFileSync(appDomain.nginxConfigFilename, 'utf8') || '';
-        if (currentNginxConfig.includes(bundle.certFilePath)) continue;
-
-        debug(`renewCerts: creating new nginx config since ${appDomain.nginxConfigFilename} does not have ${bundle.certFilePath}`);
-
-        // reconfigure since the cert changed
-        if (appDomain.type === 'webadmin' || appDomain.type === 'webadmin+mail') {
-            await writeDashboardNginxConfig(settings.dashboardFqdn(), bundle);
-        } else {
-            await writeAppNginxConfig(appDomain.app, appDomain.fqdn, appDomain.type, bundle);
-        }
-    }
-
-    debug(`renewCerts: Renewed certs of ${JSON.stringify(renewedCerts)}`);
-    if (renewedCerts.length === 0) return;
-
-    if (renewedCerts.includes(settings.mailFqdn())) await mail.handleCertChanged();
-
-    await reload(); // reload nginx if any certs were updated but the config was not rewritten
-
-    // restart tls apps on cert change
-    const tlsApps = allApps.filter(app => app.manifest.addons && app.manifest.addons.tls && renewedCerts.includes(app.fqdn));
-    for (const app of tlsApps) {
-        await apps.restart(app, auditSource);
-    }
-}
-
-async function cleanupCerts(auditSource) {
-    assert.strictEqual(typeof auditSource, 'object');
-
-    const filenames = await fs.promises.readdir(paths.NGINX_CERT_DIR);
-    const certFilenames = filenames.filter(f => f.endsWith('.cert'));
     const now = new Date();
+    const certIds = await blobs.listCertIds();
+    const removedCertNames = [];
+    for (const certId of certIds) {
+        const certName = certId.match(new RegExp(`${blobs.CERT_PREFIX}-(.*).cert`))[1];
+        if (certNamesInUse.has(certName)) continue;
 
-    debug('cleanupCerts: start');
+        const cert = await blobs.getString(certId);
+        const { endDate } = getCertificateDatesSync(cert);
+        if (!endDate) continue; // some error
 
-    const fqdns = [];
-
-    for (const certFilename of certFilenames) {
-        const certFilePath = path.join(paths.NGINX_CERT_DIR, certFilename);
-        const notAfter = getExpiryDate(certFilePath);
-        if (!notAfter) continue; // some error
-
-        if (now - notAfter >= (60 * 60 * 24 * 30 * 6 * 1000)) { // expired 6 months ago
-            const fqdn = certFilename.replace(/\.cert$/, '');
-            debug(`cleanupCerts: deleting certs of ${fqdn}`);
+        if (now - endDate >= (60 * 60 * 24 * 30 * 6 * 1000)) { // expired 6 months ago and not in use
+            progressCallback({ message: `deleting certs of ${certName}` });
 
             // it is safe to delete the certs of stopped apps because their nginx configs are removed
-            safe.fs.unlinkSync(certFilePath);
-            safe.fs.unlinkSync(path.join(paths.NGINX_CERT_DIR, `${fqdn}.key`));
-            safe.fs.unlinkSync(path.join(paths.NGINX_CERT_DIR, `${fqdn}.csr`));
+            safe.fs.unlinkSync(path.join(paths.NGINX_CERT_DIR, `${certName}.cert`));
+            safe.fs.unlinkSync(path.join(paths.NGINX_CERT_DIR, `${certName}.key`));
+            safe.fs.unlinkSync(path.join(paths.NGINX_CERT_DIR, `${certName}.csr`));
 
-            await blobs.del(`${blobs.CERT_PREFIX}-${fqdn}.key`);
-            await blobs.del(`${blobs.CERT_PREFIX}-${fqdn}.cert`);
-            await blobs.del(`${blobs.CERT_PREFIX}-${fqdn}.csr`);
+            await blobs.del(`${blobs.CERT_PREFIX}-${certName}.key`);
+            await blobs.del(`${blobs.CERT_PREFIX}-${certName}.cert`);
+            await blobs.del(`${blobs.CERT_PREFIX}-${certName}.csr`);
 
-            fqdns.push(fqdn);
+            removedCertNames.push(certName);
         }
     }
 
-    if (fqdns.length) await safe(eventlog.add(eventlog.ACTION_CERTIFICATE_CLEANUP, auditSource, { domains: fqdns }));
+    if (removedCertNames.length) await safe(eventlog.add(eventlog.ACTION_CERTIFICATE_CLEANUP, auditSource, { domains: removedCertNames }));
 
     debug('cleanupCerts: done');
 }
@@ -700,19 +626,56 @@ async function checkCerts(options, auditSource, progressCallback) {
     assert.strictEqual(typeof auditSource, 'object');
     assert.strictEqual(typeof progressCallback, 'function');
 
-    await renewCerts(options, auditSource, progressCallback);
-    await cleanupCerts(auditSource);
+    let locations = [];
+    if (settings.dashboardFqdn() !== settings.mailFqdn()) locations.push({ domain: settings.mailDomain(), fqdn: settings.mailFqdn(), certificate: null, type: apps.LOCATION_TYPE_MAIL });
+    locations.push({ domain: settings.dashboardDomain(), fqdn: settings.dashboardFqdn(), certificate: null, type: apps.LOCATION_TYPE_DASHBOARD });
+
+    const allApps = (await apps.list()).filter(app => app.runState !== apps.RSTATE_STOPPED);
+    for (const app of allApps) {
+        locations = locations.concat(getAppLocationsSync(app));
+    }
+
+    let percent = 1;
+    for (const location of locations) {
+        percent += Math.round(100/locations.length);
+        progressCallback({ percent, message: `Ensuring certs of ${location.fqdn}` });
+        await ensureCertificate(location, options, auditSource);
+    }
+
+    if (options.rebuild || fs.existsSync(paths.REVERSE_PROXY_REBUILD_FILE)) {
+        progressCallback( { message: 'Rebuilding app configs' });
+        for (const app of allApps) {
+            await writeAppConfigs(app);
+        }
+        await writeDashboardConfig(settings.dashboardDomain());
+        await notifyCertChange(); // this allows user to "rebuild" using UI just in case we crashed and went out of sync
+        safe.fs.unlinkSync(paths.REVERSE_PROXY_REBUILD_FILE);
+    } else {
+        // sync all locations and not just the ones that changed. this helps with 0 length certs when disk is full and also
+        // if renewal task crashed midway.
+        for (const location of locations) {
+            await writeCertificate(location);
+        }
+        await reload();
+        await notifyCertChange(); // propagate any cert changes to services
+    }
+
+    await cleanupCerts(locations, auditSource, progressCallback);
 }
 
 function removeAppConfigs() {
-    const dashboardConfigFilename = `${settings.dashboardFqdn()}.conf`;
-
-    debug('removeAppConfigs: reomving nginx configs of apps');
+    debug('removeAppConfigs: removing app nginx configs');
 
     // remove all configs which are not the default or current dashboard
-    for (let appConfigFile of fs.readdirSync(paths.NGINX_APPCONFIG_DIR)) {
-        if (appConfigFile !== constants.NGINX_DEFAULT_CONFIG_FILE_NAME && appConfigFile !== dashboardConfigFilename) {
-            fs.unlinkSync(path.join(paths.NGINX_APPCONFIG_DIR, appConfigFile));
+    for (const entry of fs.readdirSync(paths.NGINX_APPCONFIG_DIR, { withFileTypes: true })) {
+        if (entry.isDirectory() && entry.name === 'dashboard') continue;
+        if (entry.isFile() && entry.name === constants.NGINX_DEFAULT_CONFIG_FILE_NAME) continue;
+
+        const fullPath = path.join(paths.NGINX_APPCONFIG_DIR, entry.name);
+        if (entry.isDirectory()) {
+            fs.rmSync(fullPath, { recursive: true, force: true });
+        } else if (entry.isFile()) {
+            fs.unlinkSync(fullPath);
         }
     }
 }
@@ -754,3 +717,9 @@ async function writeDefaultConfig(options) {
 
     await reload();
 }
+
+async function handleCertificateProviderChanged(domain) {
+    assert.strictEqual(typeof domain, 'string');
+
+    safe.fs.appendFileSync(paths.REVERSE_PROXY_REBUILD_FILE, `${domain}\n`, 'utf8');
+}

src/routes/accesscontrol.js

@@ -8,8 +8,8 @@ exports = module.exports = {
     authorizeOperator,
 };
 
-const accesscontrol = require('../accesscontrol.js'),
-    apps = require('../apps.js'),
+const apps = require('../apps.js'),
+    tokens = require('../tokens.js'),
     assert = require('assert'),
     BoxError = require('../boxerror.js'),
     externalLdap = require('../externalldap.js'),
@@ -43,8 +43,13 @@ async function passwordAuth(req, res, next) {
     if (!user.ghost && !user.appPassword && user.twoFactorAuthenticationEnabled) {
         if (!totpToken) return next(new HttpError(401, 'A totpToken must be provided'));
 
-        const verified = speakeasy.totp.verify({ secret: user.twoFactorAuthenticationSecret, encoding: 'base32', token: totpToken, window: 2 });
-        if (!verified) return next(new HttpError(401, 'Invalid totpToken'));
+        if (user.source === 'ldap') {
+            const [error] = await safe(externalLdap.verifyPasswordAndTotpToken(user, password, totpToken));
+            if (error) return next(new HttpError(401, 'Invalid totpToken'));
+        } else {
+            const verified = speakeasy.totp.verify({ secret: user.twoFactorAuthenticationSecret, encoding: 'base32', token: totpToken, window: 2 });
+            if (!verified) return next(new HttpError(401, 'Invalid totpToken'));
+        }
     }
 
     req.user = user;
@@ -53,27 +58,32 @@ async function passwordAuth(req, res, next) {
 }
 
 async function tokenAuth(req, res, next) {
-    let token;
+    let accessToken;
 
     // this determines the priority
-    if (req.body && req.body.access_token) token = req.body.access_token;
-    if (req.query && req.query.access_token) token = req.query.access_token;
+    if (req.body && req.body.access_token) accessToken = req.body.access_token;
+    if (req.query && req.query.access_token) accessToken = req.query.access_token;
     if (req.headers && req.headers.authorization) {
         const parts = req.headers.authorization.split(' ');
         if (parts.length == 2) {
             const [scheme, credentials] = parts;
 
-            if (/^Bearer$/i.test(scheme)) token = credentials;
+            if (/^Bearer$/i.test(scheme)) accessToken = credentials;
         }
     }
 
-    if (!token) return next(new HttpError(401, 'Token required'));
+    if (!accessToken) return next(new HttpError(401, 'Token required'));
 
-    const [error, user] = await safe(accesscontrol.verifyToken(token));
-    if (error && error.reason === BoxError.INVALID_CREDENTIALS) return next(new HttpError(401, error.message));
-    if (error) return next(new HttpError(500, error.message));
+    const token = await tokens.getByAccessToken(accessToken);
+    if (!token) return next(new HttpError(401, 'No such token'));
 
-    req.access_token = token; // used in logout route
+    const user = await users.get(token.identifier);
+    if (!user) return next(new HttpError(401,'User not found'));
+    if (!user.active) return next(new HttpError(401,'User not active'));
+
+    await safe(tokens.update(token.id, { lastUsedTime: new Date() })); // ignore any error
+
+    req.token = token;
     req.user = user;
 
     next();
@@ -84,8 +94,10 @@ function authorize(requiredRole) {
 
     return function (req, res, next) {
         assert.strictEqual(typeof req.user, 'object');
+        assert.strictEqual(typeof req.token, 'object');
 
         if (users.compareRoles(req.user.role, requiredRole) < 0) return next(new HttpError(403, `role '${requiredRole}' is required but user has only '${req.user.role}'`));
+        if (!tokens.hasScope(req.token, req.method, req.path)) return next(new HttpError(403, 'access token does not have this scope'));
 
         next();
     };
@@ -95,7 +107,9 @@ async function authorizeOperator(req, res, next) {
     assert.strictEqual(typeof req.params.id, 'string');
     assert.strictEqual(typeof req.user, 'object');
     assert.strictEqual(typeof req.app, 'object');
+    assert.strictEqual(typeof req.token, 'object');
 
+    if (!tokens.hasScope(req.token, req.method, req.path)) return next(new HttpError(403, 'access token does not have this scope'));
     if (apps.isOperator(req.app, req.user)) return next();
 
     return next(new HttpError(403, 'user is not an operator'));

src/routes/applinks.js

@@ -0,0 +1,91 @@
+'use strict';
+
+exports = module.exports = {
+    listByUser,
+    add,
+    get,
+    update,
+    remove,
+    getIcon
+};
+
+const assert = require('assert'),
+    applinks = require('../applinks.js'),
+    BoxError = require('../boxerror.js'),
+    safe = require('safetydance'),
+    HttpError = require('connect-lastmile').HttpError,
+    HttpSuccess = require('connect-lastmile').HttpSuccess;
+
+async function listByUser(req, res, next) {
+    assert.strictEqual(typeof req.user, 'object');
+
+    const [error, result] = await safe(applinks.listByUser(req.user));
+    if (error) return next(BoxError.toHttpError(error));
+
+    // we have a separate route for this
+    result.forEach(function (a) { delete a.icon; });
+
+    next(new HttpSuccess(200, { applinks: result }));
+}
+
+async function add(req, res, next) {
+    assert.strictEqual(typeof req.body, 'object');
+
+    if (!req.body.upstreamUri || typeof req.body.upstreamUri !== 'string') return next(new HttpError(400, 'upstreamUri must be a non-empty string'));
+    if ('label' in req.body && typeof req.body.label !== 'string') return next(new HttpError(400, 'label must be a string'));
+    if ('tags' in req.body && !Array.isArray(req.body.tags)) return next(new HttpError(400, 'tags must be an array with strings'));
+    if ('accessRestriction' in req.body && typeof req.body.accessRestriction !== 'object') return next(new HttpError(400, 'accessRestriction must be an object'));
+
+    const [error] = await safe(applinks.add(req.body));
+    if (error) return next(BoxError.toHttpError(error));
+
+    next(new HttpSuccess(201, {}));
+}
+
+async function get(req, res, next) {
+    assert.strictEqual(typeof req.params.id, 'string');
+
+    const [error, result] = await safe(applinks.get(req.params.id));
+    if (error) return next(BoxError.toHttpError(error));
+    if (!result) return next(new HttpError(404, 'Applink not found'));
+
+    // we have a separate route for this
+    delete result.icon;
+
+    next(new HttpSuccess(200, result));
+}
+
+async function update(req, res, next) {
+    assert.strictEqual(typeof req.params.id, 'string');
+    assert.strictEqual(typeof req.body, 'object');
+
+    if (!req.body.upstreamUri || typeof req.body.upstreamUri !== 'string') return next(new HttpError(400, 'upstreamUri must be a non-empty string'));
+    if ('label' in req.body && typeof req.body.label !== 'string') return next(new HttpError(400, 'label must be a string'));
+    if ('tags' in req.body && !Array.isArray(req.body.tags)) return next(new HttpError(400, 'tags must be an array with strings'));
+    if ('accessRestriction' in req.body && typeof req.body.accessRestriction !== 'object') return next(new HttpError(400, 'accessRestriction must be an object'));
+    if ('icon' in req.body && typeof req.body.icon !== 'string') return next(new HttpError(400, 'icon must be a string'));
+
+    const [error] = await safe(applinks.update(req.params.id, req.body));
+    if (error) return next(BoxError.toHttpError(error));
+
+    next(new HttpSuccess(202, {}));
+}
+
+async function remove(req, res, next) {
+    assert.strictEqual(typeof req.params.id, 'string');
+
+    const [error] = await safe(applinks.remove(req.params.id));
+    if (error) return next(BoxError.toHttpError(error));
+
+    next(new HttpSuccess(204));
+}
+
+async function getIcon(req, res, next) {
+    assert.strictEqual(typeof req.params.id, 'string');
+
+    const [error, icon] = await safe(applinks.getIcon(req.params.id, { original: req.query.original }));
+    if (error) return next(BoxError.toHttpError(error));
+    if (!icon) return next(new HttpError(404, 'no such icon'));
+
+    res.send(icon);
+}

src/routes/apps.js

@@ -35,8 +35,9 @@ exports = module.exports = {
     setMailbox,
     setInbox,
     setLocation,
-    setDataDir,
+    setStorage,
     setMounts,
+    setUpstreamUri,
 
     stop,
     start,
@@ -55,8 +56,10 @@ exports = module.exports = {
     downloadFile,
 
     updateBackup,
+    downloadBackup,
 
     getLimits,
+    getGraphs,
 
     load
 };
@@ -65,7 +68,9 @@ const apps = require('../apps.js'),
     assert = require('assert'),
     AuditSource = require('../auditsource.js'),
     BoxError = require('../boxerror.js'),
+    constants = require('../constants.js'),
     debug = require('debug')('box:routes/apps'),
+    graphs = require('../graphs.js'),
     HttpError = require('connect-lastmile').HttpError,
     HttpSuccess = require('connect-lastmile').HttpSuccess,
     safe = require('safetydance'),
@@ -174,6 +179,8 @@ async function install(req, res, next) {
     let [error, result] = await safe(apps.downloadManifest(data.appStoreId, data.manifest));
     if (error) return next(BoxError.toHttpError(error));
 
+    if (result.appStoreId === constants.PROXY_APP_APPSTORE_ID && typeof data.upstreamUri !== 'string') return next(new HttpError(400, 'upstreamUri must be a non empty string'));
+
     if (safe.query(result.manifest, 'addons.docker') && req.user.role !== users.ROLE_OWNER) return next(new HttpError(403, '"owner" role is required to install app with docker addon'));
 
     data.appStoreId = result.appStoreId;
@@ -373,6 +380,7 @@ async function setMailbox(req, res, next) {
     if (req.body.enable) {
         if (req.body.mailboxName !== null && typeof req.body.mailboxName !== 'string') return next(new HttpError(400, 'mailboxName must be a string'));
         if (typeof req.body.mailboxDomain !== 'string') return next(new HttpError(400, 'mailboxDomain must be a string'));
+        if ('mailboxDisplayName' in req.body && typeof req.body.mailboxDisplayName !== 'string') return next(new HttpError(400, 'mailboxDisplayName must be a string'));
     }
 
     const [error, result] = await safe(apps.setMailbox(req.app, req.body, AuditSource.fromRequest(req)));
@@ -402,7 +410,6 @@ async function setLocation(req, res, next) {
     assert.strictEqual(typeof req.app, 'object');
 
     if (typeof req.body.subdomain !== 'string') return next(new HttpError(400, 'subdomain must be string')); // subdomain may be an empty string
-    if (!req.body.domain) return next(new HttpError(400, 'domain is required'));
     if (typeof req.body.domain !== 'string') return next(new HttpError(400, 'domain must be string'));
 
     if ('portBindings' in req.body && typeof req.body.portBindings !== 'object') return next(new HttpError(400, 'portBindings must be an object'));
@@ -431,13 +438,18 @@ async function setLocation(req, res, next) {
     next(new HttpSuccess(202, { taskId: result.taskId }));
 }
 
-async function setDataDir(req, res, next) {
+async function setStorage(req, res, next) {
     assert.strictEqual(typeof req.body, 'object');
     assert.strictEqual(typeof req.app, 'object');
 
-    if (req.body.dataDir !== null && typeof req.body.dataDir !== 'string') return next(new HttpError(400, 'dataDir must be a string'));
+    const { storageVolumeId, storageVolumePrefix } = req.body;
 
-    const [error, result] = await safe(apps.setDataDir(req.app, req.body.dataDir, AuditSource.fromRequest(req)));
+    if (storageVolumeId !== null) {
+        if (typeof storageVolumeId !== 'string') return next(new HttpError(400, 'storageVolumeId must be a string'));
+        if (typeof storageVolumePrefix !== 'string') return next(new HttpError(400, 'storageVolumePrefix must be a string'));
+    }
+
+    const [error, result] = await safe(apps.setStorage(req.app, storageVolumeId, storageVolumePrefix, AuditSource.fromRequest(req)));
     if (error) return next(BoxError.toHttpError(error));
 
     next(new HttpSuccess(202, { taskId: result.taskId }));
@@ -486,16 +498,17 @@ async function importApp(req, res, next) {
     const data = req.body;
 
     if ('remotePath' in data) { // if not provided, we import in-place
-        if (typeof data.remotePath !== 'string') return next(new HttpError(400, 'remotePath must be string'));
+        if (typeof data.remotePath !== 'string' || !data.remotePath) return next(new HttpError(400, 'remotePath must be non-empty string'));
         if (typeof data.backupFormat !== 'string') return next(new HttpError(400, 'backupFormat must be string'));
 
         if ('backupConfig' in data && typeof data.backupConfig !== 'object') return next(new HttpError(400, 'backupConfig must be an object'));
 
         const backupConfig = req.body.backupConfig;
 
-        if (req.body.backupConfig) {
+        if (backupConfig) {
             if (typeof backupConfig.provider !== 'string') return next(new HttpError(400, 'provider is required'));
             if ('password' in backupConfig && typeof backupConfig.password !== 'string') return next(new HttpError(400, 'password must be a string'));
+            if ('encryptedFilenames' in backupConfig && typeof backupConfig.encryptedFilenames !== 'boolean') return next(new HttpError(400, 'encryptedFilenames must be a boolean'));
             if ('acceptSelfSignedCerts' in backupConfig && typeof backupConfig.acceptSelfSignedCerts !== 'boolean') return next(new HttpError(400, 'format must be a boolean'));
 
             // testing backup config can take sometime
@@ -713,9 +726,11 @@ async function createExec(req, res, next) {
     if ('tty' in req.body && typeof req.body.tty !== 'boolean') return next(new HttpError(400, 'tty must be boolean'));
     const tty = !!req.body.tty;
 
+    if ('lang' in req.body && typeof req.body.lang !== 'string') return next(new HttpError(400, 'lang must be a string'));
+
     if (safe.query(req.app, 'manifest.addons.docker') && req.user.role !== users.ROLE_OWNER) return next(new HttpError(403, '"owner" role is requied to exec app with docker addon'));
 
-    const [error, id] = await safe(apps.createExec(req.app, { cmd, tty }));
+    const [error, id] = await safe(apps.createExec(req.app, { cmd, tty, lang: req.body.lang }));
     if (error) return next(BoxError.toHttpError(error));
 
     next(new HttpSuccess(200, { id }));
@@ -838,6 +853,17 @@ async function updateBackup(req, res, next) {
     next(new HttpSuccess(200, {}));
 }
 
+async function downloadBackup(req, res, next) {
+    assert.strictEqual(typeof req.app, 'object');
+    assert.strictEqual(typeof req.params.backupId, 'string');
+
+    const [error, result] = await safe(apps.getBackupDownloadStream(req.app, req.params.backupId));
+    if (error) return next(BoxError.toHttpError(error));
+
+    res.attachment(`${req.params.backupId}.tgz`);
+    result.pipe(res);
+}
+
 async function uploadFile(req, res, next) {
     assert.strictEqual(typeof req.app, 'object');
 
@@ -892,6 +918,19 @@ async function setMounts(req, res, next) {
     next(new HttpSuccess(202, { taskId: result.taskId }));
 }
 
+async function setUpstreamUri(req, res, next) {
+    assert.strictEqual(typeof req.body, 'object');
+    assert.strictEqual(typeof req.app, 'object');
+
+    if (req.app.appStoreId !== constants.PROXY_APP_APPSTORE_ID) return next(new HttpError(400, 'upstreamUri can only be set for proxy app'));
+    if (typeof req.body.upstreamUri !== 'string') return next(new HttpError(400, 'upstreamUri must be a string'));
+
+    const [error] = await safe(apps.setUpstreamUri(req.app, req.body.upstreamUri, AuditSource.fromRequest(req)));
+    if (error) return next(BoxError.toHttpError(error));
+
+    next(new HttpSuccess(200, {}));
+}
+
 async function listEventlog(req, res, next) {
     assert.strictEqual(typeof req.app, 'object');
 
@@ -935,3 +974,16 @@ async function getLimits(req, res, next) {
 
     next(new HttpSuccess(200, { limits }));
 }
+
+async function getGraphs(req, res, next) {
+    assert.strictEqual(typeof req.app, 'object');
+
+    if (!req.query.fromMinutes || !parseInt(req.query.fromMinutes)) return next(new HttpError(400, 'fromMinutes must be a number'));
+
+    const fromMinutes = parseInt(req.query.fromMinutes);
+    const noNullPoints = !!req.query.noNullPoints;
+    const [error, result] = await safe(graphs.getContainerStats(req.app.id, fromMinutes, noNullPoints));
+    if (error) return next(new HttpError(500, error));
+
+    next(new HttpSuccess(200, result));
+}

src/routes/appstore.js

@@ -20,7 +20,9 @@ const appstore = require('../appstore.js'),
     _ = require('underscore');
 
 async function getApps(req, res, next) {
-    const [error, apps] = await safe(appstore.getApps());
+    const repository = req.query.repository || 'core';
+
+    const [error, apps] = await safe(appstore.getApps(repository));
     if (error) return next(BoxError.toHttpError(error));
 
     next(new HttpSuccess(200, { apps }));