fix: Run Tailnet SSH connections in a goroutine (#3838)

kylecarbs · web-flow · commit de219d966d46 · 2022-09-02T11:58:15.000-05:00
This was causing SSH connections in parallel to fail 🤦!
diff --git a/agent/agent.go b/agent/agent.go
@@ -219,7 +219,7 @@ func (a *agent) runTailnet(ctx context.Context, derpMap *tailcfg.DERPMap) {
 			if err != nil {
 				return
 			}
-			a.sshServer.HandleConn(a.stats.wrapConn(conn))
+			go a.sshServer.HandleConn(a.stats.wrapConn(conn))
 		}
 	}()
 	reconnectingPTYListener, err := a.network.Listen("tcp", ":"+strconv.Itoa(tailnetReconnectingPTYPort))
diff --git a/go.mod b/go.mod
@@ -49,7 +49,7 @@ replace github.com/tcnksm/go-httpstat => github.com/kylecarbs/go-httpstat v0.0.0
 
 // There are a few minor changes we make to Tailscale that we're slowly upstreaming. Compare here:
 // https://github.com/tailscale/tailscale/compare/main...coder:tailscale:main
-replace tailscale.com => github.com/coder/tailscale v1.1.1-0.20220901214729-2c5af585574d
+replace tailscale.com => github.com/coder/tailscale v1.1.1-0.20220902164407-ae46caa65076
 
 require (
 	cdr.dev/slog v1.4.2-0.20220525200111-18dce5c2cd5f
diff --git a/go.sum b/go.sum
@@ -352,8 +352,8 @@ github.com/coder/glog v1.0.1-0.20220322161911-7365fe7f2cd1 h1:UqBrPWSYvRI2s5RtOu
 github.com/coder/glog v1.0.1-0.20220322161911-7365fe7f2cd1/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4=
 github.com/coder/retry v1.3.0 h1:5lAAwt/2Cm6lVmnfBY7sOMXcBOwcwJhmV5QGSELIVWY=
 github.com/coder/retry v1.3.0/go.mod h1:tXuRgZgWjUnU5LZPT4lJh4ew2elUhexhlnXzrJWdyFY=
-github.com/coder/tailscale v1.1.1-0.20220901214729-2c5af585574d h1:CMOJI1QL5myrIKW3F909o5VG3sGust5Jriz7gbaTdZ8=
-github.com/coder/tailscale v1.1.1-0.20220901214729-2c5af585574d/go.mod h1:MO+tWkQp2YIF3KBnnej/mQvgYccRS5Xk/IrEpZ4Z3BU=
+github.com/coder/tailscale v1.1.1-0.20220902164407-ae46caa65076 h1:PITEtBolloXfTMGSkL1hQSPBMT4+YJFUgjRQl5osB5k=
+github.com/coder/tailscale v1.1.1-0.20220902164407-ae46caa65076/go.mod h1:MO+tWkQp2YIF3KBnnej/mQvgYccRS5Xk/IrEpZ4Z3BU=
 github.com/coder/wireguard-go/tun/netstack v0.0.0-20220823170024-a78136eb0cab h1:9yEvRWXXfyKzXu8AqywCi+tFZAoqCy4wVcsXwuvZNMc=
 github.com/coder/wireguard-go/tun/netstack v0.0.0-20220823170024-a78136eb0cab/go.mod h1:TCJ66NtXh3urJotTdoYQOHHkyE899vOQl5TuF+WLSes=
 github.com/containerd/aufs v0.0.0-20200908144142-dab0cbea06f4/go.mod h1:nukgQABAEopAHvB6j7cnP5zJ+/3aVcE7hCYqvIwAHyE=

Original file line number	Diff line number	Diff line change
`@@ -219,7 +219,7 @@ func (a agent) runTailnet(ctx context.Context, derpMap tailcfg.DERPMap) {`
`219`	`219`	`if err != nil {`
`220`	`220`	`return`
`221`	`221`	`}`
`222`		`- a.sshServer.HandleConn(a.stats.wrapConn(conn))`
	`222`	`+ go a.sshServer.HandleConn(a.stats.wrapConn(conn))`
`223`	`223`	`}`
`224`	`224`	`}()`
`225`	`225`	`reconnectingPTYListener, err := a.network.Listen("tcp", ":"+strconv.Itoa(tailnetReconnectingPTYPort))`