feat(agent): expose HTTP debug over tailnet api

johnstcn · johnstcn · commit ed377a5f40e2 · 2024-03-13T16:58:19.000Z
diff --git a/agent/api.go b/agent/api.go
@@ -36,6 +36,8 @@ func (a *agent) apiHandler() http.Handler {
 		cacheDuration: cacheDuration,
 	}
 	r.Get("/api/v0/listening-ports", lp.handler)
+	r.Get("/debug/magicsock", a.HandleHTTPDebugMagicsock)
+	r.Get("/debug/magicsock/debug-logging/{state}", a.HandleHTTPMagicsockDebugLoggingState)
 
 	return r
 }
diff --git a/codersdk/workspaceagentconn.go b/codersdk/workspaceagentconn.go
@@ -356,6 +356,22 @@ func (c *WorkspaceAgentConn) ListeningPorts(ctx context.Context) (WorkspaceAgent
 	return resp, json.NewDecoder(res.Body).Decode(&resp)
 }
 
+// DebugMagicsock makes a request to the workspace agent's magicsock debug endpoint.
+func (c *WorkspaceAgentConn) DebugMagicsock(ctx context.Context) ([]byte, error) {
+	ctx, span := tracing.StartSpan(ctx)
+	defer span.End()
+	res, err := c.apiRequest(ctx, http.MethodGet, "/debug/magicsock", nil)
+	if err != nil {
+		return nil, xerrors.Errorf("do request: %w", err)
+	}
+	defer res.Body.Close()
+	bs, err := io.ReadAll(res.Body)
+	if err != nil {
+		return nil, xerrors.Errorf("read response body: %w", err)
+	}
+	return bs, nil
+}
+
 // apiRequest makes a request to the workspace agent's HTTP API server.
 func (c *WorkspaceAgentConn) apiRequest(ctx context.Context, method, path string, body io.Reader) (*http.Response, error) {
 	ctx, span := tracing.StartSpan(ctx)

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,8 @@ func (a *agent) apiHandler() http.Handler {`
`36`	`36`	`cacheDuration: cacheDuration,`
`37`	`37`	`}`
`38`	`38`	`r.Get("/api/v0/listening-ports", lp.handler)`
	`39`	`+ r.Get("/debug/magicsock", a.HandleHTTPDebugMagicsock)`
	`40`	`+ r.Get("/debug/magicsock/debug-logging/{state}", a.HandleHTTPMagicsockDebugLoggingState)`
`39`	`41`
`40`	`42`	`return r`
`41`	`43`	`}`