Skip to content

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

address veria comment

Andreybb35cef5529b
diff --git a/backend/src/ee/services/pam-access-request/pam-access-approval-resource.ts b/backend/src/ee/services/pam-access-request/pam-access-approval-resource.ts
index d6d7c68cc9..3bcecc3160 100644
--- a/backend/src/ee/services/pam-access-request/pam-access-approval-resource.ts
+++ b/backend/src/ee/services/pam-access-request/pam-access-approval-resource.ts
@@ -347,6 +347,24 @@ export const pamAccessApprovalResourceFactory = ({
});
};
+ const canReadScope: NonNullable<TPamAccessApprovalResource["canReadScope"]> = async ({
+ projectId,
+ scopeId,
+ actor
+ }) => {
+ if (!scopeId) return false;
+
+ try {
+ const { permission } = await checkFolderPermission(permissionService, scopeId, projectId, toActorContext(actor));
+ return (
+ permission.can(ResourcePermissionPamResourceActions.ManagePolicies, ResourcePermissionSub.PamResource) ||
+ permission.can(ResourcePermissionPamResourceActions.ViewAuditLogs, ResourcePermissionSub.PamResource)
+ );
+ } catch {
+ return false;
+ }
+ };
+
const verifyPolicyActors: NonNullable<TPamAccessApprovalResource["verifyPolicyActors"]> = async ({
projectId,
scopeId,
@@ -1014,6 +1032,7 @@ export const pamAccessApprovalResourceFactory = ({
resolveScope,
noMatchingPolicyMessage: "No approval configuration found for this folder",
assertCanManagePolicy,
+ canReadScope,
verifyPolicyActors,
assertCanCreateRequest,
assertCanReview,
diff --git a/backend/src/services/approval-policy/approval-policy-service.ts b/backend/src/services/approval-policy/approval-policy-service.ts
index be9edf7b63..8d23b8729a 100644
--- a/backend/src/services/approval-policy/approval-policy-service.ts
+++ b/backend/src/services/approval-policy/approval-policy-service.ts
@@ -1106,6 +1106,7 @@ export const approvalPolicyServiceFactory = ({
);
const checkLiveApprover = resources[request.type as ApprovalPolicyType]?.isLiveApprover;
+ const checkScopeRead = resources[request.type as ApprovalPolicyType]?.canReadScope;
const isApprover =
isSnapshotApprover &&
(!checkLiveApprover ||
@@ -1134,6 +1135,10 @@ export const approvalPolicyServiceFactory = ({
) {
throw new ForbiddenRequestError({ message: "User has insufficient privileges" });
}
+ } else if (checkScopeRead) {
+ if (!(await checkScopeRead({ projectId: request.projectId, scopeId: request.scopeId ?? null, actor }))) {
+ throw new ForbiddenRequestError({ message: "User has insufficient privileges" });
+ }
} else {
const { permission } = await permissionService.getProjectPermission({
actor: actor.type,
@@ -1516,6 +1521,8 @@ export const approvalPolicyServiceFactory = ({
ProjectPermissionApprovalRequestActions.Read,
ResourcePermissionSub.ApprovalRequests
);
+ } else if (resources[policyType]?.canReadScope) {
+ hasReadPermission = await resources[policyType]!.canReadScope!({ projectId, scopeId: dbScopeId, actor });
} else {
const { permission } = await permissionService.getProjectPermission({
actor: actor.type,
@@ -1643,6 +1650,10 @@ export const approvalPolicyServiceFactory = ({
) {
throw new ForbiddenRequestError({ message: "User has insufficient privileges" });
}
+ } else if (resources[policyType]?.canReadScope) {
+ if (!(await resources[policyType]!.canReadScope!({ projectId, scopeId: dbScopeId, actor }))) {
+ throw new ForbiddenRequestError({ message: "User has insufficient privileges" });
+ }
} else {
const { permission } = await permissionService.getProjectPermission({
actor: actor.type,
@@ -1684,19 +1695,27 @@ export const approvalPolicyServiceFactory = ({
throw new NotFoundError({ message: "Grant not found" });
}
- const { permission } = await permissionService.getProjectPermission({
- actor: actor.type,
- actorAuthMethod: actor.authMethod,
- actorId: actor.id,
- actorOrgId: actor.orgId,
- projectId: grant.projectId,
- actionProjectType: ActionProjectType.Any
- });
+ const checkScopeRead = resources[grant.type as ApprovalPolicyType]?.canReadScope;
+ if (checkScopeRead) {
+ const request = grant.requestId ? await approvalRequestDAL.findById(grant.requestId) : null;
+ if (!(await checkScopeRead({ projectId: grant.projectId, scopeId: request?.scopeId ?? null, actor }))) {
+ throw new ForbiddenRequestError({ message: "User has insufficient privileges" });
+ }
+ } else {
+ const { permission } = await permissionService.getProjectPermission({
+ actor: actor.type,
+ actorAuthMethod: actor.authMethod,
+ actorId: actor.id,
+ actorOrgId: actor.orgId,
+ projectId: grant.projectId,
+ actionProjectType: ActionProjectType.Any
+ });
- ForbiddenError.from(permission).throwUnlessCan(
- ProjectPermissionApprovalRequestGrantActions.Read,
- ProjectPermissionSub.ApprovalRequestGrants
- );
+ ForbiddenError.from(permission).throwUnlessCan(
+ ProjectPermissionApprovalRequestGrantActions.Read,
+ ProjectPermissionSub.ApprovalRequestGrants
+ );
+ }
let { status } = grant;
if (
diff --git a/backend/src/services/approval-policy/approval-policy-types.ts b/backend/src/services/approval-policy/approval-policy-types.ts
index 01f5ae1ba7..9c410e5e09 100644
--- a/backend/src/services/approval-policy/approval-policy-types.ts
+++ b/backend/src/services/approval-policy/approval-policy-types.ts
@@ -235,6 +235,10 @@ export type TApprovalResource<
actor: TApprovalActor;
action: ResourcePermissionApprovalPolicyActions;
}) => Promise<void>;
+
+ // Whether the actor may read a scope's requests and grants, for a type whose read authority is the
+ // scope rather than the project.
+ canReadScope?: (args: { projectId: string; scopeId: string | null; actor: TApprovalActor }) => Promise<boolean>;
verifyPolicyActors?: (args: {
projectId: string;
scopeId: string | null;