synced/coder
1
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2025-07-09 11:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: add dbauthz for streaming startup logs (#6758)

Browse Source 
This was causing logs to end early!
This commit is contained in:
Kyle Carberry
2023-03-23 15:02:29 -05:00
committed by GitHub
parent 88e24db643
commit 2383f64d89
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
coderd/workspaceagents.go
View File

@ -367,6 +367,7 @@ func (api *API) workspaceAgentStartupLogs(rw http.ResponseWriter, r *http.Reques
// This mostly copies how provisioner job logs are streamed! // This mostly copies how provisioner job logs are streamed!
var ( var (
ctx = r.Context() ctx = r.Context()
actor, _ = dbauthz.ActorFromContext(ctx)
workspaceAgent = httpmw.WorkspaceAgentParam(r) workspaceAgent = httpmw.WorkspaceAgentParam(r)
workspace = httpmw.WorkspaceParam(r) workspace = httpmw.WorkspaceParam(r)
logger = api.Logger.With(slog.F("workspace_agent_id", workspaceAgent.ID)) 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 { 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, AgentID: workspaceAgent.ID,
CreatedAfter: jlMsg.CreatedAfter, CreatedAfter: jlMsg.CreatedAfter,
}) })
@ -488,7 +489,7 @@ func (api *API) workspaceAgentStartupLogs(rw http.ResponseWriter, r *http.Reques
if jlMsg.EndOfLogs { if jlMsg.EndOfLogs {
endOfLogs.Store(true) 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, AgentID: workspaceAgent.ID,
CreatedAfter: lastSentLogID.Load(), CreatedAfter: lastSentLogID.Load(),
}) })