Merge branch 'main' into guidedButton

Author: davemarco

components/clp-package-utils/clp_package_utils/scripts/start_clp.py

@@ -937,6 +937,7 @@ def start_webui(
         f"HOST={clp_config.webui.host}",
         f"PORT={clp_config.webui.port}",
         f"NODE_ENV=production",
+        f"RATE_LIMIT={clp_config.webui.rate_limit}",
     ]
     necessary_mounts = [
         mounts.clp_home,

components/clp-py-utils/clp_py_utils/clp_config.py

@@ -731,6 +731,7 @@ class WebUi(BaseModel):
     host: str = "localhost"
     port: int = 4000
     results_metadata_collection_name: str = "results-metadata"
+    rate_limit: int = 1000
 
     @validator("host")
     def validate_host(cls, field):
@@ -750,6 +751,12 @@ def validate_results_metadata_collection_name(cls, field):
             )
         return field
 
+    @validator("rate_limit")
+    def validate_rate_limit(cls, field):
+        if field <= 0:
+            raise ValueError(f"rate_limit must be greater than 0")
+        return field
+
 
 class SweepInterval(BaseModel):
     archive: int = 60

components/package-template/src/etc/clp-config.yml

@@ -66,6 +66,7 @@
 #  host: "localhost"
 #  port: 4000
 #  results_metadata_collection_name: "results-metadata"
+#  rate_limit: 1000
 #
 ## Where archives should be output to
 #archive_output:

components/webui/server/.env

@@ -3,7 +3,13 @@
 # Reference: https://nodejs.org/en/learn/getting-started/nodejs-the-difference-between-development-and-production
 NODE_ENV=production
 
+# Network
 HOST=localhost
 PORT=3000
+
+# Database
 CLP_DB_USER=clp-user
 CLP_DB_PASS=
+
+# Security
+RATE_LIMIT=1000

components/webui/server/src/plugins/external/env.ts

@@ -9,8 +9,7 @@ declare module "fastify" {
             HOST: string;
             CLP_DB_USER: string;
             CLP_DB_PASS: string;
-
-            RATE_LIMIT_MAX: number;
+            RATE_LIMIT: number;
         };
     }
 }
@@ -25,6 +24,7 @@ const schema = {
         "CLP_DB_PASS",
     ],
     properties: {
+        // Network
         PORT: {
             type: "number",
             default: 3000,
@@ -48,9 +48,10 @@ const schema = {
         },
 
         // Security
-        RATE_LIMIT_MAX: {
+        RATE_LIMIT: {
             type: "number",
-            default: 100,
+            default: 1_000,
+            minimum: 1,
         },
     },
 };

components/webui/server/src/plugins/external/rateLimit.ts

@@ -6,7 +6,7 @@ import {FastifyInstance} from "fastify";
 
 export const autoConfig = (fastify: FastifyInstance) => {
     return {
-        max: fastify.config.RATE_LIMIT_MAX,
+        max: fastify.config.RATE_LIMIT,
         timeWindow: "1 minute",
     };
 };