cloudron 4.12.6 → 4.12.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudron",
-  "version": "4.12.6",
+  "version": "4.12.10",
   "license": "MIT",
   "description": "Cloudron Commandline Tool",
   "main": "main.js",
@@ -17,18 +17,18 @@
   },
   "author": "Cloudron Developers <support@cloudron.io>",
   "dependencies": {
-    "async": "^3.2.1",
-    "cloudron-manifestformat": "^5.10.2",
-    "colors": "^1.4.0",
+    "async": "^3.2.2",
+    "cloudron-manifestformat": "^5.14.0",
+    "colors": "1.4.0",
     "commander": "^6.1.0",
-    "debug": "^4.3.2",
-    "easy-table": "^1.1.1",
+    "debug": "^4.3.3",
+    "easy-table": "^1.2.0",
     "ejs": "^3.1.6",
     "eventsource": "^1.1.0",
     "micromatch": "^4.0.4",
     "mkdirp": "^1.0.4",
     "once": "^1.4.0",
-    "open": "^8.2.1",
+    "open": "^8.4.0",
     "progress": "^2.0.3",
     "progress-stream": "^2.0.0",
     "readline-sync": "^1.4.10",
@@ -39,7 +39,7 @@
     "superagent-sync": "^0.2.1",
     "supererror": "^0.7.2",
     "tar-fs": "https://registry.npmjs.org/tar-fs/-/tar-fs-1.12.0.tgz",
-    "underscore": "^1.13.1"
+    "underscore": "^1.13.2"
   },
   "engines": {
     "node": ">= 14.x.x"
@@ -47,7 +47,7 @@
   "devDependencies": {
     "expect.js": "^0.3.1",
     "memorystream": "^0.3.1",
-    "mocha": "^9.1.1",
+    "mocha": "^9.1.3",
     "rimraf": "^3.0.2"
   }
 }

package/src/actions.js

@@ -250,13 +250,18 @@ function startApp(app, options, callback) {
 }
 
 async function authenticate(adminFqdn, username, password, options) {
+    assert.strictEqual(typeof adminFqdn, 'string');
+    assert.strictEqual(typeof username, 'string');
+    assert.strictEqual(typeof password, 'string');
+    assert.strictEqual(typeof options, 'object');
+
     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)
+        .timeout(60000)
         .send({ username, password, totpToken })
         .ok(() => true)
         .set('User-Agent', 'cloudron-cli');
@@ -264,10 +269,10 @@ async function authenticate(adminFqdn, username, password, options) {
     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 });
+            return await authenticate(adminFqdn, 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 });
+            return await authenticate(adminFqdn, username, password, { rejectUnauthorized, askForTotpToken: true });
         } else {
             throw new Error('Invalid credentials');
         }
@@ -290,7 +295,7 @@ async function login(adminFqdn, options) {
     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)
+            .timeout(60000)
             .ok(() => true));
         if (error) return exit(error);
         if (response.status === 200) {
@@ -316,6 +321,8 @@ async function login(adminFqdn, options) {
     config.setToken(token);
     config.setAllowSelfsigned(options.parent.allowSelfsigned || options.parent.acceptSelfsigned);
     config.set('cloudrons.default', adminFqdn);
+
+    console.log('Login successful.'.green);
 }
 
 function logout() {

package/src/build-actions.js

@@ -336,7 +336,7 @@ function build(options) {
         if (typeof options.setRepository === 'string') {
             repository = options.setRepository;
         } else {
-            repository = readlineSync.question(`Enter repository (e.g registry/username/${manifest.id || path.basename(sourceDir)}): `, {});
+            repository = readlineSync.question(`Enter docker repository (e.g registry/username/${manifest.id || path.basename(sourceDir)}): `, {});
             if (!repository) exit('No repository provided');
             console.log();
         }

package/src/templates/Dockerfile.ejs

@@ -1,3 +1,3 @@
-FROM cloudron/base:3.0.0@sha256:455c70428723e3a823198c57472785437eb6eab082e79b3ff04ea584faf46e92
+FROM cloudron/base:3.1.0@sha256:eb2ab9c7d361acda2f3ef2d8388154bc48f1651b5013fe6de4beea003018e427
 
 EXPOSE <%- httpPort %>