From f081a7fdc1dfd47795b5d838b2d4ec64f7bc4bd9 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sat, 12 Jul 2025 10:32:35 -0500
Subject: [PATCH 1/2] Update rate limiter to use requestIp as key, pass in
 configurable error message

---
 server/utils/rateLimiterFactory.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/server/utils/rateLimiterFactory.js b/server/utils/rateLimiterFactory.js
index b51996627..0ad77406e 100644
--- a/server/utils/rateLimiterFactory.js
+++ b/server/utils/rateLimiterFactory.js
@@ -1,5 +1,6 @@
 const { rateLimit, RateLimitRequestHandler } = require('express-rate-limit')
 const Logger = require('../Logger')
+const requestIp = require('../libs/requestIp')
 
 /**
  * Factory for creating authentication rate limiters
@@ -28,7 +29,7 @@ class RateLimiterFactory {
       max = parseInt(process.env.RATE_LIMIT_AUTH_MAX)
     }
 
-    let message = 'Too many requests, please try again later.'
+    let message = 'Too many authentication requests'
     if (process.env.RATE_LIMIT_AUTH_MESSAGE) {
       message = process.env.RATE_LIMIT_AUTH_MESSAGE
     }
@@ -36,18 +37,22 @@ class RateLimiterFactory {
     this.authRateLimiter = rateLimit({
       windowMs,
       max,
-      message,
       standardHeaders: true,
       legacyHeaders: false,
+      keyGenerator: (req) => {
+        // Override keyGenerator to handle proxy IPs
+        return requestIp.getClientIp(req) || req.ip
+      },
       handler: (req, res) => {
         const userAgent = req.get('User-Agent') || 'Unknown'
         const endpoint = req.path
         const method = req.method
+        const ip = requestIp.getClientIp(req) || req.ip
 
-        Logger.warn(`[RateLimiter] Rate limit exceeded - IP: ${req.ip}, Endpoint: ${method} ${endpoint}, User-Agent: ${userAgent}`)
+        Logger.warn(`[RateLimiter] Rate limit exceeded - IP: ${ip}, Endpoint: ${method} ${endpoint}, User-Agent: ${userAgent}`)
 
         res.status(429).json({
-          error: 'Too many authentication attempts, please try again later.'
+          error: message
         })
       }
     })

From 030e43f38218f5fe9f013940fba9a63d27ed57ce Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sat, 12 Jul 2025 10:51:07 -0500
Subject: [PATCH 2/2] Support disabled rate limiter by setting max to 0, add
 logs when rate limit is changed from default

---
 server/utils/rateLimiterFactory.js | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/server/utils/rateLimiterFactory.js b/server/utils/rateLimiterFactory.js
index 0ad77406e..e639c51c9 100644
--- a/server/utils/rateLimiterFactory.js
+++ b/server/utils/rateLimiterFactory.js
@@ -6,6 +6,9 @@ const requestIp = require('../libs/requestIp')
  * Factory for creating authentication rate limiters
  */
 class RateLimiterFactory {
+  static DEFAULT_WINDOW_MS = 10 * 60 * 1000 // 10 minutes
+  static DEFAULT_MAX = 40 // 40 attempts
+
   constructor() {
     this.authRateLimiter = null
   }
@@ -19,14 +22,27 @@ class RateLimiterFactory {
       return this.authRateLimiter
     }
 
-    let windowMs = 10 * 60 * 1000 // 10 minutes default
-    if (parseInt(process.env.RATE_LIMIT_AUTH_WINDOW) > 0) {
-      windowMs = parseInt(process.env.RATE_LIMIT_AUTH_WINDOW)
+    // Disable by setting max to 0
+    if (process.env.RATE_LIMIT_AUTH_MAX === '0') {
+      this.authRateLimiter = (req, res, next) => next()
+      Logger.info(`[RateLimiterFactory] Authentication rate limiting disabled by ENV variable`)
+      return this.authRateLimiter
     }
 
-    let max = 40 // 40 attempts default
+    let windowMs = RateLimiterFactory.DEFAULT_WINDOW_MS
+    if (parseInt(process.env.RATE_LIMIT_AUTH_WINDOW) > 0) {
+      windowMs = parseInt(process.env.RATE_LIMIT_AUTH_WINDOW)
+      if (windowMs !== RateLimiterFactory.DEFAULT_WINDOW_MS) {
+        Logger.info(`[RateLimiterFactory] Authentication rate limiting window set to ${windowMs}ms by ENV variable`)
+      }
+    }
+
+    let max = RateLimiterFactory.DEFAULT_MAX
     if (parseInt(process.env.RATE_LIMIT_AUTH_MAX) > 0) {
       max = parseInt(process.env.RATE_LIMIT_AUTH_MAX)
+      if (max !== RateLimiterFactory.DEFAULT_MAX) {
+        Logger.info(`[RateLimiterFactory] Authentication rate limiting max set to ${max} by ENV variable`)
+      }
     }
 
     let message = 'Too many authentication requests'