Fix authorize test

kylecarbs · kylecarbs · commit ac55f481130f · 2023-03-20T15:12:37.000Z
diff --git a/coderd/coderdtest/authorize.go b/coderd/coderdtest/authorize.go
@@ -72,7 +72,7 @@ func AGPLRoutes(a *AuthTester) (map[string]string, map[string]RouteCheck) {
 		"GET:/api/v2/workspaceagents/me/metadata":               {NoAuthorize: true},
 		"GET:/api/v2/workspaceagents/me/coordinate":             {NoAuthorize: true},
 		"POST:/api/v2/workspaceagents/me/startup":               {NoAuthorize: true},
-		"PATCH:/api/v2/workspaceagents/me/startup/logs":         {NoAuthorize: true},
+		"PATCH:/api/v2/workspaceagents/me/startup-logs":         {NoAuthorize: true},
 		"POST:/api/v2/workspaceagents/me/app-health":            {NoAuthorize: true},
 		"POST:/api/v2/workspaceagents/me/report-stats":          {NoAuthorize: true},
 		"POST:/api/v2/workspaceagents/me/report-lifecycle":      {NoAuthorize: true},
@@ -142,6 +142,10 @@ func AGPLRoutes(a *AuthTester) (map[string]string, map[string]RouteCheck) {
 			AssertAction: rbac.ActionRead,
 			AssertObject: workspaceRBACObj,
 		},
+		"GET:/api/v2/workspaceagents/{workspaceagent}/startup-logs": {
+			AssertAction: rbac.ActionRead,
+			AssertObject: workspaceRBACObj,
+		},
 		"GET:/api/v2/workspaceagents/{workspaceagent}/pty": {
 			AssertAction: rbac.ActionCreate,
 			AssertObject: workspaceExecObj,
diff --git a/coderd/workspaceagents.go b/coderd/workspaceagents.go
@@ -223,14 +223,14 @@ func (api *API) postWorkspaceAgentStartup(rw http.ResponseWriter, r *http.Reques
 	httpapi.Write(ctx, rw, http.StatusOK, nil)
 }
 
-// @Summary Submit most recent workspace agent startup logs
-// @ID insert-update-startup-script-logs
+// @Summary Patch workspace agent startup logs
+// @ID patch-workspace-agent-startup-logs
 // @Security CoderSessionToken
 // @Accept json
 // @Produce json
 // @Tags Agents
 // @Param request body agentsdk.PatchStartupLogs true "Startup logs"
-// @Success 200
+// @Success 200 {object} codersdk.Response
 // @Router /workspaceagents/me/startup-logs [patch]
 // @x-apidocgen {"skip": true}
 func (api *API) patchWorkspaceAgentStartupLogs(rw http.ResponseWriter, r *http.Request) {
@@ -337,25 +337,28 @@ func (api *API) patchWorkspaceAgentStartupLogs(rw http.ResponseWriter, r *http.R
 // @Summary Get startup logs by workspace agent
 // @ID get-startup-logs-by-workspace-agent
 // @Security CoderSessionToken
-// @Accept json
 // @Produce json
 // @Tags Agents
 // @Param workspaceagent path string true "Workspace agent ID" format(uuid)
 // @Param before query int false "Before log id"
 // @Param after query int false "After log id"
 // @Param follow query bool false "Follow log stream"
-// @Success 200
+// @Success 200 {array} codersdk.WorkspaceAgentStartupLog
 // @Router /workspaceagents/{workspaceagent}/startup-logs [get]
-// @x-apidocgen {"skip": true}
 func (api *API) workspaceAgentStartupLogs(rw http.ResponseWriter, r *http.Request) {
 	// This mostly copies how provisioner job logs are streamed!
 	var (
 		ctx            = r.Context()
 		workspaceAgent = httpmw.WorkspaceAgentParam(r)
+		workspace      = httpmw.WorkspaceParam(r)
 		logger         = api.Logger.With(slog.F("workspace_agent_id", workspaceAgent.ID))
 		follow         = r.URL.Query().Has("follow")
 		afterRaw       = r.URL.Query().Get("after")
 	)
+	if !api.Authorize(r, rbac.ActionRead, workspace) {
+		httpapi.ResourceNotFound(rw)
+		return
+	}
 
 	var after int64
 	// Only fetch logs created after the time provided.
