@budibase/server 1.3.15-alpha.6 → 1.3.15-alpha.8

package/coverage/lcov-report/utilities/usageQuota/index.html

@@ -116,7 +116,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Wed Sep 14 2022 09:51:59 GMT+0000 (Coordinated Universal Time)
+                at Wed Sep 14 2022 13:59:29 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/usageQuota/rows.js.html

@@ -310,7 +310,7 @@ exports.getUniqueRows = async appIds => {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Wed Sep 14 2022 09:51:59 GMT+0000 (Coordinated Universal Time)
+                at Wed Sep 14 2022 13:59:29 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/usageQuota/usageQuoteReset.js.html

@@ -124,7 +124,7 @@ function <span class="fstat-no" title="function not covered" >resetQuotasIfRequi
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Wed Sep 14 2022 09:51:59 GMT+0000 (Coordinated Universal Time)
+                at Wed Sep 14 2022 13:59:29 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/users.js.html

@@ -205,7 +205,7 @@ exports.publicApiUserFix = ctx => {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Wed Sep 14 2022 09:51:59 GMT+0000 (Coordinated Universal Time)
+                at Wed Sep 14 2022 13:59:29 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/workerRequests.js.html

@@ -535,7 +535,7 @@ exports.getChecklist = <span class="fstat-no" title="function not covered" >as</
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Wed Sep 14 2022 09:51:59 GMT+0000 (Coordinated Universal Time)
+                at Wed Sep 14 2022 13:59:29 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov.info

@@ -507,11 +507,11 @@ BRH:0
 end_of_record
 TN:
 SF:src/api/controllers/component.js
-FN:7,(anonymous_0)
-FN:13,(anonymous_1)
-FN:46,(anonymous_2)
-FN:47,(anonymous_3)
-FN:48,(anonymous_4)
+FN:6,(anonymous_0)
+FN:12,(anonymous_1)
+FN:43,(anonymous_2)
+FN:44,(anonymous_3)
+FN:45,(anonymous_4)
 FNF:5
 FNH:2
 FNDA:1,(anonymous_0)
@@ -523,39 +523,35 @@ DA:1,28
 DA:2,28
 DA:3,28
 DA:4,28
-DA:5,28
-DA:7,28
+DA:6,28
+DA:7,1
 DA:8,1
 DA:9,1
-DA:10,1
-DA:12,1
+DA:11,1
+DA:13,1
 DA:14,1
-DA:15,1
+DA:20,1
 DA:21,1
 DA:22,1
-DA:23,1
-DA:24,52
-DA:25,1
+DA:23,52
+DA:24,1
+DA:26,51
 DA:27,51
-DA:28,51
+DA:36,1
 DA:37,1
-DA:39,1
-DA:40,1
-DA:45,1
+DA:42,1
+DA:43,0
+DA:44,0
 DA:46,0
 DA:47,0
-DA:49,0
-DA:50,0
-DA:57,1
-DA:59,0
-LF:29
-LH:24
-BRDA:24,0,0,1
-BRDA:24,0,1,51
-BRDA:37,1,0,1
-BRDA:37,1,1,0
-BRF:4
-BRH:3
+DA:53,1
+DA:55,0
+LF:27
+LH:22
+BRDA:23,0,0,1
+BRDA:23,0,1,51
+BRF:2
+BRH:2
 end_of_record
 TN:
 SF:src/api/controllers/datasource.js
@@ -4540,20 +4536,20 @@ BRH:0
 end_of_record
 TN:
 SF:src/api/routes/utils/validators.js
-FN:14,(anonymous_0)
-FN:28,(anonymous_1)
-FN:35,(anonymous_2)
-FN:49,filterObject
-FN:66,(anonymous_4)
-FN:80,(anonymous_5)
-FN:98,(anonymous_6)
-FN:119,(anonymous_7)
-FN:134,(anonymous_8)
-FN:150,(anonymous_9)
-FN:160,(anonymous_10)
-FN:183,generateStepSchema
-FN:198,(anonymous_12)
-FN:212,(anonymous_13)
+FN:15,(anonymous_0)
+FN:29,(anonymous_1)
+FN:36,(anonymous_2)
+FN:50,filterObject
+FN:67,(anonymous_4)
+FN:81,(anonymous_5)
+FN:99,(anonymous_6)
+FN:120,(anonymous_7)
+FN:135,(anonymous_8)
+FN:151,(anonymous_9)
+FN:161,(anonymous_10)
+FN:184,generateStepSchema
+FN:199,(anonymous_12)
+FN:213,(anonymous_13)
 FNF:14
 FNH:14
 FNDA:84,(anonymous_0)
@@ -4569,7 +4565,7 @@ FNDA:56,(anonymous_9)
 FNDA:28,(anonymous_10)
 FNDA:112,generateStepSchema
 FNDA:56,(anonymous_12)
-FNDA:56,(anonymous_13)
+FNDA:112,(anonymous_13)
 DA:1,28
 DA:2,28
 DA:3,28
@@ -4578,41 +4574,42 @@ DA:8,28
 DA:10,28
 DA:11,28
 DA:12,28
-DA:14,28
-DA:16,84
-DA:28,28
-DA:30,112
-DA:35,28
-DA:37,28
-DA:51,84
-DA:66,28
-DA:68,28
-DA:80,28
+DA:13,28
+DA:15,28
+DA:17,84
+DA:29,28
+DA:31,112
+DA:36,28
+DA:38,28
+DA:52,84
+DA:67,28
+DA:69,28
 DA:81,28
-DA:98,28
-DA:100,28
-DA:119,28
-DA:121,28
-DA:134,28
+DA:82,28
+DA:99,28
+DA:101,28
+DA:120,28
+DA:122,28
 DA:135,28
-DA:137,28
-DA:150,28
-DA:151,56
-DA:153,56
-DA:160,28
-DA:162,28
-DA:185,112
-DA:198,28
-DA:200,56
-DA:212,28
-DA:214,56
-LF:36
-LH:36
-BRDA:198,0,0,0
-BRDA:201,1,0,28
-BRDA:201,1,1,28
-BRDA:202,2,0,28
-BRDA:202,2,1,28
+DA:136,28
+DA:138,28
+DA:151,28
+DA:152,56
+DA:154,56
+DA:161,28
+DA:163,28
+DA:186,112
+DA:199,28
+DA:201,56
+DA:213,28
+DA:215,112
+LF:37
+LH:37
+BRDA:199,0,0,0
+BRDA:202,1,0,28
+BRDA:202,1,1,28
+BRDA:203,2,0,28
+BRDA:203,2,1,28
 BRF:5
 BRH:4
 end_of_record

package/dist/api/controllers/component.js

@@ -12,7 +12,6 @@ const { DocumentType, getPluginParams } = require("../../db/utils");
 const { getComponentLibraryManifest } = require("../../utilities/fileSystem");
 const { getAppDB } = require("@budibase/backend-core/context");
 const { getGlobalDB } = require("@budibase/backend-core/tenancy");
-const env = require("../../environment");
 exports.fetchAppComponentDefinitions = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
@@ -37,21 +36,18 @@ exports.fetchAppComponentDefinitions = function (ctx) {
                     }
                 }
             }
-            // for now custom components only supported in self-host
-            if (env.SELF_HOSTED) {
-                // Add custom components
-                const globalDB = getGlobalDB();
-                const response = yield globalDB.allDocs(getPluginParams(null, {
-                    include_docs: true,
-                }));
-                response.rows
-                    .map(row => row.doc)
-                    .filter(plugin => plugin.schema.type === "component")
-                    .forEach(plugin => {
-                    const fullComponentName = `plugin/${plugin.name}`;
-                    definitions[fullComponentName] = Object.assign({ component: fullComponentName }, plugin.schema.schema);
-                });
-            }
+            // Add custom components
+            const globalDB = getGlobalDB();
+            const response = yield globalDB.allDocs(getPluginParams(null, {
+                include_docs: true,
+            }));
+            response.rows
+                .map(row => row.doc)
+                .filter(plugin => plugin.schema.type === "component")
+                .forEach(plugin => {
+                const fullComponentName = `plugin/${plugin.name}`;
+                definitions[fullComponentName] = Object.assign({ component: fullComponentName }, plugin.schema.schema);
+            });
             ctx.body = definitions;
         }
         catch (err) {

package/dist/api/controllers/plugin/index.js

@@ -64,11 +64,9 @@ function upload(ctx) {
 }
 exports.upload = upload;
 function create(ctx) {
+    var _a;
     return __awaiter(this, void 0, void 0, function* () {
         const { source, url, headers, githubToken } = ctx.request.body;
-        if (!environment_1.default.SELF_HOSTED) {
-            ctx.throw(400, "Plugins not supported outside of self-host.");
-        }
         try {
             let metadata;
             let directory;
@@ -93,6 +91,10 @@ function create(ctx) {
                     break;
             }
             (0, plugins_1.validate)(metadata === null || metadata === void 0 ? void 0 : metadata.schema);
+            // Only allow components in cloud
+            if (!environment_1.default.SELF_HOSTED && ((_a = metadata === null || metadata === void 0 ? void 0 : metadata.schema) === null || _a === void 0 ? void 0 : _a.type) !== types_1.PluginType.COMPONENT) {
+                throw new Error("Only component plugins are supported outside of self-host");
+            }
             const doc = yield storePlugin(metadata, directory, source);
             ctx.body = {
                 message: "Plugin uploaded successfully",
@@ -184,6 +186,7 @@ function processPlugin(plugin, source) {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
         const { metadata, directory } = yield (0, uploaders_1.fileUpload)(plugin);
+        (0, plugins_1.validate)(metadata === null || metadata === void 0 ? void 0 : metadata.schema);
         // Only allow components in cloud
         if (!environment_1.default.SELF_HOSTED && ((_a = metadata === null || metadata === void 0 ? void 0 : metadata.schema) === null || _a === void 0 ? void 0 : _a.type) !== types_1.PluginType.COMPONENT) {
             throw new Error("Only component plugins are supported outside of self-host");

package/dist/api/routes/application.js

@@ -30,14 +30,15 @@ const router_1 = __importDefault(require("@koa/router"));
 const controller = __importStar(require("../controllers/application"));
 const authorized_1 = __importDefault(require("../../middleware/authorized"));
 const permissions_1 = require("@budibase/backend-core/permissions");
+const validators_1 = require("./utils/validators");
 const router = new router_1.default();
 router
     .post("/api/applications/:appId/sync", (0, authorized_1.default)(permissions_1.BUILDER), controller.sync)
-    .post("/api/applications", (0, authorized_1.default)(permissions_1.BUILDER), controller.create)
+    .post("/api/applications", (0, authorized_1.default)(permissions_1.BUILDER), (0, validators_1.applicationValidator)(), controller.create)
     .get("/api/applications/:appId/definition", controller.fetchAppDefinition)
     .get("/api/applications", controller.fetch)
     .get("/api/applications/:appId/appPackage", controller.fetchAppPackage)
-    .put("/api/applications/:appId", (0, authorized_1.default)(permissions_1.BUILDER), controller.update)
+    .put("/api/applications/:appId", (0, authorized_1.default)(permissions_1.BUILDER), (0, validators_1.applicationValidator)(), controller.update)
     .post("/api/applications/:appId/client/update", (0, authorized_1.default)(permissions_1.BUILDER), controller.updateClient)
     .post("/api/applications/:appId/client/revert", (0, authorized_1.default)(permissions_1.BUILDER), controller.revertClient)
     .delete("/api/applications/:appId", (0, authorized_1.default)(permissions_1.BUILDER), controller.destroy);

package/dist/api/routes/utils/validators.js

@@ -7,6 +7,7 @@ const Joi = require("joi");
 const OPTIONAL_STRING = Joi.string().optional().allow(null).allow("");
 const OPTIONAL_NUMBER = Joi.number().optional().allow(null);
 const OPTIONAL_BOOLEAN = Joi.boolean().optional().allow(null);
+const APP_NAME_REGEX = /^[\w\s]+$/;
 exports.tableValidator = () => {
     // prettier-ignore
     return joiValidator.body(Joi.object({
@@ -195,7 +196,7 @@ exports.applicationValidator = () => {
     return joiValidator.body(Joi.object({
         _id: OPTIONAL_STRING,
         _rev: OPTIONAL_STRING,
-        name: Joi.string().required(),
+        name: Joi.string().pattern(new RegExp(APP_NAME_REGEX)).required().error(new Error('App name must be letters, numbers and spaces only')),
         url: OPTIONAL_STRING,
         template: Joi.object({
             templateString: OPTIONAL_STRING,

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "1.3.15-alpha.5",
+    "version": "1.3.15-alpha.7",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -77,11 +77,11 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "10.0.3",
-        "@budibase/backend-core": "1.3.15-alpha.5",
-        "@budibase/client": "1.3.15-alpha.5",
-        "@budibase/pro": "1.3.15-alpha.5",
-        "@budibase/string-templates": "1.3.15-alpha.5",
-        "@budibase/types": "1.3.15-alpha.5",
+        "@budibase/backend-core": "1.3.15-alpha.7",
+        "@budibase/client": "1.3.15-alpha.7",
+        "@budibase/pro": "1.3.15-alpha.7",
+        "@budibase/string-templates": "1.3.15-alpha.7",
+        "@budibase/types": "1.3.15-alpha.7",
         "@bull-board/api": "3.7.0",
         "@bull-board/koa": "3.9.4",
         "@elastic/elasticsearch": "7.10.0",