mirror/tlstunnel
1
1
Fork 0
mirror of https://git.sr.ht/~emersion/tlstunnel synced 2024-11-19 15:53:50 +01:00
Code

Add more context to errors

Browse Source
This commit is contained in:
Simon Ser 2021-02-18 16:02:45 +01:00
parent 36ae57103c
commit 79a1a67994
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
server.go
View File

@ -89,7 +89,7 @@ func (srv *Server) startACME() error {
for _, cert := range srv.UnmanagedCerts { for _, cert := range srv.UnmanagedCerts {
if err := srv.ACMEConfig.CacheUnmanagedTLSCertificate(cert, nil); err != nil { if err := srv.ACMEConfig.CacheUnmanagedTLSCertificate(cert, nil); err != nil {
return err return fmt.Errorf("failed to cache unmanaged TLS certificate: %v", err)
} }
} }
@ -109,7 +109,7 @@ func (srv *Server) Start() error {
for _, ln := range srv.Listeners { for _, ln := range srv.Listeners {
if err := ln.Start(); err != nil { if err := ln.Start(); err != nil {
return err return fmt.Errorf("failed to start listener: %v", err)
} }
} }
return nil return nil
@ -137,7 +137,7 @@ func (srv *Server) Replace(old *Server) error {
for _, ln2 := range srv.Listeners { for _, ln2 := range srv.Listeners {
ln2.Stop() ln2.Stop()
} }
return err return fmt.Errorf("failed to start listener: %v", err)
} }
} }
@ -147,10 +147,10 @@ func (srv *Server) Replace(old *Server) error {
// Restart ACME // Restart ACME
old.cancelACME() old.cancelACME()
if err := srv.startACME(); err != nil { if err := srv.startACME(); err != nil {
for _, ln2 := range srv.Listeners { for _, ln := range srv.Listeners {
ln2.Stop() ln.Stop()
} }
return err return fmt.Errorf("failed to start ACME: %v", err)
} }
// TODO: clean cached unmanaged certs // TODO: clean cached unmanaged certs
@ -271,7 +271,7 @@ func (ln *Listener) handle(conn net.Conn) error {
} }
tlsConn := tls.Server(conn, tlsConfig) tlsConn := tls.Server(conn, tlsConfig)
if err := tlsConn.Handshake(); err != nil { if err := tlsConn.Handshake(); err != nil {
return err return fmt.Errorf("TLS handshake failed: %v", err)
} }
tlsState := tlsConn.ConnectionState() tlsState := tlsConn.ConnectionState()
@ -348,7 +348,10 @@ func (fe *Frontend) handle(downstream net.Conn, tlsState *tls.ConnectionState) e
} }
} }
return duplexCopy(upstream, downstream) if err := duplexCopy(upstream, downstream); err != nil {
return fmt.Errorf("failed to copy bytes: %v", err)
}
return nil
} }
type Backend struct { type Backend struct {
@ -368,6 +371,9 @@ func duplexCopy(a, b io.ReadWriter) error {
_, err := io.Copy(b, a) _, err := io.Copy(b, a)
done <- err done <- err
}() }()
if err := <-done; err != nil {
return err
}
return <-done return <-done
} }