From f15355c19ed40d0a4bed3cd5da8737bf869f3d95 Mon Sep 17 00:00:00 2001 From: AJ ONeal Date: Tue, 21 Jul 2020 01:59:32 -0600 Subject: [PATCH] fix TCP deadlines, update logging --- cmd/telebit/telebit.go | 4 ++-- routemux.go | 20 ++++++++++++++++++-- telebit.go | 31 +++++++++++++++++++++++-------- 3 files changed, 43 insertions(+), 12 deletions(-) diff --git a/cmd/telebit/telebit.go b/cmd/telebit/telebit.go index 33000e1..a244e74 100644 --- a/cmd/telebit/telebit.go +++ b/cmd/telebit/telebit.go @@ -18,11 +18,11 @@ import ( "strings" "time" + telebit "git.rootprojects.org/root/telebit" "git.rootprojects.org/root/telebit/dbg" + tbDns01 "git.rootprojects.org/root/telebit/dns01" "git.rootprojects.org/root/telebit/mgmt" "git.rootprojects.org/root/telebit/mgmt/authstore" - telebit "git.rootprojects.org/root/telebit" - tbDns01 "git.rootprojects.org/root/telebit/dns01" "git.rootprojects.org/root/telebit/table" httpshim "git.rootprojects.org/root/telebit/tunnel" legoDns01 "github.com/go-acme/lego/v3/challenge/dns01" diff --git a/routemux.go b/routemux.go index ece7d86..8d8ebb9 100644 --- a/routemux.go +++ b/routemux.go @@ -81,20 +81,36 @@ func (m *RouteMux) Serve(client net.Conn) error { port = ":" + parts[len(parts)-1] servername = strings.Join(parts[:len(parts)-1], ":") } - fmt.Println("Addr:", fam, servername, port) + fmt.Println("\nAddr:", fam, servername, port) for _, meta := range m.routes { // TODO '*.example.com' if meta.terminate { servername = wconn.Servername() } - fmt.Println("\nMeta:", meta.comment, "meta.addr="+meta.addr, "servername="+servername) if servername == meta.addr || "*" == meta.addr || port == meta.addr { //fmt.Fprintf(os.Stderr, "[debug] test of route: %v\n", meta) // Only keep trying handlers if ErrNotHandled was returned if err := meta.handler.Serve(wconn); ErrNotHandled != err { + fmt.Printf( + "[mux] Match: %s\n\tmeta.addr=%s\n\tservername=%s\n", + meta.comment, meta.addr, servername, + ) return err } + if dbg.Debug { + fmt.Fprintf( + os.Stderr, + "[debug] [mux] Failed match: %s meta.addr=%s servername=%s\n", + meta.comment, meta.addr, servername, + ) + } + } else if dbg.Debug { + fmt.Fprintf( + os.Stderr, + "[debug] [mux] Skip (no match): %s meta.addr=%s servername=%s\n", + meta.comment, meta.addr, servername, + ) } } diff --git a/telebit.go b/telebit.go index 6656edc..6183925 100644 --- a/telebit.go +++ b/telebit.go @@ -25,6 +25,7 @@ import ( // but even 1024b could work well. var defaultBufferSize = 8192 var defaultPeekerSize = 1024 +var defaultWriteTimeout = 10 * time.Second // ErrBadGateway means that the target did not accept the connection var ErrBadGateway = errors.New("EBADGATEWAY") @@ -58,7 +59,8 @@ func NewForwarder(target string, timeout time.Duration) HandlerFunc { if nil != err { return err } - return Forward(client, tconn, timeout) + go Forward(client, tconn, timeout) + return nil } } @@ -75,6 +77,12 @@ func Forward(client net.Conn, target net.Conn, timeout time.Duration) error { defer client.Close() defer target.Close() + noDeadline := time.Time{} + writeTimeout := defaultWriteTimeout + if timeout < defaultWriteTimeout { + writeTimeout = timeout + } + srcCh := make(chan []byte) dstCh := make(chan []byte) srcErrCh := make(chan error) @@ -84,6 +92,8 @@ func Forward(client net.Conn, target net.Conn, timeout time.Duration) error { go func() { for { b := make([]byte, defaultBufferSize) + client.SetReadDeadline(time.Now().Add(timeout)) + target.SetReadDeadline(time.Now().Add(timeout)) n, err := client.Read(b) if n > 0 { srcCh <- b[:n] @@ -101,6 +111,8 @@ func Forward(client net.Conn, target net.Conn, timeout time.Duration) error { go func() { for { b := make([]byte, defaultBufferSize) + target.SetReadDeadline(time.Now().Add(timeout)) + client.SetReadDeadline(time.Now().Add(timeout)) n, err := target.Read(b) if n > 0 { dstCh <- b[:n] @@ -115,10 +127,10 @@ func Forward(client net.Conn, target net.Conn, timeout time.Duration) error { } }() - fmt.Println( - "Forwarding TCP connection", - client.LocalAddr(), + fmt.Printf( + "[mux] Forwarding TCP connection\n\t%s => %s\n\t(%s => %s)\n", client.RemoteAddr(), + client.LocalAddr(), target.LocalAddr(), target.RemoteAddr(), ) @@ -131,15 +143,19 @@ ForwardData: //case <-ctx.Done(): // break case b := <-srcCh: - client.SetDeadline(time.Now().Add(timeout)) + //fmt.Println("Read(): ", len(b)) + target.SetWriteDeadline(time.Now().Add(writeTimeout)) _, err = target.Write(b) + target.SetWriteDeadline(noDeadline) if nil != err { fmt.Printf("write to target failed: %q\n", err.Error()) break ForwardData } case b := <-dstCh: - target.SetDeadline(time.Now().Add(timeout)) + //fmt.Println("Write(): ", len(b)) + client.SetWriteDeadline(time.Now().Add(writeTimeout)) _, err = client.Write(b) + client.SetWriteDeadline(noDeadline) if nil != err { fmt.Printf("write to remote failed: %q\n", err.Error()) break ForwardData @@ -168,7 +184,6 @@ ForwardData: } } - client.Close() return err } @@ -306,7 +321,7 @@ func NewCertMagic(acme *ACME) (*certmagic.Config, error) { }, }) // yes, a circular reference, passing `magic` to its own Issuer - fmt.Printf("[debug] ACME Email: %q\n", acme.Email) + fmt.Printf("ACME Email: %q\n", acme.Email) magic.Issuer = certmagic.NewACMEManager(magic, certmagic.ACMEManager{ DNSProvider: acme.DNSProvider, DNSChallengeOption: acme.DNSChallengeOption,