Skip to content

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

feat(secret): add abort signal handling to secret import functions

Victor Hugo dos Santos2c223e16d048
diff --git a/backend/src/services/secret-import/secret-import-fns.test.ts b/backend/src/services/secret-import/secret-import-fns.test.ts
index f5c0f6b926..e00fd9e5ba 100644
--- a/backend/src/services/secret-import/secret-import-fns.test.ts
+++ b/backend/src/services/secret-import/secret-import-fns.test.ts
@@ -2,7 +2,7 @@ import { describe, expect, it, vi } from "vitest";
import { ClientClosedRequestError } from "@app/lib/errors";
-import { fnSecretsV2FromImports } from "./secret-import-fns";
+import { fnSecretsFromImports, fnSecretsV2FromImports } from "./secret-import-fns";
type Args = Parameters<typeof fnSecretsV2FromImports>[0];
@@ -124,3 +124,73 @@ describe("fnSecretsV2FromImports", () => {
expect(imports[0].secrets.map((s) => s.secretValue)).toEqual(["expanded-A", `\${B_REF}`]);
});
});
+
+describe("fnSecretsFromImports", () => {
+ type LegacyArgs = Parameters<typeof fnSecretsFromImports>[0];
+
+ const makeLegacyArgs = (abortSignal?: AbortSignal) => {
+ const findByManySecretPath = vi
+ .fn<LegacyArgs["folderDAL"]["findByManySecretPath"]>()
+ .mockResolvedValue([{ id: "shared-folder", envId: "env", path: "/shared" }] as Awaited<
+ ReturnType<LegacyArgs["folderDAL"]["findByManySecretPath"]>
+ >);
+ const find = vi.fn().mockResolvedValue([]);
+ const findByFolderIds = vi.fn<LegacyArgs["secretImportDAL"]["findByFolderIds"]>().mockResolvedValue([]);
+ const rootImport = {
+ id: "import",
+ folderId: "root-folder",
+ importPath: "/shared",
+ importEnv: { id: "env", slug: "dev", name: "Development" },
+ position: 1,
+ version: 1,
+ isReplication: false,
+ isReserved: false,
+ createdAt: new Date(0),
+ updatedAt: new Date(0)
+ } as LegacyArgs["allowedImports"][number];
+
+ const args: LegacyArgs = {
+ allowedImports: [rootImport],
+ folderDAL: { findByManySecretPath },
+ secretDAL: { find },
+ secretImportDAL: { findByFolderIds },
+ abortSignal
+ };
+ return { args, rootImport, findByManySecretPath, find, findByFolderIds };
+ };
+
+ it("stops before reading any import when the client already disconnected", async () => {
+ const controller = new AbortController();
+ controller.abort();
+ const { args, findByManySecretPath, find } = makeLegacyArgs(controller.signal);
+
+ await expect(fnSecretsFromImports(args)).rejects.toBeInstanceOf(ClientClosedRequestError);
+ expect(findByManySecretPath).not.toHaveBeenCalled();
+ expect(find).not.toHaveBeenCalled();
+ });
+
+ it("stops before walking deeper import levels once the client disconnects", async () => {
+ const controller = new AbortController();
+ const { args, rootImport, findByManySecretPath, findByFolderIds } = makeLegacyArgs(controller.signal);
+ findByFolderIds.mockImplementationOnce(async () => {
+ controller.abort();
+ return [{ ...rootImport, id: "deeper-import", folderId: "shared-folder", importPath: "/deeper" }] as Awaited<
+ ReturnType<LegacyArgs["secretImportDAL"]["findByFolderIds"]>
+ >;
+ });
+
+ await expect(fnSecretsFromImports(args)).rejects.toBeInstanceOf(ClientClosedRequestError);
+ expect(findByManySecretPath).toHaveBeenCalledTimes(1);
+ });
+
+ it("walks every level when the client stays connected", async () => {
+ const { args, rootImport, findByManySecretPath, findByFolderIds } = makeLegacyArgs(new AbortController().signal);
+ findByFolderIds.mockResolvedValueOnce([
+ { ...rootImport, id: "deeper-import", folderId: "shared-folder", importPath: "/deeper" }
+ ] as Awaited<ReturnType<LegacyArgs["secretImportDAL"]["findByFolderIds"]>>);
+
+ await fnSecretsFromImports(args);
+
+ expect(findByManySecretPath).toHaveBeenCalledTimes(2);
+ });
+});
diff --git a/backend/src/services/secret-import/secret-import-fns.ts b/backend/src/services/secret-import/secret-import-fns.ts
index c2371cab03..38a2eeeabf 100644
--- a/backend/src/services/secret-import/secret-import-fns.ts
+++ b/backend/src/services/secret-import/secret-import-fns.ts
@@ -141,7 +141,8 @@ export const fnSecretsFromImports = async ({
secretDAL,
secretImportDAL,
depth = 0,
- cyclicDetector = new Set()
+ cyclicDetector = new Set(),
+ abortSignal
}: {
allowedImports: (Omit<TSecretImports, "importEnv"> & {
importEnv: { id: string; slug: string; name: string };
@@ -151,9 +152,11 @@ export const fnSecretsFromImports = async ({
secretImportDAL: Pick<TSecretImportDALFactory, "findByFolderIds">;
depth?: number;
cyclicDetector?: Set<string>;
+ abortSignal?: AbortSignal;
}) => {
// avoid going more than a depth
if (depth >= LEVEL_BREAK) return [];
+ throwIfClientDisconnected(abortSignal);
const allowedImports = possibleCyclicImports.filter(
({ importPath, importEnv }) => !cyclicDetector.has(getImportUniqKey(importEnv.slug, importPath))
@@ -208,7 +211,8 @@ export const fnSecretsFromImports = async ({
folderDAL,
secretDAL,
depth: depth + 1,
- cyclicDetector
+ cyclicDetector,
+ abortSignal
});
}
const secretsFromdeeperImportGroupedByFolderId = groupBy(secretsFromDeeperImports, (i) => i.importFolderId);
diff --git a/backend/src/services/secret/secret-service.ts b/backend/src/services/secret/secret-service.ts
index 87f8af35ac..4c2565c69b 100644
--- a/backend/src/services/secret/secret-service.ts
+++ b/backend/src/services/secret/secret-service.ts
@@ -720,7 +720,8 @@ export const secretServiceFactory = ({
allowedImports,
secretDAL,
folderDAL,
- secretImportDAL
+ secretImportDAL,
+ abortSignal
});
return {