Skip to content

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

address greptile comment

Andrey772fab7d8d7b
diff --git a/backend/src/services/approval-policy/approval-policy-service.ts b/backend/src/services/approval-policy/approval-policy-service.ts
index 874b9138fc..0dac74e9a6 100644
--- a/backend/src/services/approval-policy/approval-policy-service.ts
+++ b/backend/src/services/approval-policy/approval-policy-service.ts
@@ -1139,7 +1139,13 @@ export const approvalPolicyServiceFactory = ({
const used = await Promise.all(
claimed.map(async (input) =>
(await approvalRequestDAL.hasApprovedRequestLinkingRecord(
- { policyId, connectionId: input.connectionId, subject: input.subject, stableId: input.stableId },
+ {
+ policyId,
+ connectionId: input.connectionId,
+ subject: input.subject,
+ stableId: input.stableId,
+ recordId: input.id
+ },
tx
))
? input
diff --git a/backend/src/services/approval-policy/approval-request-dal.ts b/backend/src/services/approval-policy/approval-request-dal.ts
index 38713a7a6e..d152af949c 100644
--- a/backend/src/services/approval-policy/approval-request-dal.ts
+++ b/backend/src/services/approval-policy/approval-request-dal.ts
@@ -84,16 +84,23 @@ export const approvalRequestDALFactory = (db: TDbClient) => {
policyId,
connectionId,
subject,
- stableId
- }: { policyId: string; connectionId: string; subject: string; stableId: string },
+ stableId,
+ recordId
+ }: { policyId: string; connectionId: string; subject: string; stableId: string; recordId: string },
tx?: Knex
) => {
try {
const row = await (tx || db.replicaNode())(TableName.ApprovalRequests)
.where({ policyId, status: ApprovalRequestStatus.Approved })
- .whereRaw(`"autoApprovalEvidence" -> 'inputs' @> ?::jsonb`, [
- JSON.stringify([{ connectionId, subject, stableId }])
- ])
+ .where((qb) => {
+ void qb
+ .whereRaw(`"autoApprovalEvidence" -> 'inputs' @> ?::jsonb`, [
+ JSON.stringify([{ connectionId, subject, stableId }])
+ ])
+ .orWhereRaw(`"autoApprovalEvidence" -> 'inputs' @> ?::jsonb`, [
+ JSON.stringify([{ connectionId, subject, id: recordId }])
+ ]);
+ })
.first("id");
return Boolean(row);
} catch (error) {
diff --git a/backend/src/services/approval-policy/auto-approval/auto-approval-service.ts b/backend/src/services/approval-policy/auto-approval/auto-approval-service.ts
index bd6a21f71e..1a1c77c63b 100644
--- a/backend/src/services/approval-policy/auto-approval/auto-approval-service.ts
+++ b/backend/src/services/approval-policy/auto-approval/auto-approval-service.ts
@@ -333,7 +333,12 @@ export const autoApprovalServiceFactory = ({
stored: TStoredAutoApproval;
parsedInputs: TParsedAutoApprovalInput[];
// Whether an earlier approved request on the policy already linked this record
- isRecordUsed: (record: { connectionId: string; subject: string; stableId: string }) => Promise<boolean>;
+ isRecordUsed: (record: {
+ connectionId: string;
+ subject: string;
+ stableId: string;
+ recordId: string;
+ }) => Promise<boolean>;
orgId: string;
projectId: string;
ctx: TAutoApprovalContext;
@@ -436,9 +441,15 @@ export const autoApprovalServiceFactory = ({
const stableId = parsedInput ? (definition.getStableId?.(facts) ?? parsedInput.id) : null;
const previouslyUsed = Boolean(
- stableId &&
+ parsedInput &&
+ stableId &&
target.constraintIds.has(AUTO_APPROVAL_UNUSED_CONSTRAINT) &&
- (await isRecordUsed({ connectionId: target.connectionId, subject: target.subject, stableId }))
+ (await isRecordUsed({
+ connectionId: target.connectionId,
+ subject: target.subject,
+ stableId,
+ recordId: parsedInput.id
+ }))
);
return [
key,