Merge 8b2b6f8ee0ea544076d2822b1b6863462254495b into 915e4c90d28ec4cffc6eb146e208ab5a65eac772

context.go

@@ -989,7 +989,8 @@ func (c *Context) ClientIP() string {
 
 	if trusted && c.engine.ForwardedByClientIP && c.engine.RemoteIPHeaders != nil {
 		for _, headerName := range c.engine.RemoteIPHeaders {
-			ip, valid := c.engine.validateHeader(c.requestHeader(headerName))
+			headerValue := strings.Join(c.Request.Header.Values(headerName), ",")
+			ip, valid := c.engine.validateHeader(headerValue)
 			if valid {
 				return ip
 			}

context_test.go

@@ -1143,6 +1143,66 @@ func TestContextRenderNoContentIndentedJSON(t *testing.T) {
 	assert.Equal(t, "application/json; charset=utf-8", w.Header().Get("Content-Type"))
 }
 
+func TestContextClientIPWithMultipleHeaders(t *testing.T) {
+	// Create a new Gin engine
+	engine := New()
+
+	// Set trusted proxies
+	err := engine.SetTrustedProxies([]string{"127.0.0.1"})
+	if err != nil {
+		t.Fatalf("Failed to set trusted proxies: %v", err)
+	}
+	engine.ForwardedByClientIP = true
+	engine.RemoteIPHeaders = []string{"X-Forwarded-For"}
+
+	// Create a test request with multiple X-Forwarded-For headers
+	req := httptest.NewRequest(http.MethodGet, "/test", nil)
+	req.Header.Add("X-Forwarded-For", "1.2.3.4, 127.0.0.1")
+	req.Header.Add("X-Forwarded-For", "5.6.7.8")
+	req.RemoteAddr = "127.0.0.1:1234"
+
+	// Create response recorder
+	w := httptest.NewRecorder()
+
+	// Create context
+	c, _ := CreateTestContext(w)
+	c.Request = req
+	c.engine = engine
+
+	// Test ClientIP
+	clientIP := c.ClientIP()
+
+	// Should return 5.6.7.8 (the last non-trusted IP)
+	expected := "5.6.7.8"
+	if clientIP != expected {
+		t.Errorf("Expected ClientIP to be %s, got %s", expected, clientIP)
+	}
+}
+
+func TestContextClientIPWithSingleHeader(t *testing.T) {
+	engine := New()
+	engine.SetTrustedProxies([]string{"127.0.0.1"})
+	engine.ForwardedByClientIP = true
+	engine.RemoteIPHeaders = []string{"X-Forwarded-For"}
+
+	req := httptest.NewRequest(http.MethodGet, "/test", nil)
+	req.Header.Set("X-Forwarded-For", "1.2.3.4, 127.0.0.1")
+	req.RemoteAddr = "127.0.0.1:1234"
+
+	w := httptest.NewRecorder()
+	c, _ := CreateTestContext(w)
+	c.Request = req
+	c.engine = engine
+
+	clientIP := c.ClientIP()
+
+	// Should return 1.2.3.4
+	expected := "1.2.3.4"
+	if clientIP != expected {
+		t.Errorf("Expected ClientIP to be %s, got %s", expected, clientIP)
+	}
+}
+
 // Tests that the response is serialized as Secure JSON
 // and Content-Type is set to application/json
 func TestContextRenderSecureJSON(t *testing.T) {