blackteay/gin
3
0
Fork 0
mirror of https://github.com/gin-gonic/gin.git synced 2025-10-15 21:06:39 +08:00
Code Issues Projects Releases Wiki Activity

ClientIP() fix for single item in X-Forwarded-For.

Browse Source
This commit is contained in:
jarm 2015-05-24 06:02:57 -05:00
parent 967e62337a
commit 289e6572cc
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
context.go
View File

@ -280,8 +280,10 @@ func (c *Context) ClientIP() string {
return clientIP return clientIP
} }
clientIP = c.Request.Header.Get("X-Forwarded-For") clientIP = c.Request.Header.Get("X-Forwarded-For")
clientIP = strings.Split(clientIP, ",")[0]
if len(clientIP) > 0 { if len(clientIP) > 0 {
if strings.Contains(clientIP, ",") {
clientIP = strings.Split(clientIP, ",")[0]
}
return strings.TrimSpace(clientIP) return strings.TrimSpace(clientIP)
} }
return c.Request.RemoteAddr return c.Request.RemoteAddr

3
context_test.go
View File

@ -403,12 +403,15 @@ func TestContextClientIP(t *testing.T) {
c.Request.Header.Set("X-Real-IP", "10.10.10.10") c.Request.Header.Set("X-Real-IP", "10.10.10.10")
c.Request.Header.Set("X-Forwarded-For", "20.20.20.20 , 30.30.30.30") c.Request.Header.Set("X-Forwarded-For", "20.20.20.20 , 30.30.30.30")
c.Request.Header.Set("X-Forwarded-For", "30.30.30.30")
c.Request.RemoteAddr = "40.40.40.40" c.Request.RemoteAddr = "40.40.40.40"
assert.Equal(t, c.ClientIP(), "10.10.10.10") assert.Equal(t, c.ClientIP(), "10.10.10.10")
c.Request.Header.Del("X-Real-IP") c.Request.Header.Del("X-Real-IP")
assert.Equal(t, c.ClientIP(), "20.20.20.20") assert.Equal(t, c.ClientIP(), "20.20.20.20")
c.Request.Header.Del("X-Forwarded-For") c.Request.Header.Del("X-Forwarded-For")
assert.Equal(t, c.ClientIP(), "30.30.30.30")
c.Request.Header.Del("X-Forwarded-For")
assert.Equal(t, c.ClientIP(), "40.40.40.40") assert.Equal(t, c.ClientIP(), "40.40.40.40")
} }