cloudron 4.13.1 → 4.14.3

package/bin/cloudron

@@ -27,6 +27,7 @@ function collectArgs(value, collected) {
     return collected;
 }
 
+// TODO when updating to commander v8 we require https://github.com/tj/commander.js/pull/1670
 program.version(version)
     .option('--server <server>', 'Cloudron domain')
     .option('--token <token>', 'Cloudron token')
@@ -73,6 +74,7 @@ program.command('configure')
     .option('--no-wait', 'Wait for healthcheck to succeed [false]', false)
     .option('-p, --port-bindings [PORT=port,...]', 'Query port bindings')
     .option('-l, --location <location>', 'Location')
+    .option('-s, --secondary-domains [DOMAIN=domain,...]', 'Query/Set secondary domains')
     .action(actions.configure);
 
 program.command('debug [cmd...]')
@@ -128,8 +130,9 @@ program.command('install')
     .description('Install or update app')
     .option('--image <docker image>', 'Docker image')
     .option('--no-wait', 'Wait for healthcheck to succeed [false]', false)
-    .option('-p, --port-bindings [PORT=port,...]', 'Query port bindings')
+    .option('-p, --port-bindings [PORT=port,...]', 'Query/Set port bindings')
     .option('-l, --location <domain>', 'Subdomain or full domain')
+    .option('-s, --secondary-domains [DOMAIN=domain,...]', 'Query/Set secondary domains')
     .option('--appstore-id <appid[@version]>', 'Use app from the store')
     .option('--no-sso', 'Disable Cloudron SSO [false]', false)
     .option('--debug [cmd]', 'Enable debug mode')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudron",
-  "version": "4.13.1",
+  "version": "4.14.3",
   "license": "MIT",
   "description": "Cloudron Commandline Tool",
   "main": "main.js",
@@ -18,7 +18,7 @@
   "author": "Cloudron Developers <support@cloudron.io>",
   "dependencies": {
     "async": "^3.2.3",
-    "cloudron-manifestformat": "^5.14.0",
+    "cloudron-manifestformat": "^5.15.1",
     "commander": "^6.1.0",
     "debug": "^4.3.3",
     "delay": "^5.0.0",

package/src/actions.js

@@ -67,6 +67,10 @@ const NO_APP_FOUND_ERROR_STRING = 'Could not determine app. Use --app to specify
 // options for the request module
 function requestOptions(options) {
     const adminFqdn = options.parent.server || config.apiEndpoint();
+
+    // ensure config can return the correct section
+    config.setActive(adminFqdn);
+
     const token = options.parent.token || config.token();
     const rejectUnauthorized = !(options.parent.allowSelfsigned || options.parent.acceptSelfsigned || config.allowSelfsigned());
 
@@ -82,7 +86,7 @@ function createRequest(method, apiPath, options) {
     if (url.includes('?')) url += '&'; else url += '?';
     url += `access_token=${token}`;
     const request = superagent(method, url);
-    if (rejectUnauthorized) request.disableTLSCerts();
+    if (!rejectUnauthorized) request.disableTLSCerts();
     request.ok(() => true);
     return request;
 }
@@ -106,6 +110,7 @@ async function selectDomain(location, options) {
     const domains = response.body.domains;
 
     let domain;
+    let subdomain = location;
     let matchingDomain = domains
         .map(function (d) { return d.domain; } )
         .sort(function(a, b) { return a.length < b.length; })
@@ -113,7 +118,7 @@ async function selectDomain(location, options) {
 
     if (matchingDomain) {
         domain = matchingDomain;
-        location = location.slice(0, -matchingDomain.length-1);
+        subdomain = location.slice(0, -matchingDomain.length-1);
     } else { // use the admin domain
         domain = domains
             .map(function (d) { return d.domain; } )
@@ -121,7 +126,7 @@ async function selectDomain(location, options) {
             .find(function (d) { return adminFqdn.endsWith(d); });
     }
 
-    return { location, domain };
+    return { subdomain, domain };
 }
 
 async function stopActiveTask(app, options) {
@@ -197,7 +202,7 @@ async function getApp(options) {
         const response = await createRequest('GET', '/api/v1/apps', options);
         if (response.statusCode !== 200) throw new Error(`Failed to get apps: ${requestError(response)}`);
 
-        const match = response.body.apps.filter(function (m) { return m.location === app || m.fqdn === app; });
+        const match = response.body.apps.filter(function (m) { return m.subdomain === app || m.location === app || m.fqdn === app; });
         if (match.length == 0) throw new Error(`App at location ${app} not found`);
 
         return match[0];
@@ -363,11 +368,15 @@ async function login(adminFqdn, options) {
 
     config.setActive(adminFqdn);
 
+    const rejectUnauthorized = !(options.parent.allowSelfsigned || options.parent.acceptSelfsigned);
     let token = config.token();
     if (token) { // check if the token is not expired
-        const [error, response] = await safe(superagent.get(`https://${adminFqdn}/api/v1/profile?access_token=${token}`)
+        const request = superagent.get(`https://${adminFqdn}/api/v1/profile?access_token=${token}`)
             .timeout(60000)
-            .ok(() => true));
+            .ok(() => true);
+        if (!rejectUnauthorized) request.disableTLSCerts();
+
+        const [error, response] = await safe(request);
         if (error) return exit(error);
         if (response.status === 200) {
             console.log('Existing token still valid.');
@@ -380,7 +389,6 @@ async function login(adminFqdn, options) {
     if (!token) {
         const username = options.username || readlineSync.question('Username: ', {});
         const password = options.password || readlineSync.question('Password: ', { noEchoBack: true });
-        const rejectUnauthorized = !(options.parent.allowSelfsigned || options.parent.acceptSelfsigned);
 
         const [error, result] = await safe(authenticate(adminFqdn, username, password, { rejectUnauthorized, askForTotpToken: false }));
         if (error) return exit(`Failed to login: ${error.message}`);
@@ -448,12 +456,25 @@ async function list(options) {
     console.log(t.toString());
 }
 
+async function querySecondaryDomains(app, manifest, options) {
+    const secondaryDomains = {};
+
+    if(!manifest.httpPorts) return secondaryDomains;
+
+    for (const env in manifest.httpPorts) {
+        const defaultDomain = (app && app.secondaryDomains && app.secondaryDomains[env]) ? app.secondaryDomains[env] : (manifest.httpPorts[env].defaultValue || '');
+        const input = readlineSync.question(`${manifest.httpPorts[env].description} (default: "${defaultDomain}"): `, {});
+        secondaryDomains[env] = await selectDomain(input, options);
+    }
+    return secondaryDomains;
+}
+
 function queryPortBindings(app, manifest) {
-    const portBindings = { };
+    const portBindings = {};
     const allPorts = _.extend({}, manifest.tcpPorts, manifest.udpPorts);
-    for (var env in allPorts) {
-        var defaultPort = (app && app.portBindings && app.portBindings[env]) ? app.portBindings[env] : (allPorts[env].defaultValue || '');
-        var port = readlineSync.question(allPorts[env].description + ' (default ' + env + '=' + defaultPort + '. "x" to disable): ', {});
+    for (const env in allPorts) {
+        const defaultPort = (app && app.portBindings && app.portBindings[env]) ? app.portBindings[env] : (allPorts[env].defaultValue || '');
+        const port = readlineSync.question(allPorts[env].description + ' (default ' + env + '=' + defaultPort + '. "x" to disable): ', {});
         if (port === '') {
             portBindings[env] = defaultPort;
         } else if (isNaN(parseInt(port, 10))) {
@@ -530,6 +551,27 @@ async function install(options) {
 
         const domainObject = await selectDomain(location, options);
 
+        // secondary domains
+        let secondaryDomains = {};
+        if (options.secondaryDomains) {
+            // ask the user for port values if the ports are different in the app and the manifest
+            if (typeof options.secondaryDomains === 'string') {
+                secondaryDomains = {};
+                for (const kv of options.secondaryDomains.split(',')) {
+                    const tmp = kv.split('=');
+                    secondaryDomains[tmp[0]] = await selectDomain(tmp[1], options);
+                }
+            } else {
+                secondaryDomains = await querySecondaryDomains(null /* existing app */, manifest, options);
+            }
+        } else if (manifest.httpPorts) { // just put in defaults
+            for (const env in manifest.httpPorts) {
+                secondaryDomains[env] = await selectDomain(manifest.httpPorts[env].defaultValue, options);
+            }
+        }
+
+        for (const binding in secondaryDomains) console.log(`Secondary domain ${binding}: ${secondaryDomains[binding].subdomain}.${secondaryDomains[binding].domain}`);
+
         // port bindings
         let portBindings = {};
         if (options.portBindings) {
@@ -551,16 +593,16 @@ async function install(options) {
             }
         }
 
-        for (let binding in portBindings) {
-            console.log('%s: %s', binding, portBindings[binding]);
-        }
+        for (const binding in portBindings) console.log(`Port ${binding}: ${portBindings[binding]}`);
 
         const data = {
             appStoreId: options.appstoreId || '', // note case change
             manifest: options.appstoreId ? null : manifest, // cloudron ignores manifest anyway if appStoreId is set
-            location: domainObject.location,
+            location: domainObject.subdomain, // LEGACY
+            subdomain: domainObject.subdomain,
             domain: domainObject.domain,
-            portBindings: portBindings,
+            secondaryDomains,
+            portBindings,
             accessRestriction: null
         };
 
@@ -610,20 +652,48 @@ async function configure(options) {
 
         const domainObject = await selectDomain(location, options);
 
+        const secondaryDomains = {};
+        if (app.secondaryDomains) { // only valid post 7.1
+            app.secondaryDomains.forEach(sd => {
+                secondaryDomains[sd.environmentVariable] = {
+                    subdomain: sd.subdomain,
+                    domain: sd.domain
+                };
+            });
+        }
+
         const data = {
-            location: domainObject.location,
+            location: domainObject.subdomain, // LEGACY
+            subdomain: domainObject.subdomain,
             domain: domainObject.domain,
-            portBindings: app.portBindings
+            portBindings: app.portBindings,
+            secondaryDomains
         };
 
+        // secondary domains
+        if (options.secondaryDomains) {
+            // ask the user for port values if the ports are different in the app and the manifest
+            if (typeof options.secondaryDomains === 'string') {
+                data.secondaryDomains = {};
+                for (const kv of options.secondaryDomains.split(',')) {
+                    const tmp = kv.split('=');
+                    data.secondaryDomains[tmp[0]] = await selectDomain(tmp[1], options);
+                }
+            } else {
+                data.secondaryDomains = await querySecondaryDomains(app, app.manifest, options);
+            }
+
+            for (const binding in data.secondaryDomains) console.log(`Secondary domain ${binding}: ${data.secondaryDomains[binding].subdomain}.${data.secondaryDomains[binding].domain}`);
+        }
+
         // port bindings
         if (options.portBindings) {
-            var portBindings = app.portBindings;
+            let portBindings = app.portBindings;
             // ask the user for port values if the ports are different in the app and the manifest
             if (typeof options.portBindings === 'string') {
                 portBindings = {};
                 options.portBindings.split(',').forEach(function (kv) {
-                    var tmp = kv.split('=');
+                    const tmp = kv.split('=');
                     if (isNaN(parseInt(tmp[1], 10))) return; // disable the port
                     portBindings[tmp[0]] = parseInt(tmp[1], 10);
                 });
@@ -908,6 +978,7 @@ async function inspect(options) {
         for (const app of response.body.apps) {
             const response2 = await createRequest('GET', `/api/v1/apps/${app.id}`, options);
             if (response2.statusCode !== 200) return exit(`Failed to list app: ${requestError(response2)}`);
+            response2.body.location = response2.body.location || response2.body.subdomain; // LEGACY support
             apps.push(response2.body);
         }
 
@@ -1146,12 +1217,20 @@ async function clone(options) {
 
         if (!options.backup) return exit('Use --backup to specify the backup id');
 
-        let location = options.location || readlineSync.question('Cloned app location: ', {});
-        let portBindings = queryPortBindings(app, app.manifest);
-        let backupId = options.backup;
+        const location = options.location || readlineSync.question('Cloned app location: ', {});
+        const secondaryDomains = await querySecondaryDomains(app, app.manifest, options);
+        const portBindings = queryPortBindings(app, app.manifest);
+        const backupId = options.backup;
 
         const domainObject = await selectDomain(location, options);
-        const data = { backupId, domain: domainObject.domain, location: domainObject.location, portBindings: portBindings };
+        const data = {
+            backupId,
+            location: domainObject.subdomain, // LEGACY
+            subdomain: domainObject.subdomain,
+            domain: domainObject.domain,
+            secondaryDomains,
+            portBindings
+        };
         const request = createRequest('POST', `/api/v1/apps/${app.id}/clone`, options);
         const response = await request.send(data);
         if (response.statusCode !== 201) return exit(`Failed to list apps: ${requestError(response)}`);

package/src/appstore-actions.js

@@ -367,6 +367,19 @@ function approveVersion(appstoreId, version) {
 
         console.log('Approved.');
         console.log('');
+
+        superagentEnd(function () {
+            return superagent.get(createUrl('/api/v1/developers/apps/' + appstoreId + '/versions/' + version)).query({ accessToken: config.appStoreToken() });
+        }, function (error, result) {
+            if (error && !error.response) exit(util.format('Failed to list apps: %s', error.message));
+            if (result.statusCode !== 200) exit(util.format('Failed to list apps: %s message: %s', result.statusCode, result.text));
+
+            console.log('Changelog for forum update: ' + result.body.manifest.forumUrl);
+            console.log('');
+            console.log('[' + version + ']');
+            console.log(result.body.manifest.changelog);
+            console.log('');
+        });
     });
 }
 
@@ -505,6 +518,7 @@ function approve(options) {
         if (!version) return exit('--appstore-id must be of the format id@version');
 
         console.log('Approving ' + id + '@' + version);
+
         approveVersion(id, version);
     });
 }