cloudron 5.14.7 → 5.14.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudron",
-  "version": "5.14.7",
+  "version": "5.14.9",
   "license": "MIT",
   "description": "Cloudron Commandline Tool",
   "main": "main.js",

package/src/actions.js

@@ -89,7 +89,7 @@ function createRequest(method, apiPath, options) {
 function requestError(response) {
     if (response.status === 401) return 'Invalid token. Use cloudron login again.';
 
-    return `${response.status} message: ${response.body.message || JSON.stringify(response.body)}`; // body is sometimes just a string like in 401
+    return `${response.status} message: ${response.body.message || JSON.stringify(String(response.body))}`; // body is sometimes just a string like in 401
 }
 
 async function selectDomain(location, options) {
@@ -132,7 +132,8 @@ async function stopActiveTask(app, options) {
 
     console.log(`Stopping app's current active task ${app.taskId}`);
 
-    const response = await createRequest('POST', `/api/v1/tasks/${app.taskId}/stop`, options);
+    const request = createRequest('POST', `/api/v1/tasks/${app.taskId}/stop`, options);
+    const response = await request.send({});
     if (response.status !== 204) throw `Failed to stop active task: ${requestError(response)}`;
 }
 
@@ -295,7 +296,8 @@ async function stopApp(app, options) {
     assert.strictEqual(typeof app, 'object');
     assert.strictEqual(typeof options, 'object');
 
-    const response = await createRequest('POST', `/api/v1/apps/${app.id}/stop`, options);
+    const request = createRequest('POST', `/api/v1/apps/${app.id}/stop`, options);
+    const response = await request.send({});
     if (response.status !== 202) throw `Failed to stop app: ${requestError(response)}`;
 
     await waitForTask(response.body.taskId, options);
@@ -305,7 +307,8 @@ async function startApp(app, options) {
     assert.strictEqual(typeof app, 'object');
     assert.strictEqual(typeof options, 'object');
 
-    const response = await createRequest('POST', `/api/v1/apps/${app.id}/start`, options);
+    const request = createRequest('POST', `/api/v1/apps/${app.id}/start`, options);
+    const response = await request.send({});
     if (response.status !== 202) throw `Failed to start app: ${requestError(response)}`;
 
     await waitForTask(response.body.taskId, options);
@@ -315,7 +318,8 @@ async function restartApp(app, options) {
     assert.strictEqual(typeof app, 'object');
     assert.strictEqual(typeof options, 'object');
 
-    const response = await createRequest('POST', `/api/v1/apps/${app.id}/restart`, options);
+    const request = createRequest('POST', `/api/v1/apps/${app.id}/restart`, options);
+    const response = await request.send({});
     if (response.status !== 202) throw `Failed to restart app: ${requestError(response)}`;
 
     await waitForTask(response.body.taskId, options);
@@ -894,7 +898,8 @@ async function uninstall(localOptions, cmd) {
 
         await stopActiveTask(app, options);
 
-        const response = await createRequest('POST', `/api/v1/apps/${app.id}/uninstall`, options);
+        const request = createRequest('POST', `/api/v1/apps/${app.id}/uninstall`, options);
+        const response = await request.send({});
         if (response.status !== 202) return exit(`Failed to uninstall app: ${requestError(response)}`);
 
         process.stdout.write('\n => ' + 'Waiting for app to be uninstalled ');
@@ -1061,7 +1066,8 @@ async function backupCreate(localOptions, cmd) {
         const app = await getApp(options);
         if (!app) return exit(NO_APP_FOUND_ERROR_STRING);
 
-        const response = await createRequest('POST', `/api/v1/apps/${app.id}/backup`, options);
+        const request = createRequest('POST', `/api/v1/apps/${app.id}/backup`, options);
+        const response = await request.send({});
         if (response.status !== 202) return exit(`Failed to start backup: ${requestError(response)}`);
 
         // FIXME: this should be waitForHealthCheck but the box code incorrectly modifies the installationState
@@ -1193,7 +1199,8 @@ async function importApp(localOptions, cmd) {
             if (backupKey) data.backupConfig.key = backupKey;
         }
 
-        const response = await createRequest('POST', `/api/v1/apps/${app.id}/import`, options);
+        const request = createRequest('POST', `/api/v1/apps/${app.id}/import`, options);
+        const response = await request.send({});
         if (response.status !== 202) return exit(`Failed to import app: ${requestError(response)}`);
 
         await waitForFinishInstallation(app.id, response.body.taskId, options);

package/src/appstore-actions.js

@@ -295,6 +295,23 @@ async function verifyManifest(localOptions, cmd) {
     if (error) return exit(error);
 }
 
+async function checkDockerHub(dockerImage) {
+    // const [tagError, tagResponse] = await safe(superagent.get(`https://hub.docker.com/v2/repositories/${repo}/tags/${tag}`).ok(() => true));
+    // if (tagError || tagResponse.status !== 200) return exit(`Failed to find docker image in dockerhub. check https://hub.docker.com/r/${repo}/tags : ${tagError || requestError(tagResponse)}`);
+
+    const [repo, tag] = dockerImage.split(':');
+
+    const [error, response] = await safe(superagent.get(`https://auth.docker.io/token?service=registry.docker.io&scope=repository:${repo}:pull`).ok(() => true));
+    if (error || response.status !== 200) throw new Error(`Failed to get dockerhub token to validate image: ${error || requestError(response)}`);
+    const token = response.body.token;
+
+    const [error2, response2] = await safe(superagent.head(`https://registry-1.docker.io/v2/${repo}/manifests/${tag}`)
+        .set('Accept', 'application/vnd.docker.distribution.manifest.v2+json')
+        .set('Authorization', `Bearer ${token}`)
+        .ok(() => true));
+    if (error2 || response2.status !== 200) throw new Error(`Image not found on docker hub: ${error2 || requestError(response2)}`);
+}
+
 async function upload(localOptions, cmd) {
     const options = cmd.optsWithGlobals();
     // try to find the manifest of this project
@@ -332,9 +349,8 @@ async function upload(localOptions, cmd) {
     const error = manifestFormat.checkAppstoreRequirements(manifest);
     if (error) return exit(error);
 
-    const [repo, tag] = manifest.dockerImage.split(':');
-    const [tagError, tagResponse] = await safe(superagent.get(`https://hub.docker.com/v2/repositories/${repo}/tags/${tag}`).ok(() => true));
-    if (tagError || tagResponse.status !== 200) return exit(`Failed to find docker image in dockerhub. check https://hub.docker.com/r/${repo}/tags : ${tagError || requestError(tagResponse)}`);
+    const [imageError] = await safe(checkDockerHub(manifest.dockerImage));
+    if (imageError) return exit(error);
 
     // ensure the app is known on the appstore side
     const baseDir = path.dirname(manifestFilePath);

package/src/superagent.js

@@ -1,6 +1,7 @@
 'use strict';
 
 exports = module.exports = {
+    head,
     get,
     put,
     post,
@@ -214,6 +215,7 @@ class Request {
     }
 }
 
+function head(url) { return new Request('HEAD', url); }
 function get(url) { return new Request('GET', url); }
 function put(url) { return new Request('PUT', url); }
 function post(url) { return new Request('POST', url); }