diff --git a/context.go b/context.go index e9c2fd6..e6cc4b3 100644 --- a/context.go +++ b/context.go @@ -4,9 +4,7 @@ import ( "bytes" "encoding/json" "io" - "net" "net/http" - "strings" "github.com/julienschmidt/httprouter" ) @@ -20,8 +18,7 @@ type Context struct { store map[string]interface{} } -// 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 { +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{})} } @@ -102,20 +99,3 @@ 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 { - reqIP := c.Request.RemoteAddr - - if ip := c.Request.Header.Get(`X-Forwarded-For`); ip != `` { - reqIP = strings.Split(ip, `, `)[0] - } else if ip := c.Request.Header.Get(`X-Real-IP`); ip != `` { - reqIP = ip - } - - ra, _, _ := net.SplitHostPort(reqIP) - if ra != `` { - reqIP = ra - } - return reqIP -} diff --git a/go.mod b/go.mod deleted file mode 100644 index dc9d16a..0000000 --- a/go.mod +++ /dev/null @@ -1,5 +0,0 @@ -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 deleted file mode 100644 index 096c54e..0000000 --- a/go.sum +++ /dev/null @@ -1,2 +0,0 @@ -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 754ab42..1584600 100644 --- a/router.go +++ b/router.go @@ -3,7 +3,6 @@ package router import ( "context" "crypto/tls" - "net" "net/http" "reflect" "time" @@ -39,7 +38,6 @@ type Router struct { NotFoundHandler Handle MethodNotAllowedHandler Handle ErrorHandler ErrorHandle - TrimTrailingSlashes bool server *http.Server } @@ -96,14 +94,6 @@ 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() @@ -137,7 +127,7 @@ func (r *Router) Stop() error { return err } -func (r *Router) getHttpr() http.Handler { +func (r *Router) getHttpr() *httprouter.Router { httpr := httprouter.New() for _, v := range r.routes { @@ -162,22 +152,10 @@ func (r *Router) getHttpr() http.Handler { }) 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 } @@ -203,6 +181,8 @@ 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 { @@ -233,7 +213,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-- {