avoid index out of bounds in api.workspaceBuild

johnstcn · johnstcn · commit 8a975fc0c993 · 2023-03-09T14:39:06.000Z
diff --git a/coderd/workspaceapps_test.go b/coderd/workspaceapps_test.go
@@ -1309,6 +1309,8 @@ func TestAppSharing(t *testing.T) {
 		// Verify that the apps have the correct sharing levels set.
 		workspaceBuild, err := client.WorkspaceBuild(ctx, workspace.LatestBuild.ID)
 		require.NoError(t, err)
+		require.NotEmpty(t, workspaceBuild.Resources, "workspace build has no resources")
+		require.NotEmpty(t, workspaceBuild.Resources[0].Agents, "workspace build has no agents")
 		agnt = workspaceBuild.Resources[0].Agents[0]
 		found := map[string]codersdk.WorkspaceAppSharingLevel{}
 		expected := map[string]codersdk.WorkspaceAppSharingLevel{
diff --git a/coderd/workspacebuilds.go b/coderd/workspacebuilds.go
@@ -50,6 +50,24 @@ func (api *API) workspaceBuild(rw http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	// Ensure we have the job and template version for the workspace build.
+	// Otherwise we risk a panic in the api.convertWorkspaceBuild call below.
+	if len(data.jobs) == 0 {
+		httpapi.Write(ctx, rw, http.StatusNotFound, codersdk.Response{
+			Message: "Internal error getting workspace build data.",
+			Detail:  "No job found for workspace build.",
+		})
+		return
+	}
+
+	if len(data.templateVersions) == 0 {
+		httpapi.Write(ctx, rw, http.StatusNotFound, codersdk.Response{
+			Message: "Internal error getting workspace build data.",
+			Detail:  "No template version found for workspace build.",
+		})
+		return
+	}
+
 	apiBuild, err := api.convertWorkspaceBuild(
 		workspaceBuild,
 		workspace,
