Merge pull request #7761 from danyalprout/fix-rate-limiting

Support optional whitespace in XFF Header

proxyd/backend.go

@@ -1170,6 +1170,6 @@ func RecordBatchRPCForward(ctx context.Context, backendName string, reqs []*RPCR
 }
 
 func stripXFF(xff string) string {
-	ipList := strings.Split(xff, ", ")
+	ipList := strings.Split(xff, ",")
 	return strings.TrimSpace(ipList[0])
 }

proxyd/backend_test.go

+package proxyd
+
+import (
+	"github.com/stretchr/testify/assert"
+	"testing"
+)
+
+func TestStripXFF(t *testing.T) {
+	tests := []struct {
+		in, out string
+	}{
+		{"1.2.3, 4.5.6, 7.8.9", "1.2.3"},
+		{"1.2.3,4.5.6", "1.2.3"},
+		{" 1.2.3 , 4.5.6 ", "1.2.3"},
+	}
+
+	for _, test := range tests {
+		actual := stripXFF(test.in)
+		assert.Equal(t, test.out, actual)
+	}
+}