Compare commits

...

2 commits

Author SHA1 Message Date
152bf49c4b
Add support for net.Listener 2022-03-28 10:38:46 +02:00
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
4 changed files with 25 additions and 6 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
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
}

5
go.mod Normal file
View file

@ -0,0 +1,5 @@
module git.fuyu.moe/Fuyu/router
go 1.13
require github.com/julienschmidt/httprouter v1.3.0

2
go.sum Normal file
View file

@ -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=

View file

@ -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()