cadey
/
route
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix everything forever

This commit is contained in:
Cadey Ratio 2017-03-26 13:47:42 -07:00
parent 70191a0b88
commit 4021b4f3aa
4 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/helloserver/main.go
View File

@ -26,7 +26,7 @@ func main() {
func handle(w http.ResponseWriter, r *http.Request) { func handle(w http.ResponseWriter, r *http.Request) {
fmt.Fprintln(w, "Route is go!") fmt.Fprintln(w, "Route is go!")
fmt.Fprintf(w, "%s\n", pretty.Sprint(r.Header)) fmt.Fprintf(w, "%s\n", pretty.Sprintf("%s", r.Header))
hn, _ := os.Hostname() hn, _ := os.Hostname()
fmt.Fprintf(w, "Served by %s running %s\n", hn, runtime.GOOS) fmt.Fprintf(w, "Served by %s running %s\n", hn, runtime.GOOS)
fmt.Fprintf(w, "Hit count: %d", hits.Inc()) fmt.Fprintf(w, "Hit count: %d", hits.Inc())

2
cmd/httpagent/main.go
View File

@ -21,7 +21,7 @@ func main() {
cfg := &tun2.ClientConfig{ cfg := &tun2.ClientConfig{
TLSConfig: &tls.Config{}, TLSConfig: &tls.Config{},
ConnType: "kcp", ConnType: "tcp",
ServerAddr: *serverAddr, ServerAddr: *serverAddr,
Token: *token, Token: *token,
Domain: *domain, Domain: *domain,

10
lib/tun2/server.go
View File

@ -272,6 +272,10 @@ func (s *Server) HandleConn(c net.Conn, isKCP bool) {
"id": connection.id, "id": connection.id,
}) })
controlStream.Close()
session.Close()
c.Close()
return return
} }
} }
@ -296,6 +300,8 @@ func (s *Server) RoundTrip(req *http.Request) (*http.Response, error) {
"uri": req.RequestURI, "uri": req.RequestURI,
}) })
c.cancel()
return nil, err return nil, err
} }
defer stream.Close() defer stream.Close()
@ -310,6 +316,8 @@ func (s *Server) RoundTrip(req *http.Request) (*http.Response, error) {
"uri": req.RequestURI, "uri": req.RequestURI,
}) })
c.cancel()
return nil, err return nil, err
} }
@ -325,6 +333,8 @@ func (s *Server) RoundTrip(req *http.Request) (*http.Response, error) {
"uri": req.RequestURI, "uri": req.RequestURI,
}) })
c.cancel()
return nil, err return nil, err
} }

6
server/server.go
View File

@ -167,6 +167,7 @@ func (s *Server) Director(r *http.Request) {
func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) { func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
r.Header.Del("X-Forwarded-For") r.Header.Del("X-Forwarded-For")
r.Header.Del("X-Client-Ip")
if r.Header.Get("X-Tor2web") != "" { if r.Header.Get("X-Tor2web") != "" {
http.Error(w, "tor2web proxy use is not allowed", 400) http.Error(w, "tor2web proxy use is not allowed", 400)
@ -178,9 +179,8 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
http.Error(w, err.Error(), 500) http.Error(w, err.Error(), 500)
return return
} }
r.Header.Set("X-Forwarded-For", host) r.Header.Set("X-Remote-Ip", host)
r.Header.Set("X-Remote-IP", host) r.Header.Set("X-Request-Ingress", time.Now().Format(time.RFC3339))
r.Header.Set("X-Request-Ingress", time.Now().String())
rid := ulid.New().String() rid := ulid.New().String()
r.Header.Set("X-Request-Id", rid) r.Header.Set("X-Request-Id", rid)