Skip to content

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

fix(insights): apply a member's folder grants to the access a group gives them

Dimitris Staratzis326a484ea432
diff --git a/backend/src/ee/services/permission/permission-service-types.ts b/backend/src/ee/services/permission/permission-service-types.ts
index fac85f1162..233f897e79 100644
--- a/backend/src/ee/services/permission/permission-service-types.ts
+++ b/backend/src/ee/services/permission/permission-service-types.ts
@@ -175,6 +175,8 @@ export type TPermissionServiceFactory = {
}[];
groupPermissions: {
permission: MongoAbility<ProjectPermissionSet, MongoQuery>;
+ // The group's roles with the given member's own folder grants applied on top.
+ permissionForMember: (actorId: string) => MongoAbility<ProjectPermissionSet, MongoQuery>;
id: string;
name: string;
membershipId: string;
diff --git a/backend/src/ee/services/permission/permission-service.ts b/backend/src/ee/services/permission/permission-service.ts
index aba3947879..39749fbe45 100644
--- a/backend/src/ee/services/permission/permission-service.ts
+++ b/backend/src/ee/services/permission/permission-service.ts
@@ -1057,8 +1057,26 @@ export const permissionServiceFactory = ({
conditionsMatcher
});
+ // What a member gets through the group: the group's roles with that member's own folder grants on top, the
+ // same way their own permission is built, so a grant that narrows a folder narrows the group access too.
+ const memberPermissions = new Map<string, MongoAbility<ProjectPermissionSet>>();
+ const permissionForMember = (actorId: string) => {
+ const folderPrivileges = folderScopedPrivilegesOf(actorId, groupProjectPermission.roles);
+ if (!folderPrivileges?.length) return permission;
+ let memberPermission = memberPermissions.get(actorId);
+ if (!memberPermission) {
+ memberPermission = createMongoAbility<ProjectPermissionSet>(
+ buildProjectPermissionRules(rolePermissions, undefined, folderPrivileges),
+ { conditionsMatcher }
+ );
+ memberPermissions.set(actorId, memberPermission);
+ }
+ return memberPermission;
+ };
+
return {
permission,
+ permissionForMember,
id: groupProjectPermission.groupId,
membershipId: groupProjectPermission.id,
name: groupProjectPermission.username,
diff --git a/backend/src/ee/services/secret-read-activity/secret-read-activity-service.ts b/backend/src/ee/services/secret-read-activity/secret-read-activity-service.ts
index 159bfc459c..193216cbff 100644
--- a/backend/src/ee/services/secret-read-activity/secret-read-activity-service.ts
+++ b/backend/src/ee/services/secret-read-activity/secret-read-activity-service.ts
@@ -300,14 +300,14 @@ export const secretReadActivityServiceFactory = ({
secretReadActivityDAL.findAdminActorIds(projectId),
$getProjectTrackingStartedAt(projectId)
]);
- // The user and identity lists carry only direct members, so every group member is also checked with the
- // group's permission; an actor who qualifies more than one way still counts once.
+ // The user and identity lists carry only direct members, so every group member is also checked with what the
+ // group gives them, their own folder grants included; an actor who qualifies more than one way counts once.
const groupIds = groupPermissions.map((group) => group.id);
const [userGroupMemberships, identityGroupMemberships] = await Promise.all([
groupIds.length ? userGroupMembershipDAL.find({ $in: { groupId: groupIds } }) : [],
groupIds.length ? identityGroupMembershipDAL.find({ $in: { groupId: groupIds } }) : []
]);
- const groupPermissionById = new Map(groupPermissions.map((group) => [group.id, group.permission]));
+ const groupPermissionById = new Map(groupPermissions.map((group) => [group.id, group]));
const judgedFrom = trackingStartedAt > windowStart ? trackingStartedAt : windowStart;
// Unused access is only judged on a full window of reads: until tracking has run for 30 days, the reads
// before it began are unknown, so nobody counts as having left a secret unread.
@@ -324,8 +324,9 @@ export const secretReadActivityServiceFactory = ({
idOf: (membership: T) => string
): TActor[] =>
memberships.flatMap((membership) => {
- const permission = groupPermissionById.get(membership.groupId);
- return permission ? [{ id: idOf(membership), actorType, permission }] : [];
+ const group = groupPermissionById.get(membership.groupId);
+ const id = idOf(membership);
+ return group ? [{ id, actorType, permission: group.permissionForMember(id) }] : [];
});
const actors: TActor[] = [
...userPermissions.map((actor) => ({ ...actor, actorType: ActorType.USER as const })),