cloudron 5.4.2 → 5.6.0

package/bin/cloudron-appstore

@@ -2,7 +2,7 @@
 
 'use strict';
 
-const program = require('commander'),
+const { program } = require('commander'),
     appstoreActions = require('../src/appstore-actions.js');
 
 program.version(require('../package.json').version);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudron",
-  "version": "5.4.2",
+  "version": "5.6.0",
   "license": "MIT",
   "description": "Cloudron Commandline Tool",
   "main": "main.js",
@@ -10,40 +10,39 @@
     "url": "https://git.cloudron.io/cloudron/cloudron-cli.git"
   },
   "scripts": {
-    "test": "./node_modules/.bin/mocha test/test.js"
+    "test": "mocha test/test.js"
   },
   "bin": {
-    "cloudron": "./bin/cloudron"
+    "cloudron": "bin/cloudron"
   },
   "author": "Cloudron Developers <support@cloudron.io>",
   "dependencies": {
-    "async": "^3.2.4",
-    "cloudron-manifestformat": "^5.20.0",
-    "commander": "^9.5.0",
-    "debug": "^4.3.4",
-    "delay": "^5.0.0",
+    "async": "^3.2.5",
+    "cloudron-manifestformat": "^5.24.0",
+    "commander": "^12.1.0",
+    "debug": "^4.3.5",
     "easy-table": "^1.2.0",
-    "ejs": "^3.1.9",
+    "ejs": "^3.1.10",
     "eventsource": "^2.0.2",
-    "micromatch": "^4.0.5",
+    "micromatch": "^4.0.7",
     "once": "^1.4.0",
     "open": "^8.4.0",
     "progress": "^2.0.3",
     "progress-stream": "^2.0.0",
     "readline-sync": "^1.4.10",
-    "safetydance": "^2.2.0",
-    "split": "^1.0.1",
-    "superagent": "^8.0.9",
+    "safetydance": "^2.4.0",
+    "split2": "^4.2.0",
+    "superagent": "^9.0.2",
     "tar-fs": "https://registry.npmjs.org/tar-fs/-/tar-fs-1.12.0.tgz",
     "underscore": "^1.13.6"
   },
   "engines": {
-    "node": ">= 14.x.x"
+    "node": ">= 18.x.x"
   },
   "devDependencies": {
     "expect.js": "^0.3.1",
     "memorystream": "^0.3.1",
-    "mocha": "^10.2.0",
-    "rimraf": "^3.0.2"
+    "mocha": "^10.4.0",
+    "rimraf": "^5.0.7"
   }
 }

package/src/actions.js

@@ -2,7 +2,6 @@
 
 const assert = require('assert'),
     config = require('./config.js'),
-    delay = require('delay'),
     ejs = require('ejs'),
     { exit, locateManifest } = require('./helper.js'),
     EventSource = require('eventsource'),
@@ -17,10 +16,12 @@ const assert = require('assert'),
     readlineSync = require('readline-sync'),
     safe = require('safetydance'),
     spawn = require('child_process').spawn,
-    split = require('split'),
+    semver = require('semver'),
+    split = require('split2'),
     superagent = require('superagent'),
     Table = require('easy-table'),
     tar = require('tar-fs'),
+    timers = require('timers/promises'),
     zlib = require('zlib'),
     _ = require('underscore');
 
@@ -109,9 +110,10 @@ async function selectDomain(location, options) {
 
     let domain;
     let subdomain = location;
-    let matchingDomain = domains
+    // find longest matching domain name. this maps to DNS where subdomain is a zone of it's own
+    const matchingDomain = domains
         .map(function (d) { return d.domain; } )
-        .sort(function(a, b) { return a.length < b.length; })
+        .sort(function(a, b) { return b.length - a.length; })
         .find(function (d) { return location.endsWith(d); });
 
     if (matchingDomain) {
@@ -120,7 +122,7 @@ async function selectDomain(location, options) {
     } else { // use the admin domain
         domain = domains
             .map(function (d) { return d.domain; } )
-            .sort(function(a, b) { return a.length < b.length; })
+            .sort(function(a, b) { return b.length - a.length; })
             .find(function (d) { return adminFqdn.endsWith(d); });
     }
 
@@ -146,7 +148,7 @@ async function selectAppWithRepository(repository, options) {
     const response = await createRequest('GET', '/api/v1/apps', options);
     if (response.statusCode !== 200) throw new Error(`Failed to install app: ${requestError(response)}`);
 
-    let matchingApps = response.body.apps.filter(function (app) {
+    const matchingApps = response.body.apps.filter(function (app) {
         return !app.appStoreId && app.manifest.dockerImage.startsWith(repository); // never select apps from the store
     });
 
@@ -161,7 +163,6 @@ async function selectAppWithRepository(repository, options) {
     });
 
     let index = -1;
-    // eslint-disable-next-line no-constant-condition
     while (true) {
         index = parseInt(readlineSync.question('Choose app [0-' + (matchingApps.length-1) + ']: ', {}), 10);
         if (isNaN(index) || index < 0 || index > matchingApps.length-1) console.log('Invalid selection');
@@ -215,9 +216,8 @@ async function waitForHealthy(appId, options) {
 
     process.stdout.write('\n => ' + 'Wait for health check ');
 
-    // eslint-disable-next-line no-constant-condition
     while (true) {
-        await delay(1000);
+        await timers.setTimeout(1000);
         const response = await createRequest('GET', `/api/v1/apps/${appId}`, options);
         if (response.statusCode !== 200) throw new Error(`Failed to get app: ${requestError(response)}`);
 
@@ -240,7 +240,6 @@ async function waitForTask(taskId, options) {
 
     let currentMessage = '';
 
-    // eslint-disable-next-line no-constant-condition
     while (true) {
         const response = await createRequest('GET', `/api/v1/tasks/${taskId}`, options);
         if (response.statusCode !== 200) throw new Error(`Failed to get task: ${requestError(response)}`);
@@ -271,7 +270,7 @@ async function waitForTask(taskId, options) {
 
         currentMessage = message;
 
-        await delay(1000);
+        await timers.setTimeout(1000);
     }
 }
 
@@ -522,8 +521,13 @@ function parseDebugCommand(cmd) {
 }
 
 async function downloadManifest(appstoreId) {
-    const parts = appstoreId.split('@');
-    const url = config.appStoreOrigin() + '/api/v1/apps/' + parts[0] + (parts[1] ? '/versions/' + parts[1] : '');
+    const [ id, version ] = appstoreId.split('@');
+
+    if (!manifestFormat.isId(id)) throw new Error('Invalid appstore ID');
+    if (!semver.valid(version)) throw new Error('Invalid appstore version, not a semver');
+
+    // encodeURIComponent required to protect against passing junk in the URL (e.g appstoreId=org.wordpress.cloudronapp?foo=bar)
+    const url = config.appStoreOrigin() + '/api/v1/apps/' + id + (version ? '/versions/' + version : '');
 
     const [error, response] = await safe(superagent.get(url).ok(() => true));
     if (error) throw new Error(`Failed to list apps from appstore: ${error.message}`);
@@ -597,7 +601,7 @@ async function install(localOptions, cmd) {
 
         for (const binding in secondaryDomains) console.log(`Secondary domain ${binding}: ${secondaryDomains[binding].subdomain}.${secondaryDomains[binding].domain}`);
 
-        let aliasDomains = [];
+        const aliasDomains = [];
         if (options.aliasDomains) {
             for (const aliasDomain of options.aliasDomains.split(',')) {
                 aliasDomains.push(await selectDomain(aliasDomain, options));
@@ -611,7 +615,7 @@ async function install(localOptions, cmd) {
             if (typeof options.portBindings === 'string') {
                 portBindings = { };
                 options.portBindings.split(',').forEach(function (kv) {
-                    let tmp = kv.split('=');
+                    const tmp = kv.split('=');
                     if (isNaN(parseInt(tmp[1], 10))) return; // disable the port
                     portBindings[tmp[0]] = parseInt(tmp[1], 10);
                 });
@@ -620,7 +624,7 @@ async function install(localOptions, cmd) {
             }
         } else { // just put in defaults
             const allPorts = _.extend({}, manifest.tcpPorts, manifest.udpPorts);
-            for (let portName in allPorts) {
+            for (const portName in allPorts) {
                 portBindings[portName] = allPorts[portName].defaultValue;
             }
         }
@@ -681,7 +685,7 @@ async function configure(localOptions, cmd) {
         if (!app) return exit(NO_APP_FOUND_ERROR_STRING);
 
         if (!options.location) options.location = readlineSync.question(`Enter new location (default: ${app.fqdn}): `, { });
-        let location = options.location || app.subdomain;
+        const location = options.location || app.subdomain;
 
         const domainObject = await selectDomain(location, options);
 
@@ -743,7 +747,7 @@ async function configure(localOptions, cmd) {
                 portBindings = queryPortBindings(app, app.manifest);
             }
 
-            for (let binding in portBindings) {
+            for (const binding in portBindings) {
                 console.log('%s: %s', binding, portBindings[binding]);
             }
 
@@ -963,7 +967,7 @@ async function logs(localOptions, cmd) {
     }
 
     if (tail) {
-        const url = `${apiPath}?access_token=${token}&lines=10`;
+        const url = `${apiPath}?access_token=${token}&lines=10&format=json`;
         var es = new EventSource(url, { rejectUnauthorized }); // not sure why this is needed
 
         es.on('message', function (e) { // e { type, data, lastEventId }. lastEventId is the timestamp
@@ -976,16 +980,21 @@ async function logs(localOptions, cmd) {
             exit(error);
         });
     } else {
-        const url = `${apiPath}?access_token=${token}&lines=${lines}`;
+        const url = `${apiPath}?access_token=${token}&lines=${lines}&format=json`;
 
         const req = superagent.get(url, { rejectUnauthorized });
         req.on('response', function (response) {
             if (response.statusCode !== 200) return exit(`Failed to get logs: ${requestError(response)}`);
         });
-        req.pipe(split(JSON.parse))
+        req.on('error', (error) => exit(`Pipe error: ${error.message}`));
+
+        const jsonStream = split((line) => JSON.parse(line));
+        jsonStream
             .on('data', logPrinter)
-            .on('error', process.exit)
+            .on('error', (error) => exit(`JSON parse error: ${error.message}`))
             .on('end', process.exit);
+
+        req.pipe(jsonStream);
     }
 }
 
@@ -1012,7 +1021,7 @@ async function inspect(localOptions, cmd) {
         const response = await createRequest('GET', '/api/v1/apps', options);
         if (response.statusCode !== 200) return exit(`Failed to list apps: ${requestError(response)}`);
 
-        let apps = [];
+        const apps = [];
 
         for (const app of response.body.apps) {
             const response2 = await createRequest('GET', `/api/v1/apps/${app.id}`, options);
@@ -1171,7 +1180,8 @@ async function importApp(localOptions, cmd) {
         let data = {};
 
         if (!options.inPlace) {
-            let { remotePath, backupFormat, backupConfig, backupPath, backupKey } = options;
+            let { remotePath, backupFormat, backupConfig } = options;
+            const { backupPath, backupKey } = options;
             let backupFolder;
 
             if (backupPath) {
@@ -1223,7 +1233,7 @@ async function exportApp(localOptions, cmd) {
         const app = await getApp(options);
         if (!app) return exit(NO_APP_FOUND_ERROR_STRING);
 
-        let data = {};
+        const data = {};
 
         if (!options.snapshot) return exit('--snapshot is required');
 
@@ -1301,7 +1311,7 @@ function demuxStream(stream, stdout, stderr) {
 // cat ~/tmp/fantome.tar.gz | cloudron exec -- bash -c "tar zxf - -C /tmp" - must extrack ok
 async function exec(args, localOptions, cmd) {
     let stdin = localOptions._stdin || process.stdin; // hack for 'push', 'pull' to reuse this function
-    let stdout = localOptions._stdout || process.stdout; // hack for 'push', 'pull' to reuse this function
+    const stdout = localOptions._stdout || process.stdout; // hack for 'push', 'pull' to reuse this function
 
     const options = cmd.optsWithGlobals();
     let tty = !!options.tty;
@@ -1550,9 +1560,9 @@ async function envSet(envVars, localOptions, cmd) {
         const response = await createRequest('GET', `/api/v1/apps/${app.id}`, options);
         if (response.statusCode !== 200) return exit(`Failed to get app: ${requestError(response)}`);
 
-        let env = response.body.env;
+        const env = response.body.env;
         envVars.forEach(envVar => {
-            let m = envVar.match(/(.*?)=(.*)/);
+            const m = envVar.match(/(.*?)=(.*)/);
             if (!m) return exit(`Expecting KEY=VALUE pattern. Got ${envVar}`);
             env[m[1]] = m[2];
         });
@@ -1572,7 +1582,7 @@ async function envUnset(envNames, localOptions, cmd) {
         const response = await createRequest('GET', `/api/v1/apps/${app.id}`, options);
         if (response.statusCode !== 200) return exit(`Failed to get app: ${requestError(response)}`);
 
-        let env = response.body.env;
+        const env = response.body.env;
         envNames.forEach(name => delete env[name]);
 
         await setEnv(app, env, options);