From 317961ab6eb975d39636c425ae3116114c5de07d Mon Sep 17 00:00:00 2001 From: NiseVoid Date: Wed, 3 Jul 2019 12:24:45 +0200 Subject: [PATCH 1/7] Clean up some code --- router.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/router.go b/router.go index 7b50138..584ba01 100644 --- a/router.go +++ b/router.go @@ -102,6 +102,7 @@ func (r *Router) Start(addr string) error { return r.server.ListenAndServe() } +// StartTLS starts a TLS web server using the given key, cert and config and binds to the given address func (r *Router) StartTLS(addr, certFile, keyFile string, conf *tls.Config) error { httpr := r.getHttpr() @@ -115,7 +116,7 @@ func (r *Router) Stop() error { return nil } - ctx, cancel := context.WithTimeout(context.Background(), time.Duration(time.Second*5)) + ctx, cancel := context.WithTimeout(context.Background(), time.Second*5) defer cancel() err := r.server.Shutdown(ctx) if err == context.DeadlineExceeded { @@ -211,7 +212,7 @@ func handleReq(r *Router, handle Handle, m []Middleware) httprouter.Handle { c := newContext(r, res, req, param) f := handle - for i := len(m) - 1; i >= 0; i-- { // TODO: 1,2,3 of 3,2,1 + for i := len(m) - 1; i >= 0; i-- { f = m[i](f) } From 2a612eb82faeea8c0d499cdde0abf54398bb39d0 Mon Sep 17 00:00:00 2001 From: NiseVoid Date: Wed, 3 Jul 2019 12:26:29 +0200 Subject: [PATCH 2/7] Fix middlewares getting overwritten --- router.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/router.go b/router.go index 584ba01..1584600 100644 --- a/router.go +++ b/router.go @@ -136,7 +136,11 @@ func (r *Router) getHttpr() *httprouter.Router { handle = handlePOST(r, v.Handle) } - httpr.Handle(v.Method, v.Path, handleReq(r, handle, append(r.middleware, v.Middleware...))) + middleware := make([]Middleware, len(r.middleware)+len(v.Middleware)) + copy(middleware, r.middleware) + copy(middleware[len(r.middleware):], v.Middleware) + + httpr.Handle(v.Method, v.Path, handleReq(r, handle, middleware)) } httpr.NotFound = http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) { From d504c9d2b516cca9e8a51398fce1661ffe291094 Mon Sep 17 00:00:00 2001 From: NiseVoid Date: Mon, 6 Apr 2020 16:41:26 +0200 Subject: [PATCH 3/7] Add Context.RealIP --- context.go | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/context.go b/context.go index e6cc4b3..6b8b7a9 100644 --- a/context.go +++ b/context.go @@ -4,7 +4,9 @@ import ( "bytes" "encoding/json" "io" + "net" "net/http" + "strings" "github.com/julienschmidt/httprouter" ) @@ -99,3 +101,17 @@ func (c *Context) Set(key string, value interface{}) { func (c *Context) Get(key string) interface{} { return c.store[key] } + +// RealIP uses proxy headers for the real ip, if none exist the IP of the current connection is returned +func (c *Context) RealIP() string { + if ip := c.Request.Header.Get(`X-Forwarded-For`); ip != `` { + return strings.Split(ip, `, `)[0] + } + + if ip := c.Request.Header.Get(`X-Real-IP`); ip != `` { + return ip + } + + ra, _, _ := net.SplitHostPort(c.Request.RemoteAddr) + return ra +} From 5b5a102c71454d1e39a6575545fb48d0c89a36b2 Mon Sep 17 00:00:00 2001 From: NiseVoid Date: Thu, 9 Apr 2020 10:41:23 +0200 Subject: [PATCH 4/7] Export NewContext --- context.go | 3 ++- router.go | 6 ++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/context.go b/context.go index 6b8b7a9..eec329c 100644 --- a/context.go +++ b/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{})} } diff --git a/router.go b/router.go index 1584600..f53b4ca 100644 --- a/router.go +++ b/router.go @@ -152,7 +152,7 @@ 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) } @@ -181,8 +181,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 +211,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-- { From 66ae2a435c93a4dad4bd57dc2e1fdcf5f73efedc Mon Sep 17 00:00:00 2001 From: NiseVoid Date: Tue, 19 May 2020 17:04:00 +0200 Subject: [PATCH 5/7] Add TrimTrailingSlashes option --- router.go | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/router.go b/router.go index f53b4ca..d869fc6 100644 --- a/router.go +++ b/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 } From 283c75b32e971b100c8aa7c25c0a448f682d77d5 Mon Sep 17 00:00:00 2001 From: Elwin Tamminga Date: Tue, 20 Jul 2021 10:49:55 +0200 Subject: [PATCH 6/7] Remove port when using headers in c.RealIP Co-authored-by: Elwin Tamminga Co-committed-by: Elwin Tamminga --- context.go | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/context.go b/context.go index eec329c..e9c2fd6 100644 --- a/context.go +++ b/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 } From 152bf49c4b925a761b3a0aa5c4830da3c9f5082e Mon Sep 17 00:00:00 2001 From: robinknaapen Date: Mon, 28 Mar 2022 10:38:46 +0200 Subject: [PATCH 7/7] Add support for net.Listener --- go.mod | 5 +++++ go.sum | 2 ++ router.go | 9 +++++++++ 3 files changed, 16 insertions(+) create mode 100644 go.mod create mode 100644 go.sum diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..dc9d16a --- /dev/null +++ b/go.mod @@ -0,0 +1,5 @@ +module git.fuyu.moe/Fuyu/router + +go 1.13 + +require github.com/julienschmidt/httprouter v1.3.0 diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..096c54e --- /dev/null +++ b/go.sum @@ -0,0 +1,2 @@ +github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U= +github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= diff --git a/router.go b/router.go index d869fc6..754ab42 100644 --- a/router.go +++ b/router.go @@ -3,6 +3,7 @@ package router import ( "context" "crypto/tls" + "net" "net/http" "reflect" "time" @@ -95,6 +96,14 @@ func (r *Router) OPTIONS(path string, handle Handle, middleware ...Middleware) { r.routes = append(r.routes, route{`OPTIONS`, path, handle, middleware}) } +// Serve accepts incoming HTTP connections on the listener +func (r *Router) Serve(l net.Listener) error { + httpr := r.getHttpr() + + r.server = &http.Server{Handler: httpr} + return r.server.Serve(l) +} + // Start starts the web server and binds to the given address func (r *Router) Start(addr string) error { httpr := r.getHttpr()