Skip to content

armgit / kaneo

Public Imported from GitHub
0

⚡ Project management that doesn't become the project. Boards, Gantt charts, and GitHub integration. Self-host it or use Kaneo Cloud.

fix(tasks): prevent cross-workspace relations (#1385)

Tin Sever9c2a33b613ae
diff --git a/apps/api/src/task-relation/controllers/create-task-relation.ts b/apps/api/src/task-relation/controllers/create-task-relation.ts
index 2a0fcdc1f..c9050c190 100644
--- a/apps/api/src/task-relation/controllers/create-task-relation.ts
+++ b/apps/api/src/task-relation/controllers/create-task-relation.ts
@@ -1,7 +1,11 @@
import { and, eq, or } from "drizzle-orm";
import { HTTPException } from "hono/http-exception";
import db from "../../database";
-import { taskRelationTable, taskTable } from "../../database/schema";
+import {
+ projectTable,
+ taskRelationTable,
+ taskTable,
+} from "../../database/schema";
import { publishEvent } from "../../events";
async function createTaskRelation({
@@ -9,11 +13,13 @@ async function createTaskRelation({
targetTaskId,
relationType,
userId,
+ workspaceId,
}: {
sourceTaskId: string;
targetTaskId: string;
relationType: string;
userId: string;
+ workspaceId: string;
}) {
if (sourceTaskId === targetTaskId) {
throw new HTTPException(400, {
@@ -22,9 +28,19 @@ async function createTaskRelation({
}
const [sourceTask] = await db
- .select({ id: taskTable.id, projectId: taskTable.projectId })
+ .select({
+ id: taskTable.id,
+ projectId: taskTable.projectId,
+ workspaceId: projectTable.workspaceId,
+ })
.from(taskTable)
- .where(eq(taskTable.id, sourceTaskId))
+ .innerJoin(projectTable, eq(taskTable.projectId, projectTable.id))
+ .where(
+ and(
+ eq(taskTable.id, sourceTaskId),
+ eq(projectTable.workspaceId, workspaceId),
+ ),
+ )
.limit(1);
if (!sourceTask) {
@@ -32,9 +48,19 @@ async function createTaskRelation({
}
const [targetTask] = await db
- .select({ id: taskTable.id, projectId: taskTable.projectId })
+ .select({
+ id: taskTable.id,
+ projectId: taskTable.projectId,
+ workspaceId: projectTable.workspaceId,
+ })
.from(taskTable)
- .where(eq(taskTable.id, targetTaskId))
+ .innerJoin(projectTable, eq(taskTable.projectId, projectTable.id))
+ .where(
+ and(
+ eq(taskTable.id, targetTaskId),
+ eq(projectTable.workspaceId, workspaceId),
+ ),
+ )
.limit(1);
if (!targetTask) {
diff --git a/apps/api/src/task-relation/controllers/get-task-relations.ts b/apps/api/src/task-relation/controllers/get-task-relations.ts
index 59c7ebfe5..c7042fd91 100644
--- a/apps/api/src/task-relation/controllers/get-task-relations.ts
+++ b/apps/api/src/task-relation/controllers/get-task-relations.ts
@@ -1,8 +1,13 @@
-import { eq, inArray, or } from "drizzle-orm";
+import { and, eq, inArray, or } from "drizzle-orm";
import db from "../../database";
-import { taskRelationTable, taskTable, userTable } from "../../database/schema";
+import {
+ projectTable,
+ taskRelationTable,
+ taskTable,
+ userTable,
+} from "../../database/schema";
-async function getTaskRelations(taskId: string) {
+async function getTaskRelations(taskId: string, workspaceId: string) {
const relations = await db
.select({
id: taskRelationTable.id,
@@ -52,19 +57,27 @@ async function getTaskRelations(taskId: string) {
assigneeName: userTable.name,
})
.from(taskTable)
+ .innerJoin(projectTable, eq(taskTable.projectId, projectTable.id))
.leftJoin(userTable, eq(taskTable.userId, userTable.id))
- .where(inArray(taskTable.id, [...taskIds]));
+ .where(
+ and(
+ inArray(taskTable.id, [...taskIds]),
+ eq(projectTable.workspaceId, workspaceId),
+ ),
+ );
for (const task of taskRows) {
tasks.set(task.id, task);
}
}
- return relations.map((rel) => ({
- ...rel,
- sourceTask: tasks.get(rel.sourceTaskId) ?? null,
- targetTask: tasks.get(rel.targetTaskId) ?? null,
- }));
+ return relations
+ .filter((rel) => tasks.has(rel.sourceTaskId) && tasks.has(rel.targetTaskId))
+ .map((rel) => ({
+ ...rel,
+ sourceTask: tasks.get(rel.sourceTaskId) ?? null,
+ targetTask: tasks.get(rel.targetTaskId) ?? null,
+ }));
}
export default getTaskRelations;
diff --git a/apps/api/src/task-relation/index.ts b/apps/api/src/task-relation/index.ts
index dcc03f836..1e8fd0a64 100644
--- a/apps/api/src/task-relation/index.ts
+++ b/apps/api/src/task-relation/index.ts
@@ -45,7 +45,7 @@ const taskRelation = new Hono<{
workspaceAccess.fromTaskId("taskId"),
async (c) => {
const { taskId } = c.req.valid("param");
- const relations = await getTaskRelations(taskId);
+ const relations = await getTaskRelations(taskId, c.get("workspaceId"));
return c.json(relations);
},
)
@@ -100,6 +100,7 @@ const taskRelation = new Hono<{
targetTaskId,
relationType,
userId,
+ workspaceId: c.get("workspaceId"),
});
return c.json(relation);
},