Compare commits
2 Commits
Author | SHA1 | Date |
---|---|---|
Elwin Tamminga | 283c75b32e | |
Nise Void | 66ae2a435c |
15
context.go
15
context.go
|
@ -105,14 +105,17 @@ func (c *Context) Get(key string) interface{} {
|
|||
|
||||
// RealIP uses proxy headers for the real ip, if none exist the IP of the current connection is returned
|
||||
func (c *Context) RealIP() string {
|
||||
reqIP := c.Request.RemoteAddr
|
||||
|
||||
if ip := c.Request.Header.Get(`X-Forwarded-For`); ip != `` {
|
||||
return strings.Split(ip, `, `)[0]
|
||||
reqIP = strings.Split(ip, `, `)[0]
|
||||
} else if ip := c.Request.Header.Get(`X-Real-IP`); ip != `` {
|
||||
reqIP = ip
|
||||
}
|
||||
|
||||
if ip := c.Request.Header.Get(`X-Real-IP`); ip != `` {
|
||||
return ip
|
||||
ra, _, _ := net.SplitHostPort(reqIP)
|
||||
if ra != `` {
|
||||
reqIP = ra
|
||||
}
|
||||
|
||||
ra, _, _ := net.SplitHostPort(c.Request.RemoteAddr)
|
||||
return ra
|
||||
return reqIP
|
||||
}
|
||||
|
|
15
router.go
15
router.go
|
@ -38,6 +38,7 @@ type Router struct {
|
|||
NotFoundHandler Handle
|
||||
MethodNotAllowedHandler Handle
|
||||
ErrorHandler ErrorHandle
|
||||
TrimTrailingSlashes bool
|
||||
server *http.Server
|
||||
}
|
||||
|
||||
|
@ -127,7 +128,7 @@ func (r *Router) Stop() error {
|
|||
return err
|
||||
}
|
||||
|
||||
func (r *Router) getHttpr() *httprouter.Router {
|
||||
func (r *Router) getHttpr() http.Handler {
|
||||
httpr := httprouter.New()
|
||||
|
||||
for _, v := range r.routes {
|
||||
|
@ -156,6 +157,18 @@ func (r *Router) getHttpr() *httprouter.Router {
|
|||
r.ErrorHandler(c, err)
|
||||
}
|
||||
|
||||
if r.TrimTrailingSlashes {
|
||||
httpr.RedirectTrailingSlash = false
|
||||
|
||||
return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
|
||||
l := len(req.URL.Path)
|
||||
if l > 1 && req.URL.Path[l-1] == '/' {
|
||||
req.URL.Path = req.URL.Path[:l-1]
|
||||
}
|
||||
httpr.ServeHTTP(w, req)
|
||||
})
|
||||
}
|
||||
|
||||
return httpr
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue