[server] Fix permission check for logs streaming (#20423)

gitpod-io · Dec 5, 2024 · 2db6b3f · 2db6b3f
1 parent 10c44d3
commit 2db6b3f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/components/server/src/prebuilds/prebuild-manager.ts b/components/server/src/prebuilds/prebuild-manager.ts
@@ -677,11 +677,10 @@ export class PrebuildManager {
         onLog: (chunk: Uint8Array) => Promise<void>,
     ): Promise<{ taskUrl: string } | undefined> {
         const prebuild = await this.getPrebuild({}, userId, prebuildId);
-        const organizationId = prebuild?.info.teamId;
-        if (!prebuild || !organizationId) {
+        if (!prebuild) {
             throw new ApplicationError(ErrorCodes.PRECONDITION_FAILED, "prebuild workspace not found");
         }
-        await this.auth.checkPermissionOnProject(userId, "read_prebuild", organizationId);
+        await this.auth.checkPermissionOnProject(userId, "read_prebuild", prebuild.info.projectId);
 
         const instance = await this.workspaceService.getCurrentInstance(userId, prebuild.workspace.id, {
             skipPermissionCheck: true,

diff --git a/components/server/src/projects/projects-service.ts b/components/server/src/projects/projects-service.ts
@@ -447,8 +447,10 @@ export class ProjectsService {
                 partialProject.settings.prebuilds.triggerStrategy = "activity-based";
             }
         }
+
         return this.projectDB.updateProject(partialProject);
     }
+
     private async checkProjectSettings(userId: string, settings?: PartialProject["settings"]) {
         if (!settings) {
             return;

diff --git a/components/server/src/workspace/headless-log-service.ts b/components/server/src/workspace/headless-log-service.ts
@@ -102,7 +102,7 @@ export class HeadlessLogService {
             }
         }
 
-        // we were unable to get a repsonse from supervisor - let's try content service next
+        // we were unable to get a response from supervisor - let's try content service next
         return await this.contentServiceListLogs(wsi, ownerId);
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -102,7 +102,7 @@ export class HeadlessLogService { @@
                 }
             }
-            // we were unable to get a repsonse from supervisor - let's try content service next
+            // we were unable to get a response from supervisor - let's try content service next
             return await this.contentServiceListLogs(wsi, ownerId);
         }
@@ Expand Down @@