Skip to content

🪢 Open source agent evals & observability: Trace, evaluate, and improve LLM applications with one open platform.

fix(rbac): scope project role updates to organization (#15940)

Max Deichmann665748ddfdaa
diff --git a/web/src/__tests__/server/members-trpc.servertest.ts b/web/src/__tests__/server/members-trpc.servertest.ts
index a36e20bdbb..9a5c8041ea 100644
--- a/web/src/__tests__/server/members-trpc.servertest.ts
+++ b/web/src/__tests__/server/members-trpc.servertest.ts
@@ -614,3 +614,50 @@ describe("membersRouter.updateProjectRole - orgMembership/userId consistency", (
expect(row?.orgMembershipId).toBe(orgMembership.id);
});
});
+
+describe("membersRouter.updateProjectRole - project organization consistency", () => {
+ it("rejects a project from another organization without writing membership or audit log", async () => {
+ const { org, ownerUser, caller } = await prepare("cloud:core");
+ const { project: otherOrgProject } = await createTestOrg("cloud:core");
+
+ const orgMembership = await prisma.organizationMembership.findUniqueOrThrow(
+ {
+ where: {
+ orgId_userId: {
+ orgId: org.id,
+ userId: ownerUser.id,
+ },
+ },
+ },
+ );
+
+ await expect(
+ caller.members.updateProjectRole({
+ orgId: org.id,
+ orgMembershipId: orgMembership.id,
+ userId: ownerUser.id,
+ projectId: otherOrgProject.id,
+ projectRole: Role.OWNER,
+ }),
+ ).rejects.toMatchObject({ code: "NOT_FOUND" });
+
+ const projectMembership = await prisma.projectMembership.findUnique({
+ where: {
+ projectId_userId: {
+ projectId: otherOrgProject.id,
+ userId: ownerUser.id,
+ },
+ },
+ });
+ expect(projectMembership).toBeNull();
+
+ const auditLogs = await prisma.auditLog.findMany({
+ where: {
+ orgId: org.id,
+ resourceType: "projectMembership",
+ resourceId: `${otherOrgProject.id}--${ownerUser.id}`,
+ },
+ });
+ expect(auditLogs).toHaveLength(0);
+ });
+});
diff --git a/web/src/features/rbac/server/membersRouter.ts b/web/src/features/rbac/server/membersRouter.ts
index 26de7a94e3..b5d60f33ca 100644
--- a/web/src/features/rbac/server/membersRouter.ts
+++ b/web/src/features/rbac/server/membersRouter.ts
@@ -652,6 +652,23 @@ export const membersRouter = createTRPCRouter({
});
}
+ const project = await ctx.prisma.project.findFirst({
+ where: {
+ id: input.projectId,
+ orgId: input.orgId,
+ deletedAt: null,
+ },
+ select: {
+ id: true,
+ },
+ });
+ if (!project) {
+ throw new TRPCError({
+ code: "NOT_FOUND",
+ message: "Project not found",
+ });
+ }
+
// check org membership id, can be trusted after this check
const orgMembership = await ctx.prisma.organizationMembership.findUnique({
where: {