some stuff

coder · coadler · Jun 24, 2022 · Jun 10, 2022 · Jun 22, 2022 · Jun 22, 2022
commit c85a6e9387eabcfc1b65e3a973c0a7ea7196e6aa
diff --git a/agent/agent.go b/agent/agent.go
@@ -70,7 +70,7 @@ type PublicKeys struct {
 
 type Dialer func(ctx context.Context, logger slog.Logger) (Metadata, *peerbroker.Listener, error)
 type PostKeys func(ctx context.Context, keys PublicKeys) error
-type ListenWireguardPeers func(ctx context.Context, logger slog.Logger) (<-chan *peerwg.WireguardPeerMessage, func(), error)
+type ListenWireguardPeers func(ctx context.Context, logger slog.Logger) (<-chan peerwg.WireguardPeerMessage, func(), error)
 
 func New(dialer Dialer, options *Options) io.Closer {
 	if options == nil {

diff --git a/agent/wireguard.go b/agent/wireguard.go
@@ -13,6 +13,7 @@ import (
 func (a *agent) startWireguard(ctx context.Context, addrs []netaddr.IPPrefix) error {
 	if a.wg != nil {
 		_ = a.wg.Close()
+		a.wg = nil
 	}
 
 	if !a.enableWireguard {
@@ -46,12 +47,12 @@ func (a *agent) startWireguard(ctx context.Context, addrs []netaddr.IPPrefix) er
 			}
 
 			for {
-				peer := <-ch
-				if peer == nil {
+				peer, ok := <-ch
+				if !ok {
 					break
 				}
 
-				err := wg.AddPeer(*peer)
+				err := wg.AddPeer(peer)
 				a.logger.Info(ctx, "added wireguard peer", slog.F("peer", peer.Public.ShortString()), slog.Error(err))
 			}
 

diff --git a/cli/wireguardtunnel.go b/cli/wireguardtunnel.go
@@ -34,6 +34,7 @@ func wireguardPortForward() *cobra.Command {
 		Use:     "wireguard-port-forward <workspace>",
 		Aliases: []string{"wireguard-tunnel"},
 		Args:    cobra.ExactArgs(1),
+		Hidden:  true,
 		Example: `
   - Port forward a single TCP port from 1234 in the workspace to port 5678 on
     your local machine

diff --git a/coderd/devtunnel/tunnel.go b/coderd/devtunnel/tunnel.go
@@ -26,7 +26,6 @@ import (
 )
 
 const (
-	Proto             = "https"
 	EndpointWireguard = "wg-tunnel-udp.coder.app"
 	EndpointHTTPS     = "wg-tunnel.coder.app"
 
@@ -111,7 +110,7 @@ allowed_ip=%s/128`,
 	}()
 
 	return &Tunnel{
-		URL:      fmt.Sprintf("%s://%s.%s", Proto, cfg.ID, EndpointHTTPS),
+		URL:      fmt.Sprintf("https://%s.%s", cfg.ID, EndpointHTTPS),
 		Listener: wgListen,
 	}, ch, nil
 }
@@ -166,7 +165,7 @@ func sendConfigToServer(ctx context.Context, cfg Config) (created bool, err erro
 		return false, xerrors.Errorf("marshal config: %w", err)
 	}
 
-	req, err := http.NewRequestWithContext(ctx, "POST", Proto+"://"+EndpointHTTPS+"/tun", bytes.NewReader(raw))
+	req, err := http.NewRequestWithContext(ctx, "POST", "https://"+EndpointHTTPS+"/tun", bytes.NewReader(raw))
 	if err != nil {
 		return false, xerrors.Errorf("new request: %w", err)
 	}

diff --git a/codersdk/workspaceagents.go b/codersdk/workspaceagents.go
@@ -275,7 +275,7 @@ func (c *Client) PostWireguardPeer(ctx context.Context, workspaceID uuid.UUID, p
 // WireguardPeerListener listens for wireguard peer messages. Peer messages are
 // sent when a new client wants to connect. Once receiving a peer message, the
 // peer should be added to the NetworkMap of the wireguard interface.
-func (c *Client) WireguardPeerListener(ctx context.Context, logger slog.Logger) (<-chan *peerwg.WireguardPeerMessage, func(), error) {
+func (c *Client) WireguardPeerListener(ctx context.Context, logger slog.Logger) (<-chan peerwg.WireguardPeerMessage, func(), error) {
 	serverURL, err := c.URL.Parse("/api/v2/workspaceagents/me/wireguardlisten")
 	if err != nil {
 		return nil, nil, xerrors.Errorf("parse url: %w", err)
@@ -304,7 +304,7 @@ func (c *Client) WireguardPeerListener(ctx context.Context, logger slog.Logger)
 		return nil, nil, readBodyAsError(res)
 	}
 
-	ch := make(chan *peerwg.WireguardPeerMessage, 1)
+	ch := make(chan peerwg.WireguardPeerMessage, 1)
 	go func() {
 		defer conn.Close(websocket.StatusGoingAway, "")
 		defer close(ch)
@@ -322,7 +322,7 @@ func (c *Client) WireguardPeerListener(ctx context.Context, logger slog.Logger)
 				continue
 			}
 
-			ch <- &msg
+			ch <- msg
 		}
 	}()
 

diff --git a/peer/peerwg/peermessage.go b/peer/peerwg/peermessage.go
@@ -29,7 +29,7 @@ type WireguardPeerMessage struct {
 // WireguardPeerMessage to quickly determine if the message is meant for the
 // provided agentID.
 func WireguardPeerMessageRecipientHint(agentID []byte, msg []byte) (bool, error) {
-	idx := bytes.Index(msg, []byte{10})
+	idx := bytes.Index(msg, []byte{peerMessageSeparator})
 	if idx == -1 {
 		return false, xerrors.Errorf("invalid peer message, no separator")
 	}

diff --git a/peer/peerwg/wireguard.go b/peer/peerwg/wireguard.go
@@ -36,12 +36,7 @@ import (
 )
 
 func UUIDToInet(uid uuid.UUID) pqtype.Inet {
-	uid[0] = 0xfd
-	uid[1] = 0x7a
-	uid[2] = 0x11
-	uid[3] = 0x5c
-	uid[4] = 0xa1
-	uid[5] = 0xe0
+	uid = privateUUID(uid)
 
 	return pqtype.Inet{
 		Valid: true,
@@ -53,15 +48,19 @@ func UUIDToInet(uid uuid.UUID) pqtype.Inet {
 }
 
 func UUIDToNetaddr(uid uuid.UUID) netaddr.IP {
+	return netaddr.IPFrom16(privateUUID(uid))
+}
+
+// privateUUID sets the uid to have the tailscale private ipv6 prefix.
+func privateUUID(uid uuid.UUID) uuid.UUID {
 	// fd7a:115c:a1e0
 	uid[0] = 0xfd
 	uid[1] = 0x7a
 	uid[2] = 0x11
 	uid[3] = 0x5c
 	uid[4] = 0xa1
 	uid[5] = 0xe0
-
-	return netaddr.IPFrom16(uid)
+	return uid
 }
 
 var logf tslogger.Logf = log.Printf