Fix rate limiter

RocketChat · Feb 5, 2025 · 265cb2a · 265cb2a
1 parent b763c37
commit 265cb2a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/apps/meteor/app/api/server/api.ts b/apps/meteor/app/api/server/api.ts
@@ -237,10 +237,13 @@ export class APIClass<TBasePath extends string = ''> {
 	protected shouldAddRateLimitToRoute(options: { rateLimiterOptions?: RateLimiterOptions | boolean }): boolean {
 		const { rateLimiterOptions } = options;
 		return (
-			(typeof rateLimiterOptions === 'object' || rateLimiterOptions === undefined) &&
+			((typeof rateLimiterOptions === 'object' &&
+				Boolean(rateLimiterOptions.intervalTimeInMS) &&
+				Boolean(rateLimiterOptions.numRequestsAllowed)) ||
+				(rateLimiterOptions === undefined &&
+					Boolean(defaultRateLimiterOptions?.numRequestsAllowed && defaultRateLimiterOptions?.intervalTimeInMS))) &&
 			Boolean(this.version) &&
-			!process.env.TEST_MODE &&
-			Boolean(defaultRateLimiterOptions.numRequestsAllowed && defaultRateLimiterOptions.intervalTimeInMS)
+			process.env.TEST_MODE !== 'true'
 		);
 	}
 

diff --git a/apps/meteor/app/api/server/v1/users.ts b/apps/meteor/app/api/server/v1/users.ts
@@ -623,7 +623,7 @@ API.v1.addRoute(
 		authRequired: false,
 		rateLimiterOptions: {
 			numRequestsAllowed: settings.get('Rate_Limiter_Limit_RegisterUser') ?? 1,
-			intervalTimeInMS: settings.get('API_Enable_Rate_Limiter_Limit_Time_Default'),
+			intervalTimeInMS: settings.get('API_Enable_Rate_Limiter_Limit_Time_Default') ?? 600000,
 		},
 		validateParams: isUserRegisterParamsPOST,
 	},