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

Merge 819be6b14535772976cbab5924ee58859a8d6ebd into 80d3cc6b7512e487bcf58daf497e6b5206216818

Browse Source
This commit is contained in:
jarm 2015-05-24 13:29:07 +00:00
commit 6f28361184
2 changed files with 7 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

4
context_test.go
View File

@ -412,6 +412,10 @@ func TestContextClientIP(t *testing.T) {
assert.Equal(t, c.ClientIP(), "30.30.30.30") assert.Equal(t, c.ClientIP(), "30.30.30.30")
c.Request.Header.Del("X-Forwarded-For") 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")
c.Request.Header.Set("X-Forwarded-For", "30.30.30.30")
assert.Equal(t, c.ClientIP(), "30.30.30.30")
c.Request.Header.Del("X-Forwarded-For")
} }
func TestContextContentType(t *testing.T) { func TestContextContentType(t *testing.T) {