cloudron 4.12.2 → 4.12.6

package/.jshintrc

@@ -3,5 +3,6 @@
 	"browser": true,
 	"unused": true,
 	"globalstrict": true,
+	"esversion": 8,
 	"predef": [ "angular", "$" ]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudron",
-  "version": "4.12.2",
+  "version": "4.12.6",
   "license": "MIT",
   "description": "Cloudron Commandline Tool",
   "main": "main.js",
@@ -17,23 +17,23 @@
   },
   "author": "Cloudron Developers <support@cloudron.io>",
   "dependencies": {
-    "async": "^3.2.0",
+    "async": "^3.2.1",
     "cloudron-manifestformat": "^5.10.2",
     "colors": "^1.4.0",
     "commander": "^6.1.0",
-    "debug": "^4.3.1",
+    "debug": "^4.3.2",
     "easy-table": "^1.1.1",
     "ejs": "^3.1.6",
     "eventsource": "^1.1.0",
     "micromatch": "^4.0.4",
     "mkdirp": "^1.0.4",
     "once": "^1.4.0",
-    "open": "^8.2.0",
+    "open": "^8.2.1",
     "progress": "^2.0.3",
     "progress-stream": "^2.0.0",
     "readline-sync": "^1.4.10",
     "request": "^2.88.2",
-    "safetydance": "^2.0.1",
+    "safetydance": "^2.2.0",
     "split": "^1.0.1",
     "superagent": "^6.1.0",
     "superagent-sync": "^0.2.1",
@@ -42,12 +42,12 @@
     "underscore": "^1.13.1"
   },
   "engines": {
-    "node": ">= 4.x.x"
+    "node": ">= 14.x.x"
   },
   "devDependencies": {
     "expect.js": "^0.3.1",
     "memorystream": "^0.3.1",
-    "mocha": "^9.0.0",
+    "mocha": "^9.1.1",
     "rimraf": "^3.0.2"
   }
 }

package/src/actions.js

@@ -20,6 +20,7 @@ const assert = require('assert'),
     safe = require('safetydance'),
     spawn = require('child_process').spawn,
     split = require('split'),
+    superagent = require('superagent'),
     Table = require('easy-table'),
     tar = require('tar-fs'),
     util = require('util'),
@@ -81,6 +82,8 @@ function requestOptions(options) {
 
 // error for the request module
 function requestError(response) {
+    if (response.statusCode === 401) return 'Invalid token. Use cloudron login again.';
+
     return `${response.statusCode} message: ${response.body.message || response.body}`; // body is sometimes just a string like in 401
 }
 
@@ -246,81 +249,73 @@ function startApp(app, options, callback) {
     });
 }
 
-function login(adminFqdn, options) {
+async function authenticate(adminFqdn, username, password, options) {
+    let totpToken;
+
+    const { rejectUnauthorized, askForTotpToken } = options;
+    if (askForTotpToken) totpToken = readlineSync.question('2FA Token: ', {});
+
+    const request = superagent.post(`https://${adminFqdn}/api/v1/cloudron/login`)
+        .timeout(10000)
+        .send({ username, password, totpToken })
+        .ok(() => true)
+        .set('User-Agent', 'cloudron-cli');
+    if (!rejectUnauthorized) request.disableTLSCerts();
+    const response = await request; // this triggers the request
+    if (response.status === 401) {
+        if (response.body.message === 'A totpToken must be provided') {
+            return await authenticate(username, password, { rejectUnauthorized, askForTotpToken: true });
+        } else if (response.body.message === 'Invalid totpToken') {
+            console.log('Invalid 2FA Token'.red);
+            return await authenticate(username, password, { rejectUnauthorized, askForTotpToken: true });
+        } else {
+            throw new Error('Invalid credentials');
+        }
+    }
+
+    if (response.statusCode !== 200) throw new Error(`Login failed: Status code: ${requestError(response)}`);
+
+    return response.body.accessToken;
+}
+
+async function login(adminFqdn, options) {
     if (!adminFqdn) adminFqdn = readlineSync.question('Cloudron Domain (e.g. my.example.com): ', {});
     if (!adminFqdn) return exit('');
 
     if (adminFqdn.indexOf('https://') === 0) adminFqdn = adminFqdn.slice('https://'.length);
     if (adminFqdn.indexOf('/') !== -1) adminFqdn = adminFqdn.slice(0, adminFqdn.indexOf('/'));
 
-    function checkIfAlreadyLoggedIn(callback) {
-        config.setActive(adminFqdn);
-
-        const token = config.token();
-        if (!token) return callback('no token');
-
-        request.get(`https://${adminFqdn}/api/v1/profile?access_token=${token}`, {}, function (error, response) {
-            if (error) return callback(error);
-            if (response.statusCode !== 200) return callback(`Failed to get profile: ${requestError(response)}`);
+    config.setActive(adminFqdn);
 
+    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}`)
+            .timeout(10000)
+            .ok(() => true));
+        if (error) return exit(error);
+        if (response.status === 200) {
             console.log('Existing token still valid.'.green);
-
-            callback(null, token);
-        });
+        } else {
+            token = null;
+            console.log(`Existing token possibly expired: ${requestError(response)}`.red);
+        }
     }
 
-    function authenticate(username, password, askForTotpToken) {
-        var totpToken;
-
-        if (askForTotpToken) totpToken = readlineSync.question('2FA Token: ', {});
-
+    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);
-        request.post(`https://${adminFqdn}/api/v1/cloudron/login`, {
-            headers: {
-                'User-Agent': 'cloudron-cli'
-            },
-            rejectUnauthorized,
-            json: {
-                username,
-                password,
-                totpToken
-            }
-        }, function (error, response) {
-            if (error) return exit(error);
-            if (response.statusCode === 401) {
-                if (response.body.message === 'A totpToken must be provided') {
-                    return authenticate(username, password, true);
-                } else if (response.body.message === 'Invalid totpToken') {
-                    console.log('Invalid 2FA Token'.red);
-                    return authenticate(username, password, true);
-                } else {
-                    exit('Invalid credentials');
-                }
-            }
-            if (response.statusCode !== 200) return exit(new Error(`Login failed: Status code: ${requestError(response)}`));
-
-            console.log('Login successful.'.green);
-
-            done(response.body.accessToken);
-        });
-    }
 
-    function done(token) {
-        config.setActive(adminFqdn);
-        config.setApiEndpoint(adminFqdn);
-        config.setToken(token);
-        config.setAllowSelfsigned(options.parent.allowSelfsigned || options.parent.acceptSelfsigned);
-        config.set('cloudrons.default', adminFqdn);
+        const [error, result] = await safe(authenticate(adminFqdn, username, password, { rejectUnauthorized, askForTotpToken: false }));
+        if (error) return exit(`Failed to login: ${error.message}`);
+        token = result;
     }
 
-    checkIfAlreadyLoggedIn(function (error, token) {
-        if (!error) return done(token);
-
-        let username = options.username || readlineSync.question('Username: ', {});
-        let password = options.password || readlineSync.question('Password: ', { noEchoBack: true });
-
-        authenticate(username, password, false);
-    });
+    config.setActive(adminFqdn);
+    config.setApiEndpoint(adminFqdn);
+    config.setToken(token);
+    config.setAllowSelfsigned(options.parent.allowSelfsigned || options.parent.acceptSelfsigned);
+    config.set('cloudrons.default', adminFqdn);
 }
 
 function logout() {
@@ -1162,7 +1157,7 @@ function backupList(options) {
             response.body.backups.forEach(function (backup) {
                 t.cell('Id', backup.id);
                 t.cell('Creation Time', backup.creationTime);
-                t.cell('Version', backup.version);
+                t.cell('Version', backup.packageVersion);
 
                 t.newRow();
             });
@@ -1387,7 +1382,7 @@ function exec(cmd, options) {
         if (app.installationState !== 'installed') exit('App is not yet running. Try again later.');
 
         if (cmd.length === 0) {
-            cmd = [ '/bin/bash', '--rcfile', '/app/data/.bashrc' ];
+            cmd = [ '/bin/bash' ];
             tty = true; // override
         }
 

package/src/helper.js

@@ -2,15 +2,15 @@
 
 'use strict';
 
-let fs = require('fs'),
+const fs = require('fs'),
     path = require('path'),
     util = require('util');
 
 exports = module.exports = {
-    exit: exit,
+    exit,
 
-    locateManifest: locateManifest,
-    verifyArguments: verifyArguments
+    locateManifest,
+    verifyArguments
 };
 
 function exit(error) {
@@ -21,9 +21,9 @@ function exit(error) {
 }
 
 function locateManifest() {
-    var curdir = process.cwd();
+    let curdir = process.cwd();
     do {
-        var candidate = path.join(curdir, 'CloudronManifest.json');
+        const candidate = path.join(curdir, 'CloudronManifest.json');
         if (fs.existsSync(candidate)) return candidate;
 
         // check if we can't go further up (the previous check for '/' breaks on windows)