Infisical is the open-source platform for securing secrets, certificates, access, and AI Agents.
TypeScript acmeagentsai-agentscertificate-managementdevsecopsenvironment-variableskubernetesopen-sourcepampkipostgresprivate-caprivileged-access-managementsecret-managementsecret-managersecretssecrets-managementsecuritysecurity-toolsvault
address ai comments
adilsond29b9651b6c9
diff --git a/CLAUDE.md b/CLAUDE.mdindex 3489d0c78f..b7a431abeb 100644--- a/CLAUDE.md+++ b/CLAUDE.md@@ -166,7 +166,10 @@ to `pending_dispatch`. A user resends a `failed_dispatch` request with`POST /api/v1/access-approvals/requests/:requestId/retry-delegated-dispatch`. The product's bridge checks who mayretry, and `delegatedApprovalService.retryDispatch` checks the request can be retried and only re-enqueues thefixed-id dispatch job: the worker stays the only writer of the status, so a retry cannot run beside an attempt-BullMQ already has scheduled, and a retry that loses that race leaves the row retryable. Every provider implements `TDelegatedApprovalProvider` against the same+BullMQ already has scheduled, and a retry that loses that race leaves the row retryable. A delegated request has+no Infisical approvers, so `POST /api/v1/access-approvals/requests/:requestId/cancel` is the only way to close+one from Infisical: the requester, or anyone who can edit the policy, sets it `cancelled`, which is also how a+policy blocked by pending requests is freed for editing. Every provider implements `TDelegatedApprovalProvider` against the same`TDelegatedApprovalDispatchInput` and registers in `DELEGATED_APPROVAL_PROVIDER_MAP`(`dispatch/providers/<name>/`); a new policy type adds an arm to `TDelegatedApprovalDispatchDetails` and abuilder in `DELEGATED_APPROVAL_DISPATCH_DETAILS_BUILDER_MAP` rather than branching in a provider. The workerdiff --git a/backend/src/ee/routes/v1/access-approval-policy-router.ts b/backend/src/ee/routes/v1/access-approval-policy-router.tsindex 0c5553ec2d..da46a7f3b1 100644--- a/backend/src/ee/routes/v1/access-approval-policy-router.ts+++ b/backend/src/ee/routes/v1/access-approval-policy-router.ts@@ -139,7 +139,10 @@ export const registerAccessApprovalPolicyRouter = async (server: FastifyZodProvi.optional(),approvals: z.number().min(1).default(1),enforcementLevel: z.nativeEnum(EnforcementLevel).default(EnforcementLevel.Hard),- allowedSelfApprovals: z.boolean().default(true),+ allowedSelfApprovals: z+ .boolean()+ .optional()+ .describe("Defaults to true, or to false when delegatedApproval is set."),maxTimePeriod: maxTimePeriodSchema,requestExpirationTime: requestExpirationTimeSchema,delegatedApproval: DelegatedApprovalSchema.optional().describe(@@ -330,7 +333,10 @@ export const registerAccessApprovalPolicyRouter = async (server: FastifyZodProvi.optional(),approvals: z.number().min(1).optional(),enforcementLevel: z.nativeEnum(EnforcementLevel).default(EnforcementLevel.Hard),- allowedSelfApprovals: z.boolean().default(true),+ allowedSelfApprovals: z+ .boolean()+ .optional()+ .describe("Defaults to true, or to false when the policy is handled by a delegated approval system."),environments: z.array(z.string()).optional(),approvalsRequired: z.object({diff --git a/backend/src/ee/routes/v1/access-approval-request-router.ts b/backend/src/ee/routes/v1/access-approval-request-router.tsindex 53cb012afe..213323c2c0 100644--- a/backend/src/ee/routes/v1/access-approval-request-router.ts+++ b/backend/src/ee/routes/v1/access-approval-request-router.ts@@ -380,6 +380,53 @@ export const registerAccessApprovalRequestRouter = async (server: FastifyZodProv}});+ server.route({+ url: "/:requestId/cancel",+ method: "POST",+ config: {+ rateLimit: writeLimit+ },+ schema: {+ operationId: "cancelAccessApprovalRequest",+ description:+ "Cancel a pending access request that an external approval system is reviewing. The requester can cancel their own request, and users who can edit the project's approval policies can cancel any of them.",+ params: z.object({+ requestId: z.string().uuid()+ }),+ response: {+ 200: z.object({+ request: AccessApprovalRequestsSchema+ })+ }+ },+ onRequest: verifyAuth([AuthMode.JWT]),+ handler: async (req) => {+ const result = await server.services.accessApprovalRequest.cancelAccessRequest({+ requestId: req.params.requestId,+ actor: req.permission.type,+ actorId: req.permission.id,+ actorOrgId: req.permission.orgId,+ actorAuthMethod: req.permission.authMethod+ });++ await server.services.auditLog.createAuditLog({+ ...req.auditLogInfo,+ orgId: req.permission.orgId,+ projectId: result.projectId,+ event: {+ type: EventType.ACCESS_APPROVAL_REQUEST_CANCEL,+ metadata: {+ requestId: result.request.id,+ requestedByUserId: result.request.requestedByUserId,+ policyId: result.request.policyId+ }+ }+ });++ return { request: result.request };+ }+ });+server.route({url: "/:requestId",method: "PATCH",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.tsindex d548c64dbf..0edf4160c2 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@@ -265,7 +265,7 @@ export const accessApprovalPolicyServiceFactory = ({secretPath,name,enforcementLevel,- allowedSelfApprovals,+ allowedSelfApprovals: allowedSelfApprovals ?? true,maxTimePeriod,requestExpirationTime},@@ -541,7 +541,7 @@ export const accessApprovalPolicyServiceFactory = ({secretPath,name,enforcementLevel,- allowedSelfApprovals,+ allowedSelfApprovals: allowedSelfApprovals ?? true,maxTimePeriod,requestExpirationTime},diff --git a/backend/src/ee/services/access-approval-policy/access-approval-policy-types.ts b/backend/src/ee/services/access-approval-policy/access-approval-policy-types.tsindex 3daf186484..b15fff6ee3 100644--- a/backend/src/ee/services/access-approval-policy/access-approval-policy-types.ts+++ b/backend/src/ee/services/access-approval-policy/access-approval-policy-types.ts@@ -42,7 +42,7 @@ export type TCreateAccessApprovalPolicy = {projectSlug: string;name: string;enforcementLevel: EnforcementLevel;- allowedSelfApprovals: boolean;+ allowedSelfApprovals?: boolean;approvalsRequired?: { numberOfApprovals: number; stepNumber: number }[];maxTimePeriod?: string | null;requestExpirationTime?: string | null;@@ -64,7 +64,7 @@ export type TUpdateAccessApprovalPolicy = {secretPath?: string;name?: string;enforcementLevel?: EnforcementLevel;- allowedSelfApprovals: boolean;+ allowedSelfApprovals?: boolean;approvalsRequired?: { numberOfApprovals: number; stepNumber: number }[];environments?: string[];maxTimePeriod?: string | null;diff --git a/backend/src/ee/services/access-approval-request/access-approval-request-service.ts b/backend/src/ee/services/access-approval-request/access-approval-request-service.tsindex 422acec93d..44e7b5e839 100644--- a/backend/src/ee/services/access-approval-request/access-approval-request-service.ts+++ b/backend/src/ee/services/access-approval-request/access-approval-request-service.ts@@ -86,6 +86,7 @@ type TSecretApprovalRequestServiceFactoryDep = {| "reviewAccessApprovalRequest"| "revokeAccessApprovalRequest"| "retryDelegatedApprovalDispatch"+ | "cancelAccessApprovalRequest">;accessApprovalRequestReviewerDAL: Pick<TAccessApprovalRequestReviewerDALFactory,@@ -1183,6 +1184,28 @@ export const accessApprovalRequestServiceFactory = ({});};+ const cancelAccessRequest: TAccessApprovalRequestServiceFactory["cancelAccessRequest"] = async ({+ requestId,+ actor,+ actorId,+ actorOrgId,+ actorAuthMethod+ }) => {+ if (await secretAccessApprovalGlobalRequestBridge.isGlobalAccessApprovalRequest(requestId)) {+ return secretAccessApprovalGlobalRequestBridge.cancelAccessApprovalRequest({+ requestId,+ actor,+ actorId,+ actorOrgId,+ actorAuthMethod+ });+ }++ throw new BadRequestError({+ message: `Access request with ID '${requestId}' is not reviewed in an external approval system. Reject it instead.`+ });+ };+const revokeAccessRequest: TAccessApprovalRequestServiceFactory["revokeAccessRequest"] = async ({requestId,actor,@@ -1348,6 +1371,7 @@ export const accessApprovalRequestServiceFactory = ({reviewAccessRequest,revokeAccessRequest,retryDelegatedApprovalDispatch,+ cancelAccessRequest,getCount};};diff --git a/backend/src/ee/services/access-approval-request/access-approval-request-types.ts b/backend/src/ee/services/access-approval-request/access-approval-request-types.tsindex fa6563d9a2..a3a5a3f34f 100644--- a/backend/src/ee/services/access-approval-request/access-approval-request-types.ts+++ b/backend/src/ee/services/access-approval-request/access-approval-request-types.ts@@ -43,6 +43,10 @@ export type TRetryDelegatedApprovalDispatchDTO = {requestId: string;} & Omit<TProjectPermission, "projectId">;+export type TCancelAccessRequestDTO = {+ requestId: string;+} & Omit<TProjectPermission, "projectId">;+export type TUpdateAccessApprovalRequestDTO = {requestId: string;temporaryRange: string;@@ -240,6 +244,23 @@ export interface TAccessApprovalRequestServiceFactory {projectId: string;delegatedApprovalType: DelegatedApprovalPolicyType;}>;+ cancelAccessRequest: (arg: TCancelAccessRequestDTO) => Promise<{+ request: {+ status: string;+ id: string;+ createdAt: Date;+ updatedAt: Date;+ policyId: string;+ isTemporary: boolean;+ requestedByUserId: string;+ privilegeId?: string | null | undefined;+ temporaryRange?: string | null | undefined;+ permissions?: unknown;+ note?: string | null | undefined;+ expiresAt?: Date | null | undefined;+ };+ projectId: string;+ }>;revokeAccessRequest: (arg: TRevokeAccessRequestDTO) => Promise<{request: {status: string;diff --git a/backend/src/ee/services/audit-log/audit-log-types.ts b/backend/src/ee/services/audit-log/audit-log-types.tsindex 2bf15fbf3a..1398af608e 100644--- a/backend/src/ee/services/audit-log/audit-log-types.ts+++ b/backend/src/ee/services/audit-log/audit-log-types.ts@@ -852,6 +852,7 @@ export enum EventType {ACCESS_APPROVAL_REQUEST_REVIEW = "access-approval-request-review",ACCESS_APPROVAL_REQUEST_REVOKE = "access-approval-request-revoke",ACCESS_APPROVAL_REQUEST_DELEGATED_DISPATCH_RETRY = "access-approval-request-delegated-dispatch-retry",+ ACCESS_APPROVAL_REQUEST_CANCEL = "access-approval-request-cancel",ACCESS_APPROVAL_REQUEST_UPDATE = "access-approval-request-update",VIEW_AUDIT_LOGS = "view-audit-logs",@@ -7147,6 +7148,15 @@ interface AccessApprovalRequestDelegatedDispatchRetryEvent {};}+interface AccessApprovalRequestCancelEvent {+ type: EventType.ACCESS_APPROVAL_REQUEST_CANCEL;+ metadata: {+ requestId: string;+ requestedByUserId: string;+ policyId: string;+ };+}+interface AccessApprovalRequestUpdateEvent {type: EventType.ACCESS_APPROVAL_REQUEST_UPDATE;metadata: {@@ -8629,6 +8639,7 @@ export type Event =| AccessApprovalRequestReviewEvent| AccessApprovalRequestRevokeEvent| AccessApprovalRequestDelegatedDispatchRetryEvent+ | AccessApprovalRequestCancelEvent| AccessApprovalRequestUpdateEvent| CreateAcmeAccountEvent| RetrieveAcmeAccountEventdiff --git a/backend/src/services/delegated-approval/dispatch/providers/servicenow/servicenow-fns.ts b/backend/src/services/delegated-approval/dispatch/providers/servicenow/servicenow-fns.tsindex 17635e12dc..90a74551cc 100644--- a/backend/src/services/delegated-approval/dispatch/providers/servicenow/servicenow-fns.ts+++ b/backend/src/services/delegated-approval/dispatch/providers/servicenow/servicenow-fns.ts@@ -67,7 +67,7 @@ export const buildServiceNowAccessRequestPayload = (): TServiceNowAccessRequestPayload => {const parsed = ServiceNowAccessRequestPayloadSchema.safeParse({request_id: input.approvalRequestId,- callback_url: `https://columbus-stretchable-omega.ngrok-free.dev`,+ callback_url: input.callback.url,callback_token: input.callback.token,product_type: input.productType,...(input.project ? { project_id: input.project.id, project_name: input.project.name } : {}),diff --git a/backend/src/services/secret-access-approval-global-policy-bridge/secret-access-approval-global-policy-bridge-service.ts b/backend/src/services/secret-access-approval-global-policy-bridge/secret-access-approval-global-policy-bridge-service.tsindex dfe3ce9ac2..243e63176b 100644--- a/backend/src/services/secret-access-approval-global-policy-bridge/secret-access-approval-global-policy-bridge-service.ts+++ b/backend/src/services/secret-access-approval-global-policy-bridge/secret-access-approval-global-policy-bridge-service.ts@@ -437,7 +437,7 @@ export const secretAccessApprovalGlobalPolicyBridgeServiceFactory = ({environment,environments,enforcementLevel,- allowedSelfApprovals,+ allowedSelfApprovals: allowedSelfApprovalsInput,approvalsRequired,maxTimePeriod,requestExpirationTime,@@ -459,6 +459,8 @@ export const secretAccessApprovalGlobalPolicyBridgeServiceFactory = ({ProjectPermissionSub.SecretApproval);+ const allowedSelfApprovals = allowedSelfApprovalsInput ?? !delegatedApproval;+const mergedEnvs = (environment ? [environment] : environments) || [];if (mergedEnvs.length === 0) {throw new BadRequestError({ message: "Must provide either environment or environments" });@@ -558,7 +560,7 @@ export const secretAccessApprovalGlobalPolicyBridgeServiceFactory = ({actorAuthMethod,approvals,enforcementLevel,- allowedSelfApprovals,+ allowedSelfApprovals: allowedSelfApprovalsInput,approvalsRequired,environments,maxTimePeriod,@@ -601,6 +603,7 @@ export const secretAccessApprovalGlobalPolicyBridgeServiceFactory = ({const delegatedApprovalAfterUpdate =delegatedApproval === undefined ? existingDelegatedApproval : delegatedApproval;const involvesDelegatedApproval = Boolean(existingDelegatedApproval || delegatedApprovalAfterUpdate);+ const allowedSelfApprovals = allowedSelfApprovalsInput ?? !delegatedApprovalAfterUpdate;const reviewers = await $resolveReviewers({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.tsnew file mode 100644index 0000000000..5ce6f93a6d--- /dev/null+++ b/backend/src/services/secret-access-approval-global-request-bridge/secret-access-approval-global-request-bridge-service.test.ts@@ -0,0 +1,127 @@+import { createMongoAbility, ForbiddenError } from "@casl/ability";+import { describe, expect, test, vi } from "vitest";++import { ApprovalStatus } from "@app/ee/services/access-approval-request/access-approval-request-types";+import { ProjectPermissionActions, ProjectPermissionSub } from "@app/ee/services/permission/project-permission";+import { ApprovalRequestStatus } from "@app/services/approval-policy/approval-policy-enums";+import { ActorType, AuthMethod } from "@app/services/auth/auth-type";+import { DelegatedApprovalRequestStatus } from "@app/services/delegated-approval/delegated-approval-enums";++import { secretAccessApprovalGlobalRequestBridgeServiceFactory } from "./secret-access-approval-global-request-bridge-service";++const pendingRequest = {+ id: "req-1",+ policyId: "policy-1",+ requesterId: "requester",+ organizationId: "org-1",+ projectId: "project-1",+ requestData: {+ version: 1,+ requestData: {+ permissions: [["read", "secrets", { environment: "dev", secretPath: { $glob: "/app" } }]],+ isTemporary: false,+ temporaryRange: null+ }+ },+ justification: null,+ status: ApprovalRequestStatus.Pending,+ expiresAt: null,+ grant: null,+ privilegeId: null,+ createdAt: new Date("2026-01-01T00:00:00.000Z"),+ updatedAt: new Date("2026-01-01T00:00:00.000Z")+};++const delegatedRequest = {+ id: "delegated-1",+ requestId: "req-1",+ status: DelegatedApprovalRequestStatus.WaitingApproval+};++const canEditPolicies = createMongoAbility([+ { action: ProjectPermissionActions.Edit, subject: ProjectPermissionSub.SecretApproval }+]);+const cannotEditPolicies = createMongoAbility([+ { action: ProjectPermissionActions.Read, subject: ProjectPermissionSub.SecretApproval }+]);++const createService = ({+ lockedRequest = pendingRequest as unknown,+ delegated = delegatedRequest as unknown,+ permission = cannotEditPolicies+} = {}) => {+ let current = { ...pendingRequest };+ const updateById = vi.fn().mockImplementation(async (_id: string, patch: Partial<typeof pendingRequest>) => {+ current = { ...current, ...patch };+ return current;+ });++ const service = secretAccessApprovalGlobalRequestBridgeServiceFactory({+ secretAccessApprovalGlobalRequestBridgeDAL: {+ findSecretAccessRequestById: vi.fn().mockImplementation(async () => current)+ },+ permissionService: { getProjectPermission: vi.fn().mockResolvedValue({ permission }) },+ delegatedApprovalService: { getRequestByRequestId: vi.fn().mockResolvedValue(delegated) },+ approvalRequestDAL: {+ transaction: vi.fn().mockImplementation(async (cb: (tx: string) => unknown) => cb("tx")),+ findByIdForUpdate: vi.fn().mockResolvedValue(lockedRequest),+ updateById+ }+ } as never);++ return { service, updateById };+};++const cancelAs = (service: ReturnType<typeof createService>["service"], actorId: string) =>+ service.cancelAccessApprovalRequest({+ requestId: "req-1",+ actor: ActorType.USER,+ actorId,+ actorOrgId: "org-1",+ actorAuthMethod: AuthMethod.EMAIL+ });++describe("secretAccessApprovalGlobalRequestBridge.cancelAccessApprovalRequest", () => {+ test("lets the requester cancel their own pending delegated request", async () => {+ const { service, updateById } = createService();++ const result = await cancelAs(service, "requester");++ expect(updateById).toHaveBeenCalledWith("req-1", { status: ApprovalRequestStatus.Cancelled }, "tx");+ expect(result.projectId).toBe("project-1");+ expect(result.request).toMatchObject({ id: "req-1", policyId: "policy-1", status: ApprovalStatus.REJECTED });+ });++ test("lets a user who can edit approval policies cancel someone else's request", async () => {+ const { service, updateById } = createService({ permission: canEditPolicies });++ await cancelAs(service, "policy-admin");++ expect(updateById).toHaveBeenCalledWith("req-1", { status: ApprovalRequestStatus.Cancelled }, "tx");+ });++ test("refuses someone else's request when the actor cannot edit approval policies", async () => {+ const { service, updateById } = createService();++ await expect(cancelAs(service, "bystander")).rejects.toBeInstanceOf(ForbiddenError);+ expect(updateById).not.toHaveBeenCalled();+ });++ test("refuses a request that is not reviewed in an external approval system", async () => {+ const { service, updateById } = createService({ delegated: null });++ await expect(cancelAs(service, "requester")).rejects.toThrow(+ "Access request with ID 'req-1' is not reviewed in an external approval system. Reject it instead."+ );+ expect(updateById).not.toHaveBeenCalled();+ });++ test("refuses a request that was closed before the lock was taken", async () => {+ const { service, updateById } = createService({+ lockedRequest: { ...pendingRequest, status: ApprovalRequestStatus.Approved }+ });++ await expect(cancelAs(service, "requester")).rejects.toThrow("Only pending requests can be cancelled");+ 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.tsindex ac9d26783c..18dba57ed6 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@@ -6,6 +6,7 @@ import { verifyRequestedPermissions } from "@app/ee/services/access-approval-reqimport { ApprovalStatus } from "@app/ee/services/access-approval-request/access-approval-request-types";import { flattenActiveRolesFromMemberships } from "@app/ee/services/permission/permission-service";import {+ ProjectPermissionActions,ProjectPermissionApprovalRequestActions,ProjectPermissionMemberActions,ProjectPermissionSub@@ -48,6 +49,7 @@ import {toSecretAccessRequestListItem} from "./secret-access-approval-global-request-bridge-fns";import {+ TCancelSecretAccessApprovalGlobalRequestDTO,TCountSecretAccessApprovalGlobalRequestsDTO,TCreateSecretAccessApprovalGlobalRequestDTO,TListSecretAccessApprovalGlobalRequestsDTO,@@ -869,6 +871,55 @@ export const secretAccessApprovalGlobalRequestBridgeServiceFactory = ({};};+ const cancelAccessApprovalRequest = async ({+ requestId,+ actor,+ actorId,+ actorOrgId,+ actorAuthMethod+ }: TCancelSecretAccessApprovalGlobalRequestDTO) => {+ const request = await $findRequestById(requestId);++ const { permission } = await permissionService.getProjectPermission({+ actor,+ actorId,+ projectId: request.projectId,+ actorAuthMethod,+ actorOrgId,+ actionProjectType: ActionProjectType.SecretManager+ });++ if (request.requesterId !== actorId) {+ ForbiddenError.from(permission).throwUnlessCan(+ ProjectPermissionActions.Edit,+ ProjectPermissionSub.SecretApproval+ );+ }++ const delegatedRequest = await delegatedApprovalService.getRequestByRequestId(request.id);+ if (!delegatedRequest) {+ throw new BadRequestError({+ message: `Access request with ID '${requestId}' is not reviewed in an external approval system. Reject it instead.`+ });+ }++ const policyId = await approvalRequestDAL.transaction(async (tx) => {+ const locked = await approvalRequestDAL.findByIdForUpdate(requestId, tx);+ if (!locked || locked.status !== ApprovalRequestStatus.Pending || !locked.policyId) {+ throw new BadRequestError({ message: "Only pending requests can be cancelled" });+ }+ await approvalRequestDAL.updateById(requestId, { status: ApprovalRequestStatus.Cancelled }, tx);+ return locked.policyId;+ });++ const cancelled = await $findRequestByIdFromPrimary(requestId);++ return {+ request: { ...toLegacyAccessApprovalRequest(cancelled), policyId },+ projectId: request.projectId+ };+ };+return {isGlobalAccessApprovalRequest,listAccessApprovalRequests,@@ -876,6 +927,7 @@ export const secretAccessApprovalGlobalRequestBridgeServiceFactory = ({createAccessApprovalRequest,reviewAccessApprovalRequest,revokeAccessApprovalRequest,- retryDelegatedApprovalDispatch+ retryDelegatedApprovalDispatch,+ cancelAccessApprovalRequest};};diff --git a/backend/src/services/secret-access-approval-global-request-bridge/secret-access-approval-global-request-bridge-types.ts b/backend/src/services/secret-access-approval-global-request-bridge/secret-access-approval-global-request-bridge-types.tsindex f104604e77..1d80eea497 100644--- a/backend/src/services/secret-access-approval-global-request-bridge/secret-access-approval-global-request-bridge-types.ts+++ b/backend/src/services/secret-access-approval-global-request-bridge/secret-access-approval-global-request-bridge-types.ts@@ -1,4 +1,5 @@import {+ TCancelAccessRequestDTO,TRetryDelegatedApprovalDispatchDTO,TReviewAccessRequestDTO,TRevokeAccessRequestDTO@@ -64,7 +65,7 @@ export type TSecretAccessApprovalGlobalRequestBridgeServiceFactoryDep = {>;delegatedApprovalService: Pick<TDelegatedApprovalServiceFactory,- "getPolicyByPolicyId" | "createRequest" | "getRequestsByRequestIds" | "retryDispatch"+ "getPolicyByPolicyId" | "createRequest" | "getRequestByRequestId" | "getRequestsByRequestIds" | "retryDispatch">;delegatedApprovalDispatchQueue: Pick<TDelegatedApprovalDispatchQueueFactory, "queueDispatch">;smtpService: Pick<TSmtpService, "sendMail">;@@ -105,3 +106,4 @@ export type TReviewSecretAccessApprovalGlobalRequestDTO = TReviewAccessRequestDTexport type TRevokeSecretAccessApprovalGlobalRequestDTO = TRevokeAccessRequestDTO;export type TRetrySecretAccessApprovalGlobalRequestDispatchDTO = TRetryDelegatedApprovalDispatchDTO;+export type TCancelSecretAccessApprovalGlobalRequestDTO = TCancelAccessRequestDTO;diff --git a/docs/documentation/platform/audit-logs.mdx b/docs/documentation/platform/audit-logs.mdxindex f0da0b2c22..a515844a83 100644--- a/docs/documentation/platform/audit-logs.mdx+++ b/docs/documentation/platform/audit-logs.mdx@@ -1022,6 +1022,7 @@ Infisical emits hundreds of event types. Here are some of the most common ones y| `approval-request-create`, `approval-request-approve`, `approval-request-reject`, `approval-request-cancel` | The lifecycle of an approval request. || `access-approval-request-create`, `access-approval-request-review`, `access-approval-request-update`, `access-approval-request-revoke` | The lifecycle of an access approval request. || `access-approval-request-delegated-dispatch-retry` | A user retried an access approval request that never reached its external approval system, such as [ServiceNow](/documentation/platform/workflow-integrations/servicenow-integration). |+ | `access-approval-request-cancel` | A user cancelled a pending access approval request that its external approval system was reviewing. || `secret-approval-request`, `secret-approval-request-review`, `secret-approval-merged`, `secret-approval-closed`, `secret-approval-reopened` | The lifecycle of a secret change request. || `approval-policy-create`, `approval-policy-update`, `approval-policy-delete` | An admin changed an approval policy. |</Accordion>diff --git a/frontend/src/hooks/api/accessApproval/index.tsx b/frontend/src/hooks/api/accessApproval/index.tsxindex c769de160d..58a5047302 100644--- a/frontend/src/hooks/api/accessApproval/index.tsx+++ b/frontend/src/hooks/api/accessApproval/index.tsx@@ -1,4 +1,5 @@export {+ useCancelAccessRequest,useCreateAccessApprovalPolicy,useCreateAccessRequest,useDeleteAccessApprovalPolicy,diff --git a/frontend/src/hooks/api/accessApproval/mutation.tsx b/frontend/src/hooks/api/accessApproval/mutation.tsxindex 02c297ba66..ad872a6c67 100644--- a/frontend/src/hooks/api/accessApproval/mutation.tsx+++ b/frontend/src/hooks/api/accessApproval/mutation.tsx@@ -217,6 +217,33 @@ export const useRetryDelegatedApprovalDispatch = () => {});};+export const useCancelAccessRequest = () => {+ const queryClient = useQueryClient();+ return useMutation<+ object,+ object,+ {+ requestId: string;+ projectSlug: string;+ }+ >({+ mutationFn: async ({ requestId }) => {+ const { data } = await apiRequest.post(+ `/api/v1/access-approvals/requests/${requestId}/cancel`+ );+ return data;+ },+ onSuccess: (_, { projectSlug }) => {+ queryClient.invalidateQueries({+ queryKey: accessApprovalKeys.getAccessApprovalRequestsAllForProject(projectSlug)+ });+ queryClient.invalidateQueries({+ queryKey: accessApprovalKeys.getAccessApprovalRequestCount(projectSlug)+ });+ }+ });+};+export const useReviewAccessRequest = () => {const queryClient = useQueryClient();return useMutation<diff --git a/frontend/src/pages/cert-manager/CertificateAuthoritiesPage/components/CaInstallCertModal/VenafiCaInstallForm.tsx b/frontend/src/pages/cert-manager/CertificateAuthoritiesPage/components/CaInstallCertModal/VenafiCaInstallForm.tsxindex 1d56ab62af..48c25a846a 100644--- a/frontend/src/pages/cert-manager/CertificateAuthoritiesPage/components/CaInstallCertModal/VenafiCaInstallForm.tsx+++ b/frontend/src/pages/cert-manager/CertificateAuthoritiesPage/components/CaInstallCertModal/VenafiCaInstallForm.tsx@@ -2,6 +2,7 @@ import { Controller, useForm } from "react-hook-form";import { zodResolver } from "@hookform/resolvers/zod";import { z } from "zod";+import { useConnectionCreation } from "@app/components/app-connections/useConnectionCreation";import { createNotification } from "@app/components/notifications";import {Button,@@ -36,8 +37,6 @@ import {} from "@app/hooks/api/appConnections/venafi";import { UsePopUpState } from "@app/hooks/usePopUp";-import { useConnectionCreation } from "@app/components/app-connections/useConnectionCreation";-const schema = z.object({appConnectionId: z.string().min(1, "App connection is required"),applicationId: z.string().min(1, "Application is required"),diff --git a/frontend/src/pages/secret-manager/SecretApprovalsPage/components/AccessApprovalRequest/components/ReviewAccessModal.tsx b/frontend/src/pages/secret-manager/SecretApprovalsPage/components/AccessApprovalRequest/components/ReviewAccessModal.tsxindex 7099efc2d4..c43f56f911 100644--- a/frontend/src/pages/secret-manager/SecretApprovalsPage/components/AccessApprovalRequest/components/ReviewAccessModal.tsx+++ b/frontend/src/pages/secret-manager/SecretApprovalsPage/components/AccessApprovalRequest/components/ReviewAccessModal.tsx@@ -70,6 +70,7 @@ import {TooltipTrigger} from "@app/components/v3";import {+ ProjectPermissionActions,ProjectPermissionMemberActions,ProjectPermissionSub,useProject,@@ -82,6 +83,7 @@ import {} from "@app/context/ProjectPermissionContext/types";import { usePopUp } from "@app/hooks";import {+ useCancelAccessRequest,useListWorkspaceGroups,useRetryDelegatedApprovalDispatch,useReviewAccessRequest,@@ -369,6 +371,7 @@ export const ReviewAccessRequestModal = ({const reviewAccessRequest = useReviewAccessRequest();const revokeAccessRequest = useRevokeAccessRequest();const retryDelegatedApprovalDispatch = useRetryDelegatedApprovalDispatch();+ const cancelAccessRequest = useCancelAccessRequest();const handleRetryDispatch = useCallback(async () => {try {@@ -389,6 +392,19 @@ export const ReviewAccessRequestModal = ({onOpenChange]);+ const handleCancelRequest = useCallback(async () => {+ try {+ await cancelAccessRequest.mutateAsync({ requestId: request.id, projectSlug });+ } catch {+ return;+ }+ createNotification({+ text: "Request cancelled",+ type: "success"+ });+ onOpenChange(false);+ }, [cancelAccessRequest, request.id, projectSlug, onOpenChange]);+const handleReview = useCallback(async (status: "approved" | "rejected") => {if (bypassApproval && bypassReason.length < 10) {@@ -536,6 +552,11 @@ export const ReviewAccessRequestModal = ({ProjectPermissionSub.ApprovalRequests));+ const canCancelDelegatedRequest =+ isDelegatedPending &&+ (request.isRequestedByCurrentUser ||+ permission.can(ProjectPermissionActions.Edit, ProjectPermissionSub.SecretApproval));+const shouldBlockRequestActions =isDelegatedRequest ||hasRejected ||@@ -625,8 +646,10 @@ export const ReviewAccessRequestModal = ({: null;// The status banner moved to the top of the sheet, so the footer only renders when there- // are actions to take: Approve/Reject when unblocked, or Revoke on an approved request.- const showFooter = !shouldBlockRequestActions || (hasApproved && canRevokeAccess);+ // are actions to take: Approve/Reject when unblocked, Cancel on a pending delegated request,+ // or Revoke on an approved request.+ const showFooter =+ !shouldBlockRequestActions || canCancelDelegatedRequest || (hasApproved && canRevokeAccess);type ApproverChain = NonNullable<typeof approverSequence.approvers>[number];@@ -1024,7 +1047,7 @@ export const ReviewAccessRequestModal = ({<InfoIcon /><AlertTitle>This request is reviewed in {delegatedApprovalName}.</AlertTitle><AlertDescription>- It cannot be approved or rejected in Infisical. Infisical grants access once{" "}+ It cannot be approved in Infisical. Infisical grants access once{" "}{delegatedApprovalName} approves it.</AlertDescription></Alert>@@ -1203,6 +1226,20 @@ export const ReviewAccessRequestModal = ({</div></>)}+ {canCancelDelegatedRequest && (+ <div>+ <Button+ isPending={cancelAccessRequest.isPending}+ isDisabled={cancelAccessRequest.isPending}+ onClick={handleCancelRequest}+ size="sm"+ variant="danger"+ >+ <BanIcon />+ Cancel Request+ </Button>+ </div>+ )}{hasApproved && canRevokeAccess && (<div><Button