Skip to content

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

fix: fail request if it tries to approve an access request that is managed by an external system

adilson3801513dac17
diff --git a/backend/src/db/migrations/20261015145100_external-approvals.ts b/backend/src/db/migrations/20261015145100_external-approvals.ts
index c37e1329c8..d95ce0095e 100644
--- a/backend/src/db/migrations/20261015145100_external-approvals.ts
+++ b/backend/src/db/migrations/20261015145100_external-approvals.ts
@@ -31,7 +31,7 @@ export async function up(knex: Knex): Promise<void> {
t.string("status", 50).notNullable();
t.binary("encryptedCallbackToken").nullable();
t.text("statusReason").nullable();
- t.string("providerRequestId").nullable();
+ t.string("providerRequestId").nullable().index();
t.timestamps(true, true, true);
});
diff --git a/backend/src/services/secret-access-approval-global-request-bridge/secret-access-approval-global-request-bridge-constants.ts b/backend/src/services/secret-access-approval-global-request-bridge/secret-access-approval-global-request-bridge-constants.ts
new file mode 100644
index 0000000000..5705de1db7
--- /dev/null
+++ b/backend/src/services/secret-access-approval-global-request-bridge/secret-access-approval-global-request-bridge-constants.ts
@@ -0,0 +1,2 @@
+export const externallyReviewedAccessRequestMessage = (requestId: string) =>
+ `Access request with ID '${requestId}' is reviewed in an external approval system and cannot be approved or rejected in Infisical. Cancel it, or wait for that system to decide.`;
diff --git a/backend/src/services/secret-access-approval-global-request-bridge/secret-access-approval-global-request-bridge-service.test.ts b/backend/src/services/secret-access-approval-global-request-bridge/secret-access-approval-global-request-bridge-service.test.ts
index 5ce6f93a6d..7624ce45a8 100644
--- a/backend/src/services/secret-access-approval-global-request-bridge/secret-access-approval-global-request-bridge-service.test.ts
+++ b/backend/src/services/secret-access-approval-global-request-bridge/secret-access-approval-global-request-bridge-service.test.ts
@@ -7,6 +7,7 @@ import { ApprovalRequestStatus } from "@app/services/approval-policy/approval-po
import { ActorType, AuthMethod } from "@app/services/auth/auth-type";
import { DelegatedApprovalRequestStatus } from "@app/services/delegated-approval/delegated-approval-enums";
+import { externallyReviewedAccessRequestMessage } from "./secret-access-approval-global-request-bridge-constants";
import { secretAccessApprovalGlobalRequestBridgeServiceFactory } from "./secret-access-approval-global-request-bridge-service";
const pendingRequest = {
@@ -125,3 +126,33 @@ describe("secretAccessApprovalGlobalRequestBridge.cancelAccessApprovalRequest",
expect(updateById).not.toHaveBeenCalled();
});
});
+
+describe("secretAccessApprovalGlobalRequestBridge.reviewAccessApprovalRequest", () => {
+ const reviewAs = (service: ReturnType<typeof createService>["service"], status: ApprovalStatus) =>
+ service.reviewAccessApprovalRequest({
+ requestId: "req-1",
+ status,
+ actor: ActorType.USER,
+ actorId: "reviewer",
+ actorOrgId: "org-1",
+ actorAuthMethod: AuthMethod.EMAIL
+ });
+
+ test("refuses to approve a request reviewed in an external approval system", async () => {
+ const { service, updateById } = createService();
+
+ await expect(reviewAs(service, ApprovalStatus.APPROVED)).rejects.toThrow(
+ externallyReviewedAccessRequestMessage("req-1")
+ );
+ expect(updateById).not.toHaveBeenCalled();
+ });
+
+ test("refuses to reject a request reviewed in an external approval system", async () => {
+ const { service, updateById } = createService();
+
+ await expect(reviewAs(service, ApprovalStatus.REJECTED)).rejects.toThrow(
+ externallyReviewedAccessRequestMessage("req-1")
+ );
+ expect(updateById).not.toHaveBeenCalled();
+ });
+});
diff --git a/backend/src/services/secret-access-approval-global-request-bridge/secret-access-approval-global-request-bridge-service.ts b/backend/src/services/secret-access-approval-global-request-bridge/secret-access-approval-global-request-bridge-service.ts
index a3891c9fcf..f351676919 100644
--- a/backend/src/services/secret-access-approval-global-request-bridge/secret-access-approval-global-request-bridge-service.ts
+++ b/backend/src/services/secret-access-approval-global-request-bridge/secret-access-approval-global-request-bridge-service.ts
@@ -37,6 +37,7 @@ import { TSecretAccessRequestData } from "@app/services/approval-policy/secret-a
import { ActorType } from "@app/services/auth/auth-type";
import { AccessRequestWebhookAction, WebhookEvents } from "@app/services/webhook/webhook-types";
+import { externallyReviewedAccessRequestMessage } from "./secret-access-approval-global-request-bridge-constants";
import {
collectSecretAccessPolicyGroupIds,
collectSecretAccessRequestUserIds,
@@ -407,6 +408,10 @@ export const secretAccessApprovalGlobalRequestBridgeServiceFactory = ({
actorAuthMethod
}: TReviewSecretAccessApprovalGlobalRequestDTO) => {
const request = await $findRequestById(requestId);
+ const delegatedRequest = await delegatedApprovalService.getRequestByRequestId(request.id);
+ if (delegatedRequest) {
+ throw new BadRequestError({ message: externallyReviewedAccessRequestMessage(requestId) });
+ }
if (!request.policyId) {
throw new BadRequestError({ message: "The policy associated with this access request has been deleted." });
}