Skip to content

Infisical is the open-source platform for securing secrets, certificates, access, and AI Agents.

fix: require accepted org membership for group-derived project subjects

Claude267d9e5fb804
diff --git a/backend/src/services/project/project-dal.ts b/backend/src/services/project/project-dal.ts
index fd4025c552..deaf4a07e4 100644
--- a/backend/src/services/project/project-dal.ts
+++ b/backend/src/services/project/project-dal.ts
@@ -3,6 +3,7 @@ import { Knex } from "knex";
import { TDbClient } from "@app/db";
import {
AccessScope,
+ OrgMembershipStatus,
ProjectsSchema,
ProjectType,
ProjectUpgradeStatus,
@@ -512,15 +513,24 @@ export const projectDALFactory = (db: TDbClient) => {
};
}
- const rows = await (tx || db.replicaNode())(TableName.Membership)
+ const conn = tx || db.replicaNode();
+ // A group-derived user counts only with an accepted org membership. user_group_membership.isPending
+ // cannot tell that apart: it is set when a user is added before accepting the invite and never cleared.
+ const acceptedOrgUserIds = conn(TableName.Membership)
+ .where(`${TableName.Membership}.scope`, AccessScope.Organization)
+ .where(`${TableName.Membership}.scopeOrgId`, orgId)
+ .where(`${TableName.Membership}.status`, OrgMembershipStatus.Accepted)
+ .whereIn(`${TableName.Membership}.actorUserId`, uniqueUserIds)
+ .select(db.ref("actorUserId").withSchema(TableName.Membership));
+
+ const rows = await conn(TableName.Membership)
.join(TableName.Project, `${TableName.Membership}.scopeProjectId`, `${TableName.Project}.id`)
- // isPending is deliberately not filtered: permission-dal.getPermission grants project access on
- // group membership alone and the flag is no longer cleared once a user accepts their invite.
- .leftJoin(
- TableName.UserGroupMembership,
- `${TableName.Membership}.actorGroupId`,
- `${TableName.UserGroupMembership}.groupId`
- )
+ .leftJoin(TableName.UserGroupMembership, function joinUserGroupMembership() {
+ this.on(`${TableName.Membership}.actorGroupId`, `${TableName.UserGroupMembership}.groupId`).onIn(
+ `${TableName.UserGroupMembership}.userId`,
+ db.raw("?", [acceptedOrgUserIds])
+ );
+ })
.where(`${TableName.Membership}.scope`, AccessScope.Project)
.where(`${TableName.Membership}.scopeOrgId`, orgId)
.where(`${TableName.Membership}.scopeProjectId`, projectId)