mirror of https://github.com/gin-gonic/gin.git
Use only the ip part of request RemoteAddr
This commit is contained in:
parent
4cc2de6207
commit
c1719f7e20
|
@ -8,6 +8,7 @@ import (
|
||||||
"errors"
|
"errors"
|
||||||
"io"
|
"io"
|
||||||
"math"
|
"math"
|
||||||
|
"net"
|
||||||
"net/http"
|
"net/http"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
@ -269,7 +270,10 @@ func (c *Context) ClientIP() string {
|
||||||
return clientIP
|
return clientIP
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return strings.TrimSpace(c.Request.RemoteAddr)
|
if ip, _, err := net.SplitHostPort(strings.TrimSpace(c.Request.RemoteAddr)); err == nil {
|
||||||
|
return ip
|
||||||
|
}
|
||||||
|
return ""
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *Context) ContentType() string {
|
func (c *Context) ContentType() string {
|
||||||
|
|
|
@ -478,7 +478,7 @@ 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.RemoteAddr = " 40.40.40.40 "
|
c.Request.RemoteAddr = " 40.40.40.40:42123 "
|
||||||
|
|
||||||
assert.Equal(t, c.ClientIP(), "10.10.10.10")
|
assert.Equal(t, c.ClientIP(), "10.10.10.10")
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue