Skip to content

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

fix: remove not necessary for loop on a query

adilsona90b58a5d0c2
diff --git a/backend/src/ee/services/access-approval-policy/access-approval-policy-dal.ts b/backend/src/ee/services/access-approval-policy/access-approval-policy-dal.ts
index daeec2c9a0..80f00b79e8 100644
--- a/backend/src/ee/services/access-approval-policy/access-approval-policy-dal.ts
+++ b/backend/src/ee/services/access-approval-policy/access-approval-policy-dal.ts
@@ -149,7 +149,7 @@ export interface TAccessApprovalPolicyDALFactory
| undefined
>;
findPolicyByEnvIdAndSecretPath: (
- { envIds, secretPath }: { envIds: string[]; secretPath: string },
+ { envIds, secretPath, excludePolicyId }: { envIds: string[]; secretPath: string; excludePolicyId?: string },
tx?: Knex
) => Promise<{
name: string;
@@ -605,7 +605,7 @@ export const accessApprovalPolicyDALFactory = (db: TDbClient): TAccessApprovalPo
};
const findPolicyByEnvIdAndSecretPath: TAccessApprovalPolicyDALFactory["findPolicyByEnvIdAndSecretPath"] = async (
- { envIds, secretPath },
+ { envIds, secretPath, excludePolicyId },
tx
) => {
try {
@@ -641,6 +641,9 @@ export const accessApprovalPolicyDALFactory = (db: TDbClient): TAccessApprovalPo
)
)
.whereNull(`${TableName.AccessApprovalPolicy}.deletedAt`)
+ .where((qb) => {
+ if (excludePolicyId) void qb.whereNot(`${TableName.AccessApprovalPolicy}.id`, excludePolicyId);
+ })
.orderBy("deletedAt", "desc")
.orderByRaw(`"deletedAt" IS NULL`)
.select(selectAllTableCols(TableName.AccessApprovalPolicy))
diff --git a/backend/src/ee/services/access-approval-policy/access-approval-policy-service.ts b/backend/src/ee/services/access-approval-policy/access-approval-policy-service.ts
index 31c0747b8a..5c0ad82f24 100644
--- a/backend/src/ee/services/access-approval-policy/access-approval-policy-service.ts
+++ b/backend/src/ee/services/access-approval-policy/access-approval-policy-service.ts
@@ -110,18 +110,11 @@ export const accessApprovalPolicyServiceFactory = ({
throw new BadRequestError({ message: "Must provide either envId or envIds" });
}
- for (const id of resolvedEnvIds) {
- if (
- // eslint-disable-next-line no-await-in-loop
- await secretAccessApprovalPolicyExists(
- { envId: id, secretPath, excludePolicyId: policyId },
- { accessApprovalPolicyDAL, approvalPolicySecretEnvironmentDAL }
- )
- ) {
- return true;
- }
- }
- return false;
+ const conflictingEnvId = await secretAccessApprovalPolicyExists(
+ { envIds: resolvedEnvIds, secretPath, excludePolicyId: policyId },
+ { accessApprovalPolicyDAL, approvalPolicySecretEnvironmentDAL }
+ );
+ return Boolean(conflictingEnvId);
};
const { verifyProjectSubjectsMembership } = approvalPolicyMembershipVerifierFactory({ projectDAL });
diff --git a/backend/src/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-fns.ts b/backend/src/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-fns.ts
index 8f3570f701..ccb04d020c 100644
--- a/backend/src/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-fns.ts
+++ b/backend/src/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-fns.ts
@@ -17,25 +17,25 @@ type TSecretAccessApprovalPolicyExistsDep = {
};
export const secretAccessApprovalPolicyExists = async (
- { envId, secretPath, excludePolicyId }: { envId: string; secretPath: string; excludePolicyId?: string },
+ { envIds, secretPath, excludePolicyId }: { envIds: string[]; secretPath: string; excludePolicyId?: string },
{ accessApprovalPolicyDAL, approvalPolicySecretEnvironmentDAL }: TSecretAccessApprovalPolicyExistsDep,
tx?: Knex
) => {
const legacyPolicy = await accessApprovalPolicyDAL.findPolicyByEnvIdAndSecretPath(
- { envIds: [envId], secretPath },
+ { envIds, secretPath, excludePolicyId },
tx
);
- if (legacyPolicy && legacyPolicy.id !== excludePolicyId) return true;
+ if (legacyPolicy) return legacyPolicy.environments[0]?.id ?? envIds[0];
const policy = await approvalPolicySecretEnvironmentDAL.findPolicyByEnvIdsAndSecretPath(
{
- envIds: [envId],
+ envIds,
secretPath,
excludePolicyId
},
tx
);
- return Boolean(policy);
+ return policy?.envId;
};
// Legacy stores null on approver rows for a step with no approvalsRequired entry and reviews it as 1,
diff --git a/backend/src/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-service.ts b/backend/src/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-service.ts
index 90420cf8df..4d9c74cc62 100644
--- a/backend/src/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-service.ts
+++ b/backend/src/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-service.ts
@@ -302,20 +302,21 @@ export const secretAccessApprovalPolicyBridgeServiceFactory = ({
}: { envs: { id: string; slug: string }[]; secretPath: string; excludePolicyId?: string },
tx?: Knex
) => {
- for (const env of envs) {
- if (
- // eslint-disable-next-line no-await-in-loop
- await secretAccessApprovalPolicyExists(
- { envId: env.id, secretPath, excludePolicyId },
- { accessApprovalPolicyDAL, approvalPolicySecretEnvironmentDAL },
- tx
- )
- ) {
- throw new BadRequestError({
- message: `A policy for secret path '${secretPath}' already exists in environment '${env.slug}'`
- });
- }
- }
+ if (!envs.length) return;
+
+ const conflictingEnvId = await secretAccessApprovalPolicyExists(
+ { envIds: envs.map((env) => env.id), secretPath, excludePolicyId },
+ { accessApprovalPolicyDAL, approvalPolicySecretEnvironmentDAL },
+ tx
+ );
+ if (!conflictingEnvId) return;
+
+ const env = envs.find((candidate) => candidate.id === conflictingEnvId);
+ throw new BadRequestError({
+ message: env
+ ? `A policy for secret path '${secretPath}' already exists in environment '${env.slug}'`
+ : `A policy for secret path '${secretPath}' already exists`
+ });
};
const createAccessApprovalPolicy = async ({