Skip to content

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

fix(web): check that an invite's project belongs to the organization (#19404)

Steffen Reutherab0a26583aa6
diff --git a/web/src/__tests__/server/members-trpc.servertest.ts b/web/src/__tests__/server/members-trpc.servertest.ts
index 951dac96e8..35ffea91cc 100644
--- a/web/src/__tests__/server/members-trpc.servertest.ts
+++ b/web/src/__tests__/server/members-trpc.servertest.ts
@@ -1112,6 +1112,66 @@ describe("membersRouter.updateProjectRole - project organization consistency", (
});
});
+describe("membersRouter.create - project organization consistency", () => {
+ it("rejects a project-only invite whose project belongs to another organization", async () => {
+ // The caller is a VIEWER in the target org but OWNER of their own org.
+ // Their project-level rights there must not stand in for
+ // organizationMembers:CUD on the target org.
+ const { org: targetOrg, project: targetProject } =
+ await createTestOrg("cloud:team");
+ const {
+ org: callerOrg,
+ project: callerProject,
+ ownerUser: caller,
+ } = await createTestOrg("cloud:team");
+ await prisma.organizationMembership.create({
+ data: { userId: caller.id, orgId: targetOrg.id, role: Role.VIEWER },
+ });
+
+ const session = createSession(
+ caller,
+ targetOrg,
+ targetProject,
+ "cloud:team",
+ {
+ orgRole: Role.VIEWER,
+ projectRole: Role.VIEWER,
+ },
+ );
+ session.user!.organizations.push(
+ ...createSession(caller, callerOrg, callerProject, "cloud:team").user!
+ .organizations,
+ );
+ const ctx = createInnerTRPCContext({ session, headers: {} });
+ const trpc = appRouter.createCaller({ ...ctx, prisma });
+
+ const existingUser = await createTestUser();
+ const unknownEmail = `unknown-${uuidv4().substring(0, 8)}@test.com`;
+
+ for (const email of [existingUser.email!, unknownEmail]) {
+ await expect(
+ trpc.members.create({
+ orgId: targetOrg.id,
+ email,
+ orgRole: Role.NONE,
+ projectId: callerProject.id,
+ }),
+ ).rejects.toMatchObject({ code: "NOT_FOUND" });
+ }
+
+ expect(
+ await prisma.organizationMembership.count({
+ where: { orgId: targetOrg.id, userId: existingUser.id },
+ }),
+ ).toBe(0);
+ expect(
+ await prisma.membershipInvitation.count({
+ where: { orgId: targetOrg.id },
+ }),
+ ).toBe(0);
+ });
+});
+
describe("membersRouter - gateway key revocation", () => {
async function createBoundGatewayKey(orgId: string, userId: string) {
return createApiKey(prisma, {
diff --git a/web/src/features/rbac/server/inviteOrganizationMember.ts b/web/src/features/rbac/server/inviteOrganizationMember.ts
index d1b52b3c58..e2d7414df2 100644
--- a/web/src/features/rbac/server/inviteOrganizationMember.ts
+++ b/web/src/features/rbac/server/inviteOrganizationMember.ts
@@ -97,12 +97,12 @@ export async function inviteOrganizationMember({
/**
* Create a new organization membership
* - Checks for:
+ * - project is in org (throws if not)
* - scope: organizationMembers:CUD if not only project-role is set, then projectMembers:CUD
* - orgRole is not higher than own role
* - if project role
* - projectRole is not higher than own role
* - entitlement for project roles if projectRole is set
- * - project is in org
* - if user exists
* - if org membership exists
* - if only project role is set (orgRole === Role.NONE)
@@ -122,14 +122,29 @@ export async function inviteOrganizationMember({
* - send email
*/
+ // The project must belong to the target org before its project-level
+ // rights can stand in for organizationMembers:CUD below.
+ const project = input.projectId
+ ? await ctx.prisma.project.findFirst({
+ where: {
+ id: input.projectId,
+ orgId: input.orgId,
+ deletedAt: null,
+ },
+ })
+ : null;
+ if (input.projectId && !project) {
+ throw new TRPCError({ code: "NOT_FOUND", message: "Project not found" });
+ }
+
if (
// Require only project-level access rights if no orgRole is set but a projectId is
- input.projectId &&
+ project &&
input.orgRole === Role.NONE
) {
throwIfNoProjectAccess({
session: ctx.session,
- projectId: input.projectId,
+ projectId: project.id,
scope: "projectMembers:CUD",
});
} else {
@@ -167,16 +182,6 @@ export async function inviteOrganizationMember({
},
});
- // security check if project is in org
- const project = input.projectId
- ? await ctx.prisma.project.findFirst({
- where: {
- id: input.projectId,
- orgId: input.orgId,
- deletedAt: null,
- },
- })
- : null;
if (project && input.projectRole)
await throwIfHigherProjectRole({
orgCtx: ctx,