mirror of
https://github.com/gin-gonic/gin.git
synced 2026-01-08 23:37:05 +08:00
fix(context): ClientIP handling for multiple X-Forwarded-For header values (#4472)
* Fix ClientIP calculation by concatenating all RemoteIPHeaders values * test: used http.MethodGet instead constants and fix lints * lint error fixed * Refactor ClientIP X-Forwarded-For tests --------- Co-authored-by: Bo-Yi Wu <appleboy.tw@gmail.com>
This commit is contained in:
parent
915e4c90d2
commit
9914178584
@ -989,7 +989,8 @@ func (c *Context) ClientIP() string {
|
|||||||
|
|
||||||
if trusted && c.engine.ForwardedByClientIP && c.engine.RemoteIPHeaders != nil {
|
if trusted && c.engine.ForwardedByClientIP && c.engine.RemoteIPHeaders != nil {
|
||||||
for _, headerName := range c.engine.RemoteIPHeaders {
|
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 {
|
if valid {
|
||||||
return ip
|
return ip
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1143,6 +1143,37 @@ func TestContextRenderNoContentIndentedJSON(t *testing.T) {
|
|||||||
assert.Equal(t, "application/json; charset=utf-8", w.Header().Get("Content-Type"))
|
assert.Equal(t, "application/json; charset=utf-8", w.Header().Get("Content-Type"))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestContextClientIPWithMultipleHeaders(t *testing.T) {
|
||||||
|
c, _ := CreateTestContext(httptest.NewRecorder())
|
||||||
|
c.Request, _ = http.NewRequest(http.MethodGet, "/test", nil)
|
||||||
|
|
||||||
|
// Multiple X-Forwarded-For headers
|
||||||
|
c.Request.Header.Add("X-Forwarded-For", "1.2.3.4, "+localhostIP)
|
||||||
|
c.Request.Header.Add("X-Forwarded-For", "5.6.7.8")
|
||||||
|
c.Request.RemoteAddr = localhostIP + ":1234"
|
||||||
|
|
||||||
|
c.engine.ForwardedByClientIP = true
|
||||||
|
c.engine.RemoteIPHeaders = []string{"X-Forwarded-For"}
|
||||||
|
_ = c.engine.SetTrustedProxies([]string{localhostIP})
|
||||||
|
|
||||||
|
// Should return 5.6.7.8 (last non-trusted IP)
|
||||||
|
assert.Equal(t, "5.6.7.8", c.ClientIP())
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestContextClientIPWithSingleHeader(t *testing.T) {
|
||||||
|
c, _ := CreateTestContext(httptest.NewRecorder())
|
||||||
|
c.Request, _ = http.NewRequest(http.MethodGet, "/test", nil)
|
||||||
|
c.Request.Header.Set("X-Forwarded-For", "1.2.3.4, "+localhostIP)
|
||||||
|
c.Request.RemoteAddr = localhostIP + ":1234"
|
||||||
|
|
||||||
|
c.engine.ForwardedByClientIP = true
|
||||||
|
c.engine.RemoteIPHeaders = []string{"X-Forwarded-For"}
|
||||||
|
_ = c.engine.SetTrustedProxies([]string{localhostIP})
|
||||||
|
|
||||||
|
// Should return 1.2.3.4
|
||||||
|
assert.Equal(t, "1.2.3.4", c.ClientIP())
|
||||||
|
}
|
||||||
|
|
||||||
// Tests that the response is serialized as Secure JSON
|
// Tests that the response is serialized as Secure JSON
|
||||||
// and Content-Type is set to application/json
|
// and Content-Type is set to application/json
|
||||||
func TestContextRenderSecureJSON(t *testing.T) {
|
func TestContextRenderSecureJSON(t *testing.T) {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user