From 52a8020bb50261e77792f002427a10a66b10700d Mon Sep 17 00:00:00 2001
From: Vaibhav Acharya <vaibhavacharya111@gmail.com>
Date: Tue, 26 May 2026 16:49:45 +0530
Subject: [PATCH 1/2] fix: always rate limit, fall back to client IP when
 header absent

---
 api/middleware.go                | 28 ++++++++++++++++-----
 api/middleware_ratelimit_test.go | 42 ++++++++++++++++++++++++++++++++
 2 files changed, 64 insertions(+), 6 deletions(-)
 create mode 100644 api/middleware_ratelimit_test.go

diff --git a/api/middleware.go b/api/middleware.go
index bb858fd7..55d53be6 100644
--- a/api/middleware.go
+++ b/api/middleware.go
@@ -5,6 +5,7 @@ import (
 	"context"
 	"encoding/json"
 	"io"
+	"net"
 	"net/http"
 
 	"github.com/didip/tollbooth/v5"
@@ -142,17 +143,32 @@ func (a *API) loadInstanceConfig(w http.ResponseWriter, r *http.Request) (contex
 func (a *API) limitHandler(lmt *limiter.Limiter) middlewareHandler {
 	return func(w http.ResponseWriter, req *http.Request) (context.Context, error) {
 		c := req.Context()
-		if limitHeader := a.config.RateLimitHeader; limitHeader != "" {
-			key := req.Header.Get(a.config.RateLimitHeader)
-			err := tollbooth.LimitByKeys(lmt, []string{key})
-			if err != nil {
-				return c, httpError(http.StatusTooManyRequests, "Rate limit exceeded")
-			}
+		key := a.rateLimitKey(req)
+		if err := tollbooth.LimitByKeys(lmt, []string{key}); err != nil {
+			return c, tooManyRequestsError("Rate limit exceeded")
 		}
 		return c, nil
 	}
 }
 
+// rateLimitKey returns the value to bucket rate limits by. It prefers the
+// configured header (typically set by an upstream proxy) and falls back to the
+// client IP so requests are always rate limited even when the header is
+// missing or unset. chi/middleware.RealIP rewrites RemoteAddr from
+// X-Forwarded-For, so this remains correct behind a proxy.
+func (a *API) rateLimitKey(req *http.Request) string {
+	if h := a.config.RateLimitHeader; h != "" {
+		if v := req.Header.Get(h); v != "" {
+			return v
+		}
+	}
+	host, _, err := net.SplitHostPort(req.RemoteAddr)
+	if err != nil {
+		return req.RemoteAddr
+	}
+	return host
+}
+
 func (a *API) verifyOperatorRequest(w http.ResponseWriter, req *http.Request) (context.Context, error) {
 	c, _, err := a.extractOperatorRequest(w, req)
 	return c, err
diff --git a/api/middleware_ratelimit_test.go b/api/middleware_ratelimit_test.go
new file mode 100644
index 00000000..c31d5d68
--- /dev/null
+++ b/api/middleware_ratelimit_test.go
@@ -0,0 +1,42 @@
+package api
+
+import (
+	"net/http/httptest"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+
+	"github.com/netlify/gotrue/conf"
+)
+
+func TestRateLimitKey(t *testing.T) {
+	tests := []struct {
+		name       string
+		headerName string
+		headerVal  string
+		remoteAddr string
+		want       string
+	}{
+		{"configured header present", "X-Forwarded-For", "1.2.3.4", "10.0.0.1:54321", "1.2.3.4"},
+		{"configured header empty falls back to ip", "X-Forwarded-For", "", "10.0.0.1:54321", "10.0.0.1"},
+		{"no header configured falls back to ip", "", "", "10.0.0.1:54321", "10.0.0.1"},
+		{"remoteAddr without port falls back as-is", "", "", "10.0.0.1", "10.0.0.1"},
+		{"ipv6 remoteAddr", "", "", "[::1]:12345", "::1"},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			config := &conf.GlobalConfiguration{}
+			config.RateLimitHeader = tt.headerName
+			a := &API{config: config}
+
+			req := httptest.NewRequest("POST", "/token", nil)
+			req.RemoteAddr = tt.remoteAddr
+			if tt.headerName != "" && tt.headerVal != "" {
+				req.Header.Set(tt.headerName, tt.headerVal)
+			}
+
+			assert.Equal(t, tt.want, a.rateLimitKey(req))
+		})
+	}
+}

From 5299d293d3ae7fcd3b354cf208d3f48100324a0a Mon Sep 17 00:00:00 2001
From: Vaibhav Acharya <vaibhavacharya111@gmail.com>
Date: Wed, 27 May 2026 13:30:30 +0530
Subject: [PATCH 2/2] chore: empty commit to retrigger CI