Compare commits

...

2 commits

Author SHA1 Message Date
283c75b32e Remove port when using headers in c.RealIP
Co-authored-by: Elwin Tamminga <elwintamminga@gmail.com>
Co-committed-by: Elwin Tamminga <elwintamminga@gmail.com>
2021-07-20 10:49:55 +02:00
66ae2a435c
Add TrimTrailingSlashes option 2020-05-19 17:04:00 +02:00
2 changed files with 23 additions and 7 deletions

View file

@ -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 // RealIP uses proxy headers for the real ip, if none exist the IP of the current connection is returned
func (c *Context) RealIP() string { func (c *Context) RealIP() string {
reqIP := c.Request.RemoteAddr
if ip := c.Request.Header.Get(`X-Forwarded-For`); ip != `` { 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 != `` { ra, _, _ := net.SplitHostPort(reqIP)
return ip if ra != `` {
reqIP = ra
} }
return reqIP
ra, _, _ := net.SplitHostPort(c.Request.RemoteAddr)
return ra
} }

View file

@ -38,6 +38,7 @@ type Router struct {
NotFoundHandler Handle NotFoundHandler Handle
MethodNotAllowedHandler Handle MethodNotAllowedHandler Handle
ErrorHandler ErrorHandle ErrorHandler ErrorHandle
TrimTrailingSlashes bool
server *http.Server server *http.Server
} }
@ -127,7 +128,7 @@ func (r *Router) Stop() error {
return err return err
} }
func (r *Router) getHttpr() *httprouter.Router { func (r *Router) getHttpr() http.Handler {
httpr := httprouter.New() httpr := httprouter.New()
for _, v := range r.routes { for _, v := range r.routes {
@ -156,6 +157,18 @@ func (r *Router) getHttpr() *httprouter.Router {
r.ErrorHandler(c, err) 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 return httpr
} }