@budibase/server 1.0.79-alpha.10 → 1.0.79-alpha.11

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

@@ -136,7 +136,7 @@ module.exports = ScriptRunner
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Thu Mar 03 2022 12:44:45 GMT+0000 (Coordinated Universal Time)
+                at Thu Mar 03 2022 14:33:12 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

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

@@ -274,7 +274,7 @@ exports.CURRENTLY_SUPPORTED_LEVELS = CURRENTLY_SUPPORTED_LEVELS
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Thu Mar 03 2022 12:44:45 GMT+0000 (Coordinated Universal Time)
+                at Thu Mar 03 2022 14:33:12 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

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

@@ -85,7 +85,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Thu Mar 03 2022 12:44:45 GMT+0000 (Coordinated Universal Time)
+                at Thu Mar 03 2022 14:33:12 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

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

@@ -125,7 +125,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Thu Mar 03 2022 12:44:45 GMT+0000 (Coordinated Universal Time)
+                at Thu Mar 03 2022 14:33:12 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

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

@@ -343,7 +343,7 @@ exports.update = async (property, usage, opts = { dryRun: false }) => {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Thu Mar 03 2022 12:44:45 GMT+0000 (Coordinated Universal Time)
+                at Thu Mar 03 2022 14:33:12 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

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

@@ -289,7 +289,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">istanbul</a>
-                at Thu Mar 03 2022 12:44:45 GMT+0000 (Coordinated Universal Time)
+                at Thu Mar 03 2022 14:33:12 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

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

@@ -118,7 +118,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">istanbul</a>
-                at Thu Mar 03 2022 12:44:45 GMT+0000 (Coordinated Universal Time)
+                at Thu Mar 03 2022 14:33:12 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

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

@@ -136,7 +136,7 @@ exports.getFullUser = async (ctx, userId) => {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Thu Mar 03 2022 12:44:45 GMT+0000 (Coordinated Universal Time)
+                at Thu Mar 03 2022 14:33:12 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

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

@@ -481,7 +481,7 @@ exports.readGlobalUser = <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">istanbul</a>
-                at Thu Mar 03 2022 12:44:45 GMT+0000 (Coordinated Universal Time)
+                at Thu Mar 03 2022 14:33:12 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

package/dist/api/routes/public/index.js

@@ -12,12 +12,45 @@ const usageQuota_1 = __importDefault(require("../../../middleware/usageQuota"));
 const authorized_1 = __importDefault(require("../../../middleware/authorized"));
 const resourceId_1 = require("../../../middleware/resourceId");
 const mapper_1 = __importDefault(require("./middleware/mapper"));
+const environment_1 = __importDefault(require("../../../environment"));
+// below imports don't have declaration files
 const Router = require("@koa/router");
+const { RateLimit, Stores } = require("koa2-ratelimit");
 const { PermissionLevels, PermissionTypes, } = require("@budibase/backend-core/permissions");
+const { getRedisOptions } = require("@budibase/backend-core/redis").utils;
 const PREFIX = "/api/public/v1";
+// allow a lot more requests when in test
+const DEFAULT_API_REQ_LIMIT_PER_SEC = environment_1.default.isTest() ? 100 : 10;
+function getApiLimitPerSecond() {
+    if (!environment_1.default.API_REQ_LIMIT_PER_SEC) {
+        return DEFAULT_API_REQ_LIMIT_PER_SEC;
+    }
+    return parseInt(environment_1.default.API_REQ_LIMIT_PER_SEC);
+}
+if (!environment_1.default.isTest()) {
+    const REDIS_OPTS = getRedisOptions();
+    RateLimit.defaultOptions({
+        store: new Stores.Redis({
+            // @ts-ignore
+            socket: {
+                host: REDIS_OPTS.host,
+                port: REDIS_OPTS.port,
+            },
+            password: REDIS_OPTS.opts.password,
+            database: 1,
+        }),
+    });
+}
+// rate limiting, allows for 2 requests per second
+const limiter = RateLimit.middleware({
+    interval: { sec: 1 },
+    // per ip, per interval
+    max: getApiLimitPerSecond(),
+});
 const publicRouter = new Router({
     prefix: PREFIX,
 });
+publicRouter.use(limiter);
 function addMiddleware(endpoints, middleware, opts = { output: false }) {
     if (!endpoints) {
         return;

package/dist/environment.js

@@ -37,6 +37,7 @@ module.exports = {
     INTERNAL_API_KEY: process.env.INTERNAL_API_KEY,
     MULTI_TENANCY: process.env.MULTI_TENANCY,
     HTTP_MIGRATIONS: process.env.HTTP_MIGRATIONS,
+    API_REQ_LIMIT_PER_SEC: process.env.API_REQ_LIMIT_PER_SEC,
     // environment
     NODE_ENV: process.env.NODE_ENV,
     JEST_WORKER_ID: process.env.JEST_WORKER_ID,

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "1.0.79-alpha.9",
+    "version": "1.0.79-alpha.10",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -71,9 +71,9 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "^10.0.3",
-        "@budibase/backend-core": "^1.0.79-alpha.9",
-        "@budibase/client": "^1.0.79-alpha.9",
-        "@budibase/string-templates": "^1.0.79-alpha.9",
+        "@budibase/backend-core": "^1.0.79-alpha.10",
+        "@budibase/client": "^1.0.79-alpha.10",
+        "@budibase/string-templates": "^1.0.79-alpha.10",
         "@bull-board/api": "^3.7.0",
         "@bull-board/koa": "^3.7.0",
         "@elastic/elasticsearch": "7.10.0",
@@ -108,6 +108,7 @@
         "koa-send": "5.0.0",
         "koa-session": "5.12.0",
         "koa-static": "5.0.0",
+        "koa2-ratelimit": "^1.1.0",
         "lodash": "4.17.21",
         "memorystream": "^0.3.1",
         "mongodb": "3.6.3",
@@ -123,6 +124,7 @@
         "pouchdb-all-dbs": "1.0.2",
         "pouchdb-find": "^7.2.2",
         "pouchdb-replication-stream": "1.2.9",
+        "redis": "4",
         "server-destroy": "1.0.1",
         "svelte": "^3.38.2",
         "swagger-parser": "^10.0.3",
@@ -148,6 +150,7 @@
         "@types/koa-router": "^7.4.2",
         "@types/node": "^15.12.4",
         "@types/oracledb": "^5.2.1",
+        "@types/redis": "^4.0.11",
         "@typescript-eslint/parser": "4.28.0",
         "apidoc": "^0.50.2",
         "babel-jest": "^27.0.2",