WIP find segfault

spikecurtis · spikecurtis · commit 4c93b19608ee · 2022-07-20T21:33:23.000Z
Signed-off-by: Spike Curtis &lt;spike@coder.com&gt;
diff --git a/coderd/devtunnel/tunnel.go b/coderd/devtunnel/tunnel.go
@@ -60,7 +60,7 @@ func NewWithConfig(ctx context.Context, logger slog.Logger, cfg Config) (*Tunnel
 
 	tun, tnet, err := netstack.CreateNetTUN(
 		[]netip.Addr{server.ClientIP},
-		[]netip.Addr{},
+		[]netip.Addr{netip.AddrFrom4([4]byte{1, 1, 1, 1})},
 		1280,
 	)
 	if err != nil {
@@ -71,19 +71,27 @@ func NewWithConfig(ctx context.Context, logger slog.Logger, cfg Config) (*Tunnel
 	if err != nil {
 		return nil, nil, xerrors.Errorf("resolve endpoint: %w", err)
 	}
+	// In IPv6, we need to enclose the address to in [] before passing to wireguard's endpoint key, like
+	// [2001:abcd::1]:8888.  We'll use netip.AddrPort to correctly handle this.
+	wgAddr, err := netip.ParseAddr(wgip.String())
+	if err != nil {
+		return nil, nil, xerrors.Errorf("parse address: %w", err)
+	}
+	wgEndpoint := netip.AddrPortFrom(wgAddr, cfg.Tunnel.WireguardPort)
 
-	dev := device.NewDevice(tun, conn.NewDefaultBind(), device.NewLogger(device.LogLevelSilent, ""))
-	err = dev.IpcSet(fmt.Sprintf(`private_key=%s
+	dev := device.NewDevice(tun, conn.NewDefaultBind(), device.NewLogger(device.LogLevelVerbose, "client "))
+	setString := fmt.Sprintf(`private_key=%s
 public_key=%s
-endpoint=[%s]:%d
+endpoint=%s
 persistent_keepalive_interval=21
 allowed_ip=%s/128`,
 		hex.EncodeToString(cfg.PrivateKey[:]),
 		server.ServerPublicKey,
-		wgip.IP.String(),
-		cfg.Tunnel.WireguardPort,
+		wgEndpoint.String(),
 		server.ServerIP.String(),
-	))
+	)
+	logger.Debug(ctx, "IpcSet", slog.F("kv", setString))
+	err = dev.IpcSet(setString)
 	if err != nil {
 		return nil, nil, xerrors.Errorf("configure wireguard ipc: %w", err)
 	}
diff --git a/coderd/devtunnel/tunnel_test.go b/coderd/devtunnel/tunnel_test.go
@@ -1,6 +1,7 @@
 package devtunnel_test
 
 import (
+	"cdr.dev/slog"
 	"context"
 	"encoding/hex"
 	"encoding/json"
@@ -51,7 +52,7 @@ func TestTunnel(t *testing.T) {
 	fTunServer := newFakeTunnelServer(t)
 	cfg := fTunServer.config()
 
-	tun, errCh, err := devtunnel.NewWithConfig(ctx, slogtest.Make(t, nil), cfg)
+	tun, errCh, err := devtunnel.NewWithConfig(ctx, slogtest.Make(t, nil).Leveled(slog.LevelDebug), cfg)
 	require.NoError(t, err)
 	t.Log(tun.URL)
 
@@ -123,7 +124,7 @@ func newFakeTunnelServer(t *testing.T) *fakeTunnelServer {
 		1280,
 	)
 	require.NoError(t, err)
-	dev := device.NewDevice(tun, conn.NewDefaultBind(), device.NewLogger(device.LogLevelVerbose, ""))
+	dev := device.NewDevice(tun, conn.NewDefaultBind(), device.NewLogger(device.LogLevelVerbose, "server "))
 	err = dev.IpcSet(fmt.Sprintf(`private_key=%s
 listen_port=%d`,
 		hex.EncodeToString(privBytes[:]),
@@ -193,7 +194,7 @@ allowed_ip=%s/128`,
 		PublicKey:  device.NoisePublicKey(pub),
 		Tunnel: devtunnel.Node{
 			HostnameHTTPS:     strings.TrimPrefix(f.server.URL, "https://"),
-			HostnameWireguard: "::1",
+			HostnameWireguard: "127.0.0.1",
 			WireguardPort:     wgPort,
 		},
 		HTTPClient: f.server.Client(),
