Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.
TypeScript i18nextnext-authnextjspostgresqlprismareact-emailt3-stacktailwindcsstrpcturborepotypescriptzod
🔒️ Prevent space admins from removing or demoting the space owner (#2793)
Luke Vellabf00d433351d
diff --git a/apps/web/src/features/space/member/ability.test.ts b/apps/web/src/features/space/member/ability.test.tsnew file mode 100644index 000000000..8ef7db7cf--- /dev/null+++ b/apps/web/src/features/space/member/ability.test.ts@@ -0,0 +1,100 @@+import { subject } from "@casl/ability";+import { describe, expect, it } from "vitest";+import { defineAbilityForMember } from "./ability";+import type { MemberDTO } from "./types";++const SPACE_ID = "space-1";+const OWNER_ID = "user-owner";+const ADMIN_ID = "user-admin";+const MEMBER_ID = "user-member";++function makeMember(overrides: Partial<MemberDTO>): MemberDTO {+ return {+ id: "member-row",+ name: "Test User",+ email: "[email protected]",+ userId: MEMBER_ID,+ spaceId: SPACE_ID,+ role: "member",+ isOwner: false,+ ...overrides,+ };+}++describe("defineAbilityForMember", () => {+ describe("non-owner admin", () => {+ const ability = defineAbilityForMember({+ user: { id: ADMIN_ID },+ space: { id: SPACE_ID, ownerId: OWNER_ID, role: "admin" },+ });++ const owner = makeMember({+ id: "member-owner",+ userId: OWNER_ID,+ role: "admin",+ isOwner: true,+ });++ it("cannot remove the space owner", () => {+ expect(ability.can("delete", subject("SpaceMember", owner))).toBe(false);+ });++ it("cannot change the space owner's role", () => {+ expect(ability.can("update", subject("SpaceMember", owner))).toBe(false);+ });++ it("cannot remove themselves", () => {+ const self = makeMember({+ id: "member-admin",+ userId: ADMIN_ID,+ role: "admin",+ });+ expect(ability.can("delete", subject("SpaceMember", self))).toBe(false);+ expect(ability.can("update", subject("SpaceMember", self))).toBe(false);+ });++ it("cannot act on members of another space", () => {+ const otherSpaceMember = makeMember({+ id: "member-other",+ spaceId: "space-2",+ });+ expect(+ ability.can("delete", subject("SpaceMember", otherSpaceMember)),+ ).toBe(false);+ expect(+ ability.can("update", subject("SpaceMember", otherSpaceMember)),+ ).toBe(false);+ });++ it("can remove and update a regular member", () => {+ const regularMember = makeMember({});+ expect(ability.can("delete", subject("SpaceMember", regularMember))).toBe(+ true,+ );+ expect(ability.can("update", subject("SpaceMember", regularMember))).toBe(+ true,+ );+ });+ });++ describe("owner admin", () => {+ const ability = defineAbilityForMember({+ user: { id: OWNER_ID },+ space: { id: SPACE_ID, ownerId: OWNER_ID, role: "admin" },+ });++ it("can remove and update other admins", () => {+ const otherAdmin = makeMember({+ id: "member-admin",+ userId: ADMIN_ID,+ role: "admin",+ });+ expect(ability.can("delete", subject("SpaceMember", otherAdmin))).toBe(+ true,+ );+ expect(ability.can("update", subject("SpaceMember", otherAdmin))).toBe(+ true,+ );+ });+ });+});diff --git a/apps/web/src/features/space/member/ability.ts b/apps/web/src/features/space/member/ability.tsindex d5defbf28..d64b752f0 100644--- a/apps/web/src/features/space/member/ability.ts+++ b/apps/web/src/features/space/member/ability.ts@@ -94,4 +94,7 @@ function defineSpaceAdminRules(cannot(["delete", "update"], "SpaceMember", {userId: ctx.user.id,});+ cannot(["delete", "update"], "SpaceMember", {+ userId: ctx.space.ownerId,+ });}diff --git a/apps/web/src/features/space/member/actions.ts b/apps/web/src/features/space/member/actions.tsindex 34b91efdb..8e3c389db 100644--- a/apps/web/src/features/space/member/actions.ts+++ b/apps/web/src/features/space/member/actions.ts@@ -168,6 +168,13 @@ export const removeMemberAction = authActionClient});}+ if (member.isOwner) {+ throw new AppError({+ code: "FORBIDDEN",+ message: "The space owner cannot be removed",+ });+ }+const ability = defineAbilityForMember({ user: ctx.user, space });if (ability.cannot("delete", subject("SpaceMember", member))) {@@ -216,6 +223,13 @@ export const changeMemberRoleAction = authActionClient});}+ if (member.isOwner) {+ throw new AppError({+ code: "FORBIDDEN",+ message: "The space owner's role cannot be changed",+ });+ }+const ability = defineAbilityForMember({ user: ctx.user, space });if (ability.cannot("update", subject("SpaceMember", member))) {