Fix race condition on connection to tsserver

Author: coadler

cmd/wush/receive.go

@@ -71,8 +71,6 @@ func receiveCmd() *serpent.Command {
 			if err != nil {
 				return err
 			}
-			ts.Logf = func(string, ...any) {}
-			ts.UserLogf = func(string, ...any) {}
 
 			ts.Up(ctx)
 			fs := afero.NewOsFs()
@@ -111,7 +109,13 @@ func newTSNet(direction string) (*tsnet.Server, error) {
 	srv.AuthKey = direction
 	srv.ControlURL = "http://localhost:8080"
 	srv.Logf = func(format string, args ...any) {}
+	// srv.Logf = func(format string, args ...any) {
+	// 	fmt.Printf(format+"\n", args...)
+	// }
 	srv.UserLogf = func(format string, args ...any) {}
+	// srv.UserLogf = func(format string, args ...any) {
+	// 	fmt.Printf(format+"\n", args...)
+	// }
 
 	srv.Store, err = store.New(func(format string, args ...any) {}, "mem:wush")
 	if err != nil {

go.mod

@@ -30,7 +30,6 @@ require (
 	golang.org/x/sys v0.24.0
 	golang.org/x/term v0.22.0
 	golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9
-	gvisor.dev/gvisor v0.0.0-20240722211153-64c016c92987
 	tailscale.com v1.70.0
 )
 
@@ -216,6 +215,7 @@ require (
 	google.golang.org/protobuf v1.34.2 // indirect
 	gopkg.in/DataDog/dd-trace-go.v1 v1.64.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
+	gvisor.dev/gvisor v0.0.0-20240722211153-64c016c92987 // indirect
 	nhooyr.io/websocket v1.8.10 // indirect
 	storj.io/drpc v0.0.33 // indirect
 )

tsserver/server.go

@@ -123,7 +123,7 @@ func (s *server) ListenAndServe(_ context.Context) error {
 		}
 	}()
 
-	return http.Serve(s.ll, r)
+	return http.Serve(s.ml, r)
 }
 
 type memListen struct {
@@ -153,10 +153,10 @@ func (m *memListen) Addr() net.Addr {
 	return &net.IPAddr{}
 }
 
-func (m *memListen) Dial() net.Conn {
+func (m *memListen) Dial() (net.Conn, error) {
 	in, out := net.Pipe()
 	m.listen <- in
-	return out
+	return out, nil
 }
 
 type memDialer struct {
@@ -170,7 +170,7 @@ func (m memDialer) Dial(network string, address string) (net.Conn, error) {
 		return nil, errors.New("tls not supported")
 	}
 
-	return m.ll.Dial()
+	return m.ml.Dial()
 }
 
 func (m memDialer) DialContext(ctx context.Context, network string, address string) (net.Conn, error) {
@@ -183,7 +183,7 @@ func (m memDialer) DialContext(ctx context.Context, network string, address stri
 		return d.DialContext(ctx, network, address)
 	}
 
-	return m.ll.Dial()
+	return m.ml.Dial()
 }
 
 func (s *server) Dialer() netns.Dialer {
@@ -253,7 +253,13 @@ func (s *server) NoiseUpgradeHandler(w http.ResponseWriter, r *http.Request) {
 		w,
 		r,
 		s.noisePrivateKey,
-		ns.earlyNoise,
+		// ns.earlyNoise,
+		// TODO: for some reason when using an unbuffered network connection
+		// (such as our in-memory connection to the tsserver), the client will
+		// just hang on https://github.com/coadler/tailscale/blob/main/internal/noiseconn/conn.go#L59
+		// and https://github.com/coadler/tailscale/blob/main/control/controlhttp/server.go#L107.
+		// Disabling the early write seems to fix it.
+		nil,
 	)
 	if err != nil {
 		// http.Error(w, err.Error(), http.StatusInternalServerError)