Make removeDir less noisy

box backup and app backup can have different format

CHANGES

@@ -997,3 +997,29 @@
 * Support Ctrl/Cmd+v webterminal pasting
 * Ensure unbound always starts up
 * Add option to run app in repair mode
+
+[1.6.5]
+* DigitalOcean DNS: Add pagination
+* Cloudflare DNS: Optimize listing of DNS entries
+* Update node to 6.11.3
+* App volumes can now be symlinked individually to external storage
+* Periodically check if IP is blacklisted and notify admins
+* Do not ask password when re-configuring app (since it is non-destructive)
+* Move mail data inside boxdata directory. This makes the no-op backend more useful
+* Remove collectd stats when app is uninstalled
+
+[1.7.0]
+* Add rsync format for backups. This feature allows incremental backups
+* Add Google DNS backend (thanks @syn)
+* Add DigitalOcean spaces backup storage backend
+* Add Cloudscale and Exoscale as supported VPS providers
+* Display backup progress and status in the web interface
+* Preliminary IPv6 support
+* Add IP RBL status to web interface
+* Add auto-update pattern `Every wednesday night`
+* Update Haraka to 2.8.15. This fixes the issue where emails were bounced with the message
+  'Send MAIL FROM first'
+* Do not overwrite existing subdomain when app's location is changed
+* Add button to send test email
+* Fix crash in carbon which made graphs disappear on some Cloudrons
+

baseimage/initializeBaseUbuntuImage.sh

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

migrations/20170911133441-settings-alter-value.js

@@ -0,0 +1,15 @@
+'use strict';
+
+exports.up = function(db, callback) {
+    db.runSql('ALTER TABLE settings MODIFY value TEXT', [], function (error) {
+        if (error) console.error(error);
+        callback(error);
+    });
+};
+
+exports.down = function(db, callback) {
+    db.runSql('ALTER TABLE settings MODIFY value VARCHAR(512)', [], function (error) {
+        if (error) console.error(error);
+        callback(error);
+    });
+};

migrations/20170919185109-settings-set-backupConfig-defaults.js

@@ -0,0 +1,25 @@
+'use strict';
+
+// ensure backupFolder and format are not empty
+exports.up = function(db, callback) {
+    db.all('SELECT * FROM settings WHERE name=?', [ 'backup_config' ], function (error, result) {
+        if (error || result.length === 0) return callback(error);
+
+        var value = JSON.parse(result[0].value);
+        value.format = 'tgz'; // set the format
+
+        if (value.provider === 'filesystem' && !value.backupFolder) {
+            value.backupFolder = '/var/backups'; // set the backupFolder
+        }
+
+        db.runSql('UPDATE settings SET value = ? WHERE name = ?', [ JSON.stringify(value), 'backup_config' ], function (error) {
+            if (error) console.error('Error setting ownerid ' + JSON.stringify(u) + error);
+            callback();
+        });
+
+    });
+};
+
+exports.down = function(db, callback) {
+    callback();
+};

migrations/20170928003352-backups-add-format.js

@@ -0,0 +1,15 @@
+'use strict';
+
+exports.up = function(db, callback) {
+    db.runSql('ALTER TABLE backups ADD COLUMN format VARCHAR(16) DEFAULT "tgz"', function (error) {
+        if (error) console.error(error);
+        callback(error);
+    });
+};
+
+exports.down = function(db, callback) {
+    db.runSql('ALTER TABLE backups DROP COLUMN format', function (error) {
+        if (error) console.error(error);
+        callback(error);
+    });
+};

migrations/schema.sql

@@ -60,7 +60,7 @@ CREATE TABLE IF NOT EXISTS apps(
     manifestJson TEXT,
     httpPort INTEGER,                        // this is the nginx proxy port and not manifest.httpPort
     location VARCHAR(128) NOT NULL UNIQUE,
-    dnsRecordId VARCHAR(512), // tracks any id that we got back to track dns updates (unused)
+    dnsRecordId VARCHAR(512), // tracks any id that we got back to track dns updates
     accessRestrictionJson TEXT, // { users: [ ], groups: [ ] }
     createdAt TIMESTAMP(2) NOT NULL DEFAULT CURRENT_TIMESTAMP,
     memoryLimit BIGINT DEFAULT 0,
@@ -93,7 +93,7 @@ CREATE TABLE IF NOT EXISTS authcodes(
 
 CREATE TABLE IF NOT EXISTS settings(
     name VARCHAR(128) NOT NULL UNIQUE,
-    value VARCHAR(512),
+    value TEXT,
     PRIMARY KEY(name));
 
 CREATE TABLE IF NOT EXISTS appAddonConfigs(

package.json

@@ -14,6 +14,7 @@
     "node": ">=4.0.0 <=4.1.1"
   },
   "dependencies": {
+    "@google-cloud/dns": "^0.6.2",
     "@sindresorhus/df": "^2.1.0",
     "async": "^2.5.0",
     "aws-sdk": "^2.97.0",
@@ -39,6 +40,7 @@
     "hock": "https://registry.npmjs.org/hock/-/hock-1.3.2.tgz",
     "json": "^9.0.3",
     "ldapjs": "^1.0.0",
+    "lodash.chunk": "^4.2.0",
     "mime": "^1.3.4",
     "moment-timezone": "^0.5.5",
     "morgan": "^1.7.0",
@@ -58,7 +60,7 @@
     "progress-stream": "^2.0.0",
     "proxy-middleware": "^0.13.0",
     "s3-block-read-stream": "^0.2.0",
-    "safetydance": "^0.2.0",
+    "safetydance": "^0.7.1",
     "semver": "^4.3.6",
     "showdown": "^1.6.0",
     "split": "^1.0.0",

scripts/cloudron-setup

@@ -105,13 +105,15 @@ done
 # validate arguments in the absence of data
 if [[ -z "${dataJson}" ]]; then
     if [[ -z "${provider}" ]]; then
-        echo "--provider is required (azure, digitalocean, ec2, lightsail, linode, ovh, rosehosting, scaleway, vultr or generic)"
+        echo "--provider is required (azure, cloudscale, digitalocean, ec2, exoscale, lightsail, linode, ovh, rosehosting, scaleway, vultr or generic)"
         exit 1
     elif [[  \
                 "${provider}" != "ami" && \
                 "${provider}" != "azure" && \
+                "${provider}" != "cloudscale" && \
                 "${provider}" != "digitalocean" && \
                 "${provider}" != "ec2" && \
+                "${provider}" != "exoscale" && \
                 "${provider}" != "gce" && \
                 "${provider}" != "lightsail" && \
                 "${provider}" != "linode" && \
@@ -121,7 +123,7 @@ if [[ -z "${dataJson}" ]]; then
                 "${provider}" != "vultr" && \
                 "${provider}" != "generic" \
             ]]; then
-        echo "--provider must be one of: azure, digitalocean, ec2, gce, lightsail, linode, ovh, rosehosting, scaleway, vultr or generic"
+        echo "--provider must be one of: azure, cloudscale, digitalocean, ec2, exoscale, gce, lightsail, linode, ovh, rosehosting, scaleway, vultr or generic"
         exit 1
     fi
 
@@ -209,6 +211,7 @@ if [[ -z "${dataJson}" ]]; then
             "provider": "filesystem",
             "backupFolder": "/var/backups",
             "key": "${encryptionKey}",
+            "format": "tgz",
             "retentionSecs": 172800
         },
         "updateConfig": {

scripts/createReleaseTarball

@@ -31,8 +31,8 @@ if ! $(cd "${SOURCE_DIR}" && git diff --exit-code >/dev/null); then
     exit 1
 fi
 
-if [[ "$(node --version)" != "v6.11.2" ]]; then
-    echo "This script requires node 6.11.2"
+if [[ "$(node --version)" != "v6.11.3" ]]; then
+    echo "This script requires node 6.11.3"
     exit 1
 fi
 

scripts/installer.sh

@@ -35,12 +35,12 @@ while true; do
 done
 
 echo "==> installer: updating node"
-if [[ "$(node --version)" != "v6.11.2" ]]; then
-    mkdir -p /usr/local/node-6.11.2
-    $curl -sL https://nodejs.org/dist/v6.11.2/node-v6.11.2-linux-x64.tar.gz | tar zxvf - --strip-components=1 -C /usr/local/node-6.11.2
-    ln -sf /usr/local/node-6.11.2/bin/node /usr/bin/node
-    ln -sf /usr/local/node-6.11.2/bin/npm /usr/bin/npm
-    rm -rf /usr/local/node-6.11.1
+if [[ "$(node --version)" != "v6.11.3" ]]; then
+    mkdir -p /usr/local/node-6.11.3
+    $curl -sL https://nodejs.org/dist/v6.11.3/node-v6.11.3-linux-x64.tar.gz | tar zxvf - --strip-components=1 -C /usr/local/node-6.11.3
+    ln -sf /usr/local/node-6.11.3/bin/node /usr/bin/node
+    ln -sf /usr/local/node-6.11.3/bin/npm /usr/bin/npm
+    rm -rf /usr/local/node-6.11.2
 fi
 
 for try in `seq 1 10`; do

setup/splashpage.sh

@@ -34,11 +34,11 @@ if [[ "${arg_retire_reason}" != "" || "${existing_infra}" != "${current_infra}"
     echo "Showing progress bar on all subdomains in retired mode or infra update. retire: ${arg_retire_reason} existing: ${existing_infra} current: ${current_infra}"
     rm -f ${PLATFORM_DATA_DIR}/nginx/applications/*
     ${box_src_dir}/node_modules/.bin/ejs-cli -f "${script_dir}/start/nginx/appconfig.ejs" \
-        -O "{ \"vhost\": \"~^(.+)\$\", \"adminOrigin\": \"${admin_origin}\", \"endpoint\": \"splash\", \"sourceDir\": \"${SETUP_WEBSITE_DIR}\", \"certFilePath\": \"cert/host.cert\", \"keyFilePath\": \"cert/host.key\", \"xFrameOptions\": \"SAMEORIGIN\", \"robotsTxtQuoted\": null }" > "${PLATFORM_DATA_DIR}/nginx/applications/admin.conf"
+        -O "{ \"vhost\": \"~^(.+)\$\", \"adminOrigin\": \"${admin_origin}\", \"endpoint\": \"splash\", \"sourceDir\": \"${SETUP_WEBSITE_DIR}\", \"certFilePath\": \"cert/host.cert\", \"keyFilePath\": \"cert/host.key\", \"xFrameOptions\": \"SAMEORIGIN\", \"robotsTxtQuoted\": null, \"hasIPv6\": false }" > "${PLATFORM_DATA_DIR}/nginx/applications/admin.conf"
 else
     echo "Show progress bar only on admin domain for normal update"
     ${box_src_dir}/node_modules/.bin/ejs-cli -f "${script_dir}/start/nginx/appconfig.ejs" \
-        -O "{ \"vhost\": \"${admin_fqdn}\", \"adminOrigin\": \"${admin_origin}\", \"endpoint\": \"splash\", \"sourceDir\": \"${SETUP_WEBSITE_DIR}\", \"certFilePath\": \"cert/host.cert\", \"keyFilePath\": \"cert/host.key\", \"xFrameOptions\": \"SAMEORIGIN\", \"robotsTxtQuoted\": null }" > "${PLATFORM_DATA_DIR}/nginx/applications/admin.conf"
+        -O "{ \"vhost\": \"${admin_fqdn}\", \"adminOrigin\": \"${admin_origin}\", \"endpoint\": \"splash\", \"sourceDir\": \"${SETUP_WEBSITE_DIR}\", \"certFilePath\": \"cert/host.cert\", \"keyFilePath\": \"cert/host.key\", \"xFrameOptions\": \"SAMEORIGIN\", \"robotsTxtQuoted\": null, \"hasIPv6\": false }" > "${PLATFORM_DATA_DIR}/nginx/applications/admin.conf"
 fi
 
 if [[ "${arg_retire_reason}" == "migrate" ]]; then

setup/start.sh

@@ -77,25 +77,29 @@ mkdir -p "${APPS_DATA_DIR}"
 echo "==> Ensuring directories"
 
 mkdir -p "${PLATFORM_DATA_DIR}/graphite"
-mkdir -p "${PLATFORM_DATA_DIR}/mail/dkim"
 mkdir -p "${PLATFORM_DATA_DIR}/mysql"
 mkdir -p "${PLATFORM_DATA_DIR}/postgresql"
 mkdir -p "${PLATFORM_DATA_DIR}/mongodb"
-mkdir -p "${PLATFORM_DATA_DIR}/snapshots"
 mkdir -p "${PLATFORM_DATA_DIR}/addons/mail"
 mkdir -p "${PLATFORM_DATA_DIR}/collectd/collectd.conf.d"
 mkdir -p "${PLATFORM_DATA_DIR}/logrotate.d"
 mkdir -p "${PLATFORM_DATA_DIR}/acme"
-mkdir -p "${PLATFORM_DATA_DIR}/mail"
+mkdir -p "${PLATFORM_DATA_DIR}/backup"
 
 mkdir -p "${BOX_DATA_DIR}/appicons"
 mkdir -p "${BOX_DATA_DIR}/certs"
 mkdir -p "${BOX_DATA_DIR}/acme" # acme keys
+mkdir -p "${BOX_DATA_DIR}/mail/dkim"
 
 # ensure backups folder exists and is writeable
 mkdir -p /var/backups
 chmod 777 /var/backups
 
+echo "==> Migrating mail data"
+if [[ -d "${PLATFORM_DATA_DIR}/mail" ]]; then
+    find "${PLATFORM_DATA_DIR}/mail" -mindepth 1 -maxdepth 1 -exec mv --target-directory="${BOX_DATA_DIR}/mail" '{}' +
+fi
+
 echo "==> Configuring journald"
 sed -e "s/^#SystemMaxUse=.*$/SystemMaxUse=100M/" \
     -e "s/^#ForwardToSyslog=.*$/ForwardToSyslog=no/" \
@@ -121,7 +125,8 @@ echo "==> Setting up unbound"
 # DO uses Google nameservers by default. This causes RBL queries to fail (host 2.0.0.127.zen.spamhaus.org)
 # We do not use dnsmasq because it is not a recursive resolver and defaults to the value in the interfaces file (which is Google DNS!)
 # We listen on 0.0.0.0 because there is no way control ordering of docker (which creates the 172.18.0.0/16) and unbound
-echo -e "server:\n\tinterface: 0.0.0.0\n\tdo-ip6: no\n\taccess-control: 127.0.0.1 allow\n\taccess-control: 172.18.0.1/16 allow\n\tcache-max-negative-ttl: 30\n\tcache-max-ttl: 300" > /etc/unbound/unbound.conf.d/cloudron-network.conf
+# If IP6 is not enabled, dns queries seem to fail on some hosts
+echo -e "server:\n\tinterface: 0.0.0.0\n\tdo-ip6: yes\n\taccess-control: 127.0.0.1 allow\n\taccess-control: 172.18.0.1/16 allow\n\tcache-max-negative-ttl: 30\n\tcache-max-ttl: 300\n\t#logfile: /var/log/unbound.log\n\t#verbosity: 10" > /etc/unbound/unbound.conf.d/cloudron-network.conf
 # update the root anchor after a out-of-disk-space situation (see #269)
 unbound-anchor -a /var/lib/unbound/root.key
 
@@ -209,7 +214,7 @@ if [[ -n "${arg_restore_url}" ]]; then
 
     while true; do
         if $curl -L "${arg_restore_url}" | "${decrypt[@]}" \
-        | tar -zxf - --overwrite --transform="s,^box/\?,boxdata/," --transform="s,^mail/\?,platformdata/mail/," --show-transformed-names -C "${HOME_DIR}"; then break; fi
+        | tar -zxf - --overwrite -C "${BOX_DATA_DIR}"; then break; fi
         echo "Failed to download data, trying again"
     done
 
@@ -262,11 +267,19 @@ cat > "${BOX_SRC_DIR}/webadmin/dist/config.json" <<CONF_END
 }
 CONF_END
 
+if [[ ! -f "${BOX_DATA_DIR}/dhparams.pem" ]]; then
+    echo "==> Generating dhparams (takes forever)"
+    openssl dhparam -out "${BOX_DATA_DIR}/dhparams.pem" 2048
+    cp "${BOX_DATA_DIR}/dhparams.pem" "${PLATFORM_DATA_DIR}/addons/mail/dhparams.pem"
+else
+    cp "${BOX_DATA_DIR}/dhparams.pem" "${PLATFORM_DATA_DIR}/addons/mail/dhparams.pem"
+fi
+
 echo "==> Changing ownership"
 chown "${USER}:${USER}" -R "${CONFIG_DIR}"
-chown "${USER}:${USER}" -R "${PLATFORM_DATA_DIR}/nginx" "${PLATFORM_DATA_DIR}/collectd" "${PLATFORM_DATA_DIR}/logrotate.d" "${PLATFORM_DATA_DIR}/addons" "${PLATFORM_DATA_DIR}/acme"
+chown "${USER}:${USER}" -R "${PLATFORM_DATA_DIR}/nginx" "${PLATFORM_DATA_DIR}/collectd" "${PLATFORM_DATA_DIR}/logrotate.d" "${PLATFORM_DATA_DIR}/addons" "${PLATFORM_DATA_DIR}/acme" "${PLATFORM_DATA_DIR}/backup"
 chown "${USER}:${USER}" -R "${BOX_DATA_DIR}"
-chown "${USER}:${USER}" -R "${PLATFORM_DATA_DIR}/mail/dkim" # this is owned by box currently since it generates the keys
+chown "${USER}:${USER}" -R "${BOX_DATA_DIR}/mail/dkim" # this is owned by box currently since it generates the keys
 chown "${USER}:${USER}" "${PLATFORM_DATA_DIR}/INFRA_VERSION" 2>/dev/null || true
 chown "${USER}:${USER}" "${PLATFORM_DATA_DIR}"
 
@@ -291,11 +304,6 @@ if [[ ! -z "${arg_tls_config}" ]]; then
         -e "REPLACE INTO settings (name, value) VALUES (\"tls_config\", '$arg_tls_config')" box
 fi
 
-echo "==> Generating dhparams (takes forever)"
-if [[ ! -f "${BOX_DATA_DIR}/dhparams.pem" ]]; then
-    openssl dhparam -out "${BOX_DATA_DIR}/dhparams.pem" 2048
-fi
-
 set_progress "60" "Starting Cloudron"
 systemctl start cloudron.target
 

setup/start/cloudron-motd

@@ -7,3 +7,9 @@ printf "Cloudron relies on and may break your installation. Ubuntu security upda
 printf "are automatically installed on this server every night.\n"
 printf "\n"
 printf "Read more at https://cloudron.io/documentation/security/#os-updates\n"
+
+if grep -q "^PasswordAuthentication yes" /etc/ssh/sshd_config; then
+    printf "\nPlease disable password based SSH access to secure your server. Read more at\n"
+    printf "https://cloudron.io/documentation/security/#securing-ssh-access\n"
+fi
+

setup/start/nginx/appconfig.ejs

@@ -5,12 +5,18 @@ map $http_upgrade $connection_upgrade {
 }
 
 server {
-<% if (vhost) { %>
-    listen       443 http2;
+<% if (vhost) { -%>
     server_name  <%= vhost %>;
-<% } else { %>
+    listen       443 http2;
+<% if (hasIPv6) { -%>
+    listen       [::]:443 http2;
+<% } -%>
+<% } else { -%>
     listen       443 http2 default_server;
-<% } %>
+<% if (hasIPv6) { -%>
+    listen       [::]:443 http2 default_server;
+<% } -%>
+<% } -%>
 
     ssl                  on;
     # paths are relative to prefix and not to this file

setup/start/nginx/nginx.conf

@@ -39,6 +39,7 @@ http {
     # HTTP server
     server {
         listen      80;
+        listen      [::]:80;
 
         # collectd
         location /nginx_status {

setup/start/sudoers

@@ -13,8 +13,8 @@ yellowtent ALL=(root) NOPASSWD: /home/yellowtent/box/src/scripts/reloadnginx.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/reloadcollectd.sh env_keep="HOME BOX_ENV"
-yellowtent ALL=(root) NOPASSWD: /home/yellowtent/box/src/scripts/reloadcollectd.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
@@ -28,11 +28,9 @@ yellowtent ALL=(root) NOPASSWD: /home/yellowtent/box/src/scripts/update.sh
 Defaults!/home/yellowtent/box/src/scripts/authorized_keys.sh env_keep="HOME BOX_ENV"
 yellowtent ALL=(root) NOPASSWD: /home/yellowtent/box/src/scripts/authorized_keys.sh
 
-Defaults!/home/yellowtent/box/src/scripts/node.sh env_keep="HOME BOX_ENV NODE_ENV"
-yellowtent ALL=(root) NOPASSWD: /home/yellowtent/box/src/scripts/node.sh
+Defaults!/home/yellowtent/box/src/scripts/configurelogrotate.sh env_keep="HOME BOX_ENV"
+yellowtent ALL=(root) NOPASSWD: /home/yellowtent/box/src/scripts/configurelogrotate.sh
 
-Defaults!/home/yellowtent/box/src/scripts/mvlogrotateconfig.sh env_keep="HOME BOX_ENV"
-yellowtent ALL=(root) NOPASSWD: /home/yellowtent/box/src/scripts/mvlogrotateconfig.sh
+Defaults!/home/yellowtent/box/src/backuptask.js env_keep="HOME BOX_ENV"
+yellowtent ALL=(root) NOPASSWD:SETENV: /home/yellowtent/box/src/backuptask.js
 
-Defaults!/home/yellowtent/box/src/scripts/rmlogrotateconfig.sh env_keep="HOME BOX_ENV"
-yellowtent ALL=(root) NOPASSWD: /home/yellowtent/box/src/scripts/rmlogrotateconfig.sh

src/addons.js

@@ -644,7 +644,9 @@ function setupRedis(app, options, callback) {
     }
 
     const tag = infra.images.redis.tag, redisName = 'redis-' + app.id;
+    // note that we do not add appId label because this interferes with the stop/start app logic
     const cmd = `docker run --restart=always -d --name=${redisName} \
+                --label=location=${app.location} \
                 --net cloudron \
                 --net-alias ${redisName} \
                 -m ${memoryLimit/2} \
@@ -691,7 +693,7 @@ function teardownRedis(app, options, callback) {
 
        safe.fs.unlinkSync(paths.ADDON_CONFIG_DIR, 'redis-' + app.id + '_vars.sh');
 
-        shell.sudo('teardownRedis', [ RMAPPDIR_CMD, app.id + '/redis' ], function (error, stdout, stderr) {
+        shell.sudo('teardownRedis', [ RMAPPDIR_CMD, app.id + '/redis', true /* delete directory */ ], function (error, stdout, stderr) {
             if (error) return callback(new Error('Error removing redis data:' + error));
 
             appdb.unsetAddonConfig(app.id, 'redis', callback);

src/appstore.js

@@ -11,6 +11,8 @@ exports = module.exports = {
     getAppUpdate: getAppUpdate,
     getBoxUpdate: getBoxUpdate,
 
+    getAccount: getAccount,
+
     AppstoreError: AppstoreError
 };
 
@@ -245,3 +247,21 @@ function getAppUpdate(app, callback) {
         });
     });
 }
+
+function getAccount(callback) {
+    assert.strictEqual(typeof callback, 'function');
+
+    getAppstoreConfig(function (error, appstoreConfig) {
+        if (error) return callback(error);
+
+        var url = config.apiServerOrigin() + '/api/v1/users/' + appstoreConfig.userId;
+
+        superagent.get(url).query({ accessToken: appstoreConfig.token }).timeout(10 * 1000).end(function (error, result) {
+            if (error && !error.response) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, error));
+            if (result.statusCode !== 200) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, util.format('Bad response: %s %s', result.statusCode, result.text)));
+
+            // { profile: { id, email, groupId, billing, firstName, lastName, company, street, city, zip, state, country } }
+            callback(null, result.body.profile);
+        });
+    });
+}

src/apptask.js

@@ -56,10 +56,9 @@ var addons = require('./addons.js'),
     _ = require('underscore');
 
 var COLLECTD_CONFIG_EJS = fs.readFileSync(__dirname + '/collectd.config.ejs', { encoding: 'utf8' }),
-    RELOAD_COLLECTD_CMD = path.join(__dirname, 'scripts/reloadcollectd.sh'),
+    CONFIGURE_COLLECTD_CMD = path.join(__dirname, 'scripts/configurecollectd.sh'),
     LOGROTATE_CONFIG_EJS = fs.readFileSync(__dirname + '/logrotate.ejs', { encoding: 'utf8' }),
-    MV_LOGROTATE_CONFIG_CMD = path.join(__dirname, 'scripts/mvlogrotateconfig.sh'),
-    RM_LOGROTATE_CONFIG_CMD = path.join(__dirname, 'scripts/rmlogrotateconfig.sh'),
+    CONFIGURE_LOGROTATE_CMD = path.join(__dirname, 'scripts/configurelogrotate.sh'),
     RMAPPDIR_CMD = path.join(__dirname, 'scripts/rmappdir.sh'),
     CREATEAPPDIR_CMD = path.join(__dirname, 'scripts/createappdir.sh');
 
@@ -131,7 +130,7 @@ function deleteContainers(app, callback) {
     assert.strictEqual(typeof app, 'object');
     assert.strictEqual(typeof callback, 'function');
 
-    debugApp(app, 'deleting containers');
+    debugApp(app, 'deleting app containers (app, scheduler)');
 
     docker.deleteContainers(app.id, function (error) {
         if (error) return callback(new Error('Error deleting container: ' + error));
@@ -147,11 +146,12 @@ function createVolume(app, callback) {
     shell.sudo('createVolume', [ CREATEAPPDIR_CMD, app.id ], callback);
 }
 
-function deleteVolume(app, callback) {
+function deleteVolume(app, options, callback) {
     assert.strictEqual(typeof app, 'object');
+    assert.strictEqual(typeof options, 'object');
     assert.strictEqual(typeof callback, 'function');
 
-    shell.sudo('deleteVolume', [ RMAPPDIR_CMD, app.id ], callback);
+    shell.sudo('deleteVolume', [ RMAPPDIR_CMD, app.id, !!options.removeDirectory ], callback);
 }
 
 function addCollectdProfile(app, callback) {
@@ -161,7 +161,7 @@ function addCollectdProfile(app, callback) {
     var collectdConf = ejs.render(COLLECTD_CONFIG_EJS, { appId: app.id, containerId: app.containerId });
     fs.writeFile(path.join(paths.COLLECTD_APPCONFIG_DIR, app.id + '.conf'), collectdConf, function (error) {
         if (error) return callback(error);
-        shell.sudo('addCollectdProfile', [ RELOAD_COLLECTD_CMD ], callback);
+        shell.sudo('addCollectdProfile', [ CONFIGURE_COLLECTD_CMD, 'add', app.id ], callback);
     });
 }
 
@@ -171,7 +171,7 @@ function removeCollectdProfile(app, callback) {
 
     fs.unlink(path.join(paths.COLLECTD_APPCONFIG_DIR, app.id + '.conf'), function (error) {
         if (error && error.code !== 'ENOENT') debugApp(app, 'Error removing collectd profile', error);
-        shell.sudo('removeCollectdProfile', [ RELOAD_COLLECTD_CMD ], callback);
+        shell.sudo('removeCollectdProfile', [ CONFIGURE_COLLECTD_CMD, 'remove', app.id ], callback);
     });
 }
 
@@ -185,11 +185,12 @@ function addLogrotateConfig(app, callback) {
         var runVolume = result.Mounts.find(function (mount) { return mount.Destination === '/run'; });
         if (!runVolume) return callback(new Error('App does not have /run mounted'));
 
+        // logrotate configs can have arbitrary commands, so the config files must be owned by root
         var logrotateConf = ejs.render(LOGROTATE_CONFIG_EJS, { volumePath: runVolume.Source });
         var tmpFilePath = path.join(os.tmpdir(), app.id + '.logrotate');
         fs.writeFile(tmpFilePath, logrotateConf, function (error) {
             if (error) return callback(error);
-            shell.sudo('addLogrotateConfig', [ MV_LOGROTATE_CONFIG_CMD, tmpFilePath, app.id ], callback);
+            shell.sudo('addLogrotateConfig', [ CONFIGURE_LOGROTATE_CMD, 'add', app.id, tmpFilePath ], callback);
         });
     });
 }
@@ -198,7 +199,7 @@ function removeLogrotateConfig(app, callback) {
     assert.strictEqual(typeof app, 'object');
     assert.strictEqual(typeof callback, 'function');
 
-    shell.sudo('removeLogrotateConfig', [ RM_LOGROTATE_CONFIG_CMD, app.id ], callback);
+    shell.sudo('removeLogrotateConfig', [ CONFIGURE_LOGROTATE_CMD, 'remove', app.id ], callback);
 }
 
 function verifyManifest(app, callback) {
@@ -240,7 +241,7 @@ function downloadIcon(app, callback) {
                 if (!safe.fs.writeFileSync(path.join(paths.APP_ICONS_DIR, app.id + '.png'), res.body)) return retryCallback(new Error('Error saving icon:' + safe.error.message));
 
                 retryCallback(null);
-        });
+            });
     }, callback);
 }
 
@@ -272,6 +273,7 @@ function registerSubdomain(app, overwrite, callback) {
         }, function (error, result) {
             if (error || result instanceof Error) return callback(error || result);
 
+            // dnsRecordId tracks whether we created this DNS record so that we can unregister later
             updateApp(app, { dnsRecordId: result }, callback);
         });
     });
@@ -288,6 +290,11 @@ function unregisterSubdomain(app, location, callback) {
         return callback(null);
     }
 
+    if (!app.dnsRecordId) {
+        debugApp(app, 'Skip unregister of record not created by cloudron');
+        return callback(null);
+    }
+
     sysinfo.getPublicIp(function (error, ip) {
         if (error) return callback(error);
 
@@ -397,13 +404,13 @@ function install(app, callback) {
         deleteContainers.bind(null, app),
         // oldConfig can be null during upgrades
         addons.teardownAddons.bind(null, app, app.oldConfig ? app.oldConfig.manifest.addons : app.manifest.addons),
-        deleteVolume.bind(null, app),
+        deleteVolume.bind(null, app, { removeDirectory: false }), // do not remove any symlinked volume
 
         // for restore case
         function deleteImageIfChanged(done) {
-             if (!app.oldConfig || (app.oldConfig.manifest.dockerImage === app.manifest.dockerImage)) return done();
+            if (!app.oldConfig || (app.oldConfig.manifest.dockerImage === app.manifest.dockerImage)) return done();
 
-             docker.deleteImage(app.oldConfig.manifest, done);
+            docker.deleteImage(app.oldConfig.manifest, done);
         },
 
         reserveHttpPort.bind(null, app),
@@ -472,11 +479,10 @@ function backup(app, callback) {
     assert.strictEqual(typeof app, 'object');
     assert.strictEqual(typeof callback, 'function');
 
-    var prefix = (new Date()).toISOString().replace(/[T.]/g, '-').replace(/[:Z]/g,'');
 
     async.series([
         updateApp.bind(null, app, { installationProgress: '10, Backing up' }),
-        backups.backupApp.bind(null, app, app.manifest, prefix),
+        backups.backupApp.bind(null, app, app.manifest),
 
         // done!
         function (callback) {
@@ -497,6 +503,9 @@ function configure(app, callback) {
     assert.strictEqual(typeof app, 'object');
     assert.strictEqual(typeof callback, 'function');
 
+    // oldConfig can be null during an infra update
+    var locationChanged = app.oldConfig && app.oldConfig.location !== app.location;
+
     async.series([
         updateApp.bind(null, app, { installationProgress: '10, Cleaning up old install' }),
         unconfigureNginx.bind(null, app),
@@ -505,8 +514,7 @@ function configure(app, callback) {
         stopApp.bind(null, app),
         deleteContainers.bind(null, app),
         function (next) {
-            // oldConfig can be null during an infra update
-            if (!app.oldConfig || app.oldConfig.location === app.location) return next();
+            if (!locationChanged) return next();
             unregisterSubdomain(app, app.oldConfig.location, next);
         },
 
@@ -516,7 +524,7 @@ function configure(app, callback) {
         downloadIcon.bind(null, app),
 
         updateApp.bind(null, app, { installationProgress: '35, Registering subdomain' }),
-        registerSubdomain.bind(null, app, true /* overwrite */),
+        registerSubdomain.bind(null, app, !locationChanged /* overwrite */), // if location changed, do not overwrite to detect conflicts
 
         updateApp.bind(null, app, { installationProgress: '40, Downloading image' }),
         docker.downloadImage.bind(null, app.manifest),
@@ -590,19 +598,17 @@ function update(app, callback) {
         stopApp.bind(null, app),
         deleteContainers.bind(null, app),
         function deleteImageIfChanged(done) {
-             if (app.oldConfig.manifest.dockerImage === app.manifest.dockerImage) return done();
+            if (app.oldConfig.manifest.dockerImage === app.manifest.dockerImage) return done();
 
-             docker.deleteImage(app.oldConfig.manifest, done);
+            docker.deleteImage(app.oldConfig.manifest, done);
         },
 
         function (next) {
             if (app.installationState === appdb.ISTATE_PENDING_FORCE_UPDATE) return next(null);
 
-            var prefix = (new Date()).toISOString().replace(/[T.]/g, '-').replace(/[:Z]/g,'');
-
             async.series([
                 updateApp.bind(null, app, { installationProgress: '30, Backing up app' }),
-                backups.backupApp.bind(null, app, app.oldConfig.manifest, prefix)
+                backups.backupApp.bind(null, app, app.oldConfig.manifest)
             ], next);
         },
 
@@ -663,7 +669,7 @@ function uninstall(app, callback) {
         addons.teardownAddons.bind(null, app, app.manifest.addons),
 
         updateApp.bind(null, app, { installationProgress: '40, Deleting volume' }),
-        deleteVolume.bind(null, app),
+        deleteVolume.bind(null, app, { removeDirectory: true }),
 
         updateApp.bind(null, app, { installationProgress: '50, Deleting image' }),
         docker.deleteImage.bind(null, app.manifest),

src/backupdb.js

@@ -6,7 +6,7 @@ var assert = require('assert'),
     safe = require('safetydance'),
     util = require('util');
 
-var BACKUPS_FIELDS = [ 'id', 'creationTime', 'version', 'type', 'dependsOn', 'state', 'restoreConfigJson' ];
+var BACKUPS_FIELDS = [ 'id', 'creationTime', 'version', 'type', 'dependsOn', 'state', 'restoreConfigJson', 'format' ];
 
 exports = module.exports = {
     add: add,
@@ -47,12 +47,12 @@ function getByTypeAndStatePaged(type, state, page, perPage, callback) {
 
     database.query('SELECT ' + BACKUPS_FIELDS + ' FROM backups WHERE type = ? AND state = ? ORDER BY creationTime DESC LIMIT ?,?',
         [ type, state, (page-1)*perPage, perPage ], function (error, results) {
-        if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
+            if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
 
-        results.forEach(function (result) { postProcess(result); });
+            results.forEach(function (result) { postProcess(result); });
 
-        callback(null, results);
-    });
+            callback(null, results);
+        });
 }
 
 function getByTypePaged(type, page, perPage, callback) {
@@ -63,12 +63,12 @@ function getByTypePaged(type, page, perPage, callback) {
 
     database.query('SELECT ' + BACKUPS_FIELDS + ' FROM backups WHERE type = ? ORDER BY creationTime DESC LIMIT ?,?',
         [ type, (page-1)*perPage, perPage ], function (error, results) {
-        if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
+            if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
 
-        results.forEach(function (result) { postProcess(result); });
+            results.forEach(function (result) { postProcess(result); });
 
-        callback(null, results);
-    });
+            callback(null, results);
+        });
 }
 
 function getByAppIdPaged(page, perPage, appId, callback) {
@@ -80,12 +80,12 @@ function getByAppIdPaged(page, perPage, appId, callback) {
     // box versions (0.93.x and below) used to use appbackup_ prefix
     database.query('SELECT ' + BACKUPS_FIELDS + ' FROM backups WHERE type = ? AND state = ? AND id LIKE ? ORDER BY creationTime DESC LIMIT ?,?',
         [ exports.BACKUP_TYPE_APP, exports.BACKUP_STATE_NORMAL, '%app%\\_' + appId + '\\_%', (page-1)*perPage, perPage ], function (error, results) {
-        if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
+            if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
 
-        results.forEach(function (result) { postProcess(result); });
+            results.forEach(function (result) { postProcess(result); });
 
-        callback(null, results);
-    });
+            callback(null, results);
+        });
 }
 
 function get(id, callback) {
@@ -94,13 +94,13 @@ function get(id, callback) {
 
     database.query('SELECT ' + BACKUPS_FIELDS + ' FROM backups WHERE id = ? ORDER BY creationTime DESC',
         [ id ], function (error, result) {
-        if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
-        if (result.length === 0) return callback(new DatabaseError(DatabaseError.NOT_FOUND));
+            if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
+            if (result.length === 0) return callback(new DatabaseError(DatabaseError.NOT_FOUND));
 
-        postProcess(result[0]);
+            postProcess(result[0]);
 
-        callback(null, result[0]);
-    });
+            callback(null, result[0]);
+        });
 }
 
 function add(backup, callback) {
@@ -110,19 +110,20 @@ function add(backup, callback) {
     assert(backup.type === exports.BACKUP_TYPE_APP || backup.type === exports.BACKUP_TYPE_BOX);
     assert(util.isArray(backup.dependsOn));
     assert.strictEqual(typeof backup.restoreConfig, 'object');
+    assert.strictEqual(typeof backup.format, 'string');
     assert.strictEqual(typeof callback, 'function');
 
     var creationTime = backup.creationTime || new Date(); // allow tests to set the time
     var restoreConfig = backup.restoreConfig ? JSON.stringify(backup.restoreConfig) : '';
 
-    database.query('INSERT INTO backups (id, version, type, creationTime, state, dependsOn, restoreConfigJson) VALUES (?, ?, ?, ?, ?, ?, ?)',
-        [ backup.id, backup.version, backup.type, creationTime, exports.BACKUP_STATE_NORMAL, backup.dependsOn.join(','), restoreConfig ],
+    database.query('INSERT INTO backups (id, version, type, creationTime, state, dependsOn, restoreConfigJson, format) VALUES (?, ?, ?, ?, ?, ?, ?, ?)',
+        [ backup.id, backup.version, backup.type, creationTime, exports.BACKUP_STATE_NORMAL, backup.dependsOn.join(','), restoreConfig, backup.format ],
         function (error) {
-        if (error && error.code === 'ER_DUP_ENTRY') return callback(new DatabaseError(DatabaseError.ALREADY_EXISTS));
-        if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
+            if (error && error.code === 'ER_DUP_ENTRY') return callback(new DatabaseError(DatabaseError.ALREADY_EXISTS));
+            if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
 
-        callback(null);
-    });
+            callback(null);
+        });
 }
 
 function update(id, backup, callback) {
@@ -158,19 +159,8 @@ function del(id, callback) {
     assert.strictEqual(typeof id, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    get(id, function (error, result) {
-        if (error && error.reason === DatabaseError.NOT_FOUND) return callback();
-        if (error) return callback(error);
-
-        var whereClause = [ 'id=?' ], whereArgs = [ result.id ];
-        result.dependsOn.forEach(function (id) {
-            whereClause.push('id=?');
-            whereArgs.push(id);
-        });
-
-        database.query('DELETE FROM backups WHERE ' + whereClause.join(' OR '), whereArgs, function (error) {
-            if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
-            callback(null);
-        });
+    database.query('DELETE FROM backups WHERE id=?', [ id ], function (error) {
+        if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
+        callback(null);
     });
 }

src/backups.js

@@ -18,40 +18,54 @@ exports = module.exports = {
 
     backupBoxAndApps: backupBoxAndApps,
 
-    cleanup: cleanup
+    upload: upload,
+    download: download,
+
+    cleanup: cleanup,
+    cleanupCacheFilesSync: cleanupCacheFilesSync,
+
+    // for testing
+    _getBackupFilePath: getBackupFilePath,
+    _createTarPackStream: createTarPackStream,
+    _tarExtract: tarExtract,
+    _createEmptyDirs: createEmptyDirs,
+    _saveEmptyDirs: saveEmptyDirs
 };
 
 var addons = require('./addons.js'),
     appdb = require('./appdb.js'),
     apps = require('./apps.js'),
+    AppsError = require('./apps.js').AppsError,
     async = require('async'),
     assert = require('assert'),
     backupdb = require('./backupdb.js'),
-    caas = require('./storage/caas.js'),
     config = require('./config.js'),
+    crypto = require('crypto'),
     DatabaseError = require('./databaseerror.js'),
     debug = require('debug')('box:backups'),
     eventlog = require('./eventlog.js'),
-    filesystem = require('./storage/filesystem.js'),
+    fs = require('fs'),
     locker = require('./locker.js'),
     mailer = require('./mailer.js'),
-    noop = require('./storage/noop.js'),
+    mkdirp = require('mkdirp'),
+    once = require('once'),
     path = require('path'),
     paths = require('./paths.js'),
     progress = require('./progress.js'),
-    s3 = require('./storage/s3.js'),
+    progressStream = require('progress-stream'),
     safe = require('safetydance'),
     shell = require('./shell.js'),
     settings = require('./settings.js'),
-    SettingsError = require('./settings.js').SettingsError,
-    util = require('util');
-
-var NODE_CMD = path.join(__dirname, './scripts/node.sh');
-var BACKUPTASK_CMD = path.join(__dirname, 'backuptask.js');
+    syncer = require('./syncer.js'),
+    tar = require('tar-fs'),
+    util = require('util'),
+    zlib = require('zlib');
 
 var NOOP_CALLBACK = function (error) { if (error) debug(error); };
 
-function debugApp(app, args) {
+var BACKUPTASK_CMD = path.join(__dirname, 'backuptask.js');
+
+function debugApp(app) {
     assert(!app || typeof app === 'object');
 
     var prefix = app ? app.location : '(no app)';
@@ -86,13 +100,15 @@ BackupsError.NOT_FOUND = 'not found';
 // choose which storage backend we use for test purpose we use s3
 function api(provider) {
     switch (provider) {
-        case 'caas': return caas;
-        case 's3': return s3;
-        case 'filesystem': return filesystem;
-        case 'minio': return s3;
-        case 'exoscale-sos': return s3;
-        case 'noop': return noop;
-        default: return null;
+    case 'caas': return require('./storage/s3.js');
+    case 's3': return require('./storage/s3.js');
+    case 'filesystem': return require('./storage/filesystem.js');
+    case 'minio': return require('./storage/s3.js');
+    case 's3-v4-compat': return require('./storage/s3.js');
+    case 'digitalocean-spaces': return require('./storage/s3.js');
+    case 'exoscale-sos': return require('./storage/s3.js');
+    case 'noop': return require('./storage/noop.js');
+    default: return null;
     }
 }
 
@@ -101,7 +117,9 @@ function testConfig(backupConfig, callback) {
     assert.strictEqual(typeof callback, 'function');
 
     var func = api(backupConfig.provider);
-    if (!func) return callback(new SettingsError(SettingsError.BAD_FIELD, 'unkown storage provider'));
+    if (!func) return callback(new BackupsError(BackupsError.BAD_FIELD, 'unknown storage provider'));
+
+    if (backupConfig.format !== 'tgz' && backupConfig.format !== 'rsync') return callback(new BackupsError(BackupsError.BAD_FIELD, 'unknown format'));
 
     api(backupConfig.provider).testConfig(backupConfig, callback);
 }
@@ -145,57 +163,234 @@ function getRestoreConfig(backupId, callback) {
     });
 }
 
-function copyLastBackup(app, manifest, prefix, callback) {
-    assert.strictEqual(typeof app, 'object');
-    assert.strictEqual(typeof app.lastBackupId, 'string');
-    assert(manifest && typeof manifest === 'object');
-    assert.strictEqual(typeof prefix, 'string');
+function getBackupFilePath(backupConfig, backupId, format) {
+    assert.strictEqual(typeof backupConfig, 'object');
+    assert.strictEqual(typeof backupId, 'string');
+    assert.strictEqual(typeof format, 'string');
+
+    if (format === 'tgz') {
+        const fileType = backupConfig.key ? '.tar.gz.enc' : '.tar.gz';
+        return path.join(backupConfig.prefix || backupConfig.backupFolder, backupId+fileType);
+    } else {
+        return path.join(backupConfig.prefix || backupConfig.backupFolder, backupId);
+    }
+}
+
+function createTarPackStream(sourceDir, key) {
+    assert.strictEqual(typeof sourceDir, 'string');
+    assert(key === null || typeof key === 'string');
+
+    var pack = tar.pack('/', {
+        dereference: false, // pack the symlink and not what it points to
+        entries: [ sourceDir ],
+        map: function(header) {
+            header.name = header.name.replace(new RegExp('^' + sourceDir + '(/?)'), '.$1'); // make paths relative
+            return header;
+        },
+        strict: false // do not error for unknown types (skip fifo, char/block devices)
+    });
+
+    var gzip = zlib.createGzip({});
+    var ps = progressStream({ time: 10000 }); // display a progress every 10 seconds
+
+    pack.on('error', function (error) {
+        debug('createTarPackStream: tar stream error.', error);
+        ps.emit('error', new BackupsError(BackupsError.EXTERNAL_ERROR, error.message));
+    });
+
+    gzip.on('error', function (error) {
+        debug('createTarPackStream: gzip stream error.', error);
+        ps.emit('error', new BackupsError(BackupsError.EXTERNAL_ERROR, error.message));
+    });
+
+    ps.on('progress', function(progress) {
+        debug('createTarPackStream: %s@%s', Math.round(progress.transferred/1024/1024) + 'M', Math.round(progress.speed/1024/1024) + 'Mbps');
+    });
+
+    if (key !== null) {
+        var encrypt = crypto.createCipher('aes-256-cbc', key);
+        encrypt.on('error', function (error) {
+            debug('createTarPackStream: encrypt stream error.', error);
+            ps.emit('error', new BackupsError(BackupsError.EXTERNAL_ERROR, error.message));
+        });
+        return pack.pipe(gzip).pipe(encrypt).pipe(ps);
+    } else {
+        return pack.pipe(gzip).pipe(ps);
+    }
+}
+
+function sync(backupConfig, backupId, dataDir, callback) {
+    assert.strictEqual(typeof backupConfig, 'object');
+    assert.strictEqual(typeof backupId, 'string');
+    assert.strictEqual(typeof dataDir, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    var timestamp = (new Date()).toISOString().replace(/[T.]/g, '-').replace(/[:Z]/g,'');
-    var newBackupId = util.format('%s/app_%s_%s_v%s', prefix, app.id, timestamp, manifest.version);
+    syncer.sync(dataDir, function processTask(task, iteratorCallback) {
+        debug('sync: processing task: %j', task);
+        var backupFilePath = path.join(getBackupFilePath(backupConfig, backupId, backupConfig.format), task.path);
 
-    var restoreConfig = apps.getAppConfig(app);
-    restoreConfig.manifest = manifest;
+        if (task.operation === 'add') {
+            safe.fs.writeFileSync(paths.BACKUP_RESULT_FILE, 'Adding ' + task.path);
+            var stream = fs.createReadStream(path.join(dataDir, task.path));
+            stream.on('error', function () { return iteratorCallback(); }); // ignore error if file disappears
+            api(backupConfig.provider).upload(backupConfig, backupFilePath, stream, iteratorCallback);
+        } else if (task.operation === 'remove') {
+            safe.fs.writeFileSync(paths.BACKUP_RESULT_FILE, 'Removing ' + task.path);
+            api(backupConfig.provider).remove(backupConfig, backupFilePath, iteratorCallback);
+        } else if (task.operation === 'removedir') {
+            safe.fs.writeFileSync(paths.BACKUP_RESULT_FILE, 'Removing directory ' + task.path);
+            api(backupConfig.provider).removeDir(backupConfig, backupFilePath, iteratorCallback);
+        }
+    }, 10 /* concurrency */, function (error) {
+        if (error) return callback(new BackupsError(BackupsError.EXTERNAL_ERROR, error.message));
+
+        callback();
+    });
+}
+
+function saveEmptyDirs(appDataDir, callback) {
+    assert.strictEqual(typeof appDataDir, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    var emptyDirs = safe.child_process.execSync('find . -type d -empty', { cwd: `${appDataDir}` });
+
+    if (emptyDirs === null) return callback(safe.error);
+
+    if (!safe.fs.writeFileSync(`${appDataDir}/emptydirs.txt`, emptyDirs)) return callback(safe.error);
+    callback();
+}
+
+// this function is called via backuptask (since it needs root to traverse app's directory)
+function upload(backupId, format, dataDir, callback) {
+    assert.strictEqual(typeof backupId, 'string');
+    assert.strictEqual(typeof format, 'string');
+    assert.strictEqual(typeof dataDir, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    callback = once(callback);
+
+    debug('upload: id %s format %s dataDir %s', backupId, format, dataDir);
 
     settings.getBackupConfig(function (error, backupConfig) {
         if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error));
 
-        debug('copyLastBackup: copying backup %s to %s', app.lastBackupId, newBackupId);
-
-        backupdb.add({ id: newBackupId, version: manifest.version, type: backupdb.BACKUP_TYPE_APP, dependsOn: [ ], restoreConfig: restoreConfig }, function (error) {
-            if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error));
-
-            api(backupConfig.provider).copyBackup(backupConfig, app.lastBackupId, newBackupId, function (copyBackupError) {
-                const state = copyBackupError ? backupdb.BACKUP_STATE_ERROR : backupdb.BACKUP_STATE_NORMAL;
-
-                debugApp(app, 'copyLastBackup: %s done with state %s', newBackupId, state);
-
-                backupdb.update(newBackupId, { state: state }, function (error) {
-                    if (copyBackupError) return callback(new BackupsError(BackupsError.EXTERNAL_ERROR, copyBackupError.message));
-                    if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error));
-
-                    callback(null, newBackupId);
-                });
-            });
-        });
+        if (format === 'tgz') {
+            var tarStream = createTarPackStream(dataDir, backupConfig.key || null);
+            tarStream.on('error', callback); // already returns BackupsError
+            api(backupConfig.provider).upload(backupConfig, getBackupFilePath(backupConfig, backupId, format), tarStream, callback);
+        } else {
+            async.series([
+                saveEmptyDirs.bind(null, dataDir),
+                sync.bind(null, backupConfig, backupId, dataDir)
+            ], callback);
+        }
     });
 }
 
-function runBackupTask(backupId, appId, callback) {
-    assert.strictEqual(typeof backupId, 'string');
-    assert(appId === null || typeof backupId === 'string');
+function tarExtract(inStream, destination, key, callback) {
+    assert.strictEqual(typeof inStream, 'object');
+    assert.strictEqual(typeof destination, 'string');
+    assert(key === null || typeof key === 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    var killTimerId = null;
+    callback = once(callback);
 
-    var cp = shell.sudo('backup' + (appId ? 'App' : 'Box'), [ NODE_CMD, BACKUPTASK_CMD, backupId ].concat(appId ? [ appId ] : [ ]), function (error) {
+    var gunzip = zlib.createGunzip({});
+    var ps = progressStream({ time: 10000 }); // display a progress every 10 seconds
+    var extract = tar.extract(destination);
 
+    inStream.on('error', function (error) {
+        debug('tarExtract: input stream error.', error);
+        callback(new BackupsError(BackupsError.EXTERNAL_ERROR, error.message));
+    });
+
+    ps.on('progress', function(progress) {
+        debug('tarExtract: %s@%s', Math.round(progress.transferred/1024/1024) + 'M', Math.round(progress.speed/1024/1024) + 'Mbps');
+    });
+
+    gunzip.on('error', function (error) {
+        debug('tarExtract: gunzip stream error.', error);
+        callback(new BackupsError(BackupsError.EXTERNAL_ERROR, error.message));
+    });
+
+    extract.on('error', function (error) {
+        debug('tarExtract: extract stream error.', error);
+        callback(new BackupsError(BackupsError.EXTERNAL_ERROR, error.message));
+    });
+
+    extract.on('finish', function () {
+        debug('tarExtract: done.');
+        callback(null);
+    });
+
+    if (key !== null) {
+        var decrypt = crypto.createDecipher('aes-256-cbc', key);
+        decrypt.on('error', function (error) {
+            debug('tarExtract: decrypt stream error.', error);
+            callback(new BackupsError(BackupsError.EXTERNAL_ERROR, error.message));
+        });
+        inStream.pipe(ps).pipe(decrypt).pipe(gunzip).pipe(extract);
+    } else {
+        inStream.pipe(ps).pipe(gunzip).pipe(extract);
+    }
+}
+
+function createEmptyDirs(appDataDir, callback) {
+    assert.strictEqual(typeof appDataDir, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    debug('createEmptyDirs: recreating empty directories');
+
+    var emptyDirs = safe.fs.readFileSync(path.join(appDataDir, 'emptydirs.txt'), 'utf8');
+    if (emptyDirs === null) return callback(new Error('emptydirs.txt was not found:' + safe.error.message));
+
+    async.eachSeries(emptyDirs.trim().split('\n'), function createPath(emptyDir, iteratorDone) {
+        mkdirp(path.join(appDataDir, emptyDir), iteratorDone);
+    }, callback);
+}
+
+function download(backupId, format, dataDir, callback) {
+    assert.strictEqual(typeof backupId, 'string');
+    assert.strictEqual(typeof format, 'string');
+    assert.strictEqual(typeof dataDir, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    debug('download: id %s dataDir %s format %s', backupId, dataDir, format);
+
+    settings.getBackupConfig(function (error, backupConfig) {
+        if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error));
+
+        if (format === 'tgz') {
+            api(backupConfig.provider).download(backupConfig, getBackupFilePath(backupConfig, backupId, format), function (error, sourceStream) {
+                if (error) return callback(error);
+
+                tarExtract(sourceStream, dataDir, backupConfig.key || null, callback);
+            });
+        } else {
+            async.series([
+                api(backupConfig.provider).downloadDir.bind(null, backupConfig, getBackupFilePath(backupConfig, backupId, format), dataDir),
+                createEmptyDirs.bind(null, dataDir)
+            ], callback);
+        }
+    });
+}
+
+function runBackupTask(backupId, format, dataDir, callback) {
+    assert.strictEqual(typeof backupId, 'string');
+    assert.strictEqual(typeof format, 'string');
+    assert.strictEqual(typeof dataDir, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    var killTimerId = null, progressTimerId = null;
+
+    var cp = shell.sudo(`backup-${backupId}`, [ BACKUPTASK_CMD, backupId, format, dataDir ], { env: process.env, logFile: paths.BACKUP_LOG_FILE }, function (error) {
         clearTimeout(killTimerId);
+        clearInterval(progressTimerId);
+
         cp = null;
 
         if (error && (error.code === null /* signal */ || (error.code !== 0 && error.code !== 50))) { // backuptask crashed
-            return callback(new BackupsError(BackupsError.INTERNAL_ERROR, 'backuptask crashed'));
+            return callback(new BackupsError(BackupsError.INTERNAL_ERROR, 'Backuptask crashed'));
         } else if (error && error.code === 50) { // exited with error
             var result = safe.fs.readFileSync(paths.BACKUP_RESULT_FILE, 'utf8') || safe.error.message;
             return callback(new BackupsError(BackupsError.EXTERNAL_ERROR, result));
@@ -204,50 +399,130 @@ function runBackupTask(backupId, appId, callback) {
         callback();
     });
 
+    progressTimerId = setInterval(function () {
+        var result = safe.fs.readFileSync(paths.BACKUP_RESULT_FILE, 'utf8');
+        if (result) progress.setDetail(progress.BACKUP, result);
+    }, 1000); // every second
+
     killTimerId = setTimeout(function () {
         debug('runBackupTask: backup task taking too long. killing');
         cp.kill();
     }, 4 * 60 * 60 * 1000); // 4 hours
 }
 
-function backupBoxWithAppBackupIds(appBackupIds, prefix, callback) {
-    assert(Array.isArray(appBackupIds));
-    assert.strictEqual(typeof prefix, 'string');
+function getSnapshotInfo(id) {
+    assert.strictEqual(typeof id, 'string');
 
-    var timestamp = (new Date()).toISOString().replace(/[T.]/g, '-').replace(/[:Z]/g,'');
-    var backupId = util.format('%s/box_%s_v%s', prefix, timestamp, config.version());
+    var contents = safe.fs.readFileSync(paths.SNAPSHOT_INFO_FILE, 'utf8');
+    var info = safe.JSON.parse(contents);
+    if (!info) return { };
+    return info[id] || { };
+}
+
+function setSnapshotInfo(id, info, callback) {
+    assert.strictEqual(typeof id, 'string');
+    assert.strictEqual(typeof info, 'object');
+    assert.strictEqual(typeof callback, 'function');
+
+    var contents = safe.fs.readFileSync(paths.SNAPSHOT_INFO_FILE, 'utf8');
+    var data = safe.JSON.parse(contents) || { };
+    if (info) data[id] = info; else delete data[id];
+    if (!safe.fs.writeFileSync(paths.SNAPSHOT_INFO_FILE, JSON.stringify(data, null, 4), 'utf8')) return callback(new BackupsError(BackupsError.EXTERNAL_ERROR, safe.error.message));
+
+    callback();
+}
+
+function snapshotBox(callback) {
+    assert.strictEqual(typeof callback, 'function');
+
+    var password = config.database().password ? '-p' + config.database().password : '--skip-password';
+    var mysqlDumpArgs = [
+        '-c',
+        `/usr/bin/mysqldump -u root ${password} --single-transaction --routines \
+            --triggers ${config.database().name} > "${paths.BOX_DATA_DIR}/box.mysqldump"`
+    ];
+    shell.exec('backupBox', '/bin/bash', mysqlDumpArgs, { }, function (error) {
+        if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error));
+
+        return callback();
+    });
+}
+
+function uploadBoxSnapshot(backupConfig, callback) {
+    assert.strictEqual(typeof backupConfig, 'object');
+    assert.strictEqual(typeof callback, 'function');
+
+    var startTime = new Date();
+
+    snapshotBox(function (error) {
+        if (error) return callback(error);
+
+        // for the moment, box backups are always tarball based. this is because it makes it easy to restore
+        // in the future, if required, we can move out the mailboxes to a separate virtual app backup
+        const format = 'tgz';
+
+        runBackupTask('snapshot/box', format, paths.BOX_DATA_DIR, function (error) {
+            if (error) return callback(error);
+
+            debug('uploadBoxSnapshot: time: %s secs', (new Date() - startTime)/1000);
+
+            setSnapshotInfo('box', { timestamp: new Date().toISOString(), format: format }, callback);
+        });
+    });
+}
+
+function rotateBoxBackup(backupConfig, timestamp, appBackupIds, callback) {
+    assert.strictEqual(typeof backupConfig, 'object');
+    assert.strictEqual(typeof timestamp, 'string');
+    assert(Array.isArray(appBackupIds));
+    assert.strictEqual(typeof callback, 'function');
+
+    var snapshotInfo = getSnapshotInfo('box');
+    if (!snapshotInfo) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, 'Snapshot info missing or corrupt'));
+
+    var snapshotTime = snapshotInfo.timestamp.replace(/[T.]/g, '-').replace(/[:Z]/g,'');
+    var backupId = util.format('%s/box_%s_v%s', timestamp, snapshotTime, config.version());
+    const format = 'tgz';
+
+    debug('rotateBoxBackup: rotating to id:%s', backupId);
+
+    backupdb.add({ id: backupId, version: config.version(), type: backupdb.BACKUP_TYPE_BOX, dependsOn: appBackupIds, restoreConfig: null, format: format }, function (error) {
+        if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error));
+
+        progress.setDetail(progress.BACKUP, 'Rotating box snapshot');
+
+        api(backupConfig.provider).copy(backupConfig, getBackupFilePath(backupConfig, 'snapshot/box', format), getBackupFilePath(backupConfig, backupId, format), function (copyBackupError) {
+            const state = copyBackupError ? backupdb.BACKUP_STATE_ERROR : backupdb.BACKUP_STATE_NORMAL;
+
+            backupdb.update(backupId, { state: state }, function (error) {
+                if (copyBackupError) return callback(new BackupsError(BackupsError.EXTERNAL_ERROR, copyBackupError.message));
+                if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error));
+
+                debug('rotateBoxBackup: successful id:%s', backupId);
+
+                // FIXME this is only needed for caas, hopefully we can remove that in the future
+                api(backupConfig.provider).backupDone(backupConfig, backupId, appBackupIds, function (error) {
+                    if (error) return callback(error);
+
+                    callback(null, backupId);
+                });
+            });
+        });
+    });
+}
+
+function backupBoxWithAppBackupIds(appBackupIds, timestamp, callback) {
+    assert(Array.isArray(appBackupIds));
+    assert.strictEqual(typeof timestamp, 'string');
+    assert.strictEqual(typeof callback, 'function');
 
     settings.getBackupConfig(function (error, backupConfig) {
         if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error));
 
-        var password = config.database().password ? '-p' + config.database().password : '--skip-password';
-        var mysqlDumpArgs = [
-            '-c',
-            `/usr/bin/mysqldump -u root ${password} --single-transaction --routines \
-                --triggers ${config.database().name} > "${paths.BOX_DATA_DIR}/box.mysqldump"`
-        ];
-        shell.exec('backupBox', '/bin/bash', mysqlDumpArgs, function (error) {
-            if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error));
+        uploadBoxSnapshot(backupConfig, function (error) {
+            if (error) return callback(error);
 
-            backupdb.add({ id: backupId, version: config.version(), type: backupdb.BACKUP_TYPE_BOX, dependsOn: appBackupIds, restoreConfig: null }, function (error) {
-                if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error));
-
-                runBackupTask(backupId, null /* appId */, function (backupTaskError) {
-                    const state = backupTaskError ? backupdb.BACKUP_STATE_ERROR : backupdb.BACKUP_STATE_NORMAL;
-                    debug('backupBoxWithAppBackupIds: %s', state);
-
-                    backupdb.update(backupId, { state: state }, function (error) {
-                        if (backupTaskError) return callback(backupTaskError);
-                        if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error));
-
-                        // FIXME this is only needed for caas, hopefully we can remove that in the future
-                        api(backupConfig.provider).backupDone(backupId, appBackupIds, function (error) {
-                            if (error) return callback(error);
-                            callback(null, backupId);
-                        });
-                    });
-                });
-            });
+            rotateBoxBackup(backupConfig, timestamp, appBackupIds, callback);
         });
     });
 }
@@ -261,15 +536,11 @@ function canBackupApp(app) {
             app.installationState === appdb.ISTATE_PENDING_UPDATE; // called from apptask
 }
 
-function createNewAppBackup(app, manifest, prefix, callback) {
+function snapshotApp(app, manifest, callback) {
     assert.strictEqual(typeof app, 'object');
     assert(manifest && typeof manifest === 'object');
-    assert.strictEqual(typeof prefix, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    var timestamp = (new Date()).toISOString().replace(/[T.]/g, '-').replace(/[:Z]/g,'');
-    var backupId = util.format('%s/app_%s_%s_v%s', prefix, app.id, timestamp, manifest.version);
-
     var restoreConfig = apps.getAppConfig(app);
     restoreConfig.manifest = manifest;
 
@@ -280,22 +551,7 @@ function createNewAppBackup(app, manifest, prefix, callback) {
     addons.backupAddons(app, manifest.addons, function (error) {
         if (error) return callback(new BackupsError(BackupsError.EXTERNAL_ERROR, error.message));
 
-        backupdb.add({ id: backupId, version: manifest.version, type: backupdb.BACKUP_TYPE_APP, dependsOn: [ ], restoreConfig: restoreConfig }, function (error) {
-            if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error));
-
-            runBackupTask(backupId, app.id, function (backupTaskError) {
-                const state = backupTaskError ? backupdb.BACKUP_STATE_ERROR : backupdb.BACKUP_STATE_NORMAL;
-
-                debugApp(app, 'createNewAppBackup: %s done with state %s', backupId, state);
-
-                backupdb.update(backupId, { state: state }, function (error) {
-                    if (backupTaskError) return callback(new BackupsError(BackupsError.EXTERNAL_ERROR, backupTaskError.message));
-                    if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error));
-
-                    callback(null, backupId);
-                });
-            });
-        });
+        return callback(null, restoreConfig);
     });
 }
 
@@ -312,57 +568,121 @@ function setRestorePoint(appId, lastBackupId, callback) {
     });
 }
 
-function backupApp(app, manifest, prefix, callback) {
+function rotateAppBackup(backupConfig, app, timestamp, callback) {
+    assert.strictEqual(typeof backupConfig, 'object');
     assert.strictEqual(typeof app, 'object');
-    assert(manifest && typeof manifest === 'object');
-    assert.strictEqual(typeof prefix, 'string');
+    assert.strictEqual(typeof timestamp, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    var backupFunction;
+    var snapshotInfo = getSnapshotInfo(app.id);
+    if (!snapshotInfo) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, 'Snapshot info missing or corrupt'));
 
-    if (!canBackupApp(app)) {
-        if (!app.lastBackupId) {
-            debugApp(app, 'backupApp: cannot backup app');
-            return callback(new BackupsError(BackupsError.BAD_STATE, 'App not healthy and never backed up previously'));
-        }
+    var snapshotTime = snapshotInfo.timestamp.replace(/[T.]/g, '-').replace(/[:Z]/g,'');
+    var restoreConfig = snapshotInfo.restoreConfig;
+    var manifest = restoreConfig.manifest;
+    var backupId = util.format('%s/app_%s_%s_v%s', timestamp, app.id, snapshotTime, manifest.version);
+    const format = backupConfig.format;
 
-        // set the 'creation' date of lastBackup so that the backup persists across time based archival rules
-        // s3 does not allow changing creation time, so copying the last backup is easy way out for now
-        backupFunction = copyLastBackup.bind(null, app, manifest, prefix);
-    } else {
-        backupFunction = createNewAppBackup.bind(null, app, manifest, prefix);
-    }
+    debugApp(app, 'rotateAppBackup: rotating to id:%s', backupId);
 
-    backupFunction(function (error, backupId) {
+    backupdb.add({ id: backupId, version: manifest.version, type: backupdb.BACKUP_TYPE_APP, dependsOn: [ ], restoreConfig: restoreConfig, format: format }, function (error) {
+        if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error));
+
+        progress.setDetail(progress.BACKUP, 'Rotating app snapshot');
+
+        api(backupConfig.provider).copy(backupConfig, getBackupFilePath(backupConfig, `snapshot/app_${app.id}`, format), getBackupFilePath(backupConfig, backupId, format), function (copyBackupError) {
+            const state = copyBackupError ? backupdb.BACKUP_STATE_ERROR : backupdb.BACKUP_STATE_NORMAL;
+            debugApp(app, 'rotateAppBackup: successful id:%s', backupId);
+
+            backupdb.update(backupId, { state: state }, function (error) {
+                if (copyBackupError) return callback(new BackupsError(BackupsError.EXTERNAL_ERROR, copyBackupError.message));
+                if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error));
+
+                setRestorePoint(app.id, backupId, function (error) {
+                    if (error) return callback(error);
+
+                    return callback(null, backupId);
+                });
+            });
+        });
+    });
+}
+
+function uploadAppSnapshot(backupConfig, app, manifest, callback) {
+    assert.strictEqual(typeof backupConfig, 'object');
+    assert.strictEqual(typeof app, 'object');
+    assert(manifest && typeof manifest === 'object');
+    assert.strictEqual(typeof callback, 'function');
+
+    if (!canBackupApp(app)) return callback(); // nothing to do
+
+    var startTime = new Date();
+
+    snapshotApp(app, manifest, function (error, restoreConfig) {
         if (error) return callback(error);
 
-        debugApp(app, 'backupApp: successful id:%s', backupId);
-
-        setRestorePoint(app.id, backupId, function (error) {
+        var backupId = util.format('snapshot/app_%s', app.id);
+        var appDataDir = safe.fs.realpathSync(path.join(paths.APPS_DATA_DIR, app.id));
+        runBackupTask(backupId, backupConfig.format, appDataDir, function (error) {
             if (error) return callback(error);
 
-            return callback(null, backupId);
+            debugApp(app, 'uploadAppSnapshot: %s done time: %s secs', backupId, (new Date() - startTime)/1000);
+
+            setSnapshotInfo(app.id, { timestamp: new Date().toISOString(), restoreConfig: restoreConfig, format: backupConfig.format }, callback);
         });
     });
 }
 
+function backupAppWithTimestamp(app, manifest, timestamp, callback) {
+    assert.strictEqual(typeof app, 'object');
+    assert(manifest && typeof manifest === 'object');
+    assert.strictEqual(typeof timestamp, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    if (!canBackupApp(app)) return callback(); // nothing to do
+
+    settings.getBackupConfig(function (error, backupConfig) {
+        if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error));
+
+        uploadAppSnapshot(backupConfig, app, manifest, function (error) {
+            if (error) return callback(error);
+
+            rotateAppBackup(backupConfig, app, timestamp, callback);
+        });
+    });
+}
+
+function backupApp(app, manifest, callback) {
+    assert.strictEqual(typeof app, 'object');
+    assert(manifest && typeof manifest === 'object');
+    assert.strictEqual(typeof callback, 'function');
+
+    const timestamp = (new Date()).toISOString().replace(/[T.]/g, '-').replace(/[:Z]/g,'');
+
+    progress.set(progress.BACKUP, 10,  'Backing up ' + (app.altDomain || config.appFqdn(app.location)));
+
+    backupAppWithTimestamp(app, manifest, timestamp, function (error) {
+        progress.set(progress.BACKUP, 100, error ? error.message : '');
+
+        callback(error);
+    });
+}
+
 // this function expects you to have a lock
 function backupBoxAndApps(auditSource, callback) {
     assert.strictEqual(typeof auditSource, 'object');
 
     callback = callback || NOOP_CALLBACK;
 
-    var prefix = (new Date()).toISOString().replace(/[T.]/g, '-').replace(/[:Z]/g,'');
+    var timestamp = (new Date()).toISOString().replace(/[T.]/g, '-').replace(/[:Z]/g,'');
 
     eventlog.add(eventlog.ACTION_BACKUP_START, auditSource, { });
 
     apps.getAll(function (error, allApps) {
         if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error));
 
-        var processed = 0;
-        var step = 100/(allApps.length+1);
-
-        progress.set(progress.BACKUP, step * processed, '');
+        var processed = 1;
+        var step = 100/(allApps.length+2);
 
         async.mapSeries(allApps, function iterator(app, iteratorCallback) {
             progress.set(progress.BACKUP, step * processed,  'Backing up ' + (app.altDomain || config.appFqdn(app.location)));
@@ -374,7 +694,7 @@ function backupBoxAndApps(auditSource, callback) {
                 return iteratorCallback(null, app.lastBackupId); // just use the last backup
             }
 
-            backupApp(app, app.manifest, prefix, function (error, backupId) {
+            backupAppWithTimestamp(app, app.manifest, timestamp, function (error, backupId) {
                 if (error && error.reason !== BackupsError.BAD_STATE) {
                     debugApp(app, 'Unable to backup', error);
                     return iteratorCallback(error);
@@ -394,7 +714,7 @@ function backupBoxAndApps(auditSource, callback) {
 
             progress.set(progress.BACKUP, step * processed, 'Backing up system data');
 
-            backupBoxWithAppBackupIds(backupIds, prefix, function (error, filename) {
+            backupBoxWithAppBackupIds(backupIds, timestamp, function (error, filename) {
                 progress.set(progress.BACKUP, 100, error ? error.message : '');
 
                 eventlog.add(eventlog.ACTION_BACKUP_FINISH, auditSource, { errorMessage: error ? error.message : null, filename: filename });
@@ -412,6 +732,7 @@ function backup(auditSource, callback) {
     var error = locker.lock(locker.OP_FULL_BACKUP);
     if (error) return callback(new BackupsError(BackupsError.BAD_STATE, error.message));
 
+    var startTime = new Date();
     progress.set(progress.BACKUP, 0, 'Starting'); // ensure tools can 'wait' on progress
 
     backupBoxAndApps(auditSource, function (error) { // start the backup operation in the background
@@ -421,6 +742,8 @@ function backup(auditSource, callback) {
         }
 
         locker.unlock(locker.OP_FULL_BACKUP);
+
+        debug('backup took %s seconds', (new Date() - startTime)/1000);
     });
 
     callback(null);
@@ -453,13 +776,50 @@ function restoreApp(app, addonsToRestore, backupId, callback) {
     assert.strictEqual(typeof callback, 'function');
     assert(app.lastBackupId);
 
-    settings.getBackupConfig(function (error, backupConfig) {
+    var appDataDir = safe.fs.realpathSync(path.join(paths.APPS_DATA_DIR, app.id));
+
+    var startTime = new Date();
+
+    backupdb.get(backupId, function (error, result) {
+        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new BackupsError(BackupsError.NOT_FOUND, error));
         if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error));
 
         async.series([
-            api(backupConfig.provider).restore.bind(null, backupConfig, backupId, path.join(paths.APPS_DATA_DIR, app.id)),
+            download.bind(null, backupId, result.format, appDataDir),
             addons.restoreAddons.bind(null, app, addonsToRestore)
-        ], callback);
+        ], function (error) {
+            debug('restoreApp: time: %s', (new Date() - startTime)/1000);
+
+            callback(error);
+        });
+    });
+}
+
+function cleanupBackup(backupConfig, backup, callback) {
+    assert.strictEqual(typeof backupConfig, 'object');
+    assert.strictEqual(typeof backup, 'object');
+    assert.strictEqual(typeof callback, 'function');
+
+    var removeFunc = backup.format ==='tgz' ? api(backupConfig.provider).remove : api(backupConfig.provider).removeDir;
+    var backupFilePath = getBackupFilePath(backupConfig, backup.id, backup.format);
+
+    removeFunc(backupConfig, backupFilePath, function (error) {
+        if (error) {
+            debug('cleanupBackup: error removing backup %j : %s', backup, error.message);
+            callback();
+        }
+
+        // prune empty directory if possible
+        api(backupConfig.provider).remove(backupConfig, path.dirname(backupFilePath), function (error) {
+            if (error) debug('cleanupBackup: unable to prune backup directory %s : %s', path.dirname(backupFilePath), error.message);
+
+            backupdb.del(backup.id, function (error) {
+                if (error) debug('cleanupBackup: error removing from database', error);
+                else debug('cleanupBackup: removed %s', backup.id);
+
+                callback();
+            });
+        });
     });
 }
 
@@ -478,31 +838,20 @@ function cleanupAppBackups(backupConfig, referencedAppBackups, callback) {
             if (referencedAppBackups.indexOf(backup.id) !== -1) return iteratorDone();
             if ((now - backup.creationTime) < (backupConfig.retentionSecs * 1000)) return iteratorDone();
 
-            debug('cleanup: removing %s', backup.id);
+            debug('cleanupAppBackups: removing %s', backup.id);
 
-            api(backupConfig.provider).removeBackups(backupConfig, [ backup.id ], function (error) {
-                if (error) {
-                    debug('cleanup: error removing backup %j : %s', backup, error.message);
-                    iteratorDone();
-                }
-
-                backupdb.del(backup.id, function (error) {
-                    if (error) debug('cleanup: error removing from database', error);
-                    else debug('cleanup: removed %s', backup.id);
-
-                    iteratorDone();
-                });
-            });
+            cleanupBackup(backupConfig, backup, iteratorDone);
         }, function () {
-            debug('cleanup: done cleaning app backups');
+            debug('cleanupAppBackups: done');
 
             callback();
         });
     });
 }
 
-function cleanupBoxBackups(backupConfig, callback) {
+function cleanupBoxBackups(backupConfig, auditSource, callback) {
     assert.strictEqual(typeof backupConfig, 'object');
+    assert.strictEqual(typeof auditSource, 'object');
     assert.strictEqual(typeof callback, 'function');
 
     const now = new Date();
@@ -521,44 +870,76 @@ function cleanupBoxBackups(backupConfig, callback) {
 
         // keep the first valid backup
         if (i !== boxBackups.length) {
-            debug('cleanup: preserving box backup %j', boxBackups[i]);
+            debug('cleanupBoxBackups: preserving box backup %s (%j)', boxBackups[i].id, boxBackups[i].dependsOn);
             referencedAppBackups = boxBackups[i].dependsOn;
             boxBackups.splice(i, 1);
         } else {
-            debug('cleanup: no box backup to preserve');
+            debug('cleanupBoxBackups: no box backup to preserve');
         }
 
-        async.eachSeries(boxBackups, function iterator(backup, iteratorDone) {
-            referencedAppBackups = referencedAppBackups.concat(backup.dependsOn);
-
+        async.eachSeries(boxBackups, function iterator(backup, nextBackup) {
             // TODO: errored backups should probably be cleaned up before retention time, but we will
             // have to be careful not to remove any backup currently being created
-            if ((now - backup.creationTime) < (backupConfig.retentionSecs * 1000)) return iteratorDone();
+            if ((now - backup.creationTime) < (backupConfig.retentionSecs * 1000)) {
+                referencedAppBackups = referencedAppBackups.concat(backup.dependsOn);
+                return nextBackup();
+            }
 
-            debug('cleanup: removing %s', backup.id);
+            debug('cleanupBoxBackups: removing %s', backup.id);
 
-            var backupIds = [].concat(backup.id, backup.dependsOn);
-
-            api(backupConfig.provider).removeBackups(backupConfig, backupIds, function (error) {
-                if (error) {
-                    debug('cleanup: error removing backup %j : %s', backup, error.message);
-                    iteratorDone();
-                }
-
-                backupdb.del(backup.id, function (error) {
-                    if (error) debug('cleanup: error removing from database', error);
-                    else debug('cleanup: removed %j', backupIds);
-
-                    iteratorDone();
-                });
-            });
+            cleanupBackup(backupConfig, backup, nextBackup);
         }, function () {
+            debug('cleanupBoxBackups: done');
+
             return callback(null, referencedAppBackups);
         });
     });
 }
 
-function cleanup(callback) {
+function cleanupCacheFilesSync() {
+    var files = safe.fs.readdirSync(path.join(paths.BACKUP_INFO_DIR));
+    if (!files) return;
+
+    files.filter(function (f) { return f.endsWith('.sync.cache'); }).forEach(function (f) {
+        safe.fs.unlinkSync(path.join(paths.BACKUP_INFO_DIR, f));
+    });
+}
+
+// removes the snapshots of apps that have been uninstalled
+function cleanupSnapshots(backupConfig, callback) {
+    assert.strictEqual(typeof backupConfig, 'object');
+    assert.strictEqual(typeof callback, 'function');
+
+    var contents = safe.fs.readFileSync(paths.SNAPSHOT_INFO_FILE, 'utf8');
+    var info = safe.JSON.parse(contents);
+    if (!info) return callback();
+
+    delete info.box;
+    async.eachSeries(Object.keys(info), function (appId, iteratorDone) {
+        apps.get(appId, function (error /*, app */) {
+            if (!error || error.reason !== AppsError.NOT_FOUND) return iteratorDone();
+
+            var removeFunc = info[appId].format ==='tgz' ? api(backupConfig.provider).remove : api(backupConfig.provider).removeDir;
+            removeFunc(backupConfig, getBackupFilePath(backupConfig, `snapshot/app_${appId}`, info[appId].format), function (/* ignoredError */) {
+                safe.fs.unlinkSync(path.join(paths.BACKUP_INFO_DIR, `${appId}.sync.cache`));
+                safe.fs.unlinkSync(path.join(paths.BACKUP_INFO_DIR, `${appId}.sync.cache.new`));
+
+                setSnapshotInfo(appId, null, function (/* ignoredError */) {
+                    debug('cleanupSnapshots: cleaned up snapshot of app id %s', appId);
+
+                    iteratorDone();
+                });
+            });
+        });
+    }, function () {
+        debug('cleanupSnapshots: done');
+
+        callback();
+    });
+}
+
+function cleanup(auditSource, callback) {
+    assert.strictEqual(typeof auditSource, 'object');
     assert(!callback || typeof callback === 'function'); // callback is null when called from cronjob
 
     callback = callback || NOOP_CALLBACK;
@@ -571,12 +952,14 @@ function cleanup(callback) {
             return callback();
         }
 
-        cleanupBoxBackups(backupConfig, function (error, referencedAppBackups) {
+        cleanupBoxBackups(backupConfig, auditSource, function (error, referencedAppBackups) {
             if (error) return callback(error);
 
-            debug('cleanup: done cleaning box backups');
+            cleanupAppBackups(backupConfig, referencedAppBackups, function (error) {
+                if (error) return callback(error);
 
-            cleanupAppBackups(backupConfig, referencedAppBackups, callback);
+                cleanupSnapshots(backupConfig, callback);
+            });
         });
     });
 }

src/backuptask.js

@@ -1,7 +1,12 @@
-#!/usr/bin/env node
+#!/bin/bash
+':' //# comment; exec /usr/bin/env node --max_old_space_size=300 "$0" "$@"
+
+// to understand the above hack read http://sambal.org/2014/02/passing-options-node-shebang-line/
 
 'use strict';
 
+if (process.argv[2] === '--check') return console.log('OK');
+
 require('supererror')({ splatchError: true });
 
 // remove timestamp from debug() based output
@@ -10,29 +15,11 @@ require('debug').formatArgs = function formatArgs(args) {
 };
 
 var assert = require('assert'),
-    BackupsError = require('./backups.js').BackupsError,
-    caas = require('./storage/caas.js'),
+    backups = require('./backups.js'),
     database = require('./database.js'),
     debug = require('debug')('box:backuptask'),
-    filesystem = require('./storage/filesystem.js'),
-    noop = require('./storage/noop.js'),
-    path = require('path'),
     paths = require('./paths.js'),
-    s3 = require('./storage/s3.js'),
-    safe = require('safetydance'),
-    settings = require('./settings.js');
-
-function api(provider) {
-    switch (provider) {
-        case 'caas': return caas;
-        case 's3': return s3;
-        case 'filesystem': return filesystem;
-        case 'minio': return s3;
-        case 'exoscale-sos': return s3;
-        case 'noop': return noop;
-        default: return null;
-    }
-}
+    safe = require('safetydance');
 
 function initialize(callback) {
     assert.strictEqual(typeof callback, 'function');
@@ -40,52 +27,12 @@ function initialize(callback) {
     database.initialize(callback);
 }
 
-function backupApp(backupId, appId, callback) {
-    assert.strictEqual(typeof backupId, 'string');
-    assert.strictEqual(typeof appId, 'string');
-    assert.strictEqual(typeof callback, 'function');
-
-    debug('Start app backup with id %s for %s', backupId, appId);
-
-    settings.getBackupConfig(function (error, backupConfig) {
-        if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error));
-
-        var backupMapping = [{
-            source: path.join(paths.APPS_DATA_DIR, appId),
-            destination: '.'
-        }];
-
-        api(backupConfig.provider).backup(backupConfig, backupId, backupMapping, callback);
-    });
-}
-
-function backupBox(backupId, callback) {
-    assert.strictEqual(typeof backupId, 'string');
-    assert.strictEqual(typeof callback, 'function');
-
-    debug('Start box backup with id %s', backupId);
-
-    settings.getBackupConfig(function (error, backupConfig) {
-        if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error));
-
-        var backupMapping = [{
-            source: paths.BOX_DATA_DIR,
-            destination: 'box'
-        }, {
-            source: path.join(paths.PLATFORM_DATA_DIR, 'mail'),
-            destination: 'mail'
-        }];
-
-        api(backupConfig.provider).backup(backupConfig, backupId, backupMapping, callback);
-    });
-}
-
 // Main process starts here
 var backupId = process.argv[2];
-var appId = process.argv[3];
+var format = process.argv[3];
+var dataDir = process.argv[4];
 
-if (appId) debug('Backuptask for the app %s with id %s', appId, backupId);
-else debug('Backuptask for the whole Cloudron with id %s', backupId);
+debug(`Backing up ${dataDir} to ${backupId}`);
 
 process.on('SIGTERM', function () {
     process.exit(0);
@@ -94,7 +41,9 @@ process.on('SIGTERM', function () {
 initialize(function (error) {
     if (error) throw error;
 
-    function resultHandler(error) {
+    safe.fs.writeFileSync(paths.BACKUP_RESULT_FILE, '');
+
+    backups.upload(backupId, format, dataDir, function resultHandler(error) {
         if (error) debug('completed with error', error);
 
         debug('completed');
@@ -104,8 +53,5 @@ initialize(function (error) {
         // https://nodejs.org/api/process.html are exit codes used by node. apps.js uses the value below
         // to check apptask crashes
         process.exit(error ? 50 : 0);
-    }
-
-    if (appId) backupApp(backupId, appId, resultHandler);
-    else backupBox(backupId, resultHandler);
+    });
 });

src/cloudron.js

@@ -420,7 +420,7 @@ function getConfig(callback) {
                     fqdn: config.fqdn(),
                     version: config.version(),
                     update: updateChecker.getUpdateInfo(),
-                    progress: progress.get(),
+                    progress: progress.getAll(),
                     isCustomDomain: config.isCustomDomain(),
                     isDemo: config.isDemo(),
                     developerMode: developerMode,
@@ -576,7 +576,8 @@ function addDnsRecords(ip, callback) {
             });
         });
     }, function (error) {
-        debug('addDnsRecords: done updating records with error:', error);
+        if (error) debug('addDnsRecords: done updating records with error:', error);
+        else debug('addDnsRecords: done');
 
         callback(error);
     });

src/config.js

@@ -33,6 +33,7 @@ exports = module.exports = {
     appFqdn: appFqdn,
     zoneName: zoneName,
     setZoneName: setZoneName,
+    hasIPv6: hasIPv6,
 
     isDemo: isDemo,
 
@@ -232,3 +233,8 @@ function tlsKey() {
     var keyFile = path.join(baseDir(), 'configs/host.key');
     return safe.fs.readFileSync(keyFile, 'utf8');
 }
+
+function hasIPv6() {
+    // require here to avoid cyclic dependencies, it is cached anyways
+    return fs.existsSync(require('./paths.js').IPV6_PROC_FILE);
+}

src/cron.js

@@ -139,7 +139,7 @@ function recreateJobs(tz) {
     if (gCleanupBackupsJob) gCleanupBackupsJob.stop();
     gCleanupBackupsJob = new CronJob({
         cronTime: '00 45 */6 * * *', // every 6 hours. try not to overlap with ensureBackup job
-        onTick: backups.cleanup,
+        onTick: backups.cleanup.bind(null, AUDIT_SOURCE, NOOP_CALLBACK),
         start: true,
         timeZone: tz
     });

src/dns/caas.js

@@ -38,7 +38,7 @@ function add(dnsConfig, zoneName, subdomain, type, values, callback) {
         .send(data)
         .timeout(30 * 1000)
         .end(function (error, result) {
-            if (error && !error.response) return callback(error);
+            if (error && !error.response) return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, util.format('Network error %s', error.message)));
             if (result.statusCode === 400) return callback(new SubdomainError(SubdomainError.BAD_FIELD, result.body.message));
             if (result.statusCode === 420) return callback(new SubdomainError(SubdomainError.STILL_BUSY));
             if (result.statusCode !== 201) return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, util.format('%s %j', result.statusCode, result.body)));
@@ -63,7 +63,7 @@ function get(dnsConfig, zoneName, subdomain, type, callback) {
         .query({ token: dnsConfig.token, type: type })
         .timeout(30 * 1000)
         .end(function (error, result) {
-            if (error && !error.response) return callback(error);
+            if (error && !error.response) return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, util.format('Network error %s', error.message)));
             if (result.statusCode !== 200) return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, util.format('%s %j', result.statusCode, result.body)));
 
             return callback(null, result.body.values);
@@ -102,7 +102,7 @@ function del(dnsConfig, zoneName, subdomain, type, values, callback) {
         .send(data)
         .timeout(30 * 1000)
         .end(function (error, result) {
-            if (error && !error.response) return callback(error);
+            if (error && !error.response) return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, util.format('Network error %s', error.message)));
             if (result.statusCode === 400) return callback(new SubdomainError(SubdomainError.BAD_FIELD, result.body.message));
             if (result.statusCode === 420) return callback(new SubdomainError(SubdomainError.STILL_BUSY));
             if (result.statusCode === 404) return callback(new SubdomainError(SubdomainError.NOT_FOUND));

src/dns/cloudflare.js

@@ -66,18 +66,18 @@ function getDNSRecordsByZoneId(dnsConfig, zoneId, zoneName, subdomain, type, cal
     assert.strictEqual(typeof type, 'string');
     assert.strictEqual(typeof callback, 'function');
 
+    var fqdn = subdomain === '' ? zoneName : subdomain + '.' + zoneName;
+
     superagent.get(CLOUDFLARE_ENDPOINT + '/zones/' + zoneId + '/dns_records')
       .set('X-Auth-Key',dnsConfig.token)
       .set('X-Auth-Email',dnsConfig.email)
+      .query({ type: type, name: fqdn })
       .timeout(30 * 1000)
       .end(function (error, result) {
         if (error && !error.response) return callback(error);
         if (result.statusCode !== 200 || result.body.success !== true) return translateRequestError(result, callback);
 
-        var fqdn = subdomain === '' ? zoneName : subdomain + '.' + zoneName;
-        var tmp = result.body.result.filter(function (record) {
-            return (record.type === type && record.name === fqdn);
-        });
+        var tmp = result.body.result;
 
         return callback(null, tmp);
     });

src/dns/digitalocean.js

@@ -13,6 +13,7 @@ var assert = require('assert'),
     constants = require('../constants.js'),
     debug = require('debug')('box:dns/digitalocean'),
     dns = require('dns'),
+    safe = require('safetydance'),
     SubdomainError = require('../subdomains.js').SubdomainError,
     superagent = require('superagent'),
     util = require('util');
@@ -30,22 +31,34 @@ function getInternal(dnsConfig, zoneName, subdomain, type, callback) {
     assert.strictEqual(typeof type, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    superagent.get(DIGITALOCEAN_ENDPOINT + '/v2/domains/' + zoneName + '/records')
-      .set('Authorization', 'Bearer ' + dnsConfig.token)
-      .timeout(30 * 1000)
-      .end(function (error, result) {
-        if (error && !error.response) return callback(error);
-        if (result.statusCode === 404) return callback(new SubdomainError(SubdomainError.NOT_FOUND, formatError(result)));
-        if (result.statusCode === 403 || result.statusCode === 401) return callback(new SubdomainError(SubdomainError.ACCESS_DENIED, formatError(result)));
-        if (result.statusCode !== 200) return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, formatError(result)));
+    var nextPage = null, matchingRecords = [];
 
-        var tmp = result.body.domain_records.filter(function (record) {
-            return (record.type === type && record.name === subdomain);
+    async.doWhilst(function (iteratorDone) {
+        var url = nextPage ? nextPage : DIGITALOCEAN_ENDPOINT + '/v2/domains/' + zoneName + '/records';
+
+        superagent.get(url)
+          .set('Authorization', 'Bearer ' + dnsConfig.token)
+          .timeout(30 * 1000)
+          .end(function (error, result) {
+            if (error && !error.response) return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, util.format('Network error %s', error.message)));
+            if (result.statusCode === 404) return callback(new SubdomainError(SubdomainError.NOT_FOUND, formatError(result)));
+            if (result.statusCode === 403 || result.statusCode === 401) return callback(new SubdomainError(SubdomainError.ACCESS_DENIED, formatError(result)));
+            if (result.statusCode !== 200) return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, formatError(result)));
+
+            matchingRecords = matchingRecords.concat(result.body.domain_records.filter(function (record) {
+                return (record.type === type && record.name === subdomain);
+            }));
+
+            nextPage = (result.body.links && result.body.links.pages) ? result.body.links.pages.next : null;
+
+            iteratorDone();
         });
+    }, function () { return !!nextPage; }, function (error) {
+        if (error) return callback(error);
 
-        debug('getInternal: %j', tmp);
+        debug('getInternal: %j', matchingRecords);
 
-        return callback(null, tmp);
+        return callback(null, matchingRecords);
     });
 }
 
@@ -65,7 +78,7 @@ function upsert(dnsConfig, zoneName, subdomain, type, values, callback) {
         if (error) return callback(error);
 
         // used to track available records to update instead of create
-        var i = 0;
+        var i = 0, recordIds = [];
 
         async.eachSeries(values, function (value, callback) {
             var priority = null;
@@ -89,11 +102,13 @@ function upsert(dnsConfig, zoneName, subdomain, type, values, callback) {
                   .send(data)
                   .timeout(30 * 1000)
                   .end(function (error, result) {
-                    if (error && !error.response) return callback(error);
+                    if (error && !error.response) return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, util.format('Network error %s', error.message)));
                     if (result.statusCode === 403 || result.statusCode === 401) return callback(new SubdomainError(SubdomainError.ACCESS_DENIED, formatError(result)));
                     if (result.statusCode === 422) return callback(new SubdomainError(SubdomainError.BAD_FIELD, result.body.message));
                     if (result.statusCode !== 201) return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, formatError(result)));
 
+                    recordIds.push(safe.query(result.body, 'domain_record.id'));
+
                     return callback(null);
                 });
             } else {
@@ -105,18 +120,20 @@ function upsert(dnsConfig, zoneName, subdomain, type, values, callback) {
                     // increment, as we have consumed the record
                     ++i;
 
-                    if (error && !error.response) return callback(error);
+                    if (error && !error.response) return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, util.format('Network error %s', error.message)));
                     if (result.statusCode === 403 || result.statusCode === 401) return callback(new SubdomainError(SubdomainError.ACCESS_DENIED, formatError(result)));
                     if (result.statusCode === 422) return callback(new SubdomainError(SubdomainError.BAD_FIELD, result.body.message));
                     if (result.statusCode !== 200) return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, formatError(result)));
 
+                    recordIds.push(safe.query(result.body, 'domain_record.id'));
+
                     return callback(null);
                 });
             }
-        }, function (error) {
+        }, function (error, id) {
             if (error) return callback(error);
 
-            callback(null, 'unused');
+            callback(null, '' + recordIds[0]); // DO ids are integers
         });
     });
 }
@@ -169,7 +186,7 @@ function del(dnsConfig, zoneName, subdomain, type, values, callback) {
           .set('Authorization', 'Bearer ' + dnsConfig.token)
           .timeout(30 * 1000)
           .end(function (error, result) {
-            if (error && !error.response) return callback(error);
+            if (error && !error.response) return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, util.format('Network error %s', error.message)));
             if (result.statusCode === 404) return callback(null);
             if (result.statusCode === 403 || result.statusCode === 401) return callback(new SubdomainError(SubdomainError.ACCESS_DENIED, formatError(result)));
             if (result.statusCode !== 204) return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, formatError(result)));

src/dns/gcdns.js

@@ -0,0 +1,201 @@
+'use strict';
+
+exports = module.exports = {
+    upsert: upsert,
+    get: get,
+    del: del,
+    waitForDns: require('./waitfordns.js'),
+    verifyDnsConfig: verifyDnsConfig
+};
+
+var assert = require('assert'),
+    GCDNS = require('@google-cloud/dns'),
+    constants = require('../constants.js'),
+    debug = require('debug')('box:dns/gcdns'),
+    dns = require('dns'),
+    SubdomainError = require('../subdomains.js').SubdomainError,
+    util = require('util'),
+    _ = require('underscore');
+
+function getDnsCredentials(dnsConfig) {
+    assert.strictEqual(typeof dnsConfig, 'object');
+
+    var config = {
+        provider: dnsConfig.provider,
+        projectId: dnsConfig.projectId,
+        keyFilename: dnsConfig.keyFilename,
+        email: dnsConfig.email
+    };
+
+    if (dnsConfig.credentials) {
+        config.credentials = {
+            client_email: dnsConfig.credentials.client_email,
+            private_key: dnsConfig.credentials.private_key
+        };
+    }
+    return config;
+}
+
+function getZoneByName(dnsConfig, zoneName, callback) {
+    assert.strictEqual(typeof dnsConfig, 'object');
+    assert.strictEqual(typeof zoneName, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    var gcdns = GCDNS(getDnsCredentials(dnsConfig));
+
+    gcdns.getZones(function (error, zones) {
+        if (error && error.message === 'invalid_grant') return callback(new SubdomainError(SubdomainError.ACCESS_DENIED, 'The key was probably revoked'));
+        if (error && error.reason === 'No such domain') return callback(new SubdomainError(SubdomainError.NOT_FOUND, error.message));
+        if (error && error.code === 403) return callback(new SubdomainError(SubdomainError.ACCESS_DENIED, error.message));
+        if (error && error.code === 404) return callback(new SubdomainError(SubdomainError.NOT_FOUND, error.message));
+        if (error) {
+            debug('gcdns.getZones', error);
+            return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, error));
+        }
+
+        var zone = zones.filter(function (zone) {
+            return zone.metadata.dnsName.slice(0, -1) === zoneName;     // the zone name contains a '.' at the end
+        })[0];
+
+        if (!zone) return callback(new SubdomainError(SubdomainError.NOT_FOUND, 'no such zone'));
+
+        callback(null, zone); //zone.metadata ~= {name="", dnsName="", nameServers:[]}
+    });
+}
+
+function upsert(dnsConfig, zoneName, subdomain, type, values, callback) {
+    assert.strictEqual(typeof dnsConfig, 'object');
+    assert.strictEqual(typeof zoneName, 'string');
+    assert.strictEqual(typeof subdomain, 'string');
+    assert.strictEqual(typeof type, 'string');
+    assert(util.isArray(values));
+    assert.strictEqual(typeof callback, 'function');
+
+    debug('add: %s for zone %s of type %s with values %j', subdomain, zoneName, type, values);
+
+    getZoneByName(getDnsCredentials(dnsConfig), zoneName, function (error, zone) {
+        if (error) return callback(error);
+
+        var domain = (subdomain ? subdomain + '.' : '') + zoneName + '.';
+
+        zone.getRecords({ type: type, name: domain }, function (error, oldRecords) {
+            if (error && error.code === 403) return callback(new SubdomainError(SubdomainError.ACCESS_DENIED, error.message));
+            if (error) {
+                debug('upsert->zone.getRecords', error);
+                return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, error.message));
+            }
+
+            var newRecord = zone.record(type, {
+                name: domain,
+                data: values,
+                ttl: 1
+            });
+
+            zone.createChange({ delete: oldRecords, add: newRecord }, function(error, change) {
+                if (error && error.code === 403) return callback(new SubdomainError(SubdomainError.ACCESS_DENIED, error.message));
+                if (error && error.code === 412) return callback(new SubdomainError(SubdomainError.STILL_BUSY, error.message));
+                if (error) {
+                    debug('upsert->zone.createChange', error);
+                    return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, error.message));
+                }
+
+                callback(null, change.id);
+            });
+        });
+    });
+}
+
+function get(dnsConfig, zoneName, subdomain, type, callback) {
+    assert.strictEqual(typeof dnsConfig, 'object');
+    assert.strictEqual(typeof zoneName, 'string');
+    assert.strictEqual(typeof subdomain, 'string');
+    assert.strictEqual(typeof type, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    getZoneByName(getDnsCredentials(dnsConfig), zoneName, function (error, zone) {
+        if (error) return callback(error);
+
+        var params = {
+            name: (subdomain ? subdomain + '.' : '') + zoneName + '.',
+            type: type
+        };
+
+        zone.getRecords(params, function (error, records) {
+            if (error && error.code === 403) return callback(new SubdomainError(SubdomainError.ACCESS_DENIED, error.message));
+            if (error) return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, error));
+            if (records.length === 0) return callback(null, [ ]);
+
+            return callback(null, records[0].data);
+        });
+    });
+}
+
+function del(dnsConfig, zoneName, subdomain, type, values, callback) {
+    assert.strictEqual(typeof dnsConfig, 'object');
+    assert.strictEqual(typeof zoneName, 'string');
+    assert.strictEqual(typeof subdomain, 'string');
+    assert.strictEqual(typeof type, 'string');
+    assert(util.isArray(values));
+    assert.strictEqual(typeof callback, 'function');
+
+    getZoneByName(getDnsCredentials(dnsConfig), zoneName, function (error, zone) {
+        if (error) return callback(error);
+
+        var domain = (subdomain ? subdomain + '.' : '') + zoneName + '.';
+
+        zone.getRecords({ type: type, name: domain }, function(error, oldRecords) {
+            if (error && error.code === 403) return callback(new SubdomainError(SubdomainError.ACCESS_DENIED, error.message));
+            if (error) {
+                debug('del->zone.getRecords', error);
+                return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, error.message));
+            }
+
+            zone.deleteRecords(oldRecords, function (error, change) {
+                if (error && error.code === 403) return callback(new SubdomainError(SubdomainError.ACCESS_DENIED, error.message));
+                if (error && error.code === 412) return callback(new SubdomainError(SubdomainError.STILL_BUSY, error.message));
+                if (error) {
+                    debug('del->zone.createChange', error);
+                    return callback(new SubdomainError(SubdomainError.EXTERNAL_ERROR, error.message));
+                }
+
+                callback(null, change.id);
+            });
+        });
+    });
+}
+
+function verifyDnsConfig(dnsConfig, fqdn, zoneName, ip, callback) {
+    assert.strictEqual(typeof dnsConfig, 'object');
+    assert.strictEqual(typeof fqdn, 'string');
+    assert.strictEqual(typeof zoneName, 'string');
+    assert.strictEqual(typeof ip, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    var credentials = getDnsCredentials(dnsConfig);
+    if (process.env.BOX_ENV === 'test') return callback(null, credentials); // this shouldn't be here
+
+    dns.resolveNs(zoneName, function (error, resolvedNS) {
+        if (error && error.code === 'ENOTFOUND') return callback(new SubdomainError(SubdomainError.BAD_FIELD, 'Unable to resolve nameservers for this domain'));
+        if (error || !resolvedNS) return callback(new SubdomainError(SubdomainError.BAD_FIELD, error ? error.message : 'Unable to get nameservers'));
+
+        getZoneByName(credentials, zoneName, function (error, zone) {
+            if (error) return callback(error);
+
+            var definedNS = zone.metadata.nameServers.sort().map(function(r) { return r.replace(/\.$/, ''); });
+            if (!_.isEqual(definedNS, resolvedNS.sort())) {
+                debug('verifyDnsConfig: %j and %j do not match', resolvedNS, definedNS);
+                return callback(new SubdomainError(SubdomainError.BAD_FIELD, 'Domain nameservers are not set to Google Cloud DNS'));
+            }
+
+            const name = constants.ADMIN_LOCATION + (fqdn === zoneName ? '' :  '.' + fqdn.slice(0, - zoneName.length - 1));
+
+            upsert(credentials, zoneName, name, 'A', [ ip ], function (error, changeId) {
+                if (error) return callback(error);
+
+                debug('verifyDnsConfig: A record added with change id %s', changeId);
+
+                callback(null, credentials);
+            });
+        });
+    });
+}

src/docker.js

@@ -186,9 +186,9 @@ function createSubcontainer(app, name, cmd, options, callback) {
                 '/run': {}
             },
             Labels: {
-                "location": app.location,
-                "appId": app.id,
-                "isSubcontainer": String(!isAppContainer)
+                'location': app.location,
+                'appId': app.id,
+                'isSubcontainer': String(!isAppContainer)
             },
             HostConfig: {
                 Binds: addons.getBindsSync(app, app.manifest.addons),
@@ -198,15 +198,15 @@ function createSubcontainer(app, name, cmd, options, callback) {
                 PublishAllPorts: false,
                 ReadonlyRootfs: app.debugMode ? !!app.debugMode.readonlyRootfs : true,
                 RestartPolicy: {
-                    "Name": isAppContainer ? "always" : "no",
-                    "MaximumRetryCount": 0
+                    'Name': isAppContainer ? 'always' : 'no',
+                    'MaximumRetryCount': 0
                 },
                 CpuShares: 512, // relative to 1024 for system processes
-                VolumesFrom: isAppContainer ? null : [ app.containerId + ":rw" ],
+                VolumesFrom: isAppContainer ? null : [ app.containerId + ':rw' ],
                 NetworkMode: 'cloudron',
                 Dns: ['172.18.0.1'], // use internal dns
                 DnsSearch: ['.'], // use internal dns
-                SecurityOpt: enableSecurityOpt ? [ "apparmor=docker-cloudron-app" ] : null // profile available only on cloudron
+                SecurityOpt: enableSecurityOpt ? [ 'apparmor=docker-cloudron-app' ] : null // profile available only on cloudron
             }
         };
 
@@ -219,7 +219,7 @@ function createSubcontainer(app, name, cmd, options, callback) {
 
         containerOptions = _.extend(containerOptions, options);
 
-        debugApp(app, 'Creating container for %s with options %j', app.manifest.dockerImage, containerOptions);
+        debugApp(app, 'Creating container for %s', app.manifest.dockerImage);
 
         docker.createContainer(containerOptions, callback);
     });

src/email.js

@@ -3,6 +3,7 @@
 exports = module.exports = {
     verifyRelay: verifyRelay,
     getStatus: getStatus,
+    checkRblStatus: checkRblStatus,
 
     EmailError: EmailError
 };
@@ -14,6 +15,7 @@ var assert = require('assert'),
     constants = require('./constants.js'),
     debug = require('debug')('box:email'),
     dig = require('./dig.js'),
+    mailer = require('./mailer.js'),
     net = require('net'),
     nodemailer = require('nodemailer'),
     safe = require('safetydance'),
@@ -23,6 +25,8 @@ var assert = require('assert'),
     util = require('util'),
     _ = require('underscore');
 
+var NOOP_CALLBACK = function (error) { if (error) console.error(error); };
+
 const digOptions = { server: '127.0.0.1', port: 53, timeout: 5000 };
 
 function EmailError(reason, errorOrMessage) {
@@ -259,6 +263,100 @@ function checkPtr(callback) {
     });
 }
 
+// https://raw.githubusercontent.com/jawsome/node-dnsbl/master/list.json
+const RBL_LIST = [
+    {
+        "name": "Barracuda",
+        "dns": "b.barracudacentral.org",
+        "site": "http://www.barracudacentral.org/rbl/removal-request"
+    },
+    {
+        "name": "SpamCop",
+        "dns": "bl.spamcop.net",
+        "site": "http://spamcop.net"
+    },
+    {
+        "name": "Sorbs Aggregate Zone",
+        "dns": "dnsbl.sorbs.net",
+        "site": "http://dnsbl.sorbs.net/"
+    },
+    {
+        "name": "Sorbs spam.dnsbl Zone",
+        "dns": "spam.dnsbl.sorbs.net",
+        "site": "http://sorbs.net"
+    },
+    {
+        "name": "Composite Blocking List",
+        "dns": "cbl.abuseat.org",
+        "site": "http://www.abuseat.org"
+    },
+    {
+        "name": "SpamHaus Zen",
+        "dns": "zen.spamhaus.org",
+        "site": "http://spamhaus.org"
+    },
+    {
+        "name": "Multi SURBL",
+        "dns": "multi.surbl.org",
+        "site": "http://www.surbl.org"
+    },
+    {
+        "name": "Spam Cannibal",
+        "dns": "bl.spamcannibal.org",
+        "site": "http://www.spamcannibal.org/cannibal.cgi"
+    },
+    {
+        "name": "dnsbl.abuse.ch",
+        "dns": "spam.abuse.ch",
+        "site": "http://dnsbl.abuse.ch/"
+    },
+    {
+        "name": "The Unsubscribe Blacklist(UBL)",
+        "dns": "ubl.unsubscore.com ",
+        "site": "http://www.lashback.com/blacklist/"
+    },
+    {
+        "name": "UCEPROTECT Network",
+        "dns": "dnsbl-1.uceprotect.net",
+        "site": "http://www.uceprotect.net/en"
+    }
+];
+
+function checkRblStatus(callback) {
+    assert.strictEqual(typeof callback, 'function');
+
+    sysinfo.getPublicIp(function (error, ip) {
+        if (error) return callback(error, ip);
+
+        var flippedIp = ip.split('.').reverse().join('.');
+
+        // https://tools.ietf.org/html/rfc5782
+        async.map(RBL_LIST, function (rblServer, iteratorDone) {
+            dig.resolve(flippedIp + '.' + rblServer.dns, 'A', digOptions, function (error, records) {
+                if (error || !records) return iteratorDone(null, null);    // not listed
+
+                debug('checkRblStatus: %s (ip: %s) is in the blacklist of %j', config.fqdn(), flippedIp, rblServer);
+
+                var result = _.extend({ }, rblServer);
+
+                dig.resolve(flippedIp + '.' + rblServer.dns, 'TXT', digOptions, function (error, txtRecords) {
+                    result.txtRecords = error || !txtRecords ? 'No txt record' : txtRecords;
+
+                    debug('checkRblStatus: %s (error: %s) (txtRecords: %j)', config.fqdn(), error, txtRecords);
+
+                    return iteratorDone(null, result);
+                });
+            });
+        }, function (ignoredError, blacklistedServers) {
+            blacklistedServers = blacklistedServers.filter(function(b) { return b !== null; });
+
+            debug('checkRblStatus: %s (ip: %s) servers: %j', config.fqdn(), ip, blacklistedServers);
+
+            return callback(null, { status: blacklistedServers.length === 0, ip: ip, servers: blacklistedServers });
+        });
+    });
+}
+
 function getStatus(callback) {
     assert.strictEqual(typeof callback, 'function');
 
@@ -290,7 +388,8 @@ function getStatus(callback) {
                 recordResult('dns.spf', checkSpf),
                 recordResult('dns.dkim', checkDkim),
                 recordResult('dns.ptr', checkPtr),
-                recordResult('relay', checkOutboundPort25)
+                recordResult('relay', checkOutboundPort25),
+                recordResult('rbl', checkRblStatus)
             );
         } else {
             checks.push(recordResult('relay', checkSmtpRelay.bind(null, relay)));

src/eventlog.js

@@ -20,6 +20,7 @@ exports = module.exports = {
     ACTION_APP_LOGIN: 'app.login',
     ACTION_BACKUP_FINISH: 'backup.finish',
     ACTION_BACKUP_START: 'backup.start',
+    ACTION_BACKUP_CLEANUP: 'backup.cleanup',
     ACTION_CERTIFICATE_RENEWAL: 'certificate.renew',
     ACTION_CLI_MODE: 'settings.climode',
     ACTION_START: 'cloudron.start',

src/infra_version.js

@@ -7,7 +7,7 @@
 exports = module.exports = {
     // a major version makes all apps restore from backup
     // a minor version makes all apps re-configure themselves
-    'version': '48.5.0',
+    'version': '48.6.0',
 
     'baseImages': [ 'cloudron/base:0.10.0' ],
 
@@ -18,7 +18,7 @@ exports = module.exports = {
         'postgresql': { repo: 'cloudron/postgresql', tag: 'cloudron/postgresql:0.17.0' },
         'mongodb': { repo: 'cloudron/mongodb', tag: 'cloudron/mongodb:0.13.0' },
         'redis': { repo: 'cloudron/redis', tag: 'cloudron/redis:0.11.0' },
-        'mail': { repo: 'cloudron/mail', tag: 'cloudron/mail:0.36.3' },
-        'graphite': { repo: 'cloudron/graphite', tag: 'cloudron/graphite:0.11.0' }
+        'mail': { repo: 'cloudron/mail', tag: 'cloudron/mail:0.37.1' },
+        'graphite': { repo: 'cloudron/graphite', tag: 'cloudron/graphite:0.12.0' }
     }
 };

src/mail_templates/test.ejs

@@ -0,0 +1,11 @@
+<%if (format === 'text') { %>
+
+Test email from <%= fqdn %>,
+
+If you can read this, your Cloudron email settings are good.
+
+Sent at: <%= new Date().toUTCString() %>
+
+<% } else { %>
+
+<% } %>

src/mailer.js

@@ -30,11 +30,15 @@ exports = module.exports = {
     FEEDBACK_TYPE_UPGRADE_REQUEST: 'upgrade_request',
     sendFeedback: sendFeedback,
 
+    sendTestMail: sendTestMail,
+
     _getMailQueue: _getMailQueue,
     _clearMailQueue: _clearMailQueue
 };
 
-var assert = require('assert'),
+var appstore = require('./appstore.js'),
+    AppstoreError = appstore.AppstoreError,
+    assert = require('assert'),
     async = require('async'),
     config = require('./config.js'),
     debug = require('debug')('box:mailer'),
@@ -424,29 +428,34 @@ function sendDigest(info) {
                 cloudronName = 'Cloudron';
             }
 
-            var templateData = {
-                fqdn: config.fqdn(),
-                webadminUrl: config.adminOrigin(),
-                cloudronName: cloudronName,
-                cloudronAvatarUrl: config.adminOrigin() + '/api/v1/cloudron/avatar',
-                info: info
-            };
+            appstore.getAccount(function (error, appstoreProfile) {
+                if (error && error.reason !== AppstoreError.BILLING_REQUIRED) console.error(error);
+                if (appstoreProfile) adminEmails.push(appstoreProfile.email);
 
-            var templateDataText = JSON.parse(JSON.stringify(templateData));
-            templateDataText.format = 'text';
+                var templateData = {
+                    fqdn: config.fqdn(),
+                    webadminUrl: config.adminOrigin(),
+                    cloudronName: cloudronName,
+                    cloudronAvatarUrl: config.adminOrigin() + '/api/v1/cloudron/avatar',
+                    info: info
+                };
 
-            var templateDataHTML = JSON.parse(JSON.stringify(templateData));
-            templateDataHTML.format = 'html';
+                var templateDataText = JSON.parse(JSON.stringify(templateData));
+                templateDataText.format = 'text';
 
-            var mailOptions = {
-                from: mailConfig().from,
-                to: adminEmails.join(', '),
-                subject: util.format('[%s] Cloudron - Weekly activity digest', config.fqdn()),
-                text: render('digest.ejs', templateDataText),
-                html: render('digest.ejs', templateDataHTML)
-            };
+                var templateDataHTML = JSON.parse(JSON.stringify(templateData));
+                templateDataHTML.format = 'html';
 
-            enqueue(mailOptions);
+                var mailOptions = {
+                    from: mailConfig().from,
+                    to: adminEmails.join(', '),
+                    subject: util.format('[%s] Cloudron - Weekly activity digest', config.fqdn()),
+                    text: render('digest.ejs', templateDataText),
+                    html: render('digest.ejs', templateDataHTML)
+                };
+
+                enqueue(mailOptions);
+            });
         });
     });
 }
@@ -552,8 +561,8 @@ function sendFeedback(user, type, subject, description) {
         type === exports.FEEDBACK_TYPE_UPGRADE_REQUEST ||
         type === exports.FEEDBACK_TYPE_APP_ERROR);
 
-    var mailOptions = {
-        from: mailConfig().from,
+        var mailOptions = {
+            from: mailConfig().from,
         to: 'support@cloudron.io',
         subject: util.format('[%s] %s - %s', type, config.fqdn(), subject),
         text: render('feedback.ejs', { fqdn: config.fqdn(), type: type, user: user, subject: subject, description: description, format: 'text'})
@@ -562,6 +571,19 @@ function sendFeedback(user, type, subject, description) {
     enqueue(mailOptions);
 }
 
+function sendTestMail(email) {
+    assert.strictEqual(typeof email, 'string');
+
+    var mailOptions = {
+        from: mailConfig().from,
+        to: email,
+        subject: util.format('Test Email from %s', config.fqdn()),
+        text: render('test.ejs', { fqdn: config.fqdn(), format: 'text'})
+    };
+
+    enqueue(mailOptions);
+}
+
 function _getMailQueue() {
     return gMailQueue;
 }

src/nginx.js

@@ -32,6 +32,7 @@ function configureAdmin(certFilePath, keyFilePath, configFileName, vhost, callba
         sourceDir: path.resolve(__dirname, '..'),
         adminOrigin: config.adminOrigin(),
         vhost: vhost, // if vhost is empty it will become the default_server
+        hasIPv6: config.hasIPv6(),
         endpoint: 'admin',
         certFilePath: certFilePath,
         keyFilePath: keyFilePath,
@@ -60,6 +61,7 @@ function configureApp(app, certFilePath, keyFilePath, callback) {
         sourceDir: sourceDir,
         adminOrigin: config.adminOrigin(),
         vhost: vhost,
+        hasIPv6: config.hasIPv6(),
         port: app.httpPort,
         endpoint: endpoint,
         certFilePath: certFilePath,

src/paths.js

@@ -7,7 +7,8 @@ var config = require('./config.js'),
 exports = module.exports = {
     CLOUDRON_DEFAULT_AVATAR_FILE: path.join(__dirname + '/../assets/avatar.png'),
     INFRA_VERSION_FILE: path.join(config.baseDir(), 'platformdata/INFRA_VERSION'),
-    BACKUP_RESULT_FILE: path.join(config.baseDir(), 'platformdata/backupresult'),
+    BACKUP_RESULT_FILE: path.join(config.baseDir(), 'platformdata/backup/result.txt'),
+    BACKUP_LOG_FILE: path.join(config.baseDir(), 'platformdata/backup/logs.txt'),
 
     OLD_DATA_DIR: path.join(config.baseDir(), 'data'),
     PLATFORM_DATA_DIR: path.join(config.baseDir(), 'platformdata'),
@@ -18,14 +19,17 @@ exports = module.exports = {
     ADDON_CONFIG_DIR: path.join(config.baseDir(), 'platformdata/addons'),
     COLLECTD_APPCONFIG_DIR: path.join(config.baseDir(), 'platformdata/collectd/collectd.conf.d'),
     LOGROTATE_CONFIG_DIR: path.join(config.baseDir(), 'platformdata/logrotate.d'),
-    MAIL_DATA_DIR: path.join(config.baseDir(), 'platformdata/mail'),
+    IPV6_PROC_FILE: '/proc/net/if_inet6',
     NGINX_CONFIG_DIR: path.join(config.baseDir(), 'platformdata/nginx'),
     NGINX_APPCONFIG_DIR: path.join(config.baseDir(), 'platformdata/nginx/applications'),
     NGINX_CERT_DIR: path.join(config.baseDir(), 'platformdata/nginx/cert'),
+    BACKUP_INFO_DIR: path.join(config.baseDir(), 'platformdata/backup'),
+    SNAPSHOT_INFO_FILE: path.join(config.baseDir(), 'platformdata/backup/snapshot-info.json'),
 
     // this is not part of appdata because an icon may be set before install
-    ACME_ACCOUNT_KEY_FILE: path.join(config.baseDir(), 'boxdata/acme/acme.key'),
     APP_ICONS_DIR: path.join(config.baseDir(), 'boxdata/appicons'),
+    MAIL_DATA_DIR: path.join(config.baseDir(), 'boxdata/mail'),
+    ACME_ACCOUNT_KEY_FILE: path.join(config.baseDir(), 'boxdata/acme/acme.key'),
     APP_CERTS_DIR: path.join(config.baseDir(), 'boxdata/certs'),
     CLOUDRON_AVATAR_FILE: path.join(config.baseDir(), 'boxdata/avatar.png'),
     FIRST_RUN_FILE: path.join(config.baseDir(), 'boxdata/first_run'),

src/platform.js

@@ -162,7 +162,7 @@ function startMysql(callback) {
     const memoryLimit = (1 + Math.round(os.totalmem()/(1024*1024*1024)/4)) * 256;
 
     if (!safe.fs.writeFileSync(paths.ADDON_CONFIG_DIR + '/mysql_vars.sh',
-            'MYSQL_ROOT_PASSWORD=' + rootPassword +'\nMYSQL_ROOT_HOST=172.18.0.1', 'utf8')) {
+        'MYSQL_ROOT_PASSWORD=' + rootPassword +'\nMYSQL_ROOT_HOST=172.18.0.1', 'utf8')) {
         return callback(new Error('Could not create mysql var file:' + safe.error.message));
     }
 
@@ -261,10 +261,10 @@ function createMailConfig(callback) {
             var relay = result[settings.MAIL_RELAY_KEY];
 
             const enabled = relay.provider !== 'cloudron-smtp' ? true : false,
-                  host = relay.host || '',
-                  port = relay.port || 25,
-                  username = relay.username || '',
-                  password = relay.password || '';
+                host = relay.host || '',
+                port = relay.port || 25,
+                username = relay.username || '',
+                password = relay.password || '';
 
             if (!safe.fs.writeFileSync(paths.ADDON_CONFIG_DIR + '/mail/smtp_forward.ini',
                 `enable_outbound=${enabled}\nhost=${host}\nport=${port}\nenable_tls=true\nauth_type=plain\nauth_user=${username}\nauth_pass=${password}`, 'utf8')) {
@@ -283,13 +283,13 @@ function startMail(callback) {
     // mail container uses /app/data for backed up data and /run for restart-able data
 
     const tag = infra.images.mail.tag;
-    const dataDir = paths.PLATFORM_DATA_DIR;
     const memoryLimit = Math.max((1 + Math.round(os.totalmem()/(1024*1024*1024)/4)) * 128, 256);
 
     // admin and mail share the same certificate
     certificates.getAdminCertificate(function (error, cert, key) {
         if (error) return callback(error);
 
+        // the setup script copies dhparams.pem to /addons/mail
         if (!safe.fs.writeFileSync(paths.ADDON_CONFIG_DIR + '/mail/tls_cert.pem', cert)) return callback(new Error('Could not create cert file:' + safe.error.message));
         if (!safe.fs.writeFileSync(paths.ADDON_CONFIG_DIR + '/mail/tls_key.pem', key))  return callback(new Error('Could not create key file:' + safe.error.message));
 
@@ -311,8 +311,8 @@ function startMail(callback) {
                             --dns 172.18.0.1 \
                             --dns-search=. \
                             --env ENABLE_MDA=${mailConfig.enabled} \
-                            -v "${dataDir}/mail:/app/data" \
-                            -v "${dataDir}/addons/mail:/etc/mail" \
+                            -v "${paths.MAIL_DATA_DIR}:/app/data" \
+                            -v "${paths.PLATFORM_DATA_DIR}/addons/mail:/etc/mail" \
                             ${ports} \
                             --read-only -v /run -v /tmp ${tag}`;
 

src/progress.js

@@ -2,8 +2,9 @@
 
 exports = module.exports = {
     set: set,
+    setDetail: setDetail,
     clear: clear,
-    get: get,
+    getAll: getAll,
 
     UPDATE: 'update',
     BACKUP: 'backup',
@@ -11,6 +12,7 @@ exports = module.exports = {
 };
 
 var assert = require('assert'),
+    config = require('./config.js'),
     debug = require('debug')('box:progress');
 
 // if progress.update or progress.backup are object, they will contain 'percent' and 'message' properties
@@ -29,12 +31,22 @@ function set(tag, percent, message) {
 
     progress[tag] = {
         percent: percent,
-        message: message
+        message: message,
+        detail: ''
     };
 
     debug('%s: %s %s', tag, percent, message);
 }
 
+function setDetail(tag, detail) {
+    assert.strictEqual(typeof tag, 'string');
+    assert.strictEqual(typeof detail, 'string');
+
+    if (config.TEST && !progress[tag]) progress[tag] = { };
+
+    progress[tag].detail = detail;
+}
+
 function clear(tag) {
     assert.strictEqual(typeof tag, 'string');
 
@@ -43,6 +55,6 @@ function clear(tag) {
     debug('clearing %s', tag);
 }
 
-function get() {
+function getAll() {
     return progress;
 }

src/routes/cloudron.js

@@ -15,7 +15,8 @@ exports = module.exports = {
     feedback: feedback,
     checkForUpdates: checkForUpdates,
     getLogs: getLogs,
-    getLogStream: getLogStream
+    getLogStream: getLogStream,
+    sendTestMail: sendTestMail
 };
 
 var assert = require('assert'),
@@ -141,7 +142,7 @@ function getStatus(req, res, next) {
 }
 
 function getProgress(req, res, next) {
-    return next(new HttpSuccess(200, progress.get()));
+    return next(new HttpSuccess(200, progress.getAll()));
 }
 
 function reboot(req, res, next) {
@@ -301,3 +302,13 @@ function getLogStream(req, res, next) {
         logStream.on('error', res.end.bind(res, null));
     });
 }
+
+function sendTestMail(req, res, next) {
+    assert.strictEqual(typeof req.body, 'object');
+
+    if (!req.body.email || typeof req.body.email !== 'string') return next(new HttpError(400, 'email must be a non-empty string'));
+
+    mailer.sendTestMail(req.body.email);
+
+    next(new HttpSuccess(202));
+}

src/routes/settings.js

@@ -274,6 +274,7 @@ function setBackupConfig(req, res, next) {
     if (typeof req.body.provider !== 'string') return next(new HttpError(400, 'provider is required'));
     if (typeof req.body.retentionSecs !== 'number') return next(new HttpError(400, 'retentionSecs is required'));
     if ('key' in req.body && typeof req.body.key !== 'string') return next(new HttpError(400, 'key must be a string'));
+    if (typeof req.body.format !== 'string') return next(new HttpError(400, 'format must be a string'));
 
     settings.setBackupConfig(req.body, function (error) {
         if (error && error.reason === SettingsError.BAD_FIELD) return next(new HttpError(400, error.message));

src/routes/test/backups-test.js

@@ -10,7 +10,6 @@ var appdb = require('../../appdb.js'),
     config = require('../../config.js'),
     database = require('../../database.js'),
     expect = require('expect.js'),
-    hock = require('hock'),
     http = require('http'),
     nock = require('nock'),
     superagent = require('superagent'),
@@ -23,7 +22,6 @@ var SERVER_URL = 'http://localhost:' + config.get('port');
 var USERNAME = 'superadmin', PASSWORD = 'Foobar?1337', EMAIL ='silly@me.com';
 var token = null;
 
-var server;
 function setup(done) {
     nock.cleanAll();
     config._reset();
@@ -40,19 +38,19 @@ function setup(done) {
             var scope2 = nock(config.apiServerOrigin()).post('/api/v1/boxes/' + config.fqdn() + '/setup/done?setupToken=somesetuptoken').reply(201, {});
 
             superagent.post(SERVER_URL + '/api/v1/cloudron/activate')
-                   .query({ setupToken: 'somesetuptoken' })
-                   .send({ username: USERNAME, password: PASSWORD, email: EMAIL })
-                   .end(function (error, result) {
-                expect(result).to.be.ok();
-                expect(result.statusCode).to.eql(201);
-                expect(scope1.isDone()).to.be.ok();
-                expect(scope2.isDone()).to.be.ok();
+                .query({ setupToken: 'somesetuptoken' })
+                .send({ username: USERNAME, password: PASSWORD, email: EMAIL })
+                .end(function (error, result) {
+                    expect(result).to.be.ok();
+                    expect(result.statusCode).to.eql(201);
+                    expect(scope1.isDone()).to.be.ok();
+                    expect(scope2.isDone()).to.be.ok();
 
-                // stash token for further use
-                token = result.body.token;
+                    // stash token for further use
+                    token = result.body.token;
 
-                callback();
-            });
+                    callback();
+                });
         },
 
         function addApp(callback) {
@@ -61,7 +59,7 @@ function setup(done) {
         },
 
         function createSettings(callback) {
-            settings.setBackupConfig({ provider: 'caas', token: 'BACKUP_TOKEN', bucket: 'Bucket', prefix: 'Prefix' }, callback);
+            settings.setBackupConfig({ provider: 'filesystem', backupFolder: '/tmp', format: 'tgz' }, callback);
         }
     ], done);
 }
@@ -75,19 +73,12 @@ function cleanup(done) {
 }
 
 describe('Backups API', function () {
-    var apiHockInstance = hock.createHock({ throwOnUnmatched: false }), apiHockServer;
+    var scope1 = nock(config.apiServerOrigin()).post('/api/v1/boxes/' + config.fqdn() + '/awscredentials?token=BACKUP_TOKEN')
+        .reply(201, { credentials: { AccessKeyId: 'accessKeyId', SecretAccessKey: 'secretAccessKey' } }, { 'Content-Type': 'application/json' });
 
     before(setup);
-    before(function (done) {
-        apiHockInstance
-            .post('/api/v1/boxes/' + config.fqdn() + '/awscredentials?token=BACKUP_TOKEN')
-            .reply(201, { credentials: { AccessKeyId: 'accessKeyId', SecretAccessKey: 'secretAccessKey' } }, { 'Content-Type': 'application/json' });
-        var port = parseInt(url.parse(config.apiServerOrigin()).port, 10);
-        apiHockServer = http.createServer(apiHockInstance.handler).listen(port, done);
-    });
 
     after(function (done) {
-        apiHockServer.close();
         done();
     });
     after(cleanup);
@@ -95,37 +86,35 @@ describe('Backups API', function () {
     describe('create', function () {
         it('fails due to mising token', function (done) {
             superagent.post(SERVER_URL + '/api/v1/backups')
-                   .end(function (error, result) {
-                expect(result.statusCode).to.equal(401);
-                done();
-            });
+                .end(function (error, result) {
+                    expect(result.statusCode).to.equal(401);
+                    done();
+                });
         });
 
         it('fails due to wrong token', function (done) {
             superagent.post(SERVER_URL + '/api/v1/backups')
-                   .query({ access_token: token.toUpperCase() })
-                   .end(function (error, result) {
-                expect(result.statusCode).to.equal(401);
-                done();
-            });
+                .query({ access_token: token.toUpperCase() })
+                .end(function (error, result) {
+                    expect(result.statusCode).to.equal(401);
+                    done();
+                });
         });
 
         it('succeeds', function (done) {
             superagent.post(SERVER_URL + '/api/v1/backups')
-                   .query({ access_token: token })
-                   .end(function (error, result) {
-                expect(result.statusCode).to.equal(202);
+                .query({ access_token: token })
+                .end(function (error, result) {
+                    expect(result.statusCode).to.equal(202);
 
-                function checkAppstoreServerCalled() {
-                    apiHockInstance.done(function (error) {
-                        if (!error) return done();
+                    function checkAppstoreServerCalled() {
+                        if (scope1.isDone()) return done();
 
                         setTimeout(checkAppstoreServerCalled, 100);
-                    });
-                }
+                    }
 
-                checkAppstoreServerCalled();
-            });
+                    checkAppstoreServerCalled();
+                });
         });
     });
 });

src/routes/test/cloudron-test.js

@@ -25,7 +25,6 @@ var USERNAME = 'superadmin', PASSWORD = 'Foobar?1337', EMAIL ='silly@me.com';
 var token = null; // authentication token
 var USERNAME_1 = 'userTheFirst', EMAIL_1 = 'taO@zen.mac', userId_1, token_1;
 
-var server;
 function setup(done) {
     nock.cleanAll();
     config._reset();
@@ -34,7 +33,7 @@ function setup(done) {
 
     server.start(function (error) {
         if (error) return done(error);
-        settings.setBackupConfig({ provider: 'caas', token: 'BACKUP_TOKEN', bucket: 'Bucket', prefix: 'Prefix' }, done);
+        settings.setBackupConfig({ provider: 'filesystem', backupFolder: '/tmp', format: 'tgz' }, done);
     });
 }
 
@@ -67,89 +66,89 @@ describe('Cloudron', function () {
 
         it('fails due to missing setupToken', function (done) {
             superagent.post(SERVER_URL + '/api/v1/cloudron/activate')
-                   .send({ username: '', password: 'somepassword', email: 'admin@foo.bar' })
-                   .end(function (error, result) {
-                expect(result.statusCode).to.equal(400);
-                done();
-            });
+                .send({ username: '', password: 'somepassword', email: 'admin@foo.bar' })
+                .end(function (error, result) {
+                    expect(result.statusCode).to.equal(400);
+                    done();
+                });
         });
 
         it('fails due to internal server error on appstore side', function (done) {
             var scope = nock(config.apiServerOrigin()).get('/api/v1/boxes/' + config.fqdn() + '/setup/verify?setupToken=somesetuptoken').reply(500, { message: 'this is wrong' });
 
             superagent.post(SERVER_URL + '/api/v1/cloudron/activate')
-                   .query({ setupToken: 'somesetuptoken' })
-                   .send({ username: 'someuser', password: 'strong#A3asdf', email: 'admin@foo.bar' })
-                   .end(function (error, result) {
-                expect(result.statusCode).to.equal(500);
-                expect(scope.isDone()).to.be.ok();
-                done();
-            });
+                .query({ setupToken: 'somesetuptoken' })
+                .send({ username: 'someuser', password: 'strong#A3asdf', email: 'admin@foo.bar' })
+                .end(function (error, result) {
+                    expect(result.statusCode).to.equal(500);
+                    expect(scope.isDone()).to.be.ok();
+                    done();
+                });
         });
 
         it('fails due to empty username', function (done) {
             var scope = nock(config.apiServerOrigin()).get('/api/v1/boxes/' + config.fqdn() + '/setup/verify?setupToken=somesetuptoken').reply(200, {});
 
             superagent.post(SERVER_URL + '/api/v1/cloudron/activate')
-                   .query({ setupToken: 'somesetuptoken' })
-                   .send({ username: '', password: 'ADSFsdf$%436', email: 'admin@foo.bar' })
-                   .end(function (error, result) {
-                expect(result.statusCode).to.equal(400);
-                expect(scope.isDone()).to.be.ok();
-                done();
-            });
+                .query({ setupToken: 'somesetuptoken' })
+                .send({ username: '', password: 'ADSFsdf$%436', email: 'admin@foo.bar' })
+                .end(function (error, result) {
+                    expect(result.statusCode).to.equal(400);
+                    expect(scope.isDone()).to.be.ok();
+                    done();
+                });
         });
 
         it('fails due to empty password', function (done) {
             var scope = nock(config.apiServerOrigin()).get('/api/v1/boxes/' + config.fqdn() + '/setup/verify?setupToken=somesetuptoken').reply(200, {});
 
             superagent.post(SERVER_URL + '/api/v1/cloudron/activate')
-                   .query({ setupToken: 'somesetuptoken' })
-                   .send({ username: 'someuser', password: '', email: 'admin@foo.bar' })
-                   .end(function (error, result) {
-                expect(result.statusCode).to.equal(400);
-                expect(scope.isDone()).to.be.ok();
-                done();
-            });
+                .query({ setupToken: 'somesetuptoken' })
+                .send({ username: 'someuser', password: '', email: 'admin@foo.bar' })
+                .end(function (error, result) {
+                    expect(result.statusCode).to.equal(400);
+                    expect(scope.isDone()).to.be.ok();
+                    done();
+                });
         });
 
         it('fails due to empty email', function (done) {
             var scope = nock(config.apiServerOrigin()).get('/api/v1/boxes/' + config.fqdn() + '/setup/verify?setupToken=somesetuptoken').reply(200, {});
 
             superagent.post(SERVER_URL + '/api/v1/cloudron/activate')
-                   .query({ setupToken: 'somesetuptoken' })
-                   .send({ username: 'someuser', password: 'ADSF#asd546', email: '' })
-                   .end(function (error, result) {
-                expect(result.statusCode).to.equal(400);
-                expect(scope.isDone()).to.be.ok();
-                done();
-            });
+                .query({ setupToken: 'somesetuptoken' })
+                .send({ username: 'someuser', password: 'ADSF#asd546', email: '' })
+                .end(function (error, result) {
+                    expect(result.statusCode).to.equal(400);
+                    expect(scope.isDone()).to.be.ok();
+                    done();
+                });
         });
 
         it('fails due to wrong displayName type', function (done) {
             var scope = nock(config.apiServerOrigin()).get('/api/v1/boxes/' + config.fqdn() + '/setup/verify?setupToken=somesetuptoken').reply(200, {});
 
             superagent.post(SERVER_URL + '/api/v1/cloudron/activate')
-                   .query({ setupToken: 'somesetuptoken' })
-                   .send({ username: 'someuser', password: 'ADSF?#asd546', email: 'admin@foo.bar', displayName: 1234 })
-                   .end(function (error, result) {
-                expect(result.statusCode).to.equal(400);
-                expect(scope.isDone()).to.be.ok();
-                done();
-            });
+                .query({ setupToken: 'somesetuptoken' })
+                .send({ username: 'someuser', password: 'ADSF?#asd546', email: 'admin@foo.bar', displayName: 1234 })
+                .end(function (error, result) {
+                    expect(result.statusCode).to.equal(400);
+                    expect(scope.isDone()).to.be.ok();
+                    done();
+                });
         });
 
         it('fails due to invalid email', function (done) {
             var scope = nock(config.apiServerOrigin()).get('/api/v1/boxes/' + config.fqdn() + '/setup/verify?setupToken=somesetuptoken').reply(200, {});
 
             superagent.post(SERVER_URL + '/api/v1/cloudron/activate')
-                   .query({ setupToken: 'somesetuptoken' })
-                   .send({ username: 'someuser', password: 'ADSF#asd546', email: 'invalidemail' })
-                   .end(function (error, result) {
-                expect(result.statusCode).to.equal(400);
-                expect(scope.isDone()).to.be.ok();
-                done();
-            });
+                .query({ setupToken: 'somesetuptoken' })
+                .send({ username: 'someuser', password: 'ADSF#asd546', email: 'invalidemail' })
+                .end(function (error, result) {
+                    expect(result.statusCode).to.equal(400);
+                    expect(scope.isDone()).to.be.ok();
+                    done();
+                });
         });
 
         it('succeeds', function (done) {
@@ -157,27 +156,27 @@ describe('Cloudron', function () {
             var scope2 = nock(config.apiServerOrigin()).post('/api/v1/boxes/' + config.fqdn() + '/setup/done?setupToken=somesetuptoken').reply(201, {});
 
             superagent.post(SERVER_URL + '/api/v1/cloudron/activate')
-                   .query({ setupToken: 'somesetuptoken' })
-                   .send({ username: 'someuser', password: 'ADSF#asd546', email: 'admin@foo.bar', displayName: 'tester' })
-                   .end(function (error, result) {
-                expect(result.statusCode).to.equal(201);
-                expect(scope1.isDone()).to.be.ok();
-                expect(scope2.isDone()).to.be.ok();
-                done();
-            });
+                .query({ setupToken: 'somesetuptoken' })
+                .send({ username: 'someuser', password: 'ADSF#asd546', email: 'admin@foo.bar', displayName: 'tester' })
+                .end(function (error, result) {
+                    expect(result.statusCode).to.equal(201);
+                    expect(scope1.isDone()).to.be.ok();
+                    expect(scope2.isDone()).to.be.ok();
+                    done();
+                });
         });
 
         it('fails the second time', function (done) {
             var scope = nock(config.apiServerOrigin()).get('/api/v1/boxes/' + config.fqdn() + '/setup/verify?setupToken=somesetuptoken').reply(200, {});
 
             superagent.post(SERVER_URL + '/api/v1/cloudron/activate')
-                   .query({ setupToken: 'somesetuptoken' })
-                   .send({ username: 'someuser', password: 'ADSF#asd546', email: 'admin@foo.bar' })
-                   .end(function (error, result) {
-                expect(result.statusCode).to.equal(409);
-                expect(scope.isDone()).to.be.ok();
-                done();
-            });
+                .query({ setupToken: 'somesetuptoken' })
+                .send({ username: 'someuser', password: 'ADSF#asd546', email: 'admin@foo.bar' })
+                .end(function (error, result) {
+                    expect(result.statusCode).to.equal(409);
+                    expect(scope.isDone()).to.be.ok();
+                    done();
+                });
         });
     });
 
@@ -193,34 +192,34 @@ describe('Cloudron', function () {
                     config._reset();
 
                     superagent.post(SERVER_URL + '/api/v1/cloudron/activate')
-                           .query({ setupToken: 'somesetuptoken' })
-                           .send({ username: USERNAME, password: PASSWORD, email: EMAIL })
-                           .end(function (error, result) {
-                        expect(result).to.be.ok();
-                        expect(scope1.isDone()).to.be.ok();
-                        expect(scope2.isDone()).to.be.ok();
+                        .query({ setupToken: 'somesetuptoken' })
+                        .send({ username: USERNAME, password: PASSWORD, email: EMAIL })
+                        .end(function (error, result) {
+                            expect(result).to.be.ok();
+                            expect(scope1.isDone()).to.be.ok();
+                            expect(scope2.isDone()).to.be.ok();
 
-                        // stash token for further use
-                        token = result.body.token;
+                            // stash token for further use
+                            token = result.body.token;
 
-                        callback();
-                    });
+                            callback();
+                        });
                 },
 
                 function (callback) {
                     superagent.post(SERVER_URL + '/api/v1/users')
-                           .query({ access_token: token })
-                           .send({ username: USERNAME_1, email: EMAIL_1, invite: false })
-                           .end(function (error, result) {
-                        expect(result).to.be.ok();
-                        expect(result.statusCode).to.eql(201);
+                        .query({ access_token: token })
+                        .send({ username: USERNAME_1, email: EMAIL_1, invite: false })
+                        .end(function (error, result) {
+                            expect(result).to.be.ok();
+                            expect(result.statusCode).to.eql(201);
 
-                        token_1 = tokendb.generateToken();
-                        userId_1 = result.body.id;
+                            token_1 = tokendb.generateToken();
+                            userId_1 = result.body.id;
 
-                        // HACK to get a token for second user (passwords are generated and the user should have gotten a password setup link...)
-                        tokendb.add(token_1, userId_1, 'test-client-id',  Date.now() + 100000, '*', callback);
-                    });
+                            // HACK to get a token for second user (passwords are generated and the user should have gotten a password setup link...)
+                            tokendb.add(token_1, userId_1, 'test-client-id',  Date.now() + 100000, '*', callback);
+                        });
                 }
             ], done);
         });
@@ -229,86 +228,85 @@ describe('Cloudron', function () {
 
         it('cannot get without token', function (done) {
             superagent.get(SERVER_URL + '/api/v1/cloudron/config')
-                   .end(function (error, result) {
-                expect(result.statusCode).to.equal(401);
-                done();
-            });
+                .end(function (error, result) {
+                    expect(result.statusCode).to.equal(401);
+                    done();
+                });
         });
 
         it('succeeds without appstore', function (done) {
             superagent.get(SERVER_URL + '/api/v1/cloudron/config')
-                   .query({ access_token: token })
-                   .end(function (error, result) {
-                expect(result.statusCode).to.equal(200);
-                expect(result.body.apiServerOrigin).to.eql('http://localhost:6060');
-                expect(result.body.webServerOrigin).to.eql(null);
-                expect(result.body.fqdn).to.eql(config.fqdn());
-                expect(result.body.isCustomDomain).to.eql(true);
-                expect(result.body.progress).to.be.an('object');
-                expect(result.body.update).to.be.an('object');
-                expect(result.body.version).to.eql(config.version());
-                expect(result.body.developerMode).to.be.a('boolean');
-                expect(result.body.size).to.eql(null);
-                expect(result.body.region).to.eql(null);
-                expect(result.body.memory).to.eql(os.totalmem());
-                expect(result.body.cloudronName).to.be.a('string');
+                .query({ access_token: token })
+                .end(function (error, result) {
+                    expect(result.statusCode).to.equal(200);
+                    expect(result.body.apiServerOrigin).to.eql('http://localhost:6060');
+                    expect(result.body.webServerOrigin).to.eql(null);
+                    expect(result.body.fqdn).to.eql(config.fqdn());
+                    expect(result.body.isCustomDomain).to.eql(true);
+                    expect(result.body.progress).to.be.an('object');
+                    expect(result.body.update).to.be.an('object');
+                    expect(result.body.version).to.eql(config.version());
+                    expect(result.body.developerMode).to.be.a('boolean');
+                    expect(result.body.size).to.eql(null);
+                    expect(result.body.region).to.eql(null);
+                    expect(result.body.memory).to.eql(os.totalmem());
+                    expect(result.body.cloudronName).to.be.a('string');
 
-                done();
-            });
+                    done();
+                });
         });
 
         it('succeeds (admin)', function (done) {
             var scope = nock(config.apiServerOrigin())
-                  .get('/api/v1/boxes/localhost?token=' + config.token())
-                  .reply(200, { box: { region: 'sfo', size: '1gb' }, user: { }});
+                .get('/api/v1/boxes/localhost?token=' + config.token())
+                .reply(200, { box: { region: 'sfo', size: '1gb' }, user: { }});
 
             superagent.get(SERVER_URL + '/api/v1/cloudron/config')
-                   .query({ access_token: token })
-                   .end(function (error, result) {
-                expect(result.statusCode).to.equal(200);
-                expect(result.body.apiServerOrigin).to.eql('http://localhost:6060');
-                expect(result.body.webServerOrigin).to.eql(null);
-                expect(result.body.fqdn).to.eql(config.fqdn());
-                expect(result.body.isCustomDomain).to.eql(true);
-                expect(result.body.progress).to.be.an('object');
-                expect(result.body.update).to.be.an('object');
-                expect(result.body.version).to.eql(config.version());
-                expect(result.body.developerMode).to.be.a('boolean');
-                expect(result.body.size).to.eql('1gb');
-                expect(result.body.region).to.eql('sfo');
-                expect(result.body.memory).to.eql(os.totalmem());
-                expect(result.body.cloudronName).to.be.a('string');
-                expect(result.body.provider).to.be.a('string');
+                .query({ access_token: token })
+                .end(function (error, result) {
+                    expect(result.statusCode).to.equal(200);
+                    expect(result.body.apiServerOrigin).to.eql('http://localhost:6060');
+                    expect(result.body.webServerOrigin).to.eql(null);
+                    expect(result.body.fqdn).to.eql(config.fqdn());
+                    expect(result.body.isCustomDomain).to.eql(true);
+                    expect(result.body.progress).to.be.an('object');
+                    expect(result.body.update).to.be.an('object');
+                    expect(result.body.version).to.eql(config.version());
+                    expect(result.body.developerMode).to.be.a('boolean');
+                    expect(result.body.size).to.eql('1gb');
+                    expect(result.body.region).to.eql('sfo');
+                    expect(result.body.memory).to.eql(os.totalmem());
+                    expect(result.body.cloudronName).to.be.a('string');
+                    expect(result.body.provider).to.be.a('string');
 
-                expect(scope.isDone()).to.be.ok();
+                    expect(scope.isDone()).to.be.ok();
 
-                done();
-            });
+                    done();
+                });
         });
 
         it('succeeds (non-admin)', function (done) {
             superagent.get(SERVER_URL + '/api/v1/cloudron/config')
-                   .query({ access_token: token_1 })
-                   .end(function (error, result) {
-                expect(result.statusCode).to.equal(200);
-                console.dir(result.body);
+                .query({ access_token: token_1 })
+                .end(function (error, result) {
+                    expect(result.statusCode).to.equal(200);
 
-                expect(result.body.apiServerOrigin).to.eql('http://localhost:6060');
-                expect(result.body.webServerOrigin).to.eql(null);
-                expect(result.body.fqdn).to.eql(config.fqdn());
-                expect(result.body.isCustomDomain).to.eql(true);
-                expect(result.body.progress).to.be.an('object');
-                expect(result.body.version).to.eql(config.version());
-                expect(result.body.cloudronName).to.be.a('string');
-                expect(result.body.provider).to.be.a('string');
+                    expect(result.body.apiServerOrigin).to.eql('http://localhost:6060');
+                    expect(result.body.webServerOrigin).to.eql(null);
+                    expect(result.body.fqdn).to.eql(config.fqdn());
+                    expect(result.body.isCustomDomain).to.eql(true);
+                    expect(result.body.progress).to.be.an('object');
+                    expect(result.body.version).to.eql(config.version());
+                    expect(result.body.cloudronName).to.be.a('string');
+                    expect(result.body.provider).to.be.a('string');
 
-                expect(result.body.update).to.be(undefined);
-                expect(result.body.size).to.be(undefined);
-                expect(result.body.region).to.be(undefined);
-                expect(result.body.memory).to.be(undefined);
+                    expect(result.body.update).to.be(undefined);
+                    expect(result.body.size).to.be(undefined);
+                    expect(result.body.region).to.be(undefined);
+                    expect(result.body.memory).to.be(undefined);
 
-                done();
-            });
+                    done();
+                });
         });
 
     });
@@ -323,18 +321,18 @@ describe('Cloudron', function () {
                     var scope2 = nock(config.apiServerOrigin()).post('/api/v1/boxes/' + config.fqdn() + '/setup/done?setupToken=somesetuptoken').reply(201, {});
 
                     superagent.post(SERVER_URL + '/api/v1/cloudron/activate')
-                           .query({ setupToken: 'somesetuptoken' })
-                           .send({ username: USERNAME, password: PASSWORD, email: EMAIL })
-                           .end(function (error, result) {
-                        expect(result).to.be.ok();
-                        expect(scope1.isDone()).to.be.ok();
-                        expect(scope2.isDone()).to.be.ok();
+                        .query({ setupToken: 'somesetuptoken' })
+                        .send({ username: USERNAME, password: PASSWORD, email: EMAIL })
+                        .end(function (error, result) {
+                            expect(result).to.be.ok();
+                            expect(scope1.isDone()).to.be.ok();
+                            expect(scope2.isDone()).to.be.ok();
 
-                        // stash token for further use
-                        token = result.body.token;
+                            // stash token for further use
+                            token = result.body.token;
 
-                        callback();
-                    });
+                            callback();
+                        });
                 }
             ], done);
         });
@@ -346,73 +344,73 @@ describe('Cloudron', function () {
 
         it('fails without token', function (done) {
             superagent.post(SERVER_URL + '/api/v1/cloudron/migrate')
-                   .send({ size: 'small', region: 'sfo'})
-                   .end(function (error, result) {
-                expect(result.statusCode).to.equal(401);
-                done();
-            });
+                .send({ size: 'small', region: 'sfo'})
+                .end(function (error, result) {
+                    expect(result.statusCode).to.equal(401);
+                    done();
+                });
         });
 
         it('fails without password', function (done) {
             superagent.post(SERVER_URL + '/api/v1/cloudron/migrate')
-                   .send({ size: 'small', region: 'sfo'})
-                   .query({ access_token: token })
-                   .end(function (error, result) {
-                expect(result.statusCode).to.equal(400);
-                done();
-            });
+                .send({ size: 'small', region: 'sfo'})
+                .query({ access_token: token })
+                .end(function (error, result) {
+                    expect(result.statusCode).to.equal(400);
+                    done();
+                });
         });
 
         it('succeeds without size', function (done) {
             superagent.post(SERVER_URL + '/api/v1/cloudron/migrate')
-                   .send({ region: 'sfo', password: PASSWORD })
-                   .query({ access_token: token })
-                   .end(function (error, result) {
-                expect(result.statusCode).to.equal(202);
-                done();
-            });
+                .send({ region: 'sfo', password: PASSWORD })
+                .query({ access_token: token })
+                .end(function (error, result) {
+                    expect(result.statusCode).to.equal(202);
+                    done();
+                });
         });
 
         it('fails with wrong size type', function (done) {
             superagent.post(SERVER_URL + '/api/v1/cloudron/migrate')
-                   .send({ size: 4, region: 'sfo', password: PASSWORD })
-                   .query({ access_token: token })
-                   .end(function (error, result) {
-                expect(result.statusCode).to.equal(400);
-                done();
-            });
+                .send({ size: 4, region: 'sfo', password: PASSWORD })
+                .query({ access_token: token })
+                .end(function (error, result) {
+                    expect(result.statusCode).to.equal(400);
+                    done();
+                });
         });
 
         it('succeeds without region', function (done) {
             superagent.post(SERVER_URL + '/api/v1/cloudron/migrate')
-                   .send({ size: 'small', password: PASSWORD })
-                   .query({ access_token: token })
-                   .end(function (error, result) {
-                expect(result.statusCode).to.equal(202);
-                done();
-            });
+                .send({ size: 'small', password: PASSWORD })
+                .query({ access_token: token })
+                .end(function (error, result) {
+                    expect(result.statusCode).to.equal(202);
+                    done();
+                });
         });
 
         it('fails with wrong region type', function (done) {
             superagent.post(SERVER_URL + '/api/v1/cloudron/migrate')
-                   .send({ size: 'small', region: 4, password: PASSWORD })
-                   .query({ access_token: token })
-                   .end(function (error, result) {
-                expect(result.statusCode).to.equal(400);
-                done();
-            });
+                .send({ size: 'small', region: 4, password: PASSWORD })
+                .query({ access_token: token })
+                .end(function (error, result) {
+                    expect(result.statusCode).to.equal(400);
+                    done();
+                });
         });
 
         it('fails when in wrong state', function (done) {
             var scope2 = nock(config.apiServerOrigin())
-                    .post('/api/v1/boxes/' + config.fqdn() + '/awscredentials?token=BACKUP_TOKEN')
-                    .reply(201, { credentials: { AccessKeyId: 'accessKeyId', SecretAccessKey: 'secretAccessKey', SessionToken: 'sessionToken' } });
+                .post('/api/v1/boxes/' + config.fqdn() + '/awscredentials?token=BACKUP_TOKEN')
+                .reply(201, { credentials: { AccessKeyId: 'accessKeyId', SecretAccessKey: 'secretAccessKey', SessionToken: 'sessionToken' } });
 
             var scope3 = nock(config.apiServerOrigin())
-                    .post('/api/v1/boxes/' + config.fqdn() + '/backupDone?token=APPSTORE_TOKEN', function (body) {
-                        return body.boxVersion && body.restoreKey && !body.appId && !body.appVersion && body.appBackupIds.length === 0;
-                    })
-                    .reply(200, { id: 'someid' });
+                .post('/api/v1/boxes/' + config.fqdn() + '/backupDone?token=APPSTORE_TOKEN', function (body) {
+                    return body.boxVersion && body.restoreKey && !body.appId && !body.appVersion && body.appBackupIds.length === 0;
+                })
+                .reply(200, { id: 'someid' });
 
             var scope1 = nock(config.apiServerOrigin())
                 .post('/api/v1/boxes/' + config.fqdn() + '/migrate?token=APPSTORE_TOKEN', function (body) {
@@ -422,22 +420,22 @@ describe('Cloudron', function () {
             injectShellMock();
 
             superagent.post(SERVER_URL + '/api/v1/cloudron/migrate')
-                   .send({ size: 'small', region: 'sfo', password: PASSWORD })
-                   .query({ access_token: token })
-                   .end(function (error, result) {
-                expect(result.statusCode).to.equal(202);
+                .send({ size: 'small', region: 'sfo', password: PASSWORD })
+                .query({ access_token: token })
+                .end(function (error, result) {
+                    expect(result.statusCode).to.equal(202);
 
-                function checkAppstoreServerCalled() {
-                    if (scope1.isDone() && scope2.isDone() && scope3.isDone()) {
-                        restoreShellMock();
-                        return done();
+                    function checkAppstoreServerCalled() {
+                        if (scope1.isDone() && scope2.isDone() && scope3.isDone()) {
+                            restoreShellMock();
+                            return done();
+                        }
+
+                        setTimeout(checkAppstoreServerCalled, 100);
                     }
 
-                    setTimeout(checkAppstoreServerCalled, 100);
-                }
-
-                checkAppstoreServerCalled();
-            });
+                    checkAppstoreServerCalled();
+                });
         });
 
         it('succeeds', function (done) {
@@ -446,34 +444,34 @@ describe('Cloudron', function () {
             }).reply(202, {});
 
             var scope2 = nock(config.apiServerOrigin())
-                    .post('/api/v1/boxes/' + config.fqdn() + '/backupDone?token=APPSTORE_TOKEN', function (body) {
-                        return body.boxVersion && body.restoreKey && !body.appId && !body.appVersion && body.appBackupIds.length === 0;
-                    })
-                    .reply(200, { id: 'someid' });
+                .post('/api/v1/boxes/' + config.fqdn() + '/backupDone?token=APPSTORE_TOKEN', function (body) {
+                    return body.boxVersion && body.restoreKey && !body.appId && !body.appVersion && body.appBackupIds.length === 0;
+                })
+                .reply(200, { id: 'someid' });
 
             var scope3 = nock(config.apiServerOrigin())
-                    .post('/api/v1/boxes/' + config.fqdn() + '/awscredentials?token=BACKUP_TOKEN')
-                    .reply(201, { credentials: { AccessKeyId: 'accessKeyId', SecretAccessKey: 'secretAccessKey', SessionToken: 'sessionToken' } });
+                .post('/api/v1/boxes/' + config.fqdn() + '/awscredentials?token=BACKUP_TOKEN')
+                .reply(201, { credentials: { AccessKeyId: 'accessKeyId', SecretAccessKey: 'secretAccessKey', SessionToken: 'sessionToken' } });
 
             injectShellMock();
 
             superagent.post(SERVER_URL + '/api/v1/cloudron/migrate')
-                   .send({ size: 'small', region: 'sfo', password: PASSWORD })
-                   .query({ access_token: token })
-                   .end(function (error, result) {
-                expect(result.statusCode).to.equal(202);
+                .send({ size: 'small', region: 'sfo', password: PASSWORD })
+                .query({ access_token: token })
+                .end(function (error, result) {
+                    expect(result.statusCode).to.equal(202);
 
-                function checkAppstoreServerCalled() {
-                    if (scope1.isDone() && scope2.isDone() && scope3.isDone()) {
-                        restoreShellMock();
-                        return done();
+                    function checkAppstoreServerCalled() {
+                        if (scope1.isDone() && scope2.isDone() && scope3.isDone()) {
+                            restoreShellMock();
+                            return done();
+                        }
+
+                        setTimeout(checkAppstoreServerCalled, 100);
                     }
 
-                    setTimeout(checkAppstoreServerCalled, 100);
-                }
-
-                checkAppstoreServerCalled();
-            });
+                    checkAppstoreServerCalled();
+                });
         });
     });
 
@@ -489,18 +487,18 @@ describe('Cloudron', function () {
                     config._reset();
 
                     superagent.post(SERVER_URL + '/api/v1/cloudron/activate')
-                           .query({ setupToken: 'somesetuptoken' })
-                           .send({ username: USERNAME, password: PASSWORD, email: EMAIL })
-                           .end(function (error, result) {
-                        expect(result).to.be.ok();
-                        expect(scope1.isDone()).to.be.ok();
-                        expect(scope2.isDone()).to.be.ok();
+                        .query({ setupToken: 'somesetuptoken' })
+                        .send({ username: USERNAME, password: PASSWORD, email: EMAIL })
+                        .end(function (error, result) {
+                            expect(result).to.be.ok();
+                            expect(scope1.isDone()).to.be.ok();
+                            expect(scope2.isDone()).to.be.ok();
 
-                        // stash token for further use
-                        token = result.body.token;
+                            // stash token for further use
+                            token = result.body.token;
 
-                        callback();
-                    });
+                            callback();
+                        });
                 },
             ], done);
         });
@@ -509,111 +507,111 @@ describe('Cloudron', function () {
 
         it('fails without token', function (done) {
             superagent.post(SERVER_URL + '/api/v1/feedback')
-                   .send({ type: 'ticket', subject: 'some subject', description: 'some description' })
-                   .end(function (error, result) {
-                expect(result.statusCode).to.equal(401);
-                done();
-            });
+                .send({ type: 'ticket', subject: 'some subject', description: 'some description' })
+                .end(function (error, result) {
+                    expect(result.statusCode).to.equal(401);
+                    done();
+                });
         });
 
         it('fails without type', function (done) {
             superagent.post(SERVER_URL + '/api/v1/feedback')
-                   .send({ subject: 'some subject', description: 'some description' })
-                   .query({ access_token: token })
-                   .end(function (error, result) {
-                expect(result.statusCode).to.equal(400);
-                done();
-            });
+                .send({ subject: 'some subject', description: 'some description' })
+                .query({ access_token: token })
+                .end(function (error, result) {
+                    expect(result.statusCode).to.equal(400);
+                    done();
+                });
         });
 
         it('fails with empty type', function (done) {
             superagent.post(SERVER_URL + '/api/v1/feedback')
-                   .send({ type: '', subject: 'some subject', description: 'some description' })
-                   .query({ access_token: token })
-                   .end(function (error, result) {
-                expect(result.statusCode).to.equal(400);
-                done();
-            });
+                .send({ type: '', subject: 'some subject', description: 'some description' })
+                .query({ access_token: token })
+                .end(function (error, result) {
+                    expect(result.statusCode).to.equal(400);
+                    done();
+                });
         });
 
         it('fails with unknown type', function (done) {
             superagent.post(SERVER_URL + '/api/v1/feedback')
-                   .send({ type: 'foobar', subject: 'some subject', description: 'some description' })
-                   .query({ access_token: token })
-                   .end(function (error, result) {
-                expect(result.statusCode).to.equal(400);
-                done();
-            });
+                .send({ type: 'foobar', subject: 'some subject', description: 'some description' })
+                .query({ access_token: token })
+                .end(function (error, result) {
+                    expect(result.statusCode).to.equal(400);
+                    done();
+                });
         });
 
         it('succeeds with ticket type', function (done) {
             superagent.post(SERVER_URL + '/api/v1/feedback')
-                   .send({ type: 'ticket', subject: 'some subject', description: 'some description' })
-                   .query({ access_token: token })
-                   .end(function (error, result) {
-                expect(result.statusCode).to.equal(201);
-                done();
-            });
+                .send({ type: 'ticket', subject: 'some subject', description: 'some description' })
+                .query({ access_token: token })
+                .end(function (error, result) {
+                    expect(result.statusCode).to.equal(201);
+                    done();
+                });
         });
 
         it('succeeds with app type', function (done) {
             superagent.post(SERVER_URL + '/api/v1/feedback')
-                   .send({ type: 'app_missing', subject: 'some subject', description: 'some description' })
-                   .query({ access_token: token })
-                   .end(function (error, result) {
-                expect(result.statusCode).to.equal(201);
-                done();
-            });
+                .send({ type: 'app_missing', subject: 'some subject', description: 'some description' })
+                .query({ access_token: token })
+                .end(function (error, result) {
+                    expect(result.statusCode).to.equal(201);
+                    done();
+                });
         });
 
         it('fails without description', function (done) {
             superagent.post(SERVER_URL + '/api/v1/feedback')
-                   .send({ type: 'ticket', subject: 'some subject' })
-                   .query({ access_token: token })
-                   .end(function (error, result) {
-                expect(result.statusCode).to.equal(400);
-                done();
-            });
+                .send({ type: 'ticket', subject: 'some subject' })
+                .query({ access_token: token })
+                .end(function (error, result) {
+                    expect(result.statusCode).to.equal(400);
+                    done();
+                });
         });
 
         it('fails with empty subject', function (done) {
             superagent.post(SERVER_URL + '/api/v1/feedback')
-                   .send({ type: 'ticket', subject: '', description: 'some description' })
-                   .query({ access_token: token })
-                   .end(function (error, result) {
-                expect(result.statusCode).to.equal(400);
-                done();
-            });
+                .send({ type: 'ticket', subject: '', description: 'some description' })
+                .query({ access_token: token })
+                .end(function (error, result) {
+                    expect(result.statusCode).to.equal(400);
+                    done();
+                });
         });
 
         it('fails with empty description', function (done) {
             superagent.post(SERVER_URL + '/api/v1/feedback')
-                   .send({ type: 'ticket', subject: 'some subject', description: '' })
-                   .query({ access_token: token })
-                   .end(function (error, result) {
-                expect(result.statusCode).to.equal(400);
-                done();
-            });
+                .send({ type: 'ticket', subject: 'some subject', description: '' })
+                .query({ access_token: token })
+                .end(function (error, result) {
+                    expect(result.statusCode).to.equal(400);
+                    done();
+                });
         });
 
         it('succeeds with feedback type', function (done) {
             superagent.post(SERVER_URL + '/api/v1/feedback')
-                   .send({ type: 'feedback', subject: 'some subject', description: 'some description' })
-                   .query({ access_token: token })
-                   .end(function (error, result) {
-                expect(result.statusCode).to.equal(201);
-                done();
-            });
+                .send({ type: 'feedback', subject: 'some subject', description: 'some description' })
+                .query({ access_token: token })
+                .end(function (error, result) {
+                    expect(result.statusCode).to.equal(201);
+                    done();
+                });
         });
 
         it('fails without subject', function (done) {
             superagent.post(SERVER_URL + '/api/v1/feedback')
-                   .send({ type: 'ticket', description: 'some description' })
-                   .query({ access_token: token })
-                   .end(function (error, result) {
-                expect(result.statusCode).to.equal(400);
-                done();
-            });
+                .send({ type: 'ticket', description: 'some description' })
+                .query({ access_token: token })
+                .end(function (error, result) {
+                    expect(result.statusCode).to.equal(400);
+                    done();
+                });
         });
     });
 
@@ -629,18 +627,18 @@ describe('Cloudron', function () {
                     config._reset();
 
                     superagent.post(SERVER_URL + '/api/v1/cloudron/activate')
-                           .query({ setupToken: 'somesetuptoken' })
-                           .send({ username: USERNAME, password: PASSWORD, email: EMAIL })
-                           .end(function (error, result) {
-                        expect(result).to.be.ok();
-                        expect(scope1.isDone()).to.be.ok();
-                        expect(scope2.isDone()).to.be.ok();
+                        .query({ setupToken: 'somesetuptoken' })
+                        .send({ username: USERNAME, password: PASSWORD, email: EMAIL })
+                        .end(function (error, result) {
+                            expect(result).to.be.ok();
+                            expect(scope1.isDone()).to.be.ok();
+                            expect(scope2.isDone()).to.be.ok();
 
-                        // stash token for further use
-                        token = result.body.token;
+                            // stash token for further use
+                            token = result.body.token;
 
-                        callback();
-                    });
+                            callback();
+                        });
                 },
             ], done);
         });
@@ -651,9 +649,9 @@ describe('Cloudron', function () {
             superagent.get(SERVER_URL + '/api/v1/cloudron/logstream')
                 .query({ access_token: token, fromLine: 0 })
                 .end(function (err, res) {
-                expect(res.statusCode).to.be(400);
-                done();
-            });
+                    expect(res.statusCode).to.be(400);
+                    done();
+                });
         });
 
         it('logStream - stream logs', function (done) {
@@ -674,8 +672,8 @@ describe('Cloudron', function () {
                         if (line.indexOf('id: ') === 0) {
                             expect(parseInt(line.substr('id: '.length), 10)).to.be.a('number');
                         } else if (line.indexOf('data: ') === 0) {
-                            expect(JSON.parse(line.slice('data: '.length)).message).to.be.a('string');
-                            dataMessageFound = true;
+                            var message = JSON.parse(line.slice('data: '.length)).message;
+                            if (Array.isArray(message) || typeof message === 'string') dataMessageFound = true;
                         }
                     });
 

src/routes/test/sysadmin-test.js

@@ -12,18 +12,23 @@ var appdb = require('../../appdb.js'),
     expect = require('expect.js'),
     hock = require('hock'),
     http = require('http'),
+    MockS3 = require('mock-aws-s3'),
     nock = require('nock'),
-    superagent = require('superagent'),
+    os = require('os'),
+    path = require('path'),
+    rimraf = require('rimraf'),
+    s3 = require('../../storage/s3.js'),
+    safe = require('safetydance'),
     server = require('../../server.js'),
     settings = require('../../settings.js'),
+    settingsdb = require('../../settingsdb.js'),
+    superagent = require('superagent'),
     url = require('url');
 
 var SERVER_URL = 'http://localhost:' + config.get('port');
 
 var USERNAME = 'superadmin', PASSWORD = 'Foobar?1337', EMAIL ='silly@me.com';
-var token = null;
 
-var server;
 function setup(done) {
     config.setVersion('1.2.3');
 
@@ -37,19 +42,16 @@ function setup(done) {
             var scope2 = nock(config.apiServerOrigin()).post('/api/v1/boxes/' + config.fqdn() + '/setup/done?setupToken=somesetuptoken').reply(201, {});
 
             superagent.post(SERVER_URL + '/api/v1/cloudron/activate')
-                   .query({ setupToken: 'somesetuptoken' })
-                   .send({ username: USERNAME, password: PASSWORD, email: EMAIL })
-                   .end(function (error, result) {
-                expect(result).to.be.ok();
-                expect(result.statusCode).to.eql(201);
-                expect(scope1.isDone()).to.be.ok();
-                expect(scope2.isDone()).to.be.ok();
+                .query({ setupToken: 'somesetuptoken' })
+                .send({ username: USERNAME, password: PASSWORD, email: EMAIL })
+                .end(function (error, result) {
+                    expect(result).to.be.ok();
+                    expect(result.statusCode).to.eql(201);
+                    expect(scope1.isDone()).to.be.ok();
+                    expect(scope2.isDone()).to.be.ok();
 
-                // stash token for further use
-                token = result.body.token;
-
-                callback();
-            });
+                    callback();
+                });
         },
 
         function addApp(callback) {
@@ -58,12 +60,20 @@ function setup(done) {
         },
 
         function createSettings(callback) {
-            settings.setBackupConfig({ provider: 'caas', token: 'BACKUP_TOKEN', bucket: 'Bucket', prefix: 'Prefix' }, callback);
+            MockS3.config.basePath = path.join(os.tmpdir(), 's3-sysadmin-test-buckets/');
+
+            s3._mockInject(MockS3);
+
+            safe.fs.mkdirSync('/tmp/box-sysadmin-test');
+            settingsdb.set(settings.BACKUP_CONFIG_KEY, JSON.stringify({ provider: 'caas', token: 'BACKUP_TOKEN', key: 'key', prefix: 'boxid', format: 'tgz'}), callback);
         }
     ], done);
 }
 
 function cleanup(done) {
+    s3._mockRestore();
+    rimraf.sync(MockS3.config.basePath);
+
     database._clear(function (error) {
         expect(!error).to.be.ok();
 
@@ -93,19 +103,19 @@ describe('Internal API', function () {
     describe('backup', function () {
         it('succeeds', function (done) {
             superagent.post(config.sysadminOrigin() + '/api/v1/backup')
-                   .end(function (error, result) {
-                expect(result.statusCode).to.equal(202);
+                .end(function (error, result) {
+                    expect(result.statusCode).to.equal(202);
 
-                function checkAppstoreServerCalled() {
-                    apiHockInstance.done(function (error) {
-                        if (!error) return done();
+                    function checkAppstoreServerCalled() {
+                        apiHockInstance.done(function (error) {
+                            if (!error) return done();
 
-                        setTimeout(checkAppstoreServerCalled, 100);
-                    });
-                }
+                            setTimeout(checkAppstoreServerCalled, 100);
+                        });
+                    }
 
-                checkAppstoreServerCalled();
-            });
+                    checkAppstoreServerCalled();
+                });
         });
     });
 });

src/scripts/configurecollectd.sh

@@ -12,6 +12,9 @@ if [[ $# == 1 && "$1" == "--check" ]]; then
     exit 0
 fi
 
+cmd="$1"
+appid="$2"
+
 if [[ "${BOX_ENV}" == "cloudron" ]]; then
     # when restoring the cloudron with many apps, the apptasks rush in to restart
     # collectd which makes systemd/collectd very unhappy and puts the collectd in
@@ -19,10 +22,17 @@ if [[ "${BOX_ENV}" == "cloudron" ]]; then
     for i in {1..10}; do
         echo "Restarting collectd"
         if systemctl restart collectd; then
-            exit 0
+            break
         fi
         echo "Failed to reload collectd. Maybe some other apptask is restarting it"
         sleep $((RANDOM%30))
     done
+
+    # delete old stats when uninstalling an app
+    if [[ "${cmd}" == "remove" ]]; then
+        echo "Removing collectd stats of ${appid}"
+
+        rm -rf ${HOME}/platformdata/graphite/whisper/collectd/localhost/*${appid}*
+    fi
 fi
 

src/scripts/configurelogrotate.sh

@@ -0,0 +1,40 @@
+#!/bin/bash
+
+set -eu -o pipefail
+
+if [[ ${EUID} -ne 0 ]]; then
+    echo "This script should be run as root." > /dev/stderr
+    exit 1
+fi
+
+if [[ $# -eq 0 ]]; then
+    echo "No arguments supplied"
+    exit 1
+fi
+
+if [[ "$1" == "--check" ]]; then
+    echo "OK"
+    exit 0
+fi
+
+cmd="$1"
+appid="$2"
+
+if [[ "${cmd}" == "add" ]]; then
+    # TODO prevent this script from moving the file from $1 into a random dir with using a relative ../ path
+    if [[ "${BOX_ENV}" == "cloudron" ]]; then
+        readonly destination_file_path="${HOME}/platformdata/logrotate.d/${appid}"
+    else
+        readonly destination_file_path="${HOME}/.cloudron_test/platformdata/logrotate.d/${appid}"
+    fi
+
+    mv "${3}" "${destination_file_path}"
+    chown root:root "${destination_file_path}"
+elif [[ "${cmd}" == "remove" ]]; then
+    if [[ "${BOX_ENV}" == "cloudron" ]]; then
+        rm -rf "${HOME}/platformdata/logrotate.d/${appid}"
+    else
+        rm -rf "${HOME}/.cloudron_test/platformdata/logrotate.d/${appid}"
+    fi
+fi
+

src/scripts/mvlogrotateconfig.sh

@@ -1,28 +0,0 @@
-#!/bin/bash
-
-set -eu -o pipefail
-
-if [[ ${EUID} -ne 0 ]]; then
-    echo "This script should be run as root." > /dev/stderr
-    exit 1
-fi
-
-if [[ $# -eq 0 ]]; then
-    echo "No arguments supplied"
-    exit 1
-fi
-
-if [[ "$1" == "--check" ]]; then
-    echo "OK"
-    exit 0
-fi
-
-# TODO prevent this script from moving the file from $1 into a random dir with using a relative ../ path
-if [[ "${BOX_ENV}" == "cloudron" ]]; then
-	readonly destination_file_path="${HOME}/platformdata/logrotate.d/$2"
-else
-	readonly destination_file_path="${HOME}/.cloudron_test/platformdata/logrotate.d/$2"
-fi
-
-mv "${1}" "${destination_file_path}"
-chown root:root "${destination_file_path}"

src/scripts/node.sh

@@ -1,23 +0,0 @@
-#!/bin/bash
-
-set -eu -o pipefail
-
-if [[ ${EUID} -ne 0 ]]; then
-    echo "This script should be run as root." > /dev/stderr
-    exit 1
-fi
-
-if [[ $# -eq 0 ]]; then
-    echo "No arguments supplied"
-    exit 1
-fi
-
-if [[ "$1" == "--check" ]]; then
-    echo "OK"
-    exit 0
-fi
-
-echo "Running node with memory constraints"
-
-# note BOX_ENV and NODE_ENV are derived from parent process
-exec env "DEBUG=box*,connect-lastmile" /usr/bin/node --max_old_space_size=300 "$@"

src/scripts/rmappdir.sh

@@ -17,10 +17,21 @@ if [[ "$1" == "--check" ]]; then
     exit 0
 fi
 
+# this script is called from redis addon as well!
+
+appid="$1"
+rmdir="$2"
+
 if [[ "${BOX_ENV}" == "cloudron" ]]; then
-    readonly app_data_dir="${HOME}/appsdata/$1"
-    rm -rf "${app_data_dir}"
+    readonly app_data_dir="${HOME}/appsdata/${appid}"
 else
-    readonly app_data_dir="${HOME}/.cloudron_test/appsdata/$1"
+    readonly app_data_dir="${HOME}/.cloudron_test/appsdata/${appid}"
+fi
+
+# the approach below ensures symlinked contents are also deleted
+
+find -H "${app_data_dir}" -mindepth 1 -delete || true  # -H means resolve symlink in args
+
+if [[ "${rmdir}" == "true" ]]; then
     rm -rf "${app_data_dir}"
 fi

src/scripts/rmlogrotateconfig.sh

@@ -1,24 +0,0 @@
-#!/bin/bash
-
-set -eu -o pipefail
-
-if [[ ${EUID} -ne 0 ]]; then
-    echo "This script should be run as root." > /dev/stderr
-    exit 1
-fi
-
-if [[ $# -eq 0 ]]; then
-    echo "No arguments supplied"
-    exit 1
-fi
-
-if [[ "$1" == "--check" ]]; then
-    echo "OK"
-    exit 0
-fi
-
-if [[ "${BOX_ENV}" == "cloudron" ]]; then
-    rm -rf "${HOME}/platformdata/logrotate.d/$1"
-else
-    rm -rf "${HOME}/.cloudron_test/platformdata/logrotate.d/$1"
-fi

src/scripts/tar.js

@@ -0,0 +1,23 @@
+#!/usr/bin/env node
+
+'use strict';
+
+require('supererror')({ splatchError: true });
+
+var tar = require('tar-fs');
+
+var sourceDir = process.argv[2];
+
+if (sourceDir === '--check') return console.log('OK');
+
+process.stderr.write('Packing ' + sourceDir + '\n');
+
+tar.pack('/', {
+    dereference: false, // pack the symlink and not what it points to
+    entries: [ sourceDir ],
+    map: function(header) {
+        header.name = header.name.replace(new RegExp('^' + sourceDir + '(/?)'), '.$1'); // make paths relative
+        return header;
+    },
+    strict: false // do not error for unknown types (skip fifo, char/block devices)
+}).pipe(process.stdout);

src/server.js

@@ -112,7 +112,7 @@ function initializeExpressSync() {
 
     // cloudron routes
     router.get ('/api/v1/cloudron/config', cloudronScope, routes.cloudron.getConfig);
-    router.post('/api/v1/cloudron/update', cloudronScope, routes.user.requireAdmin, routes.user.verifyPassword, routes.cloudron.update);
+    router.post('/api/v1/cloudron/update', cloudronScope, routes.user.requireAdmin, routes.cloudron.update);
     router.post('/api/v1/cloudron/check_for_updates', cloudronScope, routes.user.requireAdmin, routes.cloudron.checkForUpdates);
     router.post('/api/v1/cloudron/reboot', cloudronScope, routes.user.requireAdmin, routes.cloudron.reboot);
     router.post('/api/v1/cloudron/migrate', cloudronScope, routes.user.requireAdmin, routes.user.verifyPassword, routes.cloudron.migrate);
@@ -124,7 +124,8 @@ function initializeExpressSync() {
     router.put ('/api/v1/cloudron/ssh/authorized_keys', cloudronScope, routes.user.requireAdmin, routes.ssh.addAuthorizedKey);
     router.get ('/api/v1/cloudron/ssh/authorized_keys/:identifier', cloudronScope, routes.user.requireAdmin, routes.ssh.getAuthorizedKey);
     router.del ('/api/v1/cloudron/ssh/authorized_keys/:identifier', cloudronScope, routes.user.requireAdmin, routes.ssh.delAuthorizedKey);
-    router.get ('/api/v1/cloudron/eventlog', settingsScope, routes.user.requireAdmin, routes.eventlog.get);
+    router.get ('/api/v1/cloudron/eventlog', cloudronScope, routes.user.requireAdmin, routes.eventlog.get);
+    router.post('/api/v1/cloudron/send_test_mail',  cloudronScope, routes.user.requireAdmin, routes.cloudron.sendTestMail);
 
     // profile api, working off the user behind the provided token
     router.get ('/api/v1/profile', profileScope, routes.profile.get);
@@ -184,7 +185,7 @@ function initializeExpressSync() {
     router.post('/api/v1/apps/:id/uninstall', appsScope, routes.user.requireAdmin, routes.user.verifyPassword, routes.apps.uninstallApp);
     router.post('/api/v1/apps/:id/configure', appsScope, routes.user.requireAdmin, routes.apps.configureApp);
     router.post('/api/v1/apps/:id/update',    appsScope, routes.user.requireAdmin, routes.apps.updateApp);
-    router.post('/api/v1/apps/:id/restore',   appsScope, routes.user.requireAdmin, routes.apps.restoreApp);
+    router.post('/api/v1/apps/:id/restore',   appsScope, routes.user.requireAdmin, routes.user.verifyPassword, routes.apps.restoreApp);
     router.post('/api/v1/apps/:id/backup',    appsScope, routes.user.requireAdmin, routes.apps.backupApp);
     router.get ('/api/v1/apps/:id/backups',   appsScope, routes.user.requireAdmin, routes.apps.listBackups);
     router.post('/api/v1/apps/:id/stop',      appsScope, routes.user.requireAdmin, routes.apps.stopApp);

src/settings.js

@@ -410,11 +410,15 @@ function setBackupConfig(backupConfig, callback) {
     assert.strictEqual(typeof backupConfig, 'object');
     assert.strictEqual(typeof callback, 'function');
 
+    if (backupConfig.key && backupConfig.format !== 'tgz') return callback(new SettingsError(SettingsError.BAD_FIELD, 'format does not support encryption'));
+
     backups.testConfig(backupConfig, function (error) {
         if (error && error.reason === BackupsError.BAD_FIELD) return callback(new SettingsError(SettingsError.BAD_FIELD, error.message));
         if (error && error.reason === BackupsError.EXTERNAL_ERROR) return callback(new SettingsError(SettingsError.EXTERNAL_ERROR, error.message));
         if (error) return callback(new SettingsError(SettingsError.INTERNAL_ERROR, error));
 
+        backups.cleanupCacheFilesSync();
+
         settingsdb.set(exports.BACKUP_CONFIG_KEY, JSON.stringify(backupConfig), function (error) {
             if (error) return callback(new SettingsError(SettingsError.INTERNAL_ERROR, error));
 
@@ -664,7 +668,7 @@ function getAll(callback) {
 
         // convert JSON objects
         [exports.DNS_CONFIG_KEY, exports.TLS_CONFIG_KEY, exports.BACKUP_CONFIG_KEY, exports.MAIL_CONFIG_KEY,
-         exports.UPDATE_CONFIG_KEY, exports.APPSTORE_CONFIG_KEY, exports.MAIL_RELAY_KEY, exports.CATCH_ALL_ADDRESS_KEY].forEach(function (key) {
+            exports.UPDATE_CONFIG_KEY, exports.APPSTORE_CONFIG_KEY, exports.MAIL_RELAY_KEY, exports.CATCH_ALL_ADDRESS_KEY].forEach(function (key) {
             result[key] = typeof result[key] === 'object' ? result[key] : safe.JSON.parse(result[key]);
         });
 

src/shell.js

@@ -10,6 +10,7 @@ exports = module.exports = {
 var assert = require('assert'),
     child_process = require('child_process'),
     debug = require('debug')('box:shell'),
+    fs = require('fs'),
     once = require('once'),
     util = require('util');
 
@@ -33,26 +34,27 @@ function exec(tag, file, args, options, callback) {
     assert.strictEqual(typeof tag, 'string');
     assert.strictEqual(typeof file, 'string');
     assert(util.isArray(args));
-
-    if (typeof options === 'function') {
-        callback = options;
-        options = { };
-    }
-
     assert.strictEqual(typeof options, 'object');
+    assert.strictEqual(typeof callback, 'function');
 
     callback = once(callback); // exit may or may not be called after an 'error'
 
     debug(tag + ' execFile: %s', file); // do not dump args as it might have sensitive info
 
     var cp = child_process.spawn(file, args, options);
-    cp.stdout.on('data', function (data) {
-        debug(tag + ' (stdout): %s', data.toString('utf8'));
-    });
+    if (options.logFile) {
+        var logFile = fs.createWriteStream(options.logFile);
+        cp.stdout.pipe(logFile);
+        cp.stderr.pipe(logFile);
+    } else {
+        cp.stdout.on('data', function (data) {
+            debug(tag + ' (stdout): %s', data.toString('utf8'));
+        });
 
-    cp.stderr.on('data', function (data) {
-        debug(tag + ' (stderr): %s', data.toString('utf8'));
-    });
+        cp.stderr.on('data', function (data) {
+            debug(tag + ' (stderr): %s', data.toString('utf8'));
+        });
+    }
 
     cp.on('exit', function (code, signal) {
         if (code || signal) debug(tag + ' code: %s, signal: %s', code, signal);
@@ -83,7 +85,7 @@ function sudo(tag, args, options, callback) {
 
     assert.strictEqual(typeof options, 'object');
 
-    // -S makes sudo read stdin for password. -E preserves arguments
+    // -S makes sudo read stdin for password. -E preserves environment
     var cp = exec(tag, SUDO, [ options.env ? '-SE' : '-S' ].concat(args), options, callback);
     cp.stdin.end();
     return cp;

src/storage/caas.js

@@ -1,229 +0,0 @@
-'use strict';
-
-exports = module.exports = {
-    backup: backup,
-    restore: restore,
-    copyBackup: copyBackup,
-    removeBackups: removeBackups,
-
-    backupDone: backupDone,
-
-    testConfig: testConfig,
-};
-
-var assert = require('assert'),
-    AWS = require('aws-sdk'),
-    BackupsError = require('../backups.js').BackupsError,
-    config = require('../config.js'),
-    debug = require('debug')('box:storage/caas'),
-    once = require('once'),
-    PassThrough = require('stream').PassThrough,
-    path = require('path'),
-    S3BlockReadStream = require('s3-block-read-stream'),
-    superagent = require('superagent'),
-    targz = require('./targz.js');
-
-var FILE_TYPE = '.tar.gz.enc';
-
-// internal only
-function getBackupCredentials(apiConfig, callback) {
-    assert.strictEqual(typeof apiConfig, 'object');
-    assert.strictEqual(typeof callback, 'function');
-    assert(apiConfig.token);
-
-    var url = config.apiServerOrigin() + '/api/v1/boxes/' + config.fqdn() + '/awscredentials';
-    superagent.post(url).query({ token: apiConfig.token }).timeout(30 * 1000).end(function (error, result) {
-        if (error && !error.response) return callback(error);
-        if (result.statusCode !== 201) return callback(new Error(result.text));
-        if (!result.body || !result.body.credentials) return callback(new Error('Unexpected response: ' + JSON.stringify(result.headers)));
-
-        var credentials = {
-            signatureVersion: 'v4',
-            accessKeyId: result.body.credentials.AccessKeyId,
-            secretAccessKey: result.body.credentials.SecretAccessKey,
-            sessionToken: result.body.credentials.SessionToken,
-            region: apiConfig.region || 'us-east-1'
-        };
-
-        if (apiConfig.endpoint) credentials.endpoint = new AWS.Endpoint(apiConfig.endpoint);
-
-        callback(null, credentials);
-    });
-}
-
-function getBackupFilePath(apiConfig, backupId) {
-    assert.strictEqual(typeof apiConfig, 'object');
-    assert.strictEqual(typeof backupId, 'string');
-
-    const FILE_TYPE = apiConfig.key ? '.tar.gz.enc' : '.tar.gz';
-
-    return path.join(apiConfig.prefix, backupId.endsWith(FILE_TYPE) ? backupId : backupId+FILE_TYPE);
-}
-
-// storage api
-function backup(apiConfig, backupId, sourceDirectories, callback) {
-    assert.strictEqual(typeof apiConfig, 'object');
-    assert.strictEqual(typeof backupId, 'string');
-    assert(Array.isArray(sourceDirectories));
-    assert.strictEqual(typeof callback, 'function');
-
-    callback = once(callback);
-
-    var backupFilePath = getBackupFilePath(apiConfig, backupId);
-
-    debug('[%s] backup: %j -> %s', backupId, sourceDirectories, backupFilePath);
-
-    getBackupCredentials(apiConfig, function (error, credentials) {
-        if (error) return callback(error);
-
-        var passThrough = new PassThrough();
-
-        var params = {
-            Bucket: apiConfig.bucket,
-            Key: backupFilePath,
-            Body: passThrough
-        };
-
-        var s3 = new AWS.S3(credentials);
-        // s3.upload automatically does a multi-part upload. we set queueSize to 1 to reduce memory usage
-        s3.upload(params, { partSize: 10 * 1024 * 1024, queueSize: 1 }, function (error) {
-            if (error) {
-                debug('[%s] backup: s3 upload error.', backupId, error);
-                return callback(new BackupsError(BackupsError.EXTERNAL_ERROR, error));
-            }
-
-            callback(null);
-        });
-
-        targz.create(sourceDirectories, apiConfig.key || null, passThrough, callback);
-    });
-}
-
-function restore(apiConfig, backupId, destination, callback) {
-    assert.strictEqual(typeof apiConfig, 'object');
-    assert.strictEqual(typeof backupId, 'string');
-    assert.strictEqual(typeof destination, 'string');
-    assert.strictEqual(typeof callback, 'function');
-
-    callback = once(callback);
-
-    var backupFilePath = getBackupFilePath(apiConfig, backupId);
-
-    debug('[%s] restore: %s -> %s', backupId, backupFilePath, destination);
-
-    getBackupCredentials(apiConfig, function (error, credentials) {
-        if (error) return callback(error);
-
-        var params = {
-            Bucket: apiConfig.bucket,
-            Key: backupFilePath
-        };
-
-        var s3 = new AWS.S3(credentials);
-        var multipartDownload = new S3BlockReadStream(s3, params, { blockSize: 64 * 1024 * 1024, logCallback: debug });
-
-        multipartDownload.on('error', function (error) {
-            // TODO ENOENT for the mock, fix upstream!
-            if (error.code === 'NoSuchKey' || error.code === 'ENOENT') return callback(new BackupsError(BackupsError.NOT_FOUND));
-
-            debug('[%s] restore: s3 stream error.', backupId, error);
-            callback(new BackupsError(BackupsError.EXTERNAL_ERROR, error.message));
-        });
-
-        targz.extract(multipartDownload, destination, apiConfig.key || null, callback);
-    });
-}
-
-function copyBackup(apiConfig, oldBackupId, newBackupId, callback) {
-    assert.strictEqual(typeof apiConfig, 'object');
-    assert.strictEqual(typeof oldBackupId, 'string');
-    assert.strictEqual(typeof newBackupId, 'string');
-    assert.strictEqual(typeof callback, 'function');
-
-    getBackupCredentials(apiConfig, function (error, credentials) {
-        if (error) return callback(error);
-
-        var params = {
-            Bucket: apiConfig.bucket,
-            Key: getBackupFilePath(apiConfig, newBackupId),
-            CopySource: path.join(apiConfig.bucket, getBackupFilePath(apiConfig, oldBackupId))
-        };
-
-        var s3 = new AWS.S3(credentials);
-        s3.copyObject(params, function (error) {
-            if (error && error.code === 'NoSuchKey') return callback(new BackupsError(BackupsError.NOT_FOUND));
-            if (error) {
-                debug('copyBackup: s3 copy error.', error);
-                return callback(new BackupsError(BackupsError.EXTERNAL_ERROR, error));
-            }
-
-            callback(null);
-        });
-    });
-}
-
-function removeBackups(apiConfig, backupIds, callback) {
-    assert.strictEqual(typeof apiConfig, 'object');
-    assert(Array.isArray(backupIds));
-    assert.strictEqual(typeof callback, 'function');
-
-    getBackupCredentials(apiConfig, function (error, credentials) {
-        if (error) return callback(error);
-
-        var params = {
-            Bucket: apiConfig.bucket,
-            Delete: {
-                Objects: [ ] // { Key }
-            }
-        };
-
-        backupIds.forEach(function (backupId) {
-            params.Delete.Objects.push({ Key: getBackupFilePath(apiConfig, backupId) });
-        });
-
-        var s3 = new AWS.S3(credentials);
-        s3.deleteObjects(params, function (error, data) {
-            if (error) debug('Unable to remove %s. Not fatal.', params.Key, error);
-            else debug('removeBackups: Deleted: %j Errors: %j', data.Deleted, data.Errors);
-
-            callback(null);
-        });
-    });
-}
-
-function testConfig(apiConfig, callback) {
-    assert.strictEqual(typeof apiConfig, 'object');
-    assert.strictEqual(typeof callback, 'function');
-
-    if (config.provider() !== 'caas') return callback(new BackupsError(BackupsError.BAD_FIELD, 'instance provider must be caas'));
-
-    callback();
-}
-
-function backupDone(backupId, appBackupIds, callback) {
-    assert.strictEqual(typeof backupId, 'string');
-    assert(Array.isArray(appBackupIds));
-    assert.strictEqual(typeof callback, 'function');
-
-    // Caas expects filenames instead of backupIds, this means no prefix but a file type extension
-    var boxBackupFilename = backupId + FILE_TYPE;
-    var appBackupFilenames = appBackupIds.map(function (id) { return id + FILE_TYPE; });
-
-    debug('[%s] backupDone: %s apps %j', backupId, boxBackupFilename, appBackupFilenames);
-
-    var url = config.apiServerOrigin() + '/api/v1/boxes/' + config.fqdn() + '/backupDone';
-    var data = {
-        boxVersion: config.version(),
-        restoreKey: boxBackupFilename,
-        appId: null,        // now unused
-        appVersion: null,   // now unused
-        appBackupIds: appBackupFilenames
-    };
-
-    superagent.post(url).send(data).query({ token: config.token() }).timeout(30 * 1000).end(function (error, result) {
-        if (error && !error.response) return callback(new BackupsError(BackupsError.EXTERNAL_ERROR, error));
-        if (result.statusCode !== 200) return callback(new BackupsError(BackupsError.EXTERNAL_ERROR, result.text));
-
-        return callback(null);
-    });
-}

src/storage/filesystem.js

@@ -1,10 +1,14 @@
 'use strict';
 
 exports = module.exports = {
-    backup: backup,
-    restore: restore,
-    copyBackup: copyBackup,
-    removeBackups: removeBackups,
+    upload: upload,
+    download: download,
+    downloadDir: downloadDir,
+
+    copy: copy,
+
+    remove: remove,
+    removeDir: removeDir,
 
     backupDone: backupDone,
 
@@ -12,156 +16,136 @@ exports = module.exports = {
 };
 
 var assert = require('assert'),
-    async = require('async'),
     BackupsError = require('../backups.js').BackupsError,
-    config = require('../config.js'),
     debug = require('debug')('box:storage/filesystem'),
     fs = require('fs'),
     mkdirp = require('mkdirp'),
-    once = require('once'),
     path = require('path'),
     safe = require('safetydance'),
-    targz = require('./targz.js');
-
-var FALLBACK_BACKUP_FOLDER = '/var/backups';
-var BACKUP_USER = config.TEST ? process.env.USER : 'yellowtent';
-
-// internal only
-function getBackupFilePath(apiConfig, backupId) {
-    assert.strictEqual(typeof apiConfig, 'object');
-    assert.strictEqual(typeof backupId, 'string');
-
-    const FILE_TYPE = apiConfig.key ? '.tar.gz.enc' : '.tar.gz';
-
-    return path.join(apiConfig.backupFolder || FALLBACK_BACKUP_FOLDER, backupId.endsWith(FILE_TYPE) ? backupId : backupId+FILE_TYPE);
-}
+    shell = require('../shell.js');
 
 // storage api
-function backup(apiConfig, backupId, sourceDirectories, callback) {
+function upload(apiConfig, backupFilePath, sourceStream, callback) {
     assert.strictEqual(typeof apiConfig, 'object');
-    assert.strictEqual(typeof backupId, 'string');
-    assert(Array.isArray(sourceDirectories));
+    assert.strictEqual(typeof backupFilePath, 'string');
+    assert.strictEqual(typeof sourceStream, 'object');
     assert.strictEqual(typeof callback, 'function');
 
-    callback = once(callback);
-
-    var backupFilePath = getBackupFilePath(apiConfig, backupId);
-
-    debug('[%s] backup: %j -> %s', backupId, sourceDirectories, backupFilePath);
-
     mkdirp(path.dirname(backupFilePath), function (error) {
         if (error) return callback(new BackupsError(BackupsError.EXTERNAL_ERROR, error.message));
 
+        safe.fs.unlinkSync(backupFilePath); // remove any hardlink
+
         var fileStream = fs.createWriteStream(backupFilePath);
 
+        // this pattern is required to ensure that the file got created before 'finish'
+        fileStream.on('open', function () {
+            sourceStream.pipe(fileStream);
+        });
+
         fileStream.on('error', function (error) {
-            debug('[%s] backup: out stream error.', backupId, error);
+            debug('[%s] upload: out stream error.', backupFilePath, error);
             callback(new BackupsError(BackupsError.EXTERNAL_ERROR, error.message));
         });
 
-        fileStream.on('close', function () {
-            debug('[%s] backup: changing ownership.', backupId);
+        fileStream.on('finish', function () {
+            // in test, upload() may or may not be called via sudo script
+            const BACKUP_UID = parseInt(process.env.SUDO_UID, 10) || process.getuid();
 
-            if (!safe.child_process.execSync('chown -R ' + BACKUP_USER + ':' + BACKUP_USER + ' ' + path.dirname(backupFilePath))) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, safe.error.message));
+            if (!safe.fs.chownSync(backupFilePath, BACKUP_UID, BACKUP_UID)) return callback(new BackupsError(BackupsError.EXTERNAL_ERROR, 'Unable to chown:' + safe.error.message));
+            if (!safe.fs.chownSync(path.dirname(backupFilePath), BACKUP_UID, BACKUP_UID)) return callback(new BackupsError(BackupsError.EXTERNAL_ERROR, 'Unable to chown:' + safe.error.message));
 
-            debug('[%s] backup: done.', backupId);
+            debug('upload %s: done.', backupFilePath);
 
             callback(null);
         });
-
-        targz.create(sourceDirectories, apiConfig.key || null, fileStream, callback);
     });
 }
 
-function restore(apiConfig, backupId, destination, callback) {
+function download(apiConfig, sourceFilePath, callback) {
     assert.strictEqual(typeof apiConfig, 'object');
-    assert.strictEqual(typeof backupId, 'string');
-    assert.strictEqual(typeof destination, 'string');
+    assert.strictEqual(typeof sourceFilePath, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    callback = once(callback);
+    debug('download: %s', sourceFilePath);
 
-    var sourceFilePath = getBackupFilePath(apiConfig, backupId);
-
-    debug('[%s] restore: %s -> %s', backupId, sourceFilePath, destination);
-
-    if (!fs.existsSync(sourceFilePath)) return callback(new BackupsError(BackupsError.NOT_FOUND, 'backup file does not exist'));
+    if (!safe.fs.existsSync(sourceFilePath)) return callback(new BackupsError(BackupsError.NOT_FOUND, 'File not found'));
 
     var fileStream = fs.createReadStream(sourceFilePath);
-
-    fileStream.on('error', function (error) {
-        debug('restore: file stream error.', error);
-        callback(new BackupsError(BackupsError.EXTERNAL_ERROR, error.message));
-    });
-
-    targz.extract(fileStream, destination, apiConfig.key || null, callback);
+    callback(null, fileStream);
 }
 
-function copyBackup(apiConfig, oldBackupId, newBackupId, callback) {
+function downloadDir(apiConfig, backupFilePath, destDir, callback) {
     assert.strictEqual(typeof apiConfig, 'object');
-    assert.strictEqual(typeof oldBackupId, 'string');
-    assert.strictEqual(typeof newBackupId, 'string');
+    assert.strictEqual(typeof backupFilePath, 'string');
+    assert.strictEqual(typeof destDir, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    callback = once(callback);
+    debug('downloadDir: %s -> %s', backupFilePath, destDir);
 
-    var oldFilePath = getBackupFilePath(apiConfig, oldBackupId);
-    var newFilePath = getBackupFilePath(apiConfig, newBackupId);
+    shell.exec('downloadDir', '/bin/cp', [ '-r', backupFilePath + '/.', destDir ], { }, function (error) {
+        if (error) return callback(new BackupsError(BackupsError.EXTERNAL_ERROR, error.message));
 
-    debug('copyBackup: %s -> %s', oldFilePath, newFilePath);
+        callback(null);
+    });
+}
+
+function copy(apiConfig, oldFilePath, newFilePath, callback) {
+    assert.strictEqual(typeof apiConfig, 'object');
+    assert.strictEqual(typeof oldFilePath, 'string');
+    assert.strictEqual(typeof newFilePath, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    debug('copy: %s -> %s', oldFilePath, newFilePath);
 
     mkdirp(path.dirname(newFilePath), function (error) {
         if (error) return callback(new BackupsError(BackupsError.EXTERNAL_ERROR, error.message));
 
-        var readStream = fs.createReadStream(oldFilePath);
-        var writeStream = fs.createWriteStream(newFilePath);
+        // this will hardlink backups saving space
+        shell.exec('copy', '/bin/cp', [ '-al', oldFilePath, newFilePath ], { }, function (error) {
+            if (error) return callback(new BackupsError(BackupsError.EXTERNAL_ERROR, error.message));
 
-        readStream.on('error', function (error) {
-            debug('copyBackup: read stream error.', error);
-            callback(new BackupsError(BackupsError.EXTERNAL_ERROR, error.message));
+            callback(null);
         });
-
-        writeStream.on('error', function (error) {
-            debug('copyBackup: write stream error.', error);
-            callback(new BackupsError(BackupsError.EXTERNAL_ERROR, error.message));
-        });
-
-        writeStream.on('close', function () {
-            if (!safe.child_process.execSync('chown -R ' + BACKUP_USER + ':' + BACKUP_USER + ' ' + path.dirname(newFilePath))) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, safe.error.message));
-
-            callback();
-        });
-
-        readStream.pipe(writeStream);
     });
 }
 
-function removeBackups(apiConfig, backupIds, callback) {
+function remove(apiConfig, filename, callback) {
     assert.strictEqual(typeof apiConfig, 'object');
-    assert(Array.isArray(backupIds));
+    assert.strictEqual(typeof filename, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    async.eachSeries(backupIds, function (id, iteratorCallback) {
-        var filePath = getBackupFilePath(apiConfig, id);
+    var stat = safe.fs.statSync(filename);
+    if (!stat) return callback();
 
-        if (!safe.fs.unlinkSync(filePath)) {
-            debug('removeBackups: Unable to remove %s : %s', filePath, safe.error.message);
-        }
+    if (stat.isFile()) {
+        if (!safe.fs.unlinkSync(filename)) return callback(new BackupsError(BackupsError.EXTERNAL_ERROR, safe.error.message));
+    } else if (stat.isDirectory()) {
+        if (!safe.fs.rmdirSync(filename)) return callback(new BackupsError(BackupsError.EXTERNAL_ERROR, safe.error.message));
+    }
 
-        safe.fs.rmdirSync(path.dirname(filePath)); // try to cleanup empty directories
+    callback(null);
+}
 
-        iteratorCallback();
-    }, callback);
+function removeDir(apiConfig, pathPrefix, callback) {
+    assert.strictEqual(typeof apiConfig, 'object');
+    assert.strictEqual(typeof pathPrefix, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    shell.exec('removeDir', '/bin/rm', [ '-rf', pathPrefix ], { }, function (error) {
+        if (error) return callback(new BackupsError(BackupsError.EXTERNAL_ERROR, error.message));
+
+        callback(null);
+    });
 }
 
 function testConfig(apiConfig, callback) {
     assert.strictEqual(typeof apiConfig, 'object');
     assert.strictEqual(typeof callback, 'function');
 
-    if ('backupFolder' in apiConfig && typeof apiConfig.backupFolder !== 'string') return callback(new BackupsError(BackupsError.BAD_FIELD, 'backupFolder must be string'));
+    if (typeof apiConfig.backupFolder !== 'string') return callback(new BackupsError(BackupsError.BAD_FIELD, 'backupFolder must be string'));
 
-    // default value will be used
-    if (!apiConfig.backupFolder) return callback();
+    if (!apiConfig.backupFolder) return callback(new BackupsError(BackupsError.BAD_FIELD, 'backupFolder is required'));
 
     fs.stat(apiConfig.backupFolder, function (error, result) {
         if (error) {
@@ -175,7 +159,8 @@ function testConfig(apiConfig, callback) {
     });
 }
 
-function backupDone(backupId, appBackupIds, callback) {
+function backupDone(apiConfig, backupId, appBackupIds, callback) {
+    assert.strictEqual(typeof apiConfig, 'object');
     assert.strictEqual(typeof backupId, 'string');
     assert(Array.isArray(appBackupIds));
     assert.strictEqual(typeof callback, 'function');

src/storage/interface.js

@@ -7,10 +7,13 @@
 // -------------------------------------------
 
 exports = module.exports = {
-    backup: backup,
-    restore: restore,
-    copyBackup: copyBackup,
-    removeBackups: removeBackups,
+    upload: upload,
+    download: download,
+    downloadDir: downloadDir,
+    copy: copy,
+
+    remove: remove,
+    removeDir: removeDir,
 
     backupDone: backupDone,
 
@@ -19,10 +22,10 @@ exports = module.exports = {
 
 var assert = require('assert');
 
-function backup(apiConfig, backupId, sourceDirectories, callback) {
+function upload(apiConfig, backupFilePath, sourceStream, callback) {
     assert.strictEqual(typeof apiConfig, 'object');
-    assert.strictEqual(typeof backupId, 'string');
-    assert(Array.isArray(sourceDirectories));
+    assert.strictEqual(typeof backupFilePath, 'string');
+    assert.strictEqual(typeof sourceStream, 'object');
     assert.strictEqual(typeof callback, 'function');
 
     // Result: none
@@ -30,10 +33,28 @@ function backup(apiConfig, backupId, sourceDirectories, callback) {
     callback(new Error('not implemented'));
 }
 
-function restore(apiConfig, backupId, destination, callback) {
+function download(apiConfig, backupFilePath, callback) {
     assert.strictEqual(typeof apiConfig, 'object');
-    assert.strictEqual(typeof backupId, 'string');
-    assert.strictEqual(typeof destination, 'string');
+    assert.strictEqual(typeof backupFilePath, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    // Result: download stream
+    callback(new Error('not implemented'));
+}
+
+function downloadDir(apiConfig, backupFilePath, destDir, callback) {
+    assert.strictEqual(typeof apiConfig, 'object');
+    assert.strictEqual(typeof backupFilePath, 'string');
+    assert.strictEqual(typeof destDir, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    callback(new Error('not implemented'));
+}
+
+function copy(apiConfig, oldFilePath, newFilePath, callback) {
+    assert.strictEqual(typeof apiConfig, 'object');
+    assert.strictEqual(typeof oldFilePath, 'string');
+    assert.strictEqual(typeof newFilePath, 'string');
     assert.strictEqual(typeof callback, 'function');
 
     // Result: none
@@ -41,10 +62,9 @@ function restore(apiConfig, backupId, destination, callback) {
     callback(new Error('not implemented'));
 }
 
-function copyBackup(apiConfig, oldBackupId, newBackupId, callback) {
+function remove(apiConfig, filename, callback) {
     assert.strictEqual(typeof apiConfig, 'object');
-    assert.strictEqual(typeof oldBackupId, 'string');
-    assert.strictEqual(typeof newBackupId, 'string');
+    assert.strictEqual(typeof filename, 'string');
     assert.strictEqual(typeof callback, 'function');
 
     // Result: none
@@ -52,9 +72,9 @@ function copyBackup(apiConfig, oldBackupId, newBackupId, callback) {
     callback(new Error('not implemented'));
 }
 
-function removeBackups(apiConfig, backupIds, callback) {
+function removeDir(apiConfig, pathPrefix, callback) {
     assert.strictEqual(typeof apiConfig, 'object');
-    assert(Array.isArray(backupIds));
+    assert.strictEqual(typeof pathPrefix, 'string');
     assert.strictEqual(typeof callback, 'function');
 
     // Result: none
@@ -71,7 +91,8 @@ function testConfig(apiConfig, callback) {
     callback(new Error('not implemented'));
 }
 
-function backupDone(backupId, appBackupIds, callback) {
+function backupDone(apiConfig, backupId, appBackupIds, callback) {
+    assert.strictEqual(typeof apiConfig, 'object');
     assert.strictEqual(typeof backupId, 'string');
     assert(Array.isArray(appBackupIds));
     assert.strictEqual(typeof callback, 'function');

src/storage/noop.js

@@ -1,10 +1,13 @@
 'use strict';
 
 exports = module.exports = {
-    backup: backup,
-    restore: restore,
-    copyBackup: copyBackup,
-    removeBackups: removeBackups,
+    upload: upload,
+    download: download,
+    downloadDir: downloadDir,
+    copy: copy,
+
+    remove: remove,
+    removeDir: removeDir,
 
     backupDone: backupDone,
 
@@ -14,60 +17,81 @@ exports = module.exports = {
 var assert = require('assert'),
     debug = require('debug')('box:storage/noop');
 
-function backup(apiConfig, backupId, sourceDirectories, callback) {
+function upload(apiConfig, backupFilePath, sourceStream, callback) {
     assert.strictEqual(typeof apiConfig, 'object');
-    assert.strictEqual(typeof backupId, 'string');
-    assert(Array.isArray(sourceDirectories));
+    assert.strictEqual(typeof backupFilePath, 'string');
+    assert.strictEqual(typeof sourceStream, 'object');
     assert.strictEqual(typeof callback, 'function');
 
-    debug('backup: %s %j', backupId, sourceDirectories);
+    debug('upload: %s', backupFilePath);
 
-    callback();
+    callback(null);
 }
 
-function restore(apiConfig, backupId, destination, callback) {
+function download(apiConfig, backupFilePath, callback) {
     assert.strictEqual(typeof apiConfig, 'object');
-    assert.strictEqual(typeof backupId, 'string');
-    assert.strictEqual(typeof destination, 'string');
+    assert.strictEqual(typeof backupFilePath, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    debug('restore: %s %s', backupId, destination);
+    debug('download: %s', backupFilePath);
 
-    callback(new Error('Cannot restore from noop backend'));
+    callback(new Error('Cannot download from noop backend'));
 }
 
-function copyBackup(apiConfig, oldBackupId, newBackupId, callback) {
+function downloadDir(apiConfig, backupFilePath, destDir, callback) {
     assert.strictEqual(typeof apiConfig, 'object');
-    assert.strictEqual(typeof oldBackupId, 'string');
-    assert.strictEqual(typeof newBackupId, 'string');
+    assert.strictEqual(typeof backupFilePath, 'string');
+    assert.strictEqual(typeof destDir, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    debug('copyBackup: %s -> %s', oldBackupId, newBackupId);
+    debug('downloadDir: %s -> %s', backupFilePath, destDir);
 
-    callback();
+    callback(new Error('Cannot download from noop backend'));
 }
 
-function removeBackups(apiConfig, backupIds, callback) {
+function copy(apiConfig, oldFilePath, newFilePath, callback) {
     assert.strictEqual(typeof apiConfig, 'object');
-    assert(Array.isArray(backupIds));
+    assert.strictEqual(typeof oldFilePath, 'string');
+    assert.strictEqual(typeof newFilePath, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    debug('removeBackups: %j', backupIds);
+    debug('copy: %s -> %s', oldFilePath, newFilePath);
 
-    callback();
+    callback(null);
+}
+
+function remove(apiConfig, filename, callback) {
+    assert.strictEqual(typeof apiConfig, 'object');
+    assert.strictEqual(typeof filename, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    debug('remove: %s', filename);
+
+    callback(null);
+}
+
+function removeDir(apiConfig, pathPrefix, callback) {
+    assert.strictEqual(typeof apiConfig, 'object');
+    assert.strictEqual(typeof pathPrefix, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    debug('removeDir: %s', pathPrefix);
+
+    callback(null);
 }
 
 function testConfig(apiConfig, callback) {
     assert.strictEqual(typeof apiConfig, 'object');
     assert.strictEqual(typeof callback, 'function');
 
-    callback();
+    callback(null);
 }
 
-function backupDone(backupId, appBackupIds, callback) {
+function backupDone(apiConfig, backupId, appBackupIds, callback) {
+    assert.strictEqual(typeof apiConfig, 'object');
     assert.strictEqual(typeof backupId, 'string');
     assert(Array.isArray(appBackupIds));
     assert.strictEqual(typeof callback, 'function');
 
-    callback();
+    callback(null);
 }

src/storage/s3.js

@@ -1,10 +1,13 @@
 'use strict';
 
 exports = module.exports = {
-    backup: backup,
-    restore: restore,
-    copyBackup: copyBackup,
-    removeBackups: removeBackups,
+    upload: upload,
+    download: download,
+    downloadDir: downloadDir,
+    copy: copy,
+
+    remove: remove,
+    removeDir: removeDir,
 
     backupDone: backupDone,
 
@@ -16,14 +19,19 @@ exports = module.exports = {
 };
 
 var assert = require('assert'),
+    async = require('async'),
     AWS = require('aws-sdk'),
     BackupsError = require('../backups.js').BackupsError,
+    config = require('../config.js'),
     debug = require('debug')('box:storage/s3'),
-    once = require('once'),
+    fs = require('fs'),
+    chunk = require('lodash.chunk'),
+    mkdirp = require('mkdirp'),
     PassThrough = require('stream').PassThrough,
     path = require('path'),
+    progress = require('../progress.js'),
     S3BlockReadStream = require('s3-block-read-stream'),
-    targz = require('./targz.js');
+    superagent = require('superagent');
 
 // test only
 var originalAWS;
@@ -36,12 +44,37 @@ function mockRestore() {
     AWS = originalAWS;
 }
 
-// internal only
+// TODO: If we decide to use rsync backups for CaaS, we should cache the credentials below
+function getCaasCredentials(apiConfig, callback) {
+    assert.strictEqual(typeof apiConfig, 'object');
+    assert.strictEqual(typeof callback, 'function');
+    assert(apiConfig.token);
+
+    var url = config.apiServerOrigin() + '/api/v1/boxes/' + config.fqdn() + '/awscredentials';
+    superagent.post(url).query({ token: apiConfig.token }).timeout(30 * 1000).end(function (error, result) {
+        if (error && !error.response) return callback(error);
+        if (result.statusCode !== 201) return callback(new Error(result.text));
+        if (!result.body || !result.body.credentials) return callback(new Error('Unexpected response: ' + JSON.stringify(result.headers)));
+
+        var credentials = {
+            signatureVersion: 'v4',
+            accessKeyId: result.body.credentials.AccessKeyId,
+            secretAccessKey: result.body.credentials.SecretAccessKey,
+            sessionToken: result.body.credentials.SessionToken,
+            region: apiConfig.region || 'us-east-1'
+        };
+
+        if (apiConfig.endpoint) credentials.endpoint = new AWS.Endpoint(apiConfig.endpoint);
+
+        callback(null, credentials);
+    });
+}
+
 function getBackupCredentials(apiConfig, callback) {
     assert.strictEqual(typeof apiConfig, 'object');
     assert.strictEqual(typeof callback, 'function');
 
-    assert(apiConfig.accessKeyId && apiConfig.secretAccessKey);
+    if (apiConfig.provider === 'caas') return getCaasCredentials(apiConfig, callback);
 
     var credentials = {
         signatureVersion: apiConfig.signatureVersion || 'v4',
@@ -56,65 +89,41 @@ function getBackupCredentials(apiConfig, callback) {
     callback(null, credentials);
 }
 
-function getBackupFilePath(apiConfig, backupId) {
-    assert.strictEqual(typeof apiConfig, 'object');
-    assert.strictEqual(typeof backupId, 'string');
-
-    const FILE_TYPE = apiConfig.key ? '.tar.gz.enc' : '.tar.gz';
-
-    return path.join(apiConfig.prefix, backupId.endsWith(FILE_TYPE) ? backupId : backupId+FILE_TYPE);
-}
-
 // storage api
-function backup(apiConfig, backupId, sourceDirectories, callback) {
+function upload(apiConfig, backupFilePath, sourceStream, callback) {
     assert.strictEqual(typeof apiConfig, 'object');
-    assert.strictEqual(typeof backupId, 'string');
-    assert(Array.isArray(sourceDirectories));
+    assert.strictEqual(typeof backupFilePath, 'string');
+    assert.strictEqual(typeof sourceStream, 'object');
     assert.strictEqual(typeof callback, 'function');
 
-    callback = once(callback);
-
-    var backupFilePath = getBackupFilePath(apiConfig, backupId);
-
-    debug('[%s] backup: %j -> %s', backupId, sourceDirectories, backupFilePath);
-
     getBackupCredentials(apiConfig, function (error, credentials) {
         if (error) return callback(error);
 
-        var passThrough = new PassThrough();
-
         var params = {
             Bucket: apiConfig.bucket,
             Key: backupFilePath,
-            Body: passThrough
+            Body: sourceStream
         };
 
         var s3 = new AWS.S3(credentials);
         // s3.upload automatically does a multi-part upload. we set queueSize to 1 to reduce memory usage
         s3.upload(params, { partSize: 10 * 1024 * 1024, queueSize: 1 }, function (error) {
             if (error) {
-                debug('[%s] backup: s3 upload error.', backupId, error);
+                debug('[%s] upload: s3 upload error.', backupFilePath, error);
                 return callback(new BackupsError(BackupsError.EXTERNAL_ERROR, error.message));
             }
 
             callback(null);
         });
-
-        targz.create(sourceDirectories, apiConfig.key || null, passThrough, callback);
     });
 }
 
-function restore(apiConfig, backupId, destination, callback) {
+function download(apiConfig, backupFilePath, callback) {
     assert.strictEqual(typeof apiConfig, 'object');
-    assert.strictEqual(typeof backupId, 'string');
-    assert.strictEqual(typeof destination, 'string');
+    assert.strictEqual(typeof backupFilePath, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    callback = once(callback);
-
-    var backupFilePath = getBackupFilePath(apiConfig, backupId);
-
-    debug('[%s] restore: %s -> %s', backupId, backupFilePath, destination);
+    debug('download: %s', backupFilePath);
 
     getBackupCredentials(apiConfig, function (error, credentials) {
         if (error) return callback(error);
@@ -126,87 +135,192 @@ function restore(apiConfig, backupId, destination, callback) {
 
         var s3 = new AWS.S3(credentials);
 
+        var ps = new PassThrough();
         var multipartDownload = new S3BlockReadStream(s3, params, { blockSize: 64 * 1024 * 1024, logCallback: debug });
 
         multipartDownload.on('error', function (error) {
-            // TODO ENOENT for the mock, fix upstream!
-            if (error.code === 'NoSuchKey' || error.code === 'ENOENT') return callback(new BackupsError(BackupsError.NOT_FOUND));
-
-            debug('[%s] restore: s3 stream error.', backupId, error);
-            callback(new BackupsError(BackupsError.EXTERNAL_ERROR, error.message));
+            if (error.code === 'NoSuchKey' || error.code === 'ENOENT') {
+                ps.emit('error', new BackupsError(BackupsError.NOT_FOUND));
+            } else {
+                debug('[%s] download: s3 stream error.', backupFilePath, error);
+                ps.emit('error', new BackupsError(BackupsError.EXTERNAL_ERROR, error.message));
+            }
         });
 
-        targz.extract(multipartDownload, destination, apiConfig.key || null, callback);
+        multipartDownload.pipe(ps);
+
+        callback(null, ps);
     });
 }
 
-function copyBackup(apiConfig, oldBackupId, newBackupId, callback) {
-    assert.strictEqual(typeof apiConfig, 'object');
-    assert.strictEqual(typeof oldBackupId, 'string');
-    assert.strictEqual(typeof newBackupId, 'string');
-    assert.strictEqual(typeof callback, 'function');
-
+function listDir(apiConfig, backupFilePath, options, iteratorCallback, callback) {
     getBackupCredentials(apiConfig, function (error, credentials) {
         if (error) return callback(error);
 
-        var params = {
-            Bucket: apiConfig.bucket,
-            Key: getBackupFilePath(apiConfig, newBackupId),
-            CopySource: path.join(apiConfig.bucket, getBackupFilePath(apiConfig, oldBackupId))
-        };
-
         var s3 = new AWS.S3(credentials);
-        s3.copyObject(params, function (error) {
-            if (error && error.code === 'NoSuchKey') return callback(new BackupsError(BackupsError.NOT_FOUND, 'Old backup not found'));
-            if (error) {
-                debug('copyBackup: s3 copy error.', error);
-                return callback(new BackupsError(BackupsError.EXTERNAL_ERROR, error.message));
-            }
+        var listParams = {
+            Bucket: apiConfig.bucket,
+            Prefix: backupFilePath
+        };
 
-            callback(null);
+        var total = 0;
+
+        async.forever(function listAndDownload(foreverCallback) {
+            s3.listObjectsV2(listParams, function (error, listData) {
+                if (error) {
+                    debug('remove: Failed to list %s. Not fatal.', error);
+                    return foreverCallback(error);
+                }
+
+                debug('listDir: processing %s files (processed %s so far)', listData.Contents.length, total);
+
+                var arr = options.batchSize === 1 ? listData.Contents : chunk(listData.Contents, options.batchSize);
+
+                async.eachLimit(arr, 10, iteratorCallback.bind(null, s3), function iteratorDone(error) {
+                    if (error) return foreverCallback(error);
+
+                    total += listData.KeyCount;
+
+                    if (!listData.IsTruncated) return foreverCallback(new Error('Done'));
+
+                    listParams.StartAfter = listData.Contents[listData.Contents.length - 1].Key; // NextMarker is returned only with delimiter
+
+                    foreverCallback();
+                });
+            });
+        }, function (error) {
+            if (error.message === 'Done') return callback(null);
+
+            callback(error);
         });
     });
 }
 
-function removeBackups(apiConfig, backupIds, callback) {
+function downloadDir(apiConfig, backupFilePath, destDir, callback) {
     assert.strictEqual(typeof apiConfig, 'object');
-    assert(Array.isArray(backupIds));
+    assert.strictEqual(typeof backupFilePath, 'string');
+    assert.strictEqual(typeof destDir, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    listDir(apiConfig, backupFilePath, { batchSize: 1 }, function downloadFile(s3, content, iteratorCallback) {
+        var relativePath = path.relative(backupFilePath, content.Key);
+
+        mkdirp(path.dirname(path.join(destDir, relativePath)), function (error) {
+            if (error) return iteratorCallback(new BackupsError(BackupsError.EXTERNAL_ERROR, error.message));
+
+            download(apiConfig, content.Key, function (error, sourceStream) {
+                if (error) return iteratorCallback(error);
+
+                var destStream = fs.createWriteStream(path.join(destDir, relativePath));
+
+                destStream.on('open', function () {
+                    sourceStream.pipe(destStream);
+                });
+
+                destStream.on('error', function (error) {
+                    return iteratorCallback(new BackupsError(BackupsError.EXTERNAL_ERROR, error.message));
+                });
+
+                destStream.on('finish', iteratorCallback);
+            });
+        });
+    }, callback);
+}
+
+function copy(apiConfig, oldFilePath, newFilePath, callback) {
+    assert.strictEqual(typeof apiConfig, 'object');
+    assert.strictEqual(typeof oldFilePath, 'string');
+    assert.strictEqual(typeof newFilePath, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    listDir(apiConfig, oldFilePath, { batchSize: 1 }, function copyFile(s3, content, iteratorCallback) {
+        var relativePath = path.relative(oldFilePath, content.Key);
+
+        var copyParams = {
+            Bucket: apiConfig.bucket,
+            Key: path.join(newFilePath, relativePath),
+            CopySource: path.join(apiConfig.bucket, content.Key)
+        };
+
+        progress.setDetail(progress.BACKUP, 'Copying ' + content.Key.slice(oldFilePath.length+1));
+
+        s3.copyObject(copyParams, function (error) {
+            if (error && error.code === 'NoSuchKey') return iteratorCallback(new BackupsError(BackupsError.NOT_FOUND, 'Old backup not found'));
+            if (error) {
+                debug('copy: s3 copy error.', error);
+                return iteratorCallback(new BackupsError(BackupsError.EXTERNAL_ERROR, error.message));
+            }
+
+            iteratorCallback();
+        });
+    }, callback);
+}
+
+function remove(apiConfig, filename, callback) {
+    assert.strictEqual(typeof apiConfig, 'object');
+    assert.strictEqual(typeof filename, 'string');
     assert.strictEqual(typeof callback, 'function');
 
     getBackupCredentials(apiConfig, function (error, credentials) {
         if (error) return callback(error);
 
-        var params = {
+        var s3 = new AWS.S3(credentials);
+
+        var deleteParams = {
             Bucket: apiConfig.bucket,
             Delete: {
-                Objects: [ ] // { Key }
+                Objects: [{ Key: filename }]
             }
         };
 
-        backupIds.forEach(function (backupId) {
-            params.Delete.Objects.push({ Key: getBackupFilePath(apiConfig, backupId) });
-        });
-
-        var s3 = new AWS.S3(credentials);
-        s3.deleteObjects(params, function (error, data) {
-            if (error) debug('removeBackups: Unable to remove %s. Not fatal.', params.Key, error);
-            else debug('removeBackups: Deleted: %j Errors: %j', data.Deleted, data.Errors);
+        s3.deleteObjects(deleteParams, function (error) {
+            if (error) debug('remove: Unable to remove %s. Not fatal.', deleteParams.Key, error);
 
             callback(null);
         });
     });
 }
 
+function removeDir(apiConfig, pathPrefix, callback) {
+    assert.strictEqual(typeof apiConfig, 'object');
+    assert.strictEqual(typeof pathPrefix, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    listDir(apiConfig, pathPrefix, { batchSize: 1000 }, function deleteFiles(s3, contents, iteratorCallback) {
+        var deleteParams = {
+            Bucket: apiConfig.bucket,
+            Delete: {
+                Objects: contents.map(function (c) { return { Key: c.Key }; })
+            }
+        };
+
+        s3.deleteObjects(deleteParams, function (error /*, deleteData */) {
+            if (error) {
+                debug('removeDir: Unable to remove %s. Not fatal.', deleteParams.Key, error);
+                return iteratorCallback(error);
+            }
+            // debug('removeDir: Deleted: %j Errors: %j', deleteData.Deleted, deleteData.Errors);
+
+            iteratorCallback();
+        });
+    }, callback);
+}
+
 function testConfig(apiConfig, callback) {
     assert.strictEqual(typeof apiConfig, 'object');
     assert.strictEqual(typeof callback, 'function');
 
-    if (typeof apiConfig.accessKeyId !== 'string') return callback(new BackupsError(BackupsError.BAD_FIELD, 'accessKeyId must be a string'));
-    if (typeof apiConfig.secretAccessKey !== 'string') return callback(new BackupsError(BackupsError.BAD_FIELD, 'secretAccessKey must be a string'));
+    if (apiConfig.provider === 'caas') {
+        if (typeof apiConfig.token !== 'string') return callback(new BackupsError(BackupsError.BAD_FIELD, 'token must be a string'));
+    } else {
+        if (typeof apiConfig.accessKeyId !== 'string') return callback(new BackupsError(BackupsError.BAD_FIELD, 'accessKeyId must be a string'));
+        if (typeof apiConfig.secretAccessKey !== 'string') return callback(new BackupsError(BackupsError.BAD_FIELD, 'secretAccessKey must be a string'));
+    }
+
     if (typeof apiConfig.bucket !== 'string') return callback(new BackupsError(BackupsError.BAD_FIELD, 'bucket must be a string'));
     if (typeof apiConfig.prefix !== 'string') return callback(new BackupsError(BackupsError.BAD_FIELD, 'prefix must be a string'));
-    if ('signatureVersion' in apiConfig && typeof apiConfig.prefix !== 'string') return callback(new BackupsError(BackupsError.BAD_FIELD, 'signatureVersion must be a string'));
-    if ('endpoint' in apiConfig && typeof apiConfig.prefix !== 'string') return callback(new BackupsError(BackupsError.BAD_FIELD, 'endpoint must be a string'));
+    if ('signatureVersion' in apiConfig && typeof apiConfig.signatureVersion !== 'string') return callback(new BackupsError(BackupsError.BAD_FIELD, 'signatureVersion must be a string'));
+    if ('endpoint' in apiConfig && typeof apiConfig.endpoint !== 'string') return callback(new BackupsError(BackupsError.BAD_FIELD, 'endpoint must be a string'));
 
     // attempt to upload and delete a file with new credentials
     getBackupCredentials(apiConfig, function (error, credentials) {
@@ -236,10 +350,34 @@ function testConfig(apiConfig, callback) {
     });
 }
 
-function backupDone(backupId, appBackupIds, callback) {
+function backupDone(apiConfig, backupId, appBackupIds, callback) {
+    assert.strictEqual(typeof apiConfig, 'object');
     assert.strictEqual(typeof backupId, 'string');
     assert(Array.isArray(appBackupIds));
     assert.strictEqual(typeof callback, 'function');
 
-    callback();
+    if (apiConfig.provider !== 'caas') return callback();
+
+    // CaaS expects filenames instead of backupIds, this means no prefix but a file type extension
+    var FILE_TYPE = '.tar.gz.enc';
+    var boxBackupFilename = backupId + FILE_TYPE;
+    var appBackupFilenames = appBackupIds.map(function (id) { return id + FILE_TYPE; });
+
+    debug('[%s] backupDone: %s apps %j', backupId, boxBackupFilename, appBackupFilenames);
+
+    var url = config.apiServerOrigin() + '/api/v1/boxes/' + config.fqdn() + '/backupDone';
+    var data = {
+        boxVersion: config.version(),
+        restoreKey: boxBackupFilename,
+        appId: null,        // now unused
+        appVersion: null,   // now unused
+        appBackupIds: appBackupFilenames
+    };
+
+    superagent.post(url).send(data).query({ token: config.token() }).timeout(30 * 1000).end(function (error, result) {
+        if (error && !error.response) return callback(new BackupsError(BackupsError.EXTERNAL_ERROR, error));
+        if (result.statusCode !== 200) return callback(new BackupsError(BackupsError.EXTERNAL_ERROR, result.text));
+
+        return callback(null);
+    });
 }

src/storage/targz.js

@@ -1,105 +0,0 @@
-'use strict';
-
-exports = module.exports = {
-    create: create,
-    extract: extract
-};
-
-var assert = require('assert'),
-    BackupsError = require('../backups.js').BackupsError,
-    crypto = require('crypto'),
-    debug = require('debug')('box:storage/targz'),
-    mkdirp = require('mkdirp'),
-    progress = require('progress-stream'),
-    tar = require('tar-fs'),
-    zlib = require('zlib');
-
-function create(sourceDirectories, key, outStream, callback) {
-    assert(Array.isArray(sourceDirectories));
-    assert(key === null || typeof key === 'string');
-    assert.strictEqual(typeof callback, 'function');
-
-    var pack = tar.pack('/', {
-        dereference: false, // pack the symlink and not what it points to
-        entries: sourceDirectories.map(function (m) { return m.source; }),
-        map: function(header) {
-            sourceDirectories.forEach(function (m) {
-                header.name = header.name.replace(new RegExp('^' + m.source + '(/?)'), m.destination + '$1');
-            });
-            return header;
-        },
-        strict: false // do not error for unknown types (skip fifo, char/block devices)
-    });
-
-    var gzip = zlib.createGzip({});
-    var progressStream = progress({ time: 10000 }); // display a progress every 10 seconds
-
-    pack.on('error', function (error) {
-        debug('backup: tar stream error.', error);
-        callback(new BackupsError(BackupsError.EXTERNAL_ERROR, error.message));
-    });
-
-    gzip.on('error', function (error) {
-        debug('backup: gzip stream error.', error);
-        callback(new BackupsError(BackupsError.EXTERNAL_ERROR, error.message));
-    });
-
-    progressStream.on('progress', function(progress) {
-        debug('backup: %s@%s', Math.round(progress.transferred/1024/1024) + 'M', Math.round(progress.speed/1024/1024) + 'Mbps');
-    });
-
-    if (key !== null) {
-        var encrypt = crypto.createCipher('aes-256-cbc', key);
-        encrypt.on('error', function (error) {
-            debug('backup: encrypt stream error.', error);
-            callback(new BackupsError(BackupsError.EXTERNAL_ERROR, error.message));
-        });
-        pack.pipe(gzip).pipe(encrypt).pipe(progressStream).pipe(outStream);
-    } else {
-        pack.pipe(gzip).pipe(progressStream).pipe(outStream);
-    }
-}
-
-function extract(inStream, destination, key, callback) {
-    assert.strictEqual(typeof destination, 'string');
-    assert(key === null || typeof key === 'string');
-    assert.strictEqual(typeof callback, 'function');
-
-    mkdirp(destination, function (error) {
-        if (error) return callback(new BackupsError(BackupsError.EXTERNAL_ERROR, error.message));
-
-        var gunzip = zlib.createGunzip({});
-        var progressStream = progress({ time: 10000 }); // display a progress every 10 seconds
-        var extract = tar.extract(destination);
-
-        progressStream.on('progress', function(progress) {
-            debug('restore: %s@%s', Math.round(progress.transferred/1024/1024) + 'M', Math.round(progress.speed/1024/1024) + 'Mbps');
-        });
-
-        gunzip.on('error', function (error) {
-            debug('restore: gunzip stream error.', error);
-            callback(new BackupsError(BackupsError.EXTERNAL_ERROR, error.message));
-        });
-
-        extract.on('error', function (error) {
-            debug('restore: extract stream error.', error);
-            callback(new BackupsError(BackupsError.EXTERNAL_ERROR, error.message));
-        });
-
-        extract.on('finish', function () {
-            debug('restore: done.');
-            callback(null);
-        });
-
-        if (key !== null) {
-            var decrypt = crypto.createDecipher('aes-256-cbc', key);
-            decrypt.on('error', function (error) {
-                debug('restore: decrypt stream error.', error);
-                callback(new BackupsError(BackupsError.EXTERNAL_ERROR, error.message));
-            });
-            inStream.pipe(progressStream).pipe(decrypt).pipe(gunzip).pipe(extract);
-        } else {
-            inStream.pipe(progressStream).pipe(gunzip).pipe(extract);
-        }
-    });
-}

src/subdomains.js

@@ -42,7 +42,7 @@ SubdomainError.BAD_FIELD = 'Bad Field';
 SubdomainError.STILL_BUSY = 'Still busy';
 SubdomainError.INTERNAL_ERROR = 'Internal error';
 SubdomainError.ACCESS_DENIED = 'Access denied';
-SubdomainError.INVALID_PROVIDER = 'provider must be route53, digitalocean, cloudflare, noop, manual or caas';
+SubdomainError.INVALID_PROVIDER = 'provider must be route53, gcdns, digitalocean, cloudflare, noop, manual or caas';
 
 // choose which subdomain backend we use for test purpose we use route53
 function api(provider) {
@@ -52,6 +52,7 @@ function api(provider) {
         case 'caas': return require('./dns/caas.js');
         case 'cloudflare': return require('./dns/cloudflare.js');
         case 'route53': return require('./dns/route53.js');
+        case 'gcdns': return require('./dns/gcdns.js');
         case 'digitalocean': return require('./dns/digitalocean.js');
         case 'noop': return require('./dns/noop.js');
         case 'manual': return require('./dns/manual.js');

src/syncer.js

@@ -0,0 +1,146 @@
+'use strict';
+
+var assert = require('assert'),
+    async = require('async'),
+    debug = require('debug')('box:syncer'),
+    fs = require('fs'),
+    path = require('path'),
+    paths = require('./paths.js'),
+    safe = require('safetydance');
+
+exports = module.exports = {
+    sync: sync
+};
+
+function readCache(cacheFile) {
+    assert.strictEqual(typeof cacheFile, 'string');
+
+    var cache = safe.fs.readFileSync(cacheFile, 'utf8');
+    if (!cache) return [ ];
+    var result = cache.trim().split('\n').map(JSON.parse);
+    return result;
+}
+
+function readTree(dir) {
+    assert.strictEqual(typeof dir, 'string');
+
+    var list = safe.fs.readdirSync(dir).sort();
+    if (!list) return [ ];
+
+    return list.map(function (e) { return { stat: safe.fs.lstatSync(path.join(dir, e)), name: e }; });
+}
+
+function ISDIR(x) {
+    return (x & fs.constants.S_IFDIR) === fs.constants.S_IFDIR;
+}
+
+function ISFILE(x) {
+    return (x & fs.constants.S_IFREG) === fs.constants.S_IFREG;
+}
+
+function sync(dir, taskProcessor, concurrency, callback) {
+    assert.strictEqual(typeof dir, 'string');
+    assert.strictEqual(typeof taskProcessor, 'function');
+    assert.strictEqual(typeof concurrency, 'number');
+    assert.strictEqual(typeof callback, 'function');
+
+    var curCacheIndex = 0, addQueue = [ ], delQueue = [ ];
+
+    var cacheFile = path.join(paths.BACKUP_INFO_DIR, path.basename(dir) + '.sync.cache'),
+        newCacheFile = path.join(paths.BACKUP_INFO_DIR, path.basename(dir) + '.sync.cache.new');
+
+    if (!safe.fs.existsSync(cacheFile)) { // if cache is missing, start out empty. TODO: do a remote listDir and rebuild
+        delQueue.push({ operation: 'removedir', path: '', reason: 'nocache' });
+    }
+
+    var cache = readCache(cacheFile);
+
+    var newCacheFd = safe.fs.openSync(newCacheFile, 'w'); // truncates any existing file
+    if (newCacheFd === -1) return callback(new Error('Error opening new cache file: ' + safe.error.message));
+
+    function advanceCache(entryPath) {
+        var lastRemovedDir = null;
+
+        for (; curCacheIndex !== cache.length && (entryPath === '' || cache[curCacheIndex].path < entryPath); ++curCacheIndex) {
+            // ignore subdirs of lastRemovedDir since it was removed already
+            if (lastRemovedDir && cache[curCacheIndex].path.startsWith(lastRemovedDir)) continue;
+
+            if (ISDIR(cache[curCacheIndex].stat.mode)) {
+                delQueue.push({ operation: 'removedir', path: cache[curCacheIndex].path, reason: 'missing' });
+                lastRemovedDir = cache[curCacheIndex].path;
+            } else {
+                delQueue.push({ operation: 'remove', path: cache[curCacheIndex].path, reason: 'missing' });
+                lastRemovedDir = null;
+            }
+        }
+    }
+
+    function traverse(relpath) {
+        var entries = readTree(path.join(dir, relpath));
+
+        for (var i = 0; i < entries.length; i++) {
+            var entryPath = path.join(relpath, entries[i].name);
+            var entryStat = entries[i].stat;
+
+            if (!entryStat) continue; // some stat error. prented it doesn't exist
+            if (!entryStat.isDirectory() && !entryStat.isFile()) continue; // ignore non-files and dirs
+            if (entryStat.isSymbolicLink()) continue;
+
+            safe.fs.appendFileSync(newCacheFd, JSON.stringify({ path: entryPath, stat: { mtime: entryStat.mtime.getTime(), size: entryStat.size, inode: entryStat.inode, mode: entryStat.mode } }) + '\n');
+
+            if (curCacheIndex !== cache.length && cache[curCacheIndex].path < entryPath) { // files disappeared. first advance cache as needed
+                advanceCache(entryPath);
+            }
+
+            const cachePath = curCacheIndex === cache.length ? null : cache[curCacheIndex].path;
+            const cacheStat = curCacheIndex === cache.length ? null : cache[curCacheIndex].stat;
+
+            if (cachePath === null || cachePath > entryPath) { // new files appeared
+                if (entryStat.isDirectory()) {
+                    traverse(entryPath);
+                } else {
+                    addQueue.push({ operation: 'add', path: entryPath, reason: 'new' });
+                }
+            } else if (ISDIR(cacheStat.mode) && entryStat.isDirectory()) { // dir names match
+                ++curCacheIndex;
+                traverse(entryPath);
+            } else if (ISFILE(cacheStat.mode) && entryStat.isFile()) { // file names match
+                if (entryStat.mtime.getTime() !== cacheStat.mtime || entryStat.size != cacheStat.size || entryStat.inode !== cacheStat.inode) { // file changed
+                    addQueue.push({ operation: 'add', path: entryPath, reason: 'changed' });
+                }
+                ++curCacheIndex;
+            } else if (entryStat.isDirectory()) { // was a file, now a directory
+                delQueue.push({ operation: 'remove', path: cachePath, reason: 'wasfile' });
+                ++curCacheIndex;
+                traverse(entryPath);
+            } else { // was a dir, now a file
+                delQueue.push({ operation: 'removedir', path: cachePath, reason: 'wasdir' });
+                while (curCacheIndex !== cache.length && cache[curCacheIndex].path.startsWith(cachePath)) ++curCacheIndex;
+                addQueue.push({ operation: 'add', path: entryPath, reason: 'wasdir' });
+            }
+        }
+    }
+
+    traverse('');
+    advanceCache(''); // remove rest of the cache entries
+
+    safe.fs.closeSync(newCacheFd);
+
+    debug('Processing %s deletes and %s additions', delQueue.length, addQueue.length);
+
+    async.eachLimit(delQueue, concurrency, taskProcessor, function (error) {
+        debug('Done processing deletes', error);
+
+        async.eachLimit(addQueue, concurrency, taskProcessor, function (error) {
+            debug('Done processing adds', error);
+
+            if (error) return callback(error);
+
+            safe.fs.unlinkSync(cacheFile);
+
+            if (!safe.fs.renameSync(newCacheFile, cacheFile)) debug('Unable to save new cache file');
+
+            callback();
+        });
+    });
+}

src/test/apptask-test.js

@@ -138,9 +138,19 @@ describe('apptask', function () {
         });
     });
 
-    it('delete volume', function (done) {
-        apptask._deleteVolume(APP, function (error) {
+    it('delete volume - removeDirectory (false) ', function (done) {
+        apptask._deleteVolume(APP, { removeDirectory: false }, function (error) {
             expect(!fs.existsSync(paths.APPS_DATA_DIR + '/' + APP.id + '/data')).to.be(true);
+            expect(fs.existsSync(paths.APPS_DATA_DIR + '/' + APP.id)).to.be(true);
+            expect(fs.readdirSync(paths.APPS_DATA_DIR + '/' + APP.id).length).to.be(0); // empty
+            expect(error).to.be(null);
+            done();
+        });
+    });
+
+    it('delete volume - removeDirectory (true) ', function (done) {
+        apptask._deleteVolume(APP, { removeDirectory: true }, function (error) {
+            expect(!fs.existsSync(paths.APPS_DATA_DIR + '/' + APP.id)).to.be(true);
             expect(error).to.be(null);
             done();
         });

src/test/backups-test.js

@@ -7,13 +7,88 @@
 'use strict';
 
 var async = require('async'),
-    appdb = require('../appdb.js'),
     backupdb = require('../backupdb.js'),
     backups = require('../backups.js'),
+    createTree = require('./common.js').createTree,
     database = require('../database'),
     DatabaseError = require('../databaseerror.js'),
     expect = require('expect.js'),
-    settings = require('../settings.js');
+    fs = require('fs'),
+    os = require('os'),
+    mkdirp = require('mkdirp'),
+    readdirp = require('readdirp'),
+    path = require('path'),
+    progress = require('../progress.js'),
+    rimraf = require('rimraf'),
+    settings = require('../settings.js'),
+    SettingsError = require('../settings.js').SettingsError;
+
+function compareDirectories(one, two, callback) {
+    readdirp({ root: one }, function (error, treeOne) {
+        if (error) return callback(error);
+
+        readdirp({ root: two }, function (error, treeTwo) {
+            if (error) return callback(error);
+
+            var mismatch = [];
+
+            function compareDirs(a, b) {
+                a.forEach(function (tmpA) {
+                    var found = b.find(function (tmpB) {
+                        return tmpA.path === tmpB.path;
+                    });
+
+                    if (!found) mismatch.push(tmpA);
+                });
+            }
+
+            function compareFiles(a, b) {
+                a.forEach(function (tmpA) {
+                    var found = b.find(function (tmpB) {
+                        // TODO check file or symbolic link
+                        return tmpA.path === tmpB.path && tmpA.mode === tmpB.mode;
+                    });
+
+                    if (!found) mismatch.push(tmpA);
+                });
+            }
+
+            compareDirs(treeOne.directories, treeTwo.directories);
+            compareDirs(treeTwo.directories, treeOne.directories);
+            compareFiles(treeOne.files, treeTwo.files);
+            compareFiles(treeTwo.files, treeOne.files);
+
+            if (mismatch.length) {
+                console.error('Files not found in both: %j', mismatch);
+                return callback(new Error('file mismatch'));
+            }
+
+            callback(null);
+        });
+    });
+}
+
+function createBackup(callback) {
+    backups.backup({ username: 'test' }, function (error) { // this call does not wait for the backup!
+        if (error) return callback(error);
+
+        function waitForBackup() {
+            var p = progress.getAll();
+            if (p.backup.percent !== 100) return setTimeout(waitForBackup, 1000);
+
+            if (p.backup.message) return callback(new Error('backup failed:' + p.backup.message));
+
+            backups.getByStatePaged(backupdb.BACKUP_STATE_NORMAL, 1, 1, function (error, result) {
+                if (error) return callback(error);
+                if (result.length !== 1) return callback(new Error('result is not of length 1'));
+
+                callback(null, result[0]);
+            });
+        }
+
+        setTimeout(waitForBackup, 1000);
+    });
+}
 
 describe('backups', function () {
     before(function (done) {
@@ -24,7 +99,9 @@ describe('backups', function () {
             settings.setBackupConfig.bind(null, {
                 provider: 'filesystem',
                 key: 'enckey',
-                retentionSecs: 1
+                backupFolder: '/var/backups',
+                retentionSecs: 1,
+                format: 'tgz'
             })
         ], done);
     });
@@ -44,7 +121,8 @@ describe('backups', function () {
             version: '1.0.0',
             type: backupdb.BACKUP_TYPE_BOX,
             dependsOn: [ 'backup-app-00', 'backup-app-01' ],
-            restoreConfig: null
+            restoreConfig: null,
+            format: 'tgz'
         };
 
         var BACKUP_0_APP_0 = {
@@ -52,7 +130,8 @@ describe('backups', function () {
             version: '1.0.0',
             type: backupdb.BACKUP_TYPE_APP,
             dependsOn: [],
-            restoreConfig: null
+            restoreConfig: null,
+            format: 'tgz'
         };
 
         var BACKUP_0_APP_1 = {
@@ -60,7 +139,8 @@ describe('backups', function () {
             version: '1.0.0',
             type: backupdb.BACKUP_TYPE_APP,
             dependsOn: [],
-            restoreConfig: null
+            restoreConfig: null,
+            format: 'tgz'
         };
 
         var BACKUP_1 = {
@@ -68,7 +148,8 @@ describe('backups', function () {
             version: '1.0.0',
             type: backupdb.BACKUP_TYPE_BOX,
             dependsOn: [ 'backup-app-10', 'backup-app-11' ],
-            restoreConfig: null
+            restoreConfig: null,
+            format: 'tgz'
         };
 
         var BACKUP_1_APP_0 = {
@@ -76,7 +157,8 @@ describe('backups', function () {
             version: '1.0.0',
             type: backupdb.BACKUP_TYPE_APP,
             dependsOn: [],
-            restoreConfig: null
+            restoreConfig: null,
+            format: 'tgz'
         };
 
         var BACKUP_1_APP_1 = {
@@ -84,11 +166,12 @@ describe('backups', function () {
             version: '1.0.0',
             type: backupdb.BACKUP_TYPE_APP,
             dependsOn: [],
-            restoreConfig: null
+            restoreConfig: null,
+            format: 'tgz'
         };
 
         it('succeeds without backups', function (done) {
-            backups.cleanup(done);
+            backups.cleanup({ username: 'test' }, done);
         });
 
         it('succeeds with box backups, keeps latest', function (done) {
@@ -100,7 +183,7 @@ describe('backups', function () {
             }, function (error) {
                 expect(error).to.not.be.ok();
 
-                backups.cleanup(function (error) {
+                backups.cleanup({ username: 'test' }, function (error) {
                     expect(error).to.not.be.ok();
 
                     backupdb.getByTypePaged(backupdb.BACKUP_TYPE_BOX, 1, 1000, function (error, result) {
@@ -121,7 +204,7 @@ describe('backups', function () {
         });
 
         it('does not remove expired backups if only one left', function (done) {
-            backups.cleanup(function (error) {
+            backups.cleanup({ username: 'test' }, function (error) {
                 expect(error).to.not.be.ok();
 
                 backupdb.getByTypePaged(backupdb.BACKUP_TYPE_BOX, 1, 1000, function (error, result) {
@@ -146,7 +229,7 @@ describe('backups', function () {
 
                 // wait for expiration
                 setTimeout(function () {
-                    backups.cleanup(function (error) {
+                    backups.cleanup({ username: 'test' }, function (error) {
                         expect(error).to.not.be.ok();
 
                         backupdb.getByTypePaged(backupdb.BACKUP_TYPE_APP, 1, 1000, function (error, result) {
@@ -160,4 +243,109 @@ describe('backups', function () {
             });
         });
     });
+
+    describe('empty dirs', function () {
+        var tmpdir;
+        before(function () {
+            tmpdir = fs.mkdtempSync(path.join(os.tmpdir(), 'backups-test'));
+        });
+        after(function () {
+            rimraf.sync(tmpdir);
+        });
+
+        it('saves empty dirs file', function (done) {
+            createTree(tmpdir, { 'data': { 'subdir': { 'emptydir': { } } }, 'dir2': { 'file': 'stuff' } });
+
+            backups._saveEmptyDirs(tmpdir, function (error) {
+                expect(error).to.not.be.ok();
+
+                var emptyDirs = fs.readFileSync(path.join(tmpdir, 'emptydirs.txt'), 'utf8').trim().split('\n');
+                expect(emptyDirs).to.eql(['./data/subdir/emptydir']);
+
+                done();
+            });
+        });
+
+        it('creates empty dirs file', function (done) {
+            rimraf.sync(path.join(tmpdir, 'data'));
+
+            expect(fs.existsSync(path.join(tmpdir, 'data/subdir/emptydir'))).to.be(false); // just make sure rimraf worked
+
+            backups._createEmptyDirs(tmpdir, function (error) {
+                expect(error).to.not.be.ok();
+
+                expect(fs.existsSync(path.join(tmpdir, 'data/subdir/emptydir'))).to.be(true);
+
+                done();
+            });
+        });
+    });
+
+    describe('filesystem', function () {
+        var backupInfo1;
+
+        var gBackupConfig = {
+            provider: 'filesystem',
+            backupFolder: path.join(os.tmpdir(), 'backups-test-filesystem'),
+            format: 'tgz'
+        };
+
+        before(function (done) {
+            rimraf.sync(gBackupConfig.backupFolder);
+
+            done();
+        });
+
+        after(function (done) {
+            rimraf.sync(gBackupConfig.backupFolder);
+            progress.clear(progress.BACKUP);
+            done();
+        });
+
+        it('fails to set backup config for non-existing folder', function (done) {
+            settings.setBackupConfig(gBackupConfig, function (error) {
+                expect(error).to.be.a(SettingsError);
+                expect(error.reason).to.equal(SettingsError.BAD_FIELD);
+
+                done();
+            });
+        });
+
+        it('succeeds to set backup config', function (done) {
+            mkdirp.sync(gBackupConfig.backupFolder);
+
+            settings.setBackupConfig(gBackupConfig, function (error) {
+                expect(error).to.be(null);
+
+                done();
+            });
+        });
+
+        it('can backup', function (done) {
+            this.timeout(6000);
+
+            createBackup(function (error, result) {
+                expect(error).to.be(null);
+                expect(fs.statSync(path.join(gBackupConfig.backupFolder, 'snapshot/box.tar.gz')).nlink).to.be(2); // hard linked to a rotated backup
+                expect(fs.statSync(path.join(gBackupConfig.backupFolder, `${result.id}.tar.gz`)).nlink).to.be(2);
+
+                backupInfo1 = result;
+
+                done();
+            });
+        });
+
+        it('can take another backup', function (done) {
+            this.timeout(6000);
+
+            createBackup(function (error, result) {
+                expect(error).to.be(null);
+                expect(fs.statSync(path.join(gBackupConfig.backupFolder, 'snapshot/box.tar.gz')).nlink).to.be(2); // hard linked to a rotated backup
+                expect(fs.statSync(path.join(gBackupConfig.backupFolder, `${result.id}.tar.gz`)).nlink).to.be(2); // hard linked to new backup
+                expect(fs.statSync(path.join(gBackupConfig.backupFolder, `${backupInfo1.id}.tar.gz`)).nlink).to.be(1); // not hard linked anymore
+
+                done();
+            });
+        });
+    });
 });

src/test/checkInstall

@@ -15,11 +15,10 @@ scripts=("${SOURCE_DIR}/src/scripts/rmappdir.sh" \
          "${SOURCE_DIR}/src/scripts/reboot.sh" \
          "${SOURCE_DIR}/src/scripts/update.sh" \
          "${SOURCE_DIR}/src/scripts/collectlogs.sh" \
-         "${SOURCE_DIR}/src/scripts/reloadcollectd.sh" \
+         "${SOURCE_DIR}/src/scripts/configurecollectd.sh" \
          "${SOURCE_DIR}/src/scripts/authorized_keys.sh" \
-         "${SOURCE_DIR}/src/scripts/node.sh" \
-         "${SOURCE_DIR}/src/scripts/mvlogrotateconfig.sh" \
-         "${SOURCE_DIR}/src/scripts/rmlogrotateconfig.sh")
+         "${SOURCE_DIR}/src/backuptask.js" \
+         "${SOURCE_DIR}/src/scripts/configurelogrotate.sh")
 
 for script in "${scripts[@]}"; do
     if [[ $(sudo -n "${script}" --check 2>/dev/null) != "OK" ]]; then

src/test/common.js

@@ -0,0 +1,33 @@
+'use strict';
+
+var fs = require('fs'),
+    mkdirp = require('mkdirp'),
+    path = require('path'),
+    rimraf = require('rimraf');
+
+exports = module.exports = {
+    createTree: createTree
+};
+
+function createTree(root, obj) {
+    rimraf.sync(root);
+    mkdirp.sync(root);
+
+    function createSubTree(tree, curpath) {
+        for (var key in tree) {
+            if (typeof tree[key] === 'string') {
+                if (key.startsWith('link:')) {
+                    fs.symlinkSync(tree[key], path.join(curpath, key.slice(5)));
+                } else {
+                    fs.writeFileSync(path.join(curpath, key), tree[key], 'utf8');
+                }
+            } else {
+                fs.mkdirSync(path.join(curpath, key));
+                createSubTree(tree[key], path.join(curpath, key));
+            }
+        }
+    }
+
+    createSubTree(obj, root);
+}
+

src/test/config-test.js

@@ -17,7 +17,7 @@ describe('config', function () {
     });
 
     after(function () {
-        delete require.cache[require.resolve('../config.js')];
+        config._reset();
     });
 
     it('baseDir() is set', function (done) {
@@ -94,4 +94,7 @@ describe('config', function () {
         done();
     });
 
+    it('test machine has IPv6 support', function () {
+        expect(config.hasIPv6()).to.equal(true);
+    });
 });

src/test/database-test.js

@@ -1025,7 +1025,8 @@ describe('database', function () {
                 version: '1.0.0',
                 type: backupdb.BACKUP_TYPE_BOX,
                 dependsOn: [ 'dep1' ],
-                restoreConfig: null
+                restoreConfig: null,
+                format: 'tgz'
             };
 
             backupdb.add(backup, function (error) {
@@ -1090,7 +1091,8 @@ describe('database', function () {
                 version: '1.0.0',
                 type: backupdb.BACKUP_TYPE_APP,
                 dependsOn: [ ],
-                restoreConfig: { manifest: { foo: 'bar' } }
+                restoreConfig: { manifest: { foo: 'bar' } },
+                format: 'tgz'
             };
 
             backupdb.add(backup, function (error) {

src/test/digest-test.js

@@ -12,6 +12,7 @@ var async = require('async'),
     eventlog = require('../eventlog.js'),
     expect = require('expect.js'),
     mailer = require('../mailer.js'),
+    nock = require('nock'),
     paths = require('../paths.js'),
     safe = require('safetydance'),
     settings = require('../settings.js'),
@@ -30,10 +31,15 @@ var AUDIT_SOURCE = {
     ip: '1.2.3.4'
 };
 
-function checkMails(number, done) {
+function checkMails(number, email, done) {
     // mails are enqueued async
     setTimeout(function () {
         expect(mailer._getMailQueue().length).to.equal(number);
+
+        if (number && email) {
+            expect(mailer._getMailQueue()[0].to.indexOf(email)).to.not.equal(-1);
+        }
+
         mailer._clearMailQueue();
         done();
     }, 500);
@@ -78,7 +84,7 @@ describe('digest', function () {
         it('does not send mail with digest disabled', function (done) {
             digest.maybeSend(function (error) {
                 if (error) return done(error);
-                checkMails(0, done);
+                checkMails(0, '', done);
             });
         });
 
@@ -93,7 +99,7 @@ describe('digest', function () {
             digest.maybeSend(function (error) {
                 if (error) return done(error);
 
-                checkMails(1, done);
+                checkMails(1, '', done);
             });
         });
 
@@ -103,7 +109,40 @@ describe('digest', function () {
             digest.maybeSend(function (error) {
                 if (error) return done(error);
 
-                checkMails(1, done);
+                checkMails(1, '', done);
+            });
+        });
+
+        it('sends mail for pending update to appstore account email (caas)', function (done) {
+            var subscription = {
+                id: 'caas',
+                created: 0,
+                canceled_at: 0,
+                status: 'active',
+                plan: { id: 'caas' }
+            };
+
+            updatechecker._setUpdateInfo({ box: null, apps: { 'appid': { manifest: { version: '1.2.5', changelog: 'noop\nreally' } } } });
+            var fake1 = nock(config.apiServerOrigin()).post(function (uri) { return uri.indexOf('/api/v1/users/test-user/cloudrons') >= 0; }).reply(201, { cloudron: { id: 'test-cloudron' }});
+            var fake2 = nock(config.apiServerOrigin()).get(function (uri) { return uri.indexOf('/api/v1/users/test-user/cloudrons/test-cloudron/subscription') >= 0; }).reply(200, { subscription: subscription });
+            var fake3 = nock(config.apiServerOrigin()).get('/api/v1/users/test-user?accessToken=test-token').reply(200, { profile: { id: 'test-user', email: 'test@email.com' } });
+
+            settings.setAppstoreConfig({ userId: 'test-user', token: 'test-token', cloudronId: 'test-cloudron' }, function (error) {
+                if (error) return done(error);
+
+                digest.maybeSend(function (error) {
+                    if (error) return done(error);
+
+                    checkMails(1, 'test@email.com', function (error) {
+                        if (error) return done(error);
+
+                        expect(fake1.isDone()).to.be.ok();
+                        expect(fake2.isDone()).to.be.ok();
+                        expect(fake3.isDone()).to.be.ok();
+
+                        done();
+                    });
+                });
             });
         });
     });

src/test/dns-test.js

@@ -8,6 +8,7 @@
 
 var async = require('async'),
     AWS = require('aws-sdk'),
+    GCDNS = require('@google-cloud/dns'),
     config = require('../config.js'),
     database = require('../database.js'),
     expect = require('expect.js'),
@@ -108,7 +109,7 @@ describe('dns provider', function () {
 
             subdomains.upsert('test', 'A', [ '1.2.3.4' ], function (error, result) {
                 expect(error).to.eql(null);
-                expect(result).to.eql('unused');
+                expect(result).to.eql('3352892');
                 expect(req1.isDone()).to.be.ok();
                 expect(req2.isDone()).to.be.ok();
 
@@ -154,11 +155,11 @@ describe('dns provider', function () {
                 .reply(200, { domain_records: [ DOMAIN_RECORD_0, DOMAIN_RECORD_1 ] });
             var req2 = nock(DIGITALOCEAN_ENDPOINT).filteringRequestBody(function () { return false; })
                 .put('/v2/domains/' + config.zoneName() + '/records/' + DOMAIN_RECORD_1.id)
-                .reply(200, { domain_records: DOMAIN_RECORD_1_NEW });
+                .reply(200, { domain_record: DOMAIN_RECORD_1_NEW });
 
             subdomains.upsert('test', 'A', [ DOMAIN_RECORD_1_NEW.data ], function (error, result) {
                 expect(error).to.eql(null);
-                expect(result).to.eql('unused');
+                expect(result).to.eql('3352893');
                 expect(req1.isDone()).to.be.ok();
                 expect(req2.isDone()).to.be.ok();
 
@@ -234,17 +235,17 @@ describe('dns provider', function () {
                 .reply(200, { domain_records: [ DOMAIN_RECORD_0, DOMAIN_RECORD_1, DOMAIN_RECORD_2 ] });
             var req2 = nock(DIGITALOCEAN_ENDPOINT).filteringRequestBody(function () { return false; })
                 .put('/v2/domains/' + config.zoneName() + '/records/' + DOMAIN_RECORD_1.id)
-                .reply(200, { domain_records: DOMAIN_RECORD_1_NEW });
+                .reply(200, { domain_record: DOMAIN_RECORD_1_NEW });
             var req3 = nock(DIGITALOCEAN_ENDPOINT).filteringRequestBody(function () { return false; })
                 .put('/v2/domains/' + config.zoneName() + '/records/' + DOMAIN_RECORD_2.id)
-                .reply(200, { domain_records: DOMAIN_RECORD_2_NEW });
+                .reply(200, { domain_record: DOMAIN_RECORD_2_NEW });
             var req4 = nock(DIGITALOCEAN_ENDPOINT).filteringRequestBody(function () { return false; })
                 .post('/v2/domains/' + config.zoneName() + '/records')
-                .reply(201, { domain_records: DOMAIN_RECORD_2_NEW });
+                .reply(201, { domain_record: DOMAIN_RECORD_2_NEW });
 
             subdomains.upsert('', 'TXT', [ DOMAIN_RECORD_2_NEW.data, DOMAIN_RECORD_1_NEW.data, DOMAIN_RECORD_3_NEW.data ], function (error, result) {
                 expect(error).to.eql(null);
-                expect(result).to.eql('unused');
+                expect(result).to.eql('3352893');
                 expect(req1.isDone()).to.be.ok();
                 expect(req2.isDone()).to.be.ok();
                 expect(req3.isDone()).to.be.ok();
@@ -517,4 +518,134 @@ describe('dns provider', function () {
             });
         });
     });
+
+    describe('gcdns', function () {
+        var HOSTED_ZONES = [];
+        var zoneQueue = [];
+        var _OriginalGCDNS;
+
+        before(function (done) {
+            var domain = 'example.com';
+            config.setFqdn(domain);
+            config.setZoneName(domain);
+            var dnsConfig = {
+                provider: 'gcdns',
+                projectId: 'my-dns-proj',
+                keyFilename: __dirname + '/syn-im-1ec6f9f870bf.json'
+            };
+
+            function mockery (queue) {
+                return function() {
+                    var callback = arguments[--arguments.length];
+
+                    var elem = queue.shift();
+                    if (!util.isArray(elem)) throw(new Error('Mock answer required'));
+
+                    // if no callback passed, return a req object with send();
+                    if (typeof callback !== 'function') {
+                        return {
+                            httpRequest: { headers: {} },
+                            send: function (callback) {
+                                expect(callback).to.be.a(Function);
+                                callback.apply(callback, elem);
+                            }
+                        };
+                    } else {
+                        callback.apply(callback, elem);
+                    }
+                };
+            }
+
+            function fakeZone(name, ns, recordQueue) {
+                var zone = GCDNS().zone(name.replace('.', '-'));
+                zone.metadata.dnsName = name + '.';
+                zone.metadata.nameServers = ns || ['8.8.8.8', '8.8.4.4'];
+                zone.getRecords = mockery(recordQueue || zoneQueue);
+                zone.createChange = mockery(recordQueue || zoneQueue);
+                zone.replaceRecords = mockery(recordQueue || zoneQueue);
+                zone.deleteRecords = mockery(recordQueue || zoneQueue);
+                return zone;
+            }
+            HOSTED_ZONES = [fakeZone(domain), fakeZone('cloudron.us')];
+
+            _OriginalGCDNS = GCDNS.prototype.getZones;
+            GCDNS.prototype.getZones = mockery(zoneQueue);
+
+            settings.setDnsConfig(dnsConfig, config.fqdn(), config.zoneName(), done);
+        });
+
+        after(function () {
+            GCDNS.prototype.getZones = _OriginalGCDNS;
+            _OriginalGCDNS = null;
+        });
+
+        it('upsert non-existing record succeeds', function (done) {
+            zoneQueue.push([null, HOSTED_ZONES]); // getZone
+            zoneQueue.push([null, [ ]]); // getRecords
+            zoneQueue.push([null, {id: '1'}]);
+            subdomains.upsert('test', 'A', [ '1.2.3.4' ], function (error, result) {
+                expect(error).to.eql(null);
+                expect(result).to.eql('1');
+                expect(zoneQueue.length).to.eql(0);
+
+                done();
+            });
+        });
+
+        it('upsert existing record succeeds', function (done) {
+            zoneQueue.push([null, HOSTED_ZONES]);
+            zoneQueue.push([null, [GCDNS().zone('test').record('A', {'name': 'test', data:['5.6.7.8'], ttl: 1})]]);
+            zoneQueue.push([null, {id: '2'}]);
+
+            subdomains.upsert('test', 'A', [ '1.2.3.4' ], function (error, result) {
+                expect(error).to.eql(null);
+                expect(result).to.eql('2');
+                expect(zoneQueue.length).to.eql(0);
+
+                done();
+            });
+        });
+
+        it('upsert multiple record succeeds', function (done) {
+            zoneQueue.push([null, HOSTED_ZONES]);
+            zoneQueue.push([null, [ ]]); // getRecords
+            zoneQueue.push([null, {id: '3'}]);
+
+            subdomains.upsert('', 'TXT', [ 'first', 'second', 'third' ], function (error, result) {
+                expect(error).to.eql(null);
+                expect(result).to.eql('3');
+                expect(zoneQueue.length).to.eql(0);
+
+                done();
+            });
+        });
+
+        it('get succeeds', function (done) {
+            zoneQueue.push([null, HOSTED_ZONES]);
+            zoneQueue.push([null, [GCDNS().zone('test').record('A', {'name': 'test', data:['1.2.3.4', '5.6.7.8'], ttl: 1})]]);
+
+            subdomains.get('test', 'A', function (error, result) {
+                expect(error).to.eql(null);
+                expect(result).to.be.an(Array);
+                expect(result.length).to.eql(2);
+                expect(result).to.eql(['1.2.3.4', '5.6.7.8']);
+                expect(zoneQueue.length).to.eql(0);
+
+                done();
+            });
+        });
+
+        it('del succeeds', function (done) {
+            zoneQueue.push([null, HOSTED_ZONES]);
+            zoneQueue.push([null, [GCDNS().zone('test').record('A', {'name': 'test', data:['5.6.7.8'], ttl: 1})]]);
+            zoneQueue.push([null, {id: '5'}]);
+
+            subdomains.remove('test', 'A', ['1.2.3.4'], function (error) {
+                expect(error).to.eql(null);
+                expect(zoneQueue.length).to.eql(0);
+
+                done();
+            });
+        });
+    });
 });

src/test/server-test.js

@@ -6,12 +6,11 @@
 
 'use strict';
 
-var async = require('async'),
-    progress = require('../progress.js'),
-    config = require('../config.js'),
+var config = require('../config.js'),
     database = require('../database.js'),
     expect = require('expect.js'),
     nock = require('nock'),
+    progress = require('../progress.js'),
     superagent = require('superagent'),
     server = require('../server.js');
 

src/test/settings-test.js

@@ -9,18 +9,29 @@ var async = require('async'),
     config = require('../config.js'),
     database = require('../database.js'),
     expect = require('expect.js'),
+    MockS3 = require('mock-aws-s3'),
+    nock = require('nock'),
+    os = require('os'),
+    path = require('path'),
+    rimraf = require('rimraf'),
+    s3 = require('../storage/s3.js'),
     settings = require('../settings.js'),
     settingsdb = require('../settingsdb.js');
 
 function setup(done) {
     config.set('provider', 'caas');
+    nock.cleanAll();
 
     async.series([
         database.initialize,
         settings.initialize,
         function (callback) {
+            MockS3.config.basePath = path.join(os.tmpdir(), 's3-settings-test-buckets/');
+
+            s3._mockInject(MockS3);
+
             // a cloudron must have a backup config to startup
-            settings.setBackupConfig({ provider: 'caas', token: 'foo', key: 'key'}, function (error) {
+            settingsdb.set(settings.BACKUP_CONFIG_KEY, JSON.stringify({ provider: 'caas', token: 'foo', key: 'key', format: 'tgz'}), function (error) {
                 expect(error).to.be(null);
                 callback();
             });
@@ -29,6 +40,9 @@ function setup(done) {
 }
 
 function cleanup(done) {
+    s3._mockRestore();
+    rimraf.sync(MockS3.config.basePath);
+
     async.series([
         settings.uninitialize,
         database._clear
@@ -129,7 +143,11 @@ describe('Settings', function () {
         });
 
         it('can set backup config', function (done) {
-            settings.setBackupConfig({ provider: 'caas', token: 'TOKEN' }, function (error) {
+            var scope2 = nock(config.apiServerOrigin())
+                .post('/api/v1/boxes/' + config.fqdn() + '/awscredentials?token=TOKEN')
+                .reply(201, { credentials: { AccessKeyId: 'accessKeyId', SecretAccessKey: 'secretAccessKey', SessionToken: 'sessionToken' } });
+
+            settings.setBackupConfig({ provider: 'caas', token: 'TOKEN', format: 'tgz', prefix: 'boxid', bucket: 'bucket' }, function (error) {
                 expect(error).to.be(null);
                 done();
             });

src/test/setupTest

@@ -10,11 +10,13 @@ readonly source_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")"/../.. && pwd)"
 rm -rf $HOME/.cloudron_test 2>/dev/null || true # some of those docker container data requires sudo to be removed
 mkdir -p $HOME/.cloudron_test
 cd $HOME/.cloudron_test
-mkdir -p appsdata boxdata/appicons platformdata/mail platformdata/addons/mail platformdata/nginx/cert platformdata/nginx/applications platformdata/collectd/collectd.conf.d platformdata/addons configs boxdata/certs platformdata/mail/dkim/localhost platformdata/mail/dkim/foobar.com platformdata/logrotate.d/
+mkdir -p configs
+mkdir -p appsdata
+mkdir -p boxdata/appicons boxdata/mail boxdata/certs boxdata/mail/dkim/localhost boxdata/mail/dkim/foobar.com
+mkdir -p platformdata/addons/mail platformdata/nginx/cert platformdata/nginx/applications platformdata/collectd/collectd.conf.d platformdata/addons platformdata/logrotate.d platformdata/backup
 
 # put cert
 openssl req -x509 -newkey rsa:2048 -keyout platformdata/nginx/cert/host.key -out platformdata/nginx/cert/host.cert -days 3650 -subj '/CN=localhost' -nodes
 
 # create docker network (while the infra code does this, most tests skip infra setup)
 docker network create --subnet=172.18.0.0/16 cloudron || true
-

src/test/shell-test.js

@@ -12,7 +12,7 @@ var expect = require('expect.js'),
 
 describe('shell', function () {
     it('can run valid program', function (done) {
-        var cp = shell.exec('test', 'ls', [ '-l' ], function (error) {
+        var cp = shell.exec('test', 'ls', [ '-l' ], { }, function (error) {
             expect(cp).to.be.ok();
             expect(error).to.be(null);
             done();
@@ -20,14 +20,14 @@ describe('shell', function () {
     });
 
     it('fails on invalid program', function (done) {
-        var cp = shell.exec('test', 'randomprogram', [ ], function (error) {
+        var cp = shell.exec('test', 'randomprogram', [ ], { }, function (error) {
             expect(error).to.be.ok();
             done();
         });
     });
 
     it('fails on failing program', function (done) {
-        var cp = shell.exec('test', '/usr/bin/false', [ ], function (error) {
+        var cp = shell.exec('test', '/usr/bin/false', [ ], { }, function (error) {
             expect(error).to.be.ok();
             done();
         });
@@ -63,4 +63,3 @@ describe('shell', function () {
         done();
     });
 });
-

src/test/storage-test.js

@@ -5,227 +5,195 @@
 
 'use strict';
 
-var async = require('async'),
+var BackupsError = require('../backups.js').BackupsError,
+    expect = require('expect.js'),
+    filesystem = require('../storage/filesystem.js'),
     fs = require('fs'),
+    MockS3 = require('mock-aws-s3'),
+    noop = require('../storage/noop.js'),
     os = require('os'),
     path = require('path'),
-    readdirp = require('readdirp'),
-    MockS3 = require('mock-aws-s3'),
     rimraf = require('rimraf'),
-    mkdirp = require('mkdirp'),
-    BackupsError = require('../backups.js').BackupsError,
-    config = require('../config.js'),
-    database = require('../database.js'),
-    caas = require('../storage/caas.js'),
-    s3 = require('../storage/s3.js'),
-    filesystem = require('../storage/filesystem.js'),
-    expect = require('expect.js'),
-    settings = require('../settings.js'),
-    SettingsError = settings.SettingsError,
-    stream = require('stream');
-
-function setup(done) {
-    config.set('provider', 'caas');
-
-    async.series([
-        database.initialize,
-        settings.initialize,
-        function (callback) {
-            // a cloudron must have a backup config to startup
-            settings.setBackupConfig({ provider: 'caas', token: 'foo', key: 'key'}, function (error) {
-                expect(error).to.be(null);
-                callback();
-            });
-        }
-    ], done);
-}
-
-function cleanup(done) {
-    async.series([
-        settings.uninitialize,
-        database._clear
-    ], done);
-}
-
-function compareDirectories(one, two, callback) {
-    readdirp({ root: one }, function (error, treeOne) {
-        if (error) return callback(error);
-
-        readdirp({ root: two }, function (error, treeTwo) {
-            if (error) return callback(error);
-
-            var mismatch = [];
-
-            function compareDirs(a, b) {
-                a.forEach(function (tmpA) {
-                    var found = b.find(function (tmpB) {
-                        return tmpA.path === tmpB.path;
-                    });
-
-                    if (!found) mismatch.push(tmpA);
-                });
-            }
-
-            function compareFiles(a, b) {
-                a.forEach(function (tmpA) {
-                    var found = b.find(function (tmpB) {
-                        // TODO check file or symbolic link
-                        return tmpA.path === tmpB.path && tmpA.mode === tmpB.mode;
-                    });
-
-                    if (!found) mismatch.push(tmpA);
-                });
-            }
-
-            compareDirs(treeOne.directories, treeTwo.directories);
-            compareDirs(treeTwo.directories, treeOne.directories);
-            compareFiles(treeOne.files, treeTwo.files);
-            compareFiles(treeTwo.files, treeOne.files);
-
-            if (mismatch.length) {
-                console.error('Files not found in both: %j', mismatch);
-                return callback(new Error('file mismatch'));
-            }
-
-            callback(null);
-        });
-    });
-}
+    s3 = require('../storage/s3.js');
 
 describe('Storage', function () {
     describe('filesystem', function () {
-        var gBackupId_1 = 'someprefix/one';
-        var gBackupId_2 = 'someprefix/two';
+
         var gTmpFolder;
-        var gSourceFolder;
-        var gDestinationFolder;
+
         var gBackupConfig = {
             provider: 'filesystem',
             key: 'key',
-            backupFolder: null
+            backupFolder: null,
+            format: 'tgz'
         };
 
         before(function (done) {
-            setup(function (error) {
-                expect(error).to.be(null);
+            gTmpFolder = fs.mkdtempSync(path.join(os.tmpdir(), 'filesystem-storage-test_'));
 
-                gTmpFolder = fs.mkdtempSync(path.join(os.tmpdir(), 'filesystem-backup-test_'));
+            gBackupConfig.backupFolder = path.join(gTmpFolder, 'backups/');
 
-                gBackupConfig.backupFolder = path.join(gTmpFolder, 'backups/');
-                gSourceFolder = path.join(__dirname, 'storage');
-                gDestinationFolder = path.join(gTmpFolder, 'destination/');
-
-                done();
-            });
+            done();
         });
 
         after(function (done) {
-            cleanup(function (error) {
-                expect(error).to.be(null);
-                done()
-                // rimraf(gTmpFolder, done);
-            });
+            rimraf.sync(gTmpFolder);
+            done();
         });
 
-        it('fails to set backup config for non-existing folder', function (done) {
-            settings.setBackupConfig(gBackupConfig, function (error) {
-                expect(error).to.be.a(SettingsError);
-                expect(error.reason).to.equal(SettingsError.BAD_FIELD);
-
+        it('can upload', function (done) {
+            var sourceFile = path.join(__dirname, 'storage/data/test.txt');
+            var sourceStream = fs.createReadStream(sourceFile);
+            var destFile = gTmpFolder + '/uploadtest/test.txt';
+            filesystem.upload(gBackupConfig, destFile, sourceStream, function (error) {
+                expect(error).to.be(null);
+                expect(fs.existsSync(destFile));
+                expect(fs.statSync(sourceFile).size).to.be(fs.statSync(destFile).size);
                 done();
             });
         });
 
-        it('succeeds to set backup config', function (done) {
-            mkdirp.sync(gBackupConfig.backupFolder);
-
-            settings.setBackupConfig(gBackupConfig, function (error) {
+        it('upload waits for empty file to be created', function (done) {
+            var sourceFile = path.join(__dirname, 'storage/data/empty');
+            var sourceStream = fs.createReadStream(sourceFile);
+            var destFile = gTmpFolder + '/uploadtest/empty';
+            filesystem.upload(gBackupConfig, destFile, sourceStream, function (error) {
                 expect(error).to.be(null);
-
+                expect(fs.existsSync(destFile));
+                expect(fs.statSync(sourceFile).size).to.be(fs.statSync(destFile).size);
                 done();
             });
         });
 
-        it('can backup', function (done) {
-            var backupMapping = [{
-                source: path.join(gSourceFolder, 'data'),
-                destination: '/datadir'
-            }, {
-                source: path.join(gSourceFolder, 'addon'),
-                destination: '/addondir/'
-            }];
-
-            filesystem.backup(gBackupConfig, gBackupId_1, backupMapping, function (error) {
+        it('upload unlinks old file', function (done) {
+            var sourceFile = path.join(__dirname, 'storage/data/test.txt');
+            var sourceStream = fs.createReadStream(sourceFile);
+            var destFile = gTmpFolder + '/uploadtest/test.txt';
+            var oldStat = fs.statSync(destFile);
+            filesystem.upload(gBackupConfig, destFile, sourceStream, function (error) {
                 expect(error).to.be(null);
-
+                expect(fs.existsSync(destFile)).to.be(true);
+                expect(fs.statSync(sourceFile).size).to.be(fs.statSync(destFile).size);
+                expect(oldStat.inode).to.not.be(fs.statSync(destFile).size);
                 done();
             });
         });
 
-        it('can restore', function (done) {
-            filesystem.restore(gBackupConfig, gBackupId_1, gDestinationFolder, function (error) {
+        it('can download file', function (done) {
+            var sourceFile = gTmpFolder + '/uploadtest/test.txt';
+
+            filesystem.download(gBackupConfig, sourceFile, function (error, stream) {
                 expect(error).to.be(null);
-
-                compareDirectories(path.join(gSourceFolder, 'data'), path.join(gDestinationFolder, 'datadir'), function (error) {
-                    expect(error).to.equal(null);
-
-                    compareDirectories(path.join(gSourceFolder, 'addon'), path.join(gDestinationFolder, 'addondir'), function (error) {
-                        expect(error).to.equal(null);
-
-                        rimraf(gDestinationFolder, done);
-                    });
-                });
-            });
-        });
-
-        it('can copy backup', function (done) {
-            // will be verified after removing the first and restoring from the copy
-            filesystem.copyBackup(gBackupConfig, gBackupId_1, gBackupId_2, done);
-        });
-
-        it('can remove backup', function (done) {
-            // will be verified with next test trying to restore the removed one
-            filesystem.removeBackups(gBackupConfig, [ gBackupId_1 ], done);
-        });
-
-        it('cannot restore deleted backup', function (done) {
-            filesystem.restore(gBackupConfig, gBackupId_1, gDestinationFolder, function (error) {
-                expect(error).to.be.an('object');
-                expect(error.reason).to.equal(BackupsError.NOT_FOUND);
-
+                expect(stream).to.be.an('object');
                 done();
             });
         });
 
-        it('can restore backup copy', function (done) {
-            filesystem.restore(gBackupConfig, gBackupId_2, gDestinationFolder, function (error) {
-                expect(error).to.be(null);
+        it('download errors for missing file', function (done) {
+            var sourceFile = gTmpFolder + '/uploadtest/missing';
 
-                compareDirectories(path.join(gSourceFolder, 'data'), path.join(gDestinationFolder, 'datadir'), function (error) {
-                    expect(error).to.equal(null);
-
-                    compareDirectories(path.join(gSourceFolder, 'addon'), path.join(gDestinationFolder, 'addondir'), function (error) {
-                        expect(error).to.equal(null);
-
-                        rimraf(gDestinationFolder, done);
-                    });
-                });
+            filesystem.download(gBackupConfig, sourceFile, function (error) {
+                expect(error.reason).to.be(BackupsError.NOT_FOUND);
+                done();
             });
         });
 
-        it('can remove backup copy', function (done) {
-            filesystem.removeBackups(gBackupConfig, [ gBackupId_2 ], done);
+        it('download dir copies contents of source dir', function (done) {
+            var sourceDir = path.join(__dirname, 'storage');
+
+            filesystem.downloadDir(gBackupConfig, sourceDir, gTmpFolder, function (error) {
+                expect(error).to.be(null);
+                expect(fs.statSync(path.join(gTmpFolder, 'data/empty')).size).to.be(0);
+                done();
+            });
+        });
+
+        it('can copy', function (done) {
+            var sourceFile = gTmpFolder + '/uploadtest/test.txt'; // keep the test within save device
+            var destFile = gTmpFolder + '/uploadtest/test-hardlink.txt';
+
+            filesystem.copy(gBackupConfig, sourceFile, destFile, function (error) {
+                expect(error).to.be(null);
+                expect(fs.statSync(destFile).nlink).to.be(2); // created a hardlink
+                done();
+            });
+        });
+
+        it('can remove file', function (done) {
+            var sourceFile = gTmpFolder + '/uploadtest/test-hardlink.txt';
+
+            filesystem.remove(gBackupConfig, sourceFile, function (error) {
+                expect(error).to.be(null);
+                expect(fs.existsSync(sourceFile)).to.be(false);
+                done();
+            });
+        });
+
+        it('can remove empty dir', function (done) {
+            var sourceDir = gTmpFolder + '/emptydir';
+            fs.mkdirSync(sourceDir);
+
+            filesystem.remove(gBackupConfig, sourceDir, function (error) {
+                expect(error).to.be(null);
+                expect(fs.existsSync(sourceDir)).to.be(false);
+                done();
+            });
+        });
+    });
+
+    describe('noop', function () {
+        var gBackupConfig = {
+            provider: 'noop',
+            format: 'tgz'
+        };
+
+        it('upload works', function (done) {
+            noop.upload(gBackupConfig, 'file', { }, function (error) {
+                expect(error).to.be(null);
+                done();
+            });
+        });
+
+        it('can download file', function (done) {
+            noop.download(gBackupConfig, 'file', function (error) {
+                expect(error).to.be.an(Error);
+                done();
+            });
+        });
+
+        it('download dir copies contents of source dir', function (done) {
+            noop.downloadDir(gBackupConfig, 'sourceDir', 'destDir', function (error) {
+                expect(error).to.be.an(Error);
+                done();
+            });
+        });
+
+        it('can copy', function (done) {
+            noop.copy(gBackupConfig, 'sourceFile', 'destFile', function (error) {
+                expect(error).to.be(null);
+                done();
+            });
+        });
+
+        it('can remove file', function (done) {
+            noop.remove(gBackupConfig, 'sourceFile', function (error) {
+                expect(error).to.be(null);
+                done();
+            });
+        });
+
+        it('can remove empty dir', function (done) {
+            noop.remove(gBackupConfig, 'sourceDir', function (error) {
+                expect(error).to.be(null);
+                done();
+            });
         });
     });
 
     describe('s3', function () {
         this.timeout(10000);
 
-        var gBackupId_1 = 'someprefix/one';
-        var gBackupId_2 = 'someprefix/two';
-        var gTmpFolder;
-        var gSourceFolder;
-        var gDestinationFolder;
+        var gS3Folder;
         var gBackupConfig = {
             provider: 's3',
             key: 'key',
@@ -233,108 +201,80 @@ describe('Storage', function () {
             bucket: 'cloudron-storage-test',
             accessKeyId: 'testkeyid',
             secretAccessKey: 'testsecret',
-            region: 'eu-central-1'
+            region: 'eu-central-1',
+            format: 'tgz'
         };
 
-        before(function (done) {
+        before(function () {
             MockS3.config.basePath = path.join(os.tmpdir(), 's3-backup-test-buckets/');
+            rimraf.sync(MockS3.config.basePath);
+            gS3Folder = path.join(MockS3.config.basePath, gBackupConfig.bucket);
 
             s3._mockInject(MockS3);
-
-            setup(function (error) {
-                expect(error).to.be(null);
-
-                gTmpFolder = fs.mkdtempSync(path.join(os.tmpdir(), 's3-backup-test_'));
-                gSourceFolder = path.join(__dirname, 'storage');
-                gDestinationFolder = path.join(gTmpFolder, 'destination/');
-
-                settings.setBackupConfig(gBackupConfig, function (error) {
-                    expect(error).to.be(null);
-
-                    done();
-                });
-            });
         });
 
-        after(function (done) {
+        after(function () {
             s3._mockRestore();
             rimraf.sync(MockS3.config.basePath);
-
-            cleanup(function (error) {
-                expect(error).to.be(null);
-                rimraf(gTmpFolder, done);
-            });
         });
 
-        it('can backup', function (done) {
-            var backupMapping = [{
-                source: path.join(gSourceFolder, 'data'),
-                destination: '/datadir'
-            }, {
-                source: path.join(gSourceFolder, 'addon'),
-                destination: '/addondir/'
-            }];
-
-            s3.backup(gBackupConfig, gBackupId_1, backupMapping, function (error) {
+        it('can upload', function (done) {
+            var sourceFile = path.join(__dirname, 'storage/data/test.txt');
+            var sourceStream = fs.createReadStream(sourceFile);
+            var destKey = 'uploadtest/test.txt';
+            s3.upload(gBackupConfig, destKey, sourceStream, function (error) {
                 expect(error).to.be(null);
-
+                expect(fs.existsSync(path.join(gS3Folder, destKey))).to.be(true);
+                expect(fs.statSync(path.join(gS3Folder, destKey)).size).to.be(fs.statSync(sourceFile).size);
                 done();
             });
         });
 
-        it('can restore', function (done) {
-            s3.restore(gBackupConfig, gBackupId_1, gDestinationFolder, function (error) {
+        it('can download file', function (done) {
+            var sourceKey = 'uploadtest/test.txt';
+            s3.download(gBackupConfig, sourceKey, function (error, stream) {
                 expect(error).to.be(null);
-
-                compareDirectories(path.join(gSourceFolder, 'data'), path.join(gDestinationFolder, 'datadir'), function (error) {
-                    expect(error).to.equal(null);
-
-                    compareDirectories(path.join(gSourceFolder, 'addon'), path.join(gDestinationFolder, 'addondir'), function (error) {
-                        expect(error).to.equal(null);
-
-                        rimraf(gDestinationFolder, done);
-                    });
-                });
-            });
-        });
-
-        it('can copy backup', function (done) {
-            // will be verified after removing the first and restoring from the copy
-            s3.copyBackup(gBackupConfig, gBackupId_1, gBackupId_2, done);
-        });
-
-        it('can remove backup', function (done) {
-            // will be verified with next test trying to restore the removed one
-            s3.removeBackups(gBackupConfig, [ gBackupId_1 ], done);
-        });
-
-        it('cannot restore deleted backup', function (done) {
-            s3.restore(gBackupConfig, gBackupId_1, gDestinationFolder, function (error) {
-                expect(error).to.be.an('object');
-                expect(error.reason).to.equal(BackupsError.NOT_FOUND);
-
+                expect(stream).to.be.an('object');
                 done();
             });
         });
 
-        it('can restore backup copy', function (done) {
-            s3.restore(gBackupConfig, gBackupId_2, gDestinationFolder, function (error) {
+        it('download dir copies contents of source dir', function (done) {
+            var sourceFile = path.join(__dirname, 'storage/data/test.txt');
+            var sourceKey = '';
+            var destDir = path.join(os.tmpdir(), 's3-destdir');
+
+            s3.downloadDir(gBackupConfig, sourceKey, destDir, function (error) {
                 expect(error).to.be(null);
-
-                compareDirectories(path.join(gSourceFolder, 'data'), path.join(gDestinationFolder, 'datadir'), function (error) {
-                    expect(error).to.equal(null);
-
-                    compareDirectories(path.join(gSourceFolder, 'addon'), path.join(gDestinationFolder, 'addondir'), function (error) {
-                        expect(error).to.equal(null);
-
-                        rimraf(gDestinationFolder, done);
-                    });
-                });
+                expect(fs.statSync(path.join(destDir, 'uploadtest/test.txt')).size).to.be(fs.statSync(sourceFile).size);
+                done();
             });
         });
 
-        it('can remove backup copy', function (done) {
-            s3.removeBackups(gBackupConfig, [ gBackupId_2 ], done);
+        it('can copy', function (done) {
+            var sourceKey = 'uploadtest';
+
+            s3.copy(gBackupConfig, sourceKey, 'uploadtest-copy', function (error) {
+                var sourceFile = path.join(__dirname, 'storage/data/test.txt');
+                expect(error).to.be(null);
+                expect(fs.statSync(path.join(gS3Folder, 'uploadtest-copy/test.txt')).size).to.be(fs.statSync(sourceFile).size);
+                done();
+            });
+        });
+
+        it('can remove file', function (done) {
+            s3.remove(gBackupConfig, 'uploadtest-copy/test.txt', function (error) {
+                expect(error).to.be(null);
+                expect(fs.existsSync(path.join(gS3Folder, 'uploadtest-copy/test.txt'))).to.be(false);
+                done();
+            });
+        });
+
+        it('can remove non-existent dir', function (done) {
+            noop.remove(gBackupConfig, 'blah', function (error) {
+                expect(error).to.be(null);
+                done();
+            });
         });
     });
 });

src/test/syn-im-1ec6f9f870bf.json

@@ -0,0 +1,12 @@
+{
+  "type": "service_account",
+  "project_id": "second-metrics-123822",
+  "private_key_id": "12345678912345678659bacc6a9ba2bd495304e8",
+  "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvwIBADANBgkqhkiG9w0BAQEFAA123456789lAgEAAoIBAQDbogLCpOPRIgFD\nQGMB1A3RO234567898+gQIEzr3wM+kgDuh5lsm5C5YBGHppC5dD2GdWDGFxBhSGP\nYWW4F8593TDsSoeg3tsffIHQ4gTA3q/V4q5M4fEi+XWL123450KUjLYVs6DgZk28\nF5TbHFHxQjRvbQTj1245lQXsqR/WEBIShA0HwrF6ayz2n123456FuR7kCQ6Srxv6\n4d3i2S3KrkabcEzCHoo3NKeXj3f/cbWapoJaaaaaaaNfK3dEyuicoJaoFYspK194\n9qStl9opEwWzeiW95Ps5P4WFdQq5bSWw4LatEcdxnre7IR11ZVjktZwg6bU19Aes\ntfvSOiMhAgMBAAECggEAUm5y5MToMDS4DpqazjPdX7pFdSDnZgzxfy7WjyR8xY4l\n+ygegoK+eWMTir2vng4NKGC3zvUUow6pctvWRorA2GJtGzI5xzn9OcsMGe7KY+zw\nR7FFQ9vFGiBQasOdNfh8/630JR7+8VnUMRUUrEvrwUXc0jkzjYYaZuCtkY5EQZ2i\nfGm4I25uNckd2BNCvyc+bMT/zXD33vaMUe9B/Dy8lnKHstKds6C9lweocu/7XpMd\nRhzOeIxLYoPpdNveVNsfztj5y3bKaopxaEQoGIdXrNrBANiHumbEjF6VcOmQ6xnp\n5L+5ht1c4hLeydn/O7/xQeuik72+aD9PQE3Xz1aOlQKBgQDuGf/PURwVC/h2Jiz6\nSdZNAeCpeE/7S4iumksjXdp1gT+6rLv4UumpDX7DXNbRELwFBJMOZu9tM6DrHnMZ\nt+5U9qkS4r5tKoOBHv3YvabH5hkj5oeSFQfi2CDHS9hURuQUwvTYfZluJXDseswX\nAHF3NJzsnGxYqPQ+t3SMLvCi7wKBgQDsJJoMzkfsxExlhGH3zwmhcp5t7DBAYCKC\nz/IpZhY48iFdEAS1NA35F8EofN5d3TWPzVW2oT4f4Qz7VtKp9OHwtFpHnsSpBLGX\nB66gh5wO+yscvnRTFIGPNBg9fHNn70OQJaixelhDp7/BBfpcusF6ByND4F29vRiv\ng9n99lZa7wKBgQCsjpseHKJFfo9q0O/31FtDJAE10MPmUy+Tmq6pyvLwBeOx3k28\nAhrlMaqU20uz6HTbDh2lamRKuAf/Xen80Zgga0LNNRbc9tqnUVaXJZshdFjz87Z8\n4FD+zbOzu/vj2BykD0ZzP1NayDe2qqgOY3vX8IFp2VOMTaX1be9BSSOMcQKBgQCw\nObBtFhQ+8U9CA0VJNcyuG2d4COcJY7Tdgmnp0zGKVcfoN2gMAkjbN4sCuA0KZ2bt\nZgMtQ6+lAsI5X1XfV8y1YSJuiGGi8MnHOAht7EXeODq4PLl6trbpM6tTV2iYi8oT\n7Mazi+YKt0k2t0tboFN6yZDburi6PEAL2433JLrVKQKBgQDZOwr1XOEuOos1LeQC\nMqO6c4bHo615jtX0NcWLhpN/Z8oHEgIbz0/O0KpcuLrxaCquxpDX9n0pALzg3AoX\nXnvuuq4r9pjoD5LN2qD4+SCIwUhB8ubGnlc97vWtkWnK7Wn49QMnqo2OfeCctk6S\nF36saiVnMV5alSVlU+ThqI8aLw==\n-----END PRIVATE KEY-----\n",
+  "client_email": "123456789349-compute@developer.gserviceaccount.com",
+  "client_id": "123456789012345506547",
+  "auth_uri": "https://accounts.google.com/o/oauth2/auth",
+  "token_uri": "https://accounts.google.com/o/oauth2/token",
+  "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
+  "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/735900230349-compute%40developer.gserviceaccount.com"
+}

src/test/syncer-test.js

@@ -0,0 +1,330 @@
+/* global it:false */
+/* global describe:false */
+/* global before:false */
+/* global after:false */
+
+'use strict';
+
+var createTree = require('./common.js').createTree,
+    execSync = require('child_process').execSync,
+    expect = require('expect.js'),
+    fs = require('fs'),
+    os = require('os'),
+    path = require('path'),
+    paths = require('../paths.js'),
+    safe = require('safetydance'),
+    syncer = require('../syncer.js');
+
+var gTasks = [ ],
+    gTmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'syncer-test')),
+    gCacheFile = path.join(paths.BACKUP_INFO_DIR, path.basename(gTmpDir) + '.sync.cache');
+
+function collectTasks(task, callback) {
+    gTasks.push(task);
+    callback();
+}
+
+describe('Syncer', function () {
+    before(function () {
+        console.log('Tests are run in %s with cache file %s', gTmpDir, gCacheFile)
+    });
+
+    it('missing cache - removes remote dir', function (done) {
+        gTasks = [ ];
+        safe.fs.unlinkSync(gCacheFile);
+        createTree(gTmpDir, { });
+
+        syncer.sync(gTmpDir, collectTasks, 10, function (error) {
+            expect(error).to.not.be.ok();
+
+            expect(gTasks).to.eql([
+                { operation: 'removedir', path: '', reason: 'nocache' }
+            ]);
+            done();
+        });
+    });
+
+    it('empty cache - adds all', function (done) {
+        gTasks = [ ];
+        fs.writeFileSync(gCacheFile, '', 'utf8');
+        createTree(gTmpDir, { 'src': { 'index.js': 'some code' }, 'test': { 'test.js': 'This is a README' }, 'walrus': 'animal' });
+
+        syncer.sync(gTmpDir, collectTasks, 10, function (error) {
+            expect(error).to.not.be.ok();
+
+            expect(gTasks).to.eql([
+                { operation: 'add', path: 'src/index.js', reason: 'new' },
+                { operation: 'add', path: 'test/test.js', reason: 'new' },
+                { operation: 'add', path: 'walrus', reason: 'new' }
+            ]);
+            done();
+        });
+    });
+
+    it('empty cache - deep', function (done) {
+        gTasks = [ ];
+        fs.writeFileSync(gCacheFile, '', 'utf8');
+        createTree(gTmpDir, { a: { b: { c: { d: { e: 'some code' } } } } });
+
+        syncer.sync(gTmpDir, collectTasks, 10, function (error) {
+            expect(error).to.not.be.ok();
+
+            expect(gTasks).to.eql([
+                { operation: 'add', path: 'a/b/c/d/e', reason: 'new' }
+            ]);
+            done();
+        });
+    });
+
+    it('ignores special files', function (done) {
+        gTasks = [ ];
+        fs.writeFileSync(gCacheFile, '', 'utf8');
+        createTree(gTmpDir, { 'link:file': '/tmp', 'readme': 'this is readme' });
+
+        syncer.sync(gTmpDir, collectTasks, 10, function (error) {
+            expect(error).to.not.be.ok();
+
+            expect(gTasks).to.eql([
+                { operation: 'add', path: 'readme', reason: 'new' }
+            ]);
+            done();
+        });
+    });
+
+    it('adds changed files', function (done) {
+        gTasks = [ ];
+        fs.writeFileSync(gCacheFile, '', 'utf8');
+        createTree(gTmpDir, { 'src': { 'index.js': 'some code' }, 'test': { 'test.js': 'This is a README' }, 'walrus': 'animal' });
+
+        syncer.sync(gTmpDir, collectTasks, 10, function (error) {
+            expect(error).to.not.be.ok();
+            expect(gTasks.length).to.be(3);
+
+            execSync(`touch src/index.js test/test.js`, { cwd: gTmpDir });
+
+            gTasks = [ ];
+            syncer.sync(gTmpDir, collectTasks, 10, function (error) {
+                expect(error).to.not.be.ok();
+
+                expect(gTasks).to.eql([
+                    { operation: 'add', path: 'src/index.js', reason: 'changed' },
+                    { operation: 'add', path: 'test/test.js', reason: 'changed' }
+                ]);
+
+                done();
+            });
+        });
+    });
+
+    it('removes missing files', function (done) {
+        gTasks = [ ];
+        fs.writeFileSync(gCacheFile, '', 'utf8');
+        createTree(gTmpDir, { 'src': { 'index.js': 'some code' }, 'test': { 'test.js': 'This is a README' }, 'walrus': 'animal' });
+
+        syncer.sync(gTmpDir, collectTasks, 10, function (error) {
+            expect(error).to.not.be.ok();
+            expect(gTasks.length).to.be(3);
+
+            execSync(`rm src/index.js walrus`, { cwd: gTmpDir });
+
+            gTasks = [ ];
+            syncer.sync(gTmpDir, collectTasks, 10, function (error) {
+                expect(error).to.not.be.ok();
+
+                expect(gTasks).to.eql([
+                    { operation: 'remove', path: 'src/index.js', reason: 'missing' },
+                    { operation: 'remove', path: 'walrus', reason: 'missing' }
+                ]);
+
+                done();
+            });
+        });
+    });
+
+    it('removes missing dirs', function (done) {
+        gTasks = [ ];
+        fs.writeFileSync(gCacheFile, '', 'utf8');
+        createTree(gTmpDir, { 'src': { 'index.js': 'some code' }, 'test': { 'test.js': 'This is a README' }, 'walrus': 'animal' });
+
+        syncer.sync(gTmpDir, collectTasks, 10, function (error) {
+            expect(error).to.not.be.ok();
+            expect(gTasks.length).to.be(3);
+
+            execSync(`rm -rf src test`, { cwd: gTmpDir });
+
+            gTasks = [ ];
+            syncer.sync(gTmpDir, collectTasks, 10, function (error) {
+                expect(error).to.not.be.ok();
+
+                expect(gTasks).to.eql([
+                    { operation: 'removedir', path: 'src', reason: 'missing' },
+                    { operation: 'removedir', path: 'test', reason: 'missing' }
+                ]);
+
+                done();
+            });
+        });
+    });
+
+    it('all files disappeared', function (done) {
+        gTasks = [ ];
+        fs.writeFileSync(gCacheFile, '', 'utf8');
+        createTree(gTmpDir, { 'src': { 'index.js': 'some code' }, 'test': { 'test.js': 'This is a README' }, 'walrus': 'animal' });
+
+        syncer.sync(gTmpDir, collectTasks, 10, function (error) {
+            expect(error).to.not.be.ok();
+            expect(gTasks.length).to.be(3);
+
+            execSync(`find . -delete`, { cwd: gTmpDir });
+
+            gTasks = [ ];
+            syncer.sync(gTmpDir, collectTasks, 10, function (error) {
+                expect(error).to.not.be.ok();
+
+                expect(gTasks).to.eql([
+                    { operation: 'removedir', path: 'src', reason: 'missing' },
+                    { operation: 'removedir', path: 'test', reason: 'missing' },
+                    { operation: 'remove', path: 'walrus', reason: 'missing' }
+                ]);
+
+                done();
+            });
+        });
+    });
+
+    it('no redundant deletes', function (done) {
+        gTasks = [ ];
+        fs.writeFileSync(gCacheFile, '', 'utf8');
+        createTree(gTmpDir, { a: { b: { c: { d: { e: 'some code' } } } } });
+
+        syncer.sync(gTmpDir, collectTasks, 10, function (error) {
+            expect(error).to.not.be.ok();
+            expect(gTasks.length).to.be(1);
+
+            execSync(`rm -r a/b; touch a/f`, { cwd: gTmpDir });
+
+            gTasks = [ ];
+            syncer.sync(gTmpDir, collectTasks, 10, function (error) {
+                expect(error).to.not.be.ok();
+
+                expect(gTasks).to.eql([
+                    { operation: 'removedir', path: 'a/b', reason: 'missing' },
+                    { operation: 'add', path: 'a/f', reason: 'new' }
+                ]);
+
+                done();
+            });
+        });
+    });
+
+    it('file became dir', function (done) {
+        gTasks = [ ];
+        fs.writeFileSync(gCacheFile, '', 'utf8');
+        createTree(gTmpDir, { 'data': { 'src': { 'index.js': 'some code' }, 'test': { 'test.js': 'This is a README' }, 'walrus': 'animal' } });
+
+        syncer.sync(gTmpDir, collectTasks, 10, function (error) {
+            expect(error).to.not.be.ok();
+            expect(gTasks.length).to.be(3);
+
+            execSync(`rm data/test/test.js; mkdir data/test/test.js; touch data/test/test.js/trick`, { cwd: gTmpDir });
+
+            gTasks = [ ];
+            syncer.sync(gTmpDir, collectTasks, 10, function (error) {
+                expect(error).to.not.be.ok();
+
+                expect(gTasks).to.eql([
+                    { operation: 'remove', path: 'data/test/test.js', reason: 'wasfile' },
+                    { operation: 'add', path: 'data/test/test.js/trick', reason: 'new' }
+                ]);
+
+                done();
+            });
+        });
+    });
+
+    it('dir became file', function (done) {
+        gTasks = [ ];
+        fs.writeFileSync(gCacheFile, '', 'utf8');
+        createTree(gTmpDir, { 'src': { 'index.js': 'some code' }, 'test': { 'test.js': 'this', 'test2.js': 'test' }, 'walrus': 'animal' });
+
+        syncer.sync(gTmpDir, collectTasks, 10, function (error) {
+            expect(error).to.not.be.ok();
+            expect(gTasks.length).to.be(4);
+
+            execSync(`rm -r test; touch test`, { cwd: gTmpDir });
+
+            gTasks = [ ];
+            syncer.sync(gTmpDir, collectTasks, 10, function (error) {
+                expect(error).to.not.be.ok();
+
+                expect(gTasks).to.eql([
+                    { operation: 'removedir', path: 'test', reason: 'wasdir' },
+                    { operation: 'add', path: 'test', reason: 'wasdir' }
+                ]);
+
+                done();
+            });
+        });
+    });
+
+    it('is complicated', function (done) {
+        gTasks = [ ];
+        createTree(gTmpDir, {
+            a: 'data',
+            a2: 'data',
+            b: 'data',
+            file: 'data',
+            g: {
+                file: 'data'
+            },
+            j: {
+                k: { },
+                l: {
+                    file: 'data'
+                },
+                m: { }
+            }
+        });
+
+        syncer.sync(gTmpDir, collectTasks, 10, function (error) {
+            expect(error).to.not.be.ok();
+
+            execSync(`rm a; \
+                      mkdir a; \
+                      touch a/file; \
+                      rm a2; \
+                      touch b; \
+                      rm file g/file; \
+                      ln -s /tmp h; \
+                      rm -r j/l;
+                      touch j/k/file; \
+                      rmdir j/m;`, { cwd: gTmpDir });
+
+            gTasks = [ ];
+            syncer.sync(gTmpDir, collectTasks, 10, function (error) {
+                expect(error).to.not.be.ok();
+
+                expect(gTasks).to.eql([
+                    { operation: 'remove', path: 'a', reason: 'wasfile' },
+                    { operation: 'remove', path: 'a2', reason: 'missing' },
+                    { operation: 'remove', path: 'file', reason: 'missing' },
+                    { operation: 'remove', path: 'g/file', reason: 'missing' },
+                    { operation: 'removedir', path: 'j/l', reason: 'missing' },
+                    { operation: 'removedir', path: 'j/m', reason: 'missing' },
+
+                    { operation: 'add', path: 'a/file', reason: 'new' },
+                    { operation: 'add', path: 'b', reason: 'changed' },
+                    { operation: 'add', path: 'j/k/file', reason: 'new' },
+                ]);
+
+                gTasks = [ ];
+                syncer.sync(gTmpDir, collectTasks, 10, function (error) {
+                    expect(error).to.not.be.ok();
+                    expect(gTasks.length).to.be(0);
+
+                    done();
+                });
+            });
+        });
+    });
+});

webadmin/src/appstatus.html

@@ -3,16 +3,9 @@
 <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width, height=device-height" />
-    <meta http-equiv="Content-Security-Policy" content="default-src 'unsafe-inline' 'self' <%= apiOriginHostname %>; img-src 'self' <%= apiOriginHostname %>;" />
 
     <title> Cloudron App Error </title>
 
-    <!-- fonts and CSS -->
-    <link href="3rdparty/css/font-awesome.min.css" rel="stylesheet" type="text/css">
-
-    <!-- Latest compiled and minified CSS -->
-    <link rel="stylesheet" href="3rdparty/bootstrap-3.3.7.min.css" type="text/css">
-
     <!-- Use static style as we can't include local stylesheets -->
     <style>
 
@@ -31,17 +24,12 @@
             text-align: center;
         }
 
-        .wrapper {
-            display: table;
-            width: 100%;
-            height: 100%;
-        }
-
         .content {
-            display: table-cell;
+            display: flex;
             width: 100%;
             height: 100%;
-            vertical-align: middle;
+            flex-direction: column;
+            justify-content: center;
         }
 
         footer {
@@ -58,6 +46,11 @@
         footer a {
             color: #62bdfc;
             padding: 10px;
+            text-decoration: none;
+        }
+
+        h1, h2, p {
+            margin: 10px;
         }
 
     </style>
@@ -66,17 +59,15 @@
 
 <body>
 
-<div class="wrapper">
-    <div class="content">
-        <h1><i class="fa fa-frown-o fa-fw text-danger"></i></h1>
-        <h2>Something has gone wrong</h2>
-        This app is currently not running. Try refreshing the page.
-    </div>
+<div class="content">
+    <h1>&#128577;</h1>
+    <h2>Something has gone wrong</h2>
+    <p>This app is currently not responding. Try refreshing the page.</p>
 </div>
 
 <footer class="text-center">
-    <span class="text-muted">&copy;2017 <a href="https://cloudron.io" target="_blank">Cloudron</a></span>
-    <span class="text-muted"><a href="https://twitter.com/cloudron_io" target="_blank">Twitter <i class="fa fa-twitter"></i></a></span>
+    <span class="text-muted"><a href="https://cloudron.io" target="_blank">Cloudron</a></span>
+    <span class="text-muted"><a href="https://twitter.com/cloudron_io" target="_blank">Twitter</a></span>
     <span class="text-muted"><a href="https://chat.cloudron.io" target="_blank">Chat <i class="fa fa-comments"></i></a></span>
 </footer>
 

webadmin/src/index.html

@@ -130,14 +130,6 @@
                         <div ng-hide="config.provider !== 'caas' && config.update.box.upgrade">
                             <fieldset>
                                 <form name="update_form" role="form" ng-submit="doUpdate()" autocomplete="off">
-                                    <div class="form-group" ng-class="{ 'has-error': (update_form.password.$dirty && update_form.password.$invalid) || (!update_form.password.$dirty && update.error.password) }">
-                                        <label class="control-label" for="inputUpdatePassword">Give your password to verify that you are performing that action</label>
-                                        <div class="control-label" ng-show="(update_form.password.$dirty && update_form.password.$invalid) || (!update_form.password.$dirty && update.error.password)">
-                                            <small ng-show=" update_form.password.$dirty && update_form.password.$invalid">Password required</small>
-                                            <small ng-show="!update_form.password.$dirty && update.error.password">Wrong password</small>
-                                        </div>
-                                        <input type="password" class="form-control" ng-model="update.password" id="inputUpdatePassword" name="password" placeholder="Password" required autofocus>
-                                    </div>
                                     <input class="ng-hide" type="submit" ng-disabled="update_form.$invalid || update.busy"/>
                                 </form>
                             </fieldset>

webadmin/src/js/client.js

@@ -345,10 +345,9 @@ angular.module('Application').service('Client', ['$http', 'md5', 'Notification',
         }).error(defaultErrorHandler(callback));
     };
 
-    Client.prototype.configureApp = function (id, password, config, callback) {
+    Client.prototype.configureApp = function (id, config, callback) {
         var data = {
             appId: id,
-            password: password,
             location: config.location,
             portBindings: config.portBindings,
             accessRestriction: config.accessRestriction,
@@ -367,10 +366,9 @@ angular.module('Application').service('Client', ['$http', 'md5', 'Notification',
         }).error(defaultErrorHandler(callback));
     };
 
-    Client.prototype.updateApp = function (id, manifest, portBindings, password, callback) {
+    Client.prototype.updateApp = function (id, manifest, portBindings, callback) {
         var data =  {
             appStoreId: manifest.id + '@' + manifest.version,
-            password: password,
             portBindings: portBindings
         };
 
@@ -821,8 +819,8 @@ angular.module('Application').service('Client', ['$http', 'md5', 'Notification',
         }).error(defaultErrorHandler(callback));
     };
 
-    Client.prototype.update = function (password, callback) {
-        var data = { password: password };
+    Client.prototype.update = function (callback) {
+        var data = { };
 
         post('/api/v1/cloudron/update', data).success(function(data, status) {
             if (status !== 202 || typeof data !== 'object') return callback(new ClientError(status, data));
@@ -1159,6 +1157,17 @@ angular.module('Application').service('Client', ['$http', 'md5', 'Notification',
         }).error(defaultErrorHandler(callback));
     };
 
+    Client.prototype.sentTestMail = function (email, callback) {
+        var data = {
+            email: email
+        };
+
+        post('/api/v1/cloudron/send_test_mail', data).success(function(data, status) {
+            if (status !== 202) return callback(new ClientError(status, data));
+            callback(null);
+        }).error(defaultErrorHandler(callback));
+    };
+
     client = new Client();
     return client;
 }]);

webadmin/src/js/index.js

@@ -295,10 +295,10 @@ var ACTION_APP_INSTALL = 'app.install';
 var ACTION_APP_RESTORE = 'app.restore';
 var ACTION_APP_UNINSTALL = 'app.uninstall';
 var ACTION_APP_UPDATE = 'app.update';
-var ACTION_APP_UPDATE = 'app.update';
 var ACTION_APP_LOGIN = 'app.login';
 var ACTION_BACKUP_FINISH = 'backup.finish';
 var ACTION_BACKUP_START = 'backup.start';
+var ACTION_BACKUP_CLEANUP = 'backup.cleanup';
 var ACTION_CERTIFICATE_RENEWAL = 'certificate.renew';
 var ACTION_CLI_MODE = 'settings.climode';
 var ACTION_START = 'cloudron.start';
@@ -325,6 +325,7 @@ app.filter('eventLogDetails', function() {
         case ACTION_APP_LOGIN: return 'App ' + data.appId + ' logged in';
         case ACTION_BACKUP_START: return 'Backup started';
         case ACTION_BACKUP_FINISH: return 'Backup finished. ' + (errorMessage ? ('error: ' + errorMessage) : ('id: ' + data.filename));
+        case ACTION_BACKUP_CLEANUP: return 'Backup ' + data.backup.id + ' removed';
         case ACTION_CERTIFICATE_RENEWAL: return 'Certificate renewal for ' + data.domain + (errorMessage ? ' failed' : 'succeeded');
         case ACTION_CLI_MODE: return 'CLI mode was ' + (data.enabled ? 'enabled' : 'disabled');
         case ACTION_START: return 'Cloudron started with version ' + data.version;

webadmin/src/js/main.js

@@ -12,8 +12,7 @@ angular.module('Application').controller('MainController', ['$scope', '$route',
 
     $scope.update = {
         busy: false,
-        error: {},
-        password: ''
+        error: {}
     };
 
     $scope.isActive = function (url) {
@@ -77,8 +76,6 @@ angular.module('Application').controller('MainController', ['$scope', '$route',
 
     $scope.showUpdateModal = function (form) {
         $scope.update.error.generic = null;
-        $scope.update.error.password = null;
-        $scope.update.password = '';
 
         form.$setPristine();
         form.$setUntouched();
@@ -98,21 +95,12 @@ angular.module('Application').controller('MainController', ['$scope', '$route',
 
     $scope.doUpdate = function () {
         $scope.update.error.generic = null;
-        $scope.update.error.password = null;
 
         $scope.update.busy = true;
-        Client.update($scope.update.password, function (error) {
+        Client.update(function (error) {
             if (error) {
-                if (error.statusCode === 403) {
-                    $scope.update.error.password = true;
-                    $scope.update.password = '';
-                    $scope.update_form.password.$setPristine();
-                    $('#inputUpdatePassword').focus();
-                } else if (error.statusCode === 409) {
+                if (error.statusCode === 409) {
                     $scope.update.error.generic = 'Please try again later. The Cloudron is creating a backup at the moment.';
-                    $scope.update.password = '';
-                    $scope.update_form.password.$setPristine();
-                    $('#inputUpdatePassword').focus();
                 } else {
                     $scope.update.error.generic = error.message;
                     console.error('Unable to update.', error);

webadmin/src/js/setupdns.js

@@ -40,8 +40,9 @@ app.controller('SetupDNSController', ['$scope', '$http', 'Client', function ($sc
     // keep in sync with certs.js
     $scope.dnsProvider = [
         { name: 'AWS Route53', value: 'route53' },
-        { name: 'Digital Ocean', value: 'digitalocean' },
         { name: 'Cloudflare (DNS only)', value: 'cloudflare' },
+        { name: 'Digital Ocean', value: 'digitalocean' },
+        { name: 'Google Cloud DNS', value: 'gcdns' },
         { name: 'Wildcard', value: 'wildcard' },
         { name: 'Manual (not recommended)', value: 'manual' },
         { name: 'No-op (only for development)', value: 'noop' }
@@ -52,10 +53,29 @@ app.controller('SetupDNSController', ['$scope', '$http', 'Client', function ($sc
         domain: '',
         accessKeyId: '',
         secretAccessKey: '',
+        gcdnsKey: { keyFileName: '', content: '' },
         digitalOceanToken: '',
         provider: 'route53'
     };
 
+    function readFileLocally(obj, file, fileName) {
+        return function (event) {
+            $scope.$apply(function () {
+                obj[file] = null;
+                obj[fileName] = event.target.files[0].name;
+
+                var reader = new FileReader();
+                reader.onload = function (result) {
+                    if (!result.target || !result.target.result) return console.error('Unable to read local file');
+                    obj[file] = result.target.result;
+                };
+                reader.readAsText(event.target.files[0]);
+            });
+        };
+    }
+
+    document.getElementById('gcdnsKeyFileInput').onchange = readFileLocally($scope.dnsCredentials.gcdnsKey, 'content', 'keyFileName');
+
     $scope.setDnsCredentials = function () {
         $scope.dnsCredentials.busy = true;
         $scope.dnsCredentials.error = null;
@@ -77,6 +97,23 @@ app.controller('SetupDNSController', ['$scope', '$http', 'Client', function ($sc
         if (data.provider === 'route53') {
             data.accessKeyId = $scope.dnsCredentials.accessKeyId;
             data.secretAccessKey = $scope.dnsCredentials.secretAccessKey;
+        } else if (data.provider === 'gcdns'){
+            try {
+                var serviceAccountKey = JSON.parse($scope.dnsCredentials.gcdnsKey.content);
+                data.projectId = serviceAccountKey.project_id;
+                data.credentials = {
+                    client_email: serviceAccountKey.client_email,
+                    private_key: serviceAccountKey.private_key
+                };
+
+                if (!data.projectId || !data.credentials || !data.credentials.client_email || !data.credentials.private_key) {
+                    throw "fields_missing";
+                }
+            } catch(e) {
+                $scope.dnsCredentials.error = "Cannot parse Google Service Account Key";
+                $scope.dnsCredentials.busy = false;
+                return;
+            }
         } else if (data.provider === 'digitalocean') {
             data.token = $scope.dnsCredentials.digitalOceanToken;
         } else if (data.provider === 'cloudflare') {
@@ -123,6 +160,7 @@ app.controller('SetupDNSController', ['$scope', '$http', 'Client', function ($sc
         if (status.adminFqdn) return waitForDnsSetup();
 
         if (status.provider === 'digitalocean') $scope.dnsCredentials.provider = 'digitalocean';
+        if (status.provider === 'gcp') $scope.dnsCredentials.provider = 'gcdns';
         if (status.provider === 'ami') {
             // remove route53 on ami
             $scope.dnsProvider.shift();

webadmin/src/setupdns.html

@@ -58,7 +58,7 @@
                                 <div class="form-group" style="margin-bottom: 0;" ng-class="{ 'has-error': dnsCredentialsForm.domain.$dirty && dnsCredentialsForm.domain.$invalid }">
                                     <input type="text" class="form-control" ng-model="dnsCredentials.domain" name="domain" placeholder="example.com" required autofocus ng-disabled="dnsCredentials.busy">
                                 </div>
-                                <p ng-show="isSubdomain" class="text-bold">Installing Cloudron on a subdomain requires an enterprise subscription.</p>
+                                <p ng-show="isSubdomain" class="text-bold">Installing on a subdomain requires an enterprise subscription.</p>
                             </div>
                         </div>
                         <div class="row">
@@ -80,6 +80,19 @@
                                     <span ng-show="isDomain || explicitZone"><b>{{ explicitZone ? explicitZone : (dnsCredentials.domain | zoneName) }}</b> must be hosted on <a href="https://aws.amazon.com/route53/?nc2=h_m1" target="_blank">AWS Route53</a>.</span>
                                 </div>
 
+                                <!-- Google Cloud DNS -->
+                                <div class="form-group" ng-class="{ 'has-error': false }" ng-show="dnsCredentials.provider === 'gcdns'">
+                                    <div class="input-group">
+                                        <input type="file" id="gcdnsKeyFileInput" style="display:none"/>
+                                        <input type="text" class="form-control" placeholder="Service Account Key" ng-model="dnsCredentials.gcdnsKey.keyFileName" id="gcdnsKeyInput" name="cert" onclick="getElementById('gcdnsKeyFileInput').click();" style="cursor: pointer;" ng-required="dnsCredentials.provider === 'gcdns'" ng-disabled="dnsCredentials.busy">
+                                        <span class="input-group-addon">
+                                          <i class="fa fa-upload" onclick="getElementById('gcdnsKeyFileInput').click();"></i>
+                                        </span>
+                                    </div>
+                                    <br/>
+                                    <span ng-show="isDomain || explicitZone"><b>{{ explicitZone ? explicitZone : (dnsCredentials.domain | zoneName) }}</b> must be hosted on <a href="https://console.cloud.google.com/net-services/dns/zones" target="_blank">Google Cloud DNS</a>.</span>
+                                </div>
+
                                 <!-- DigitalOcean -->
                                 <div class="form-group" ng-class="{ 'has-error': dnsCredentialsForm.digitalOceanToken.$dirty && dnsCredentialsForm.digitalOceanToken.$invalid }" ng-show="dnsCredentials.provider === 'digitalocean'">
                                     <input type="text" class="form-control" ng-model="dnsCredentials.digitalOceanToken" name="digitalOceanToken" placeholder="API Token" ng-required="dnsCredentials.provider === 'digitalocean'" ng-disabled="dnsCredentials.busy">
@@ -94,7 +107,7 @@
                                 <div class="form-group" ng-class="{ 'has-error': dnsCredentialsForm.cloudflareEmail.$dirty && dnsCredentialsForm.cloudflareEmail.$invalid }" ng-show="dnsCredentials.provider === 'cloudflare'">
                                     <input type="email" class="form-control" ng-model="dnsCredentials.cloudflareEmail" name="cloudflareEmail" placeholder="Cloudflare Account Email" ng-required="dnsCredentials.provider === 'cloudflare'" ng-disabled="dnsCredentials.busy">
                                     <br/>
-                                    <span>{{ dnsCredentials.domain || 'The domain' }} must be hosted on <a href="https://www.cloudflare.com" target="_blank">Cloudflare</a>.</span>
+                                    <span ng-show="isDomain || explicitZone"><b>{{ explicitZone ? explicitZone : (dnsCredentials.domain | zoneName) }}</b> must be hosted on <a href="https://www.cloudflare.com" target="_blank">Cloudflare</a>.</span>
                                 </div>
 
                                 <!-- Wildcard -->

webadmin/src/views/activity.html

@@ -10,7 +10,7 @@
     <div class="filter">
       <input type="text" class="form-control" ng-model="search" ng-model-options="{ debounce: 1000 }" ng-change="updateFilter()" placeholder="Search"/>
       <select class="form-control" ng-model="action" ng-options="a.name for a in actions" ng-change="updateFilter()">
-        <option value="">-- all actions --</option>
+        <option value="">-- All actions --</option>
       </select>
       <select class="form-control" ng-model="pageItems" ng-options="a.name for a in pageItemCount" ng-change="updateFilter(true)">
       </select>

webadmin/src/views/activity.js

@@ -15,6 +15,7 @@ angular.module('Application').controller('ActivityController', ['$scope', '$loca
         { name: 'app.uninstall', value: 'app.uninstall' },
         { name: 'app.update', value: 'app.update' },
         { name: 'app.login', value: 'app.login' },
+        { name: 'backup.cleanup', value: 'backup.cleanup' },
         { name: 'backup.finish', value: 'backup.finish' },
         { name: 'backup.start', value: 'backup.start' },
         { name: 'certificate.renew', value: 'certificate.renew' },

webadmin/src/views/apps.html

@@ -42,8 +42,8 @@
                             <br>
                         </p>
 
-                        <p class="text-center" ng-show="appConfigure.location && dnsConfig.provider === 'manual' && !dnsConfig.wildcard">
-                            <b>Do not forget, to add an A record for {{ appConfigure.location }}.{{ config.fqdn }}</b>
+                        <p class="text-center" ng-show="!appConfigure.usingAltDomain && appConfigure.location && dnsConfig.provider === 'manual' && !dnsConfig.wildcard">
+                            <b>Do not forget to add an A record for {{ appConfigure.location }}.{{ config.fqdn }}</b>
                             <br>
                         </p>
 
@@ -57,8 +57,6 @@
                             </ng-form>
                         </div>
 
-                        <br/>
-
                         <div class="form-group" ng-show="appConfigure.customAuth && !appConfigure.app.manifest.addons.email">
                             <label class="control-label">User management</label>
                             <p>
@@ -162,16 +160,6 @@
                             </div>
                         </div>
 
-                        <br/>
-                        <br/>
-                        <div class="form-group" ng-class="{ 'has-error': (appConfigureForm.password.$dirty && appConfigureForm.password.$invalid) || (!appConfigureForm.password.$dirty && appConfigure.error.password) }">
-                            <label class="control-label" for="appConfigurePasswordInput">Provide your password to confirm this action</label>
-                            <div class="control-label" ng-show="(appConfigureForm.password.$dirty && appConfigureForm.password.$invalid) || (!appConfigureForm.password.$dirty && appConfigure.error.password)">
-                                <small ng-show=" appConfigureForm.password.$dirty && appConfigureForm.password.$invalid">Password required</small>
-                                <small ng-show="!appConfigureForm.password.$dirty && appConfigure.error.password">Wrong password</small>
-                            </div>
-                            <input type="password" class="form-control" ng-model="appConfigure.password" id="appConfigurePasswordInput" name="password" required>
-                        </div>
                         <input class="ng-hide" type="submit" ng-disabled="appConfigureForm.$invalid || appConfigure.busy || (appConfigure.accessRestrictionOption === 'groups' && !appConfigure.isAccessRestrictionValid()) || (appConfigure.usingAltDomain && !appConfigure.isAltDomainValid())"/>
                     </form>
                 </fieldset>
@@ -328,10 +316,6 @@
                                 </div>
                             </ng-form>
                         </div>
-                        <div class="form-group" ng-class="{ 'has-error': (!appUpdateForm.password.$dirty && appUpdate.error.password) || (appUpdateForm.password.$dirty && appUpdateForm.password.$invalid) }">
-                            <label class="control-label" for="inputUpdatePassword">Provide your password to confirm this action</label>
-                            <input type="password" class="form-control" ng-model="appUpdate.password" id="inputUpdatePassword" name="password" required autofocus>
-                        </div>
                         <input class="ng-hide" type="submit" ng-disabled="appUpdateForm.$invalid || busy"/>
                     </form>
                 </fieldset>

webadmin/src/views/apps.js

@@ -20,7 +20,6 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
         location: '',
         usingAltDomain: false,
         advancedVisible: false,
-        password: '',
         portBindings: {},
         portBindingsEnabled: {},
         portBindingsInfo: {},
@@ -88,7 +87,6 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
         busy: false,
         error: {},
         app: {},
-        password: '',
         manifest: {},
         portBindings: {}
     };
@@ -108,7 +106,6 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
         $scope.appConfigure.location = '';
         $scope.appConfigure.advancedVisible = false;
         $scope.appConfigure.usingAltDomain = false;
-        $scope.appConfigure.password = '';
         $scope.appConfigure.portBindings = {};          // This is the actual model holding the env:port pair
         $scope.appConfigure.portBindingsEnabled = {};   // This is the actual model holding the enabled/disabled flag
         $scope.appConfigure.certificateFile = null;
@@ -138,7 +135,6 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
         // reset update dialog
         $scope.appUpdate.error = {};
         $scope.appUpdate.app = {};
-        $scope.appUpdate.password = '';
         $scope.appUpdate.manifest = {};
         $scope.appUpdate.portBindings = {};
 
@@ -250,7 +246,6 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
         $scope.appConfigure.busy = true;
         $scope.appConfigure.error.other = null;
         $scope.appConfigure.error.location = null;
-        $scope.appConfigure.error.password = null;
         $scope.appConfigure.error.xFrameOptions = null;
 
         // only use enabled ports from portBindings
@@ -274,7 +269,7 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
             enableBackup: $scope.appConfigure.enableBackup
         };
 
-        Client.configureApp($scope.appConfigure.app.id, $scope.appConfigure.password, data, function (error) {
+        Client.configureApp($scope.appConfigure.app.id, data, function (error) {
             if (error) {
                 if (error.statusCode === 409 && (error.message.indexOf('is reserved') !== -1 || error.message.indexOf('is already in use') !== -1)) {
                     $scope.appConfigure.error.port = error.message;
@@ -282,11 +277,6 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
                     $scope.appConfigure.error.location = 'This name is already taken.';
                     $scope.appConfigureForm.location.$setPristine();
                     $('#appConfigureLocationInput').focus();
-                } else if (error.statusCode === 403) {
-                    $scope.appConfigure.error.password = true;
-                    $scope.appConfigure.password = '';
-                    $scope.appConfigureForm.password.$setPristine();
-                    $('#appConfigurePasswordInput').focus();
                 } else if (error.statusCode === 400 && error.message.indexOf('cert') !== -1 ) {
                     $scope.appConfigure.error.cert = error.message;
                     $scope.appConfigure.certificateFileName = '';
@@ -483,7 +473,6 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
     };
 
     $scope.doUpdate = function (form) {
-        $scope.appUpdate.error.password = null;
         $scope.appUpdate.busy = true;
 
         // only use enabled ports from portBindings
@@ -494,15 +483,11 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
             }
         }
 
-        Client.updateApp($scope.appUpdate.app.id, $scope.appUpdate.manifest, finalPortBindings, $scope.appUpdate.password, function (error) {
-            if (error && error.statusCode === 403) {
-                $scope.appUpdate.password = '';
-                $scope.appUpdate.error.password = true;
-            } else if (error) {
+        Client.updateApp($scope.appUpdate.app.id, $scope.appUpdate.manifest, finalPortBindings, function (error) {
+            if (error) {
                 Client.error(error);
             } else {
                 $scope.appUpdate.app = {};
-                $scope.appUpdate.password = '';
 
                 form.$setPristine();
                 form.$setUntouched();

webadmin/src/views/appstore.html

@@ -28,7 +28,7 @@
                         </div>
 
                         <p class="text-center" ng-show="appInstall.location && dnsConfig.provider === 'manual' && !dnsConfig.wildcard">
-                            <b>Do not forget, to add an A record for {{ appInstall.location }}.{{ config.fqdn }}</b>
+                            <b>Do not forget to add an A record for {{ appInstall.location }}.{{ config.fqdn }}</b>
                             <br>
                         </p>
 

webadmin/src/views/certs.html

@@ -29,6 +29,17 @@
                             <input type="text" class="form-control" ng-model="dnsCredentials.secretAccessKey" id="dnsCredentialsSecretAccessKey" name="secretAccessKey" ng-disabled="dnsCredentials.busy" ng-required="dnsCredentials.provider === 'route53'">
                         </div>
 
+                        <!-- Google Cloud DNS -->
+                        <div class="form-group" ng-class="{ 'has-error': false }" ng-show="dnsCredentials.provider === 'gcdns'">
+                            <div class="input-group">
+                                <input type="file" id="gcdnsKeyFileInput" style="display:none"/>
+                                <input type="text" class="form-control" placeholder="Service Account Key" ng-model="dnsCredentials.gcdnsKey.keyFileName" id="gcdnsKeyInput" name="cert" onclick="getElementById('gcdnsKeyFileInput').click();" style="cursor: pointer;" ng-disabled="dnsCredentials.busy" required>
+                                <span class="input-group-addon">
+                                  <i class="fa fa-upload" onclick="getElementById('gcdnsKeyFileInput').click();"></i>
+                              </span>
+                            </div>
+                        </div>
+
                         <!-- DigitalOcean -->
                         <div class="form-group" ng-class="{ 'has-error': false }" ng-show="dnsCredentials.provider === 'digitalocean'">
                             <label class="control-label" for="dnsCredentialsDigitalOceanToken">DigitalOcean token</label>
@@ -62,6 +73,10 @@
                     This domain must be hosted on <a href="https://aws.amazon.com/route53/?nc2=h_m1" target="_blank">AWS Route53</a>.
                 </p>
 
+                <p ng-show="dnsCredentials.provider === 'gcdns'">
+                    This domain must be hosted on <a href="https://console.cloud.google.com/net-services/dns/zones" target="_blank">Google Cloud DNS</a>.
+                </p>
+
                 <p ng-show="dnsCredentials.provider === 'digitalocean'">
                     This domain must be hosted on <a href="https://www.digitalocean.com/community/tutorials/how-to-set-up-a-host-name-with-digitalocean#step-two%E2%80%94change-your-domain-server" target="_blank">DigitalOcean</a>.
                 </p>

webadmin/src/views/certs.js

@@ -9,8 +9,9 @@ angular.module('Application').controller('CertsController', ['$scope', '$locatio
     // keep in sync with setupdns.js
     $scope.dnsProvider = [
         { name: 'AWS Route53', value: 'route53' },
-        { name: 'Digital Ocean', value: 'digitalocean' },
         { name: 'Cloudflare (DNS only)', value: 'cloudflare' },
+        { name: 'Digital Ocean', value: 'digitalocean' },
+        { name: 'Google Cloud DNS', value: 'gcdns' },
         { name: 'Wildcard', value: 'wildcard' },
         { name: 'Manual (not recommended)', value: 'manual' },
         { name: 'No-op (only for development)', value: 'noop' }
@@ -43,6 +44,7 @@ angular.module('Application').controller('CertsController', ['$scope', '$locatio
         customDomain: '',
         accessKeyId: '',
         secretAccessKey: '',
+        gcdnsKey: { keyFileName: '', content: '' },
         digitalOceanToken: '',
         cloudflareToken: '',
         cloudflareEmail: '',
@@ -71,6 +73,8 @@ angular.module('Application').controller('CertsController', ['$scope', '$locatio
     document.getElementById('adminCertFileInput').onchange = readFileLocally($scope.adminCert, 'certificateFile', 'certificateFileName');
     document.getElementById('adminKeyFileInput').onchange = readFileLocally($scope.adminCert, 'keyFile', 'keyFileName');
 
+    document.getElementById('gcdnsKeyFileInput').onchange = readFileLocally($scope.dnsCredentials.gcdnsKey, 'content', 'keyFileName');
+
     $scope.setDefaultCert = function () {
         $scope.defaultCert.busy = true;
         $scope.defaultCert.error = null;
@@ -130,6 +134,23 @@ angular.module('Application').controller('CertsController', ['$scope', '$locatio
         if (data.provider === 'route53') {
             data.accessKeyId = $scope.dnsCredentials.accessKeyId;
             data.secretAccessKey = $scope.dnsCredentials.secretAccessKey;
+        } else if (data.provider === 'gcdns'){
+            try {
+                var serviceAccountKey = JSON.parse($scope.dnsCredentials.gcdnsKey.content);
+                data.projectId = serviceAccountKey.project_id;
+                data.credentials = {
+                    client_email: serviceAccountKey.client_email,
+                    private_key: serviceAccountKey.private_key
+                };
+
+                if (!data.projectId || !data.credentials || !data.credentials.client_email || !data.credentials.private_key) {
+                    throw 'fields_missing';
+                }
+            } catch (e) {
+                $scope.dnsCredentials.error = 'Cannot parse Google Service Account Key: ' + e.message;
+                $scope.dnsCredentials.busy = false;
+                return;
+            }
         } else if (data.provider === 'digitalocean') {
             data.token = $scope.dnsCredentials.digitalOceanToken;
         } else if (data.provider === 'cloudflare') {
@@ -178,6 +199,8 @@ angular.module('Application').controller('CertsController', ['$scope', '$locatio
         $scope.dnsCredentials.customDomain = '';
         $scope.dnsCredentials.accessKeyId = '';
         $scope.dnsCredentials.secretAccessKey = '';
+        $scope.dnsCredentials.gcdnsKey.keyFileName = '';
+        $scope.dnsCredentials.gcdnsKey.content = '';
         $scope.dnsCredentials.digitalOceanToken = '';
         $scope.dnsCredentials.cloudflareToken = '';
         $scope.dnsCredentials.cloudflareEmail = '';
@@ -196,6 +219,16 @@ angular.module('Application').controller('CertsController', ['$scope', '$locatio
         $scope.dnsCredentials.customDomain = $scope.config.isCustomDomain ? $scope.config.fqdn : '';
         $scope.dnsCredentials.accessKeyId = $scope.dnsConfig.accessKeyId;
         $scope.dnsCredentials.secretAccessKey = $scope.dnsConfig.secretAccessKey;
+
+        $scope.dnsCredentials.gcdnsKey.keyFileName = '';
+        $scope.dnsCredentials.gcdnsKey.content = '';
+        if ($scope.dnsConfig.provider === 'gcdns') {
+            $scope.dnsCredentials.gcdnsKey.keyFileName = $scope.dnsConfig.credentials.client_email;
+            $scope.dnsCredentials.gcdnsKey.content = JSON.stringify({
+                "project_id": $scope.dnsConfig.projectId,
+                "credentials": $scope.dnsConfig.credentials
+            });
+        }
         $scope.dnsCredentials.digitalOceanToken = $scope.dnsConfig.provider === 'digitalocean' ? $scope.dnsConfig.token : '';
         $scope.dnsCredentials.cloudflareToken = $scope.dnsConfig.provider === 'cloudflare' ? $scope.dnsConfig.token : '';
         $scope.dnsCredentials.cloudflareEmail = $scope.dnsConfig.email;

webadmin/src/views/email.html

@@ -9,7 +9,7 @@
       <div class="modal-body" ng-show="dnsConfig.provider === 'noop' || dnsConfig.provider === 'manual'">
         No DNS provider is setup. Displayed DNS records will have to be setup manually.<br/>
       </div>
-      <div class="modal-body" ng-show="dnsConfig.provider === 'route53' || dnsConfig.provider === 'digitalocean' || dnsConfig.provider === 'cloudflare'">
+      <div class="modal-body" ng-hide="dnsConfig.provider === 'noop' || dnsConfig.provider === 'manual'">
         Cloudron will setup Email related DNS records automatically.
         If this domain is already configured to handle email with some other provider, it will <b>overwrite</b> those records.
         <br/><br/>
@@ -26,6 +26,23 @@
   </div>
 </div>
 
+<!-- Test email sent -->
+<div class="modal fade" id="testEmailSent" tabindex="-1" role="dialog">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h4 class="modal-title">Test Email Sent</h4>
+      </div>
+      <div class="modal-body">
+        A test email was sent to {{ user.email }}. Please check the inbox of this account and verify the email was delivered.
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-default" data-dismiss="modal">Ok</button>
+      </div>
+    </div>
+  </div>
+</div>
+
 <div class="content">
   <div class="text-left">
     <h1>Email</h1>
@@ -39,6 +56,7 @@
     <div class="row">
       <div class="col-md-12">
         Cloudron has a built-in <a ng-href="{{ config.webServerOrigin + '/documentation/email/' }}" target="_blank">email server</a> that allows users to send and receive email for your domain.
+        Apps can send emails regardless of this setting.
       </div>
     </div>
     <div class="row" ng-show="mailConfig.enabled">
@@ -57,7 +75,7 @@
     <br/>
     <div class="row">
       <div class="col-md-12" ng-show="dnsConfig.provider !== 'caas'">
-        <button ng-class="mailConfig.enabled ? 'btn btn-danger' : 'btn btn-primary'" ng-click="email.toggle()" ng-enabled="mailConfig">{{ mailConfig.enabled ? "Disable Email" : "Enable Email" }}</button>
+        <button class="pull-left" ng-class="mailConfig.enabled ? 'btn btn-danger' : 'btn btn-primary'" ng-click="email.toggle()" ng-enabled="mailConfig">{{ mailConfig.enabled ? "Disable Email" : "Enable Email" }}</button>
       </div>
       <div class="col-md-12" ng-show="dnsConfig.provider === 'caas'">
         <span class="text-danger text-bold">This feature requires the Cloudron to be on <a ng-href="{{ config.webServerOrigin + '/documentation/managed-hosting/#using-a-custom-domain' }}" target="_blank">custom domain</a>.</span>
@@ -175,7 +193,7 @@
         <br/><br/>
 
         <div ng-repeat="record in expectedDnsRecordsTypes">
-         <div class="row" ng-if="expectedDnsRecords[record.value] && (mailConfig.enabled || (record.name !== 'DMARC' && record.name !== 'MX'))">
+          <div class="row" ng-if="expectedDnsRecords[record.value] && (mailConfig.enabled || (record.name !== 'DMARC' && record.name !== 'MX'))">
             <div class="col-xs-12">
               <p class="text-muted">
                 <i ng-class="expectedDnsRecords[record.value].status ? 'fa fa-check-circle text-success' : 'fa fa-exclamation-triangle text-danger'"></i> &nbsp;
@@ -193,6 +211,17 @@
             </div>
           </div>
         </div>
+      </div>
+    </div>
+  </div>
+
+  <div class="text-left" ng-show="dnsConfig.provider && dnsConfig.provider !== 'caas'">
+      <h3>SMTP Status</h3>
+  </div>
+
+  <div class="card" style="margin-bottom: 15px;" ng-show="dnsConfig.provider && dnsConfig.provider !== 'caas'">
+    <div class="row">
+      <div class="col-md-12">
 
         <div class="row">
           <div class="col-xs-12">
@@ -210,7 +239,34 @@
             </div>
           </div>
         </div>
+
+        <div class="row" ng-show="rbl">
+          <div class="col-xs-12">
+            <p class="text-muted">
+              <i ng-class="rbl.status ? 'fa fa-check-circle text-success' : 'fa fa-exclamation-triangle text-danger'"></i> &nbsp;
+              <a href="" data-toggle="collapse" data-parent="#accordion" data-target="#collapse_rbl">
+                  IP Address Blacklist Check
+              </a>
+              <button class="btn btn-xs btn-default" ng-click="email.refresh()" ng-disabled="email.refreshBusy" ng-show="!rbl.status"><i class="fa fa-refresh" ng-class="{ 'fa-pulse': email.refreshBusy }"></i></button>
+            </p>
+            <div id="collapse_rbl" class="panel-collapse collapse">
+              <div class="panel-body">
+                  <div>This server's IP {{ rbl.ip }} is <b ng-hide="rbl.servers.length">not</b> blacklisted.</div>
+                  <div ng-repeat="server in rbl.servers">
+                    <a ng-href="{{server.site}}" target="_blank">{{ server.name }}</a>
+                  </div>
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <div class="row">
+          <div class="col-xs-12">
+            <button class="btn btn-primary pull-left" ng-click="sendTestEmail()">Send Test Email</button>
+          </div>
+        </div>
       </div>
     </div>
   </div>
+
 </div>

webadmin/src/views/email.js

@@ -8,6 +8,7 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
     $scope.config = Client.getConfig();
     $scope.dnsConfig = {};
     $scope.relay = {};
+    $scope.rbl = null;
     $scope.expectedDnsRecords = {};
     $scope.expectedDnsRecordsTypes = [
         { name: 'MX', value: 'mx' },
@@ -157,6 +158,14 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
         }
     };
 
+    $scope.sendTestEmail = function () {
+        Client.sentTestMail($scope.user.email, function (error) {
+            if (error) return console.error(error);
+
+            $('#testEmailSent').modal('show');
+        });
+    };
+
     function getMailConfig() {
         Client.getMailConfig(function (error, mailConfig) {
             if (error) return console.error(error);
@@ -210,6 +219,7 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
 
             $scope.expectedDnsRecords = result.dns;
             $scope.relay = result.relay;
+            $scope.rbl = result.rbl;
 
             // open the record details if they are not correct
             for (var type in $scope.expectedDnsRecords) {

webadmin/src/views/settings.html

@@ -139,7 +139,7 @@
                         <!-- Filesystem -->
                         <div class="form-group" ng-class="{ 'has-error': configureBackup.error.backupFolder }" ng-show="configureBackup.provider === 'filesystem'">
                             <label class="control-label" for="inputConfigureBackupFolder">Local backup directory</label>
-                            <input type="text" class="form-control" ng-model="configureBackup.backupFolder" id="inputConfigureBackupFolder" name="backupFolder" ng-disabled="configureBackup.busy" placeholder="Leave empty for default /var/backups">
+                            <input type="text" class="form-control" ng-model="configureBackup.backupFolder" id="inputConfigureBackupFolder" name="backupFolder" ng-disabled="configureBackup.busy" placeholder="Directory for backups" ng-required="configureBackup.provider === 'filesystem'">
 
                             <p class="has-error" ng-show="configureBackup.provider === 'filesystem'">
                                 Please ensure that the backup directory is an external disk
@@ -147,9 +147,9 @@
                         </div>
 
                         <!-- S3/Minio/SOS -->
-                        <div class="form-group" ng-class="{ 'has-error': configureBackup.error.endpoint }" ng-show="configureBackup.provider === 'minio'">
+                        <div class="form-group" ng-class="{ 'has-error': configureBackup.error.endpoint }" ng-show="configureBackup.provider === 'minio' || configureBackup.provider === 's3-v4-compat'">
                             <label class="control-label" for="inputConfigureBackupEndpoint">Endpoint</label>
-                            <input type="text" class="form-control" ng-model="configureBackup.endpoint" id="inputConfigureBackupEndpoint" name="endpoint" ng-disabled="configureBackup.busy" placeholder="URL of Minio" ng-required="configureBackup.provider === 'minio'">
+                            <input type="text" class="form-control" ng-model="configureBackup.endpoint" id="inputConfigureBackupEndpoint" name="endpoint" ng-disabled="configureBackup.busy" placeholder="URL of Minio/S3 Compatible" ng-required="configureBackup.provider === 'minio' || configureBackup.provider === 's3-v4-compat'">
                         </div>
 
                         <div class="form-group" ng-class="{ 'has-error': configureBackup.error.bucket }" ng-show="s3like(configureBackup.provider)">
@@ -177,12 +177,17 @@
                             <input type="text" class="form-control" ng-model="configureBackup.secretAccessKey" id="inputConfigureBackupSecretAccessKey" name="secretAccessKey" ng-disabled="configureBackup.busy" ng-required="s3like(configureBackup.provider)">
                         </div>
 
+                        <div class="form-group" ng-show="configureBackup.provider !== 'noop'">
+                            <label class="control-label" for="storageFormat">Storage Format</label>
+                            <select class="form-control" id="storageFormat" ng-change="configureBackup.key = ''" ng-model="configureBackup.format" ng-options="a.value as a.name for a in formats"></select>
+                        </div>
+
                         <div class="form-group" ng-show="configureBackup.provider !== 'noop'">
                             <label class="control-label" for="storageRetention">Retention Time</label>
                             <select class="form-control" id="storageRetention" ng-model="configureBackup.retentionSecs" ng-options="a.value as a.name for a in retentionTimes"></select>
                         </div>
 
-                        <div class="form-group" ng-class="{ 'has-error': configureBackup.error.key }" ng-show="configureBackup.provider !== 'noop'">
+                        <div class="form-group" ng-class="{ 'has-error': configureBackup.error.key }" ng-show="configureBackup.provider !== 'noop' && configureBackup.format === 'tgz'">
                             <label class="control-label" for="inputConfigureBackupKey">Encryption key (optional)</label>
                             <input type="text" class="form-control" ng-model="configureBackup.key" id="inputConfigureBackupKey" name="prefix" ng-disabled="configureBackup.busy" placeholder="Passphrase used to encrypt the backups">
                         </div>
@@ -335,21 +340,31 @@
               <span class="text-muted">Location</span>
           </div>
           <div class="col-xs-6 text-right">
-              <span ng-show="backupConfig.provider === 'filesystem'">{{ backupConfig.backupFolder || '/var/backups' }}</span>
-              <span ng-show="backupConfig.provider === 'minio' || backupConfig.provider === 'exoscale-sos'">{{ backupConfig.bucket + '/' + backupConfig.prefix }}</span>
+              <span ng-show="backupConfig.provider === 'filesystem'">{{ backupConfig.backupFolder }}</span>
+              <span ng-show="backupConfig.provider === 'minio' || backupConfig.provider === 'exoscale-sos' || backupConfig.provider === 's3-v4-compat' || backupConfig.provider === 'digitalocean-spaces'">{{ backupConfig.bucket + '/' + backupConfig.prefix }}</span>
               <span ng-show="backupConfig.provider === 's3'">{{ backupConfig.region + '   ' + backupConfig.bucket + '/' + backupConfig.prefix }}</span>
           </div>
       </div>
 
       <br/>
 
+      <div class="row">
+        <div class="col-xs-4">
+            <span class="text-muted">Backup ID</span>
+        </div>
+        <div class="col-xs-8 text-right">
+            <span ng-click-select ng-show="lastBackup">{{ lastBackup.id }}</span>
+            <span ng-hide="lastBackup">No backups have been made yet</span>
+        </div>
+    </div>
+
       <div class="row">
           <div class="col-xs-6">
               <span class="text-muted">Last backup</span>
           </div>
           <div class="col-xs-6 text-right">
               <span ng-show="lastBackup">{{ lastBackup.creationTime | prettyDate }}</span>
-              <span ng-hide="lastBackup">No backups have been made yet</span>
+              <span ng-hide="lastBackup">-</span>
           </div>
       </div>
 
@@ -359,12 +374,23 @@
               <div ng-show="createBackup.busy" class="progress progress-striped active animateMe">
                   <div class="progress-bar progress-bar-success" role="progressbar" style="width: {{ createBackup.percent }}%"></div>
               </div>
-              <br/>
           </div>
       </div>
+
+      <div class="row" ng-show="backupConfig.provider !== 'caas'">
+        <div class="col-md-11" ng-show="createBackup.busy">
+            <p class="text-muted status" style="text-overflow: ellipsis; white-space: nowrap; overflow: hidden">
+                {{ createBackup.detail || 'Syncing ...' }}
+            </p>
+        </div>
+      </div>
+
       <div class="row" ng-show="backupConfig.provider !== 'caas'">
           <div class="col-md-6">
               <p ng-show="createBackup.busy">{{ createBackup.message }}</p>
+              <p ng-hide="createBackup.busy">
+                <div class="has-error" ng-show="createBackup.percent === 100 && createBackup.result">{{ createBackup.result }}</div>
+              </p>
           </div>
           <div class="col-md-6 text-right">
               <button class="btn btn-outline btn-primary pull-right" ng-click="configureBackup.show()" ng-disabled="createBackup.busy">Configure</button>
@@ -394,6 +420,12 @@
                   Every night
                 </label>
               </div>
+              <div class="radio">
+                <label>
+                  <input type="radio" name="scheduleRadio" ng-change="autoUpdate.success = false" ng-model="autoUpdate.pattern" value="00 00 3,5 * * 3">
+                  Wednesday night
+                </label>
+              </div>
               <div class="radio">
                 <label>
                   <input type="radio" name="scheduleRadio" ng-change="autoUpdate.success = false" ng-model="autoUpdate.pattern" value="00 00 1,3,5,23 * * 6">

webadmin/src/views/settings.js

@@ -42,10 +42,12 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
 
     $scope.storageProvider = [
         { name: 'Amazon S3', value: 's3' },
+        { name: 'DigitalOcean Spaces', value: 'digitalocean-spaces' },
         { name: 'Exoscale SOS', value: 'exoscale-sos' },
         { name: 'Filesystem', value: 'filesystem' },
         { name: 'Minio', value: 'minio' },
-        { name: 'No-op (Only for testing)', value: 'noop' }
+        { name: 'No-op (Only for testing)', value: 'noop' },
+        { name: 'S3 API Compatible (v4)', value: 's3-v4-compat' },
     ];
 
     $scope.retentionTimes = [
@@ -55,6 +57,11 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
         { name: 'Forever', value: -1 }
     ];
 
+    $scope.formats = [
+        { name: 'Tarball (zipped)', value: 'tgz' },
+        { name: 'rsync', value: 'rsync' }
+    ];
+
     $scope.planChange = {
         busy: false,
         error: {},
@@ -110,14 +117,42 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
 
     $scope.createBackup = {
         busy: false,
-        percent: 100,
+        percent: 0,
         message: '',
         errorMessage: '',
+        result: '',
+
+        updateStatus: function () {
+            Client.progress(function (error, data) {
+                if (error) return window.setTimeout($scope.createBackup.updateStatus, 250);
+
+                // check if we are done
+                if (!data.backup || data.backup.percent >= 100) {
+                    if (data.backup && data.backup.message) console.error('Backup message: ' + data.backup.message); // backup error message
+
+                    $scope.createBackup.busy = false;
+                    $scope.createBackup.message = '';
+                    $scope.createBackup.detail = '';
+                    $scope.createBackup.percent = 100; // indicates that 'result' is valid
+                    $scope.createBackup.result = data.backup ? data.backup.message : null;
+
+                    return fetchBackups();
+                }
+
+                $scope.createBackup.busy = true;
+                $scope.createBackup.percent = data.backup.percent;
+                $scope.createBackup.message = data.backup.message;
+                $scope.createBackup.detail = data.backup.detail;
+                window.setTimeout($scope.createBackup.updateStatus, 500);
+            });
+        },
 
         doCreateBackup: function () {
             $scope.createBackup.busy = true;
             $scope.createBackup.percent = 0;
             $scope.createBackup.message = '';
+            $scope.createBackup.detail = '';
+            $scope.createBackup.result = '';
             $scope.createBackup.errorMessage = '';
 
             Client.backup(function (error) {
@@ -137,27 +172,7 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
                     return;
                 }
 
-                function checkIfDone() {
-                    Client.progress(function (error, data) {
-                        if (error) return window.setTimeout(checkIfDone, 250);
-
-                        // check if we are done
-                        if (!data.backup || data.backup.percent >= 100) {
-                            if (data.backup && data.backup.message) console.error('Backup message: ' + data.backup.message); // backup error message
-
-                            $scope.createBackup.busy = false;
-                            $scope.createBackup.message = '';
-
-                            return fetchBackups();
-                        }
-
-                        $scope.createBackup.percent = data.backup.percent;
-                        $scope.createBackup.message = data.backup.message;
-                        window.setTimeout(checkIfDone, 500);
-                    });
-                }
-
-                checkIfDone();
+                $scope.createBackup.updateStatus();
             });
         }
     };
@@ -295,7 +310,7 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
     };
 
     $scope.s3like = function (provider) {
-        return provider === 's3' || provider === 'minio' || provider === 'exoscale-sos';
+        return provider === 's3' || provider === 'minio' || provider === 's3-v4-compat' || provider === 'exoscale-sos' || provider === 'digitalocean-spaces';
     };
 
     $scope.configureBackup = {
@@ -311,6 +326,7 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
         endpoint: '',
         backupFolder: '',
         retentionSecs: -1,
+        format: 'tgz',
 
         clearForm: function () {
             $scope.configureBackup.bucket = '';
@@ -321,6 +337,7 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
             $scope.configureBackup.region = '';
             $scope.configureBackup.backupFolder = '';
             $scope.configureBackup.retentionSecs = -1;
+            $scope.configureBackup.format = 'tgz';
         },
 
         show: function () {
@@ -337,6 +354,7 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
             $scope.configureBackup.key = $scope.backupConfig.key;
             $scope.configureBackup.backupFolder = $scope.backupConfig.backupFolder;
             $scope.configureBackup.retentionSecs = $scope.backupConfig.retentionSecs;
+            $scope.configureBackup.format = $scope.backupConfig.format;
 
             $('#configureBackupModal').modal('show');
         },
@@ -348,7 +366,8 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
             var backupConfig = {
                 provider: $scope.configureBackup.provider,
                 key: $scope.configureBackup.key,
-                retentionSecs: $scope.configureBackup.retentionSecs
+                retentionSecs: $scope.configureBackup.retentionSecs,
+                format: $scope.configureBackup.format
             };
 
             // only set provider specific fields, this will clear them in the db
@@ -362,14 +381,16 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
 
                 if (backupConfig.provider === 's3') {
                     if ($scope.configureBackup.region) backupConfig.region = $scope.configureBackup.region;
-                } else if (backupConfig.provider === 'minio') {
+                } else if (backupConfig.provider === 'minio' || backupConfig.provider === 's3-v4-compat') {
                     backupConfig.region = 'us-east-1';
                 } else if (backupConfig.provider === 'exoscale-sos') {
                     backupConfig.endpoint = 'https://sos.exo.io';
                     backupConfig.region = 'us-east-1';
                     backupConfig.signatureVersion = 'v2';
+                } else if (backupConfig.provider === 'digitalocean-spaces') {
+                    backupConfig.endpoint = 'https://nyc3.digitaloceanspaces.com';
+                    backupConfig.region = 'us-east-1';
                 }
-
             } else if (backupConfig.provider === 'filesystem') {
                 backupConfig.backupFolder = $scope.configureBackup.backupFolder;
             }
@@ -617,6 +638,9 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
         getBackupConfig();
         getAutoupdatePattern();
 
+        // show backup status
+        $scope.createBackup.updateStatus();
+
         if ($scope.config.provider === 'caas') {
             getPlans();