Compare commits
3 Commits
Author | SHA1 | Date |
---|---|---|
Elwin Tamminga | 283c75b32e | |
Nise Void | 66ae2a435c | |
Nise Void | 5b5a102c71 |
18
context.go
18
context.go
|
@ -20,7 +20,8 @@ type Context struct {
|
|||
store map[string]interface{}
|
||||
}
|
||||
|
||||
func newContext(router *Router, res http.ResponseWriter, req *http.Request, param httprouter.Params) *Context {
|
||||
// NewContext creates a new context, this function is only exported for use in tests
|
||||
func NewContext(router *Router, res http.ResponseWriter, req *http.Request, param httprouter.Params) *Context {
|
||||
return &Context{router, req, res, param.ByName, make(map[string]interface{})}
|
||||
}
|
||||
|
||||
|
@ -104,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
|
||||
}
|
||||
|
|
21
router.go
21
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 {
|
||||
|
@ -152,10 +153,22 @@ func (r *Router) getHttpr() *httprouter.Router {
|
|||
})
|
||||
|
||||
httpr.PanicHandler = func(res http.ResponseWriter, req *http.Request, err interface{}) {
|
||||
c := newContext(r, res, req, nil)
|
||||
c := NewContext(r, res, req, nil)
|
||||
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
|
||||
}
|
||||
|
||||
|
@ -181,8 +194,6 @@ func checkInterfaceHandle(f interface{}) {
|
|||
if rt.In(0) != reflect.TypeOf(&Context{}) {
|
||||
panic(`handle should accept Context as first argument`)
|
||||
}
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
func handlePOST(r *Router, f interface{}) Handle {
|
||||
|
@ -213,7 +224,7 @@ func handlePOST(r *Router, f interface{}) Handle {
|
|||
|
||||
func handleReq(r *Router, handle Handle, m []Middleware) httprouter.Handle {
|
||||
return func(res http.ResponseWriter, req *http.Request, param httprouter.Params) {
|
||||
c := newContext(r, res, req, param)
|
||||
c := NewContext(r, res, req, param)
|
||||
|
||||
f := handle
|
||||
for i := len(m) - 1; i >= 0; i-- {
|
||||
|
|
Loading…
Reference in New Issue