From 2383f64d89294b426d300f4efd9a815e73dc47b3 Mon Sep 17 00:00:00 2001 From: Kyle Carberry Date: Thu, 23 Mar 2023 15:02:29 -0500 Subject: [PATCH] fix: add dbauthz for streaming startup logs (#6758) This was causing logs to end early! --- coderd/workspaceagents.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/coderd/workspaceagents.go b/coderd/workspaceagents.go index 808ba4f191..6fa5118345 100644 --- a/coderd/workspaceagents.go +++ b/coderd/workspaceagents.go @@ -367,6 +367,7 @@ func (api *API) workspaceAgentStartupLogs(rw http.ResponseWriter, r *http.Reques // This mostly copies how provisioner job logs are streamed! var ( ctx = r.Context() + actor, _ = dbauthz.ActorFromContext(ctx) workspaceAgent = httpmw.WorkspaceAgentParam(r) workspace = httpmw.WorkspaceParam(r) logger = api.Logger.With(slog.F("workspace_agent_id", workspaceAgent.ID)) @@ -475,7 +476,7 @@ func (api *API) workspaceAgentStartupLogs(rw http.ResponseWriter, r *http.Reques } if jlMsg.CreatedAfter != 0 { - logs, err := api.Database.GetWorkspaceAgentStartupLogsAfter(ctx, database.GetWorkspaceAgentStartupLogsAfterParams{ + logs, err := api.Database.GetWorkspaceAgentStartupLogsAfter(dbauthz.As(ctx, actor), database.GetWorkspaceAgentStartupLogsAfterParams{ AgentID: workspaceAgent.ID, CreatedAfter: jlMsg.CreatedAfter, }) @@ -488,7 +489,7 @@ func (api *API) workspaceAgentStartupLogs(rw http.ResponseWriter, r *http.Reques if jlMsg.EndOfLogs { endOfLogs.Store(true) - logs, err := api.Database.GetWorkspaceAgentStartupLogsAfter(ctx, database.GetWorkspaceAgentStartupLogsAfterParams{ + logs, err := api.Database.GetWorkspaceAgentStartupLogsAfter(dbauthz.As(ctx, actor), database.GetWorkspaceAgentStartupLogsAfterParams{ AgentID: workspaceAgent.ID, CreatedAfter: lastSentLogID.Load(), })