blackteay/gin
3
0
Fork 0
mirror of https://github.com/gin-gonic/gin.git synced 2025-10-16 13:22:09 +08:00
Code Issues Projects Releases Wiki Activity

Merge 6bf060f179e4706d5ad994e35e4cea4ef9f9ab04 into 52fcc5dbf6e94df33ad313858fb94b713e9d1b4a

Browse Source
This commit is contained in:
Philipp Meinen 2015-09-29 17:32:12 +00:00
commit 659a470f34
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
context.go
View File

@ -8,6 +8,7 @@ import (
"errors" "errors"
"io" "io"
"math" "math"
"net"
"net/http" "net/http"
"strings" "strings"
"time" "time"
@ -291,7 +292,13 @@ func (c *Context) ClientIP() string {
return clientIP return clientIP
} }
} }
return strings.TrimSpace(c.Request.RemoteAddr)
// http.Request.RemoteAddr also contains the connection's port number; only return the client's ip
host, _, err := net.SplitHostPort(c.Request.RemoteAddr)
if err != nil {
host = c.Request.RemoteAddr
}
return strings.TrimSpace(host)
} }
// ContentType returns the Content-Type header of the request. // ContentType returns the Content-Type header of the request.

3
context_test.go
View File

@ -532,6 +532,9 @@ func TestContextClientIP(t *testing.T) {
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.RemoteAddr = " 40.40.40.40:12345 "
assert.Equal(t, c.ClientIP(), "40.40.40.40")
} }
func TestContextContentType(t *testing.T) { func TestContextContentType(t *testing.T) {