Clone DERP header on client create

kylecarbs · kylecarbs · commit 2e81ac62d577 · 2023-03-21T17:30:20.000Z
diff --git a/cli/root.go b/cli/root.go
@@ -346,7 +346,6 @@ func createUnauthenticatedClient(cmd *cobra.Command, serverURL *url.URL) (*coder
 
 	client.HTTPClient.Transport = transport
 	client.DERPHeader = &http.Header{}
-
 	for header, value := range transport.headers {
 		client.DERPHeader.Set(header, value)
 	}
diff --git a/codersdk/workspaceagents.go b/codersdk/workspaceagents.go
@@ -143,10 +143,11 @@ func (c *Client) DialWorkspaceAgent(ctx context.Context, agentID uuid.UUID, opti
 	}
 
 	ip := tailnet.IP()
+	header := c.DERPHeader.Clone()
 	conn, err := tailnet.NewConn(&tailnet.Options{
 		Addresses:      []netip.Prefix{netip.PrefixFrom(ip, 128)},
 		DERPMap:        connInfo.DERPMap,
-		DERPHeader:     c.DERPHeader,
+		DERPHeader:     &header,
 		Logger:         options.Logger,
 		BlockEndpoints: options.BlockEndpoints,
 	})

Original file line number	Diff line number	Diff line change
`@@ -346,7 +346,6 @@ func createUnauthenticatedClient(cmd cobra.Command, serverURL url.URL) (*coder`
`346`	`346`
`347`	`347`	`client.HTTPClient.Transport = transport`
`348`	`348`	`client.DERPHeader = &http.Header{}`
`349`		`-`
`350`	`349`	`for header, value := range transport.headers {`
`351`	`350`	`client.DERPHeader.Set(header, value)`
`352`	`351`	`}`