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(api): serialize member project access updates

Andrejfd7103f37bc2
diff --git a/apps/api/src/project-access/is-project-access-restricted.ts b/apps/api/src/project-access/is-project-access-restricted.ts
index 0387ab912..7f09568b9 100644
--- a/apps/api/src/project-access/is-project-access-restricted.ts
+++ b/apps/api/src/project-access/is-project-access-restricted.ts
@@ -1,17 +1,19 @@
import { and, eq } from "drizzle-orm";
import db, { schema } from "../database";
import { hasInstanceAdminRole } from "../utils/instance-admin-role";
+import type { DbOrTx } from "./db-or-tx";
import { getMemberProjectAccess } from "./get-member-project-access";
import { isOwnerRole } from "./is-owner-role";
export async function isProjectAccessRestricted(
workspaceId: string,
userId: string,
+ database: DbOrTx = db,
): Promise<boolean> {
- const access = await getMemberProjectAccess(workspaceId, userId);
+ const access = await getMemberProjectAccess(workspaceId, userId, database);
if (access.projectAccess === "all") return false;
- const [row] = await db
+ const [row] = await database
.select({
memberRole: schema.workspaceUserTable.role,
userRole: schema.userTable.role,
diff --git a/apps/api/src/project-access/keep-hidden-grants.ts b/apps/api/src/project-access/keep-hidden-grants.ts
index 5f38fae8f..e5fde5bfb 100644
--- a/apps/api/src/project-access/keep-hidden-grants.ts
+++ b/apps/api/src/project-access/keep-hidden-grants.ts
@@ -1,3 +1,4 @@
+import type { DbOrTx } from "./db-or-tx";
import { findInaccessibleProjectIds } from "./find-inaccessible-project-ids";
import { isProjectAccessRestricted } from "./is-project-access-restricted";
import { getMemberProjectAccess } from "./get-member-project-access";
@@ -12,14 +13,15 @@ export async function keepHiddenGrants(request: {
actorId: string;
userId: string;
access: ResolvedProjectAccess;
+ database: DbOrTx;
}): Promise<Outcome> {
- const { workspaceId, actorId, userId, access } = request;
+ const { workspaceId, actorId, userId, access, database } = request;
- if (!(await isProjectAccessRestricted(workspaceId, actorId))) {
+ if (!(await isProjectAccessRestricted(workspaceId, actorId, database))) {
return { ok: true, access };
}
- const current = await getMemberProjectAccess(workspaceId, userId);
+ const current = await getMemberProjectAccess(workspaceId, userId, database);
if (current.projectAccess === "all") {
return {
ok: false,
@@ -28,7 +30,11 @@ export async function keepHiddenGrants(request: {
};
}
- const hidden = await findInaccessibleProjectIds(actorId, current.projectIds);
+ const hidden = await findInaccessibleProjectIds(
+ actorId,
+ current.projectIds,
+ database,
+ );
return {
ok: true,
access: {
diff --git a/apps/api/src/project-access/lock-access-change.ts b/apps/api/src/project-access/lock-access-change.ts
new file mode 100644
index 000000000..357f697ab
--- /dev/null
+++ b/apps/api/src/project-access/lock-access-change.ts
@@ -0,0 +1,37 @@
+import { and, eq, inArray } from "drizzle-orm";
+import { schema } from "../database";
+import { hasInstanceAdminRole } from "../utils/instance-admin-role";
+import type { DbOrTx } from "./db-or-tx";
+
+export async function lockAccessChange(
+ database: DbOrTx,
+ change: { workspaceId: string; actorId: string; userId: string },
+): Promise<{ actorAllowed: boolean; targetIsMember: boolean }> {
+ const rows = await database
+ .select({ userId: schema.workspaceUserTable.userId })
+ .from(schema.workspaceUserTable)
+ .where(
+ and(
+ eq(schema.workspaceUserTable.workspaceId, change.workspaceId),
+ inArray(schema.workspaceUserTable.userId, [
+ change.actorId,
+ change.userId,
+ ]),
+ ),
+ )
+ .orderBy(schema.workspaceUserTable.id)
+ .for("update");
+ const members = new Set(rows.map((row) => row.userId));
+
+ let actorAllowed = members.has(change.actorId);
+ if (!actorAllowed) {
+ const [actor] = await database
+ .select({ role: schema.userTable.role })
+ .from(schema.userTable)
+ .where(eq(schema.userTable.id, change.actorId))
+ .limit(1);
+ actorAllowed = hasInstanceAdminRole(actor?.role);
+ }
+
+ return { actorAllowed, targetIsMember: members.has(change.userId) };
+}
diff --git a/apps/api/src/project-access/lock-actor-membership.ts b/apps/api/src/project-access/lock-actor-membership.ts
deleted file mode 100644
index 35763622e..000000000
--- a/apps/api/src/project-access/lock-actor-membership.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { and, eq } from "drizzle-orm";
-import { schema } from "../database";
-import { hasInstanceAdminRole } from "../utils/instance-admin-role";
-import type { DbOrTx } from "./db-or-tx";
-
-export async function lockActorMembership(
- database: DbOrTx,
- workspaceId: string,
- userId: string,
-): Promise<boolean> {
- const [user] = await database
- .select({ role: schema.userTable.role })
- .from(schema.userTable)
- .where(eq(schema.userTable.id, userId))
- .limit(1);
- if (hasInstanceAdminRole(user?.role)) return true;
-
- const [member] = await database
- .select({ id: schema.workspaceUserTable.id })
- .from(schema.workspaceUserTable)
- .where(
- and(
- eq(schema.workspaceUserTable.workspaceId, workspaceId),
- eq(schema.workspaceUserTable.userId, userId),
- ),
- )
- .limit(1)
- .for("share");
-
- return Boolean(member);
-}
diff --git a/apps/api/src/workspace/controllers/update-member-project-access.ts b/apps/api/src/workspace/controllers/update-member-project-access.ts
index 7b3bf0c48..569501e3c 100644
--- a/apps/api/src/workspace/controllers/update-member-project-access.ts
+++ b/apps/api/src/workspace/controllers/update-member-project-access.ts
@@ -3,7 +3,7 @@ import { HTTPException } from "hono/http-exception";
import db, { schema } from "../../database";
import { publishEvent } from "../../events";
import { keepHiddenGrants } from "../../project-access/keep-hidden-grants";
-import { lockActorMembership } from "../../project-access/lock-actor-membership";
+import { lockAccessChange } from "../../project-access/lock-access-change";
import { replaceMemberProjectAccess } from "../../project-access/replace-member-project-access";
import type { ProjectAccessMode } from "../../project-access/project-access-mode";
import { resolveProjectAccessRequest } from "../../project-access/resolve-project-access-request";
@@ -53,23 +53,28 @@ async function updateMemberProjectAccess(request: {
});
}
- const outcome = await keepHiddenGrants({
- workspaceId,
- actorId,
- userId,
- access: resolution.access,
- });
-
- if (!outcome.ok) {
- throw new HTTPException(403, { message: outcome.message });
- }
-
const unassigned = await db.transaction(async (tx) => {
- if (!(await lockActorMembership(tx, workspaceId, actorId))) {
+ const lock = await lockAccessChange(tx, { workspaceId, actorId, userId });
+ if (!lock.actorAllowed) {
throw new HTTPException(403, {
message: "You don't have access to this workspace",
});
}
+ if (!lock.targetIsMember) {
+ throw new HTTPException(404, { message: "Member not found" });
+ }
+
+ const outcome = await keepHiddenGrants({
+ workspaceId,
+ actorId,
+ userId,
+ access: resolution.access,
+ database: tx,
+ });
+ if (!outcome.ok) {
+ throw new HTTPException(403, { message: outcome.message });
+ }
+
await replaceMemberProjectAccess(tx, {
workspaceId,
userId,