Skip to content

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

fix scan of empty repositories

Matheus Nogueira93cd70ce7535
diff --git a/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-fns.test.ts b/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-fns.test.ts
index fe9db9b273..c41aff5f2c 100644
--- a/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-fns.test.ts
+++ b/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-fns.test.ts
@@ -15,6 +15,7 @@ import {
assertClonedRepositoryWithinSizeLimit,
parseScanErrorMessage,
planCommitBatches,
+ repositoryHasCommits,
SecretScanningSizeLimitError
} from "./secret-scanning-v2-fns";
@@ -189,6 +190,20 @@ describe("planCommitBatches", () => {
}
};
+ test("reports an empty repository as having no commits", async () => {
+ await withRepo(async (repoPath) => {
+ expect(await repositoryHasCommits(repoPath)).toBe(false);
+ });
+ });
+
+ test("reports a repository with a commit as having commits", async () => {
+ await withRepo(async (repoPath) => {
+ await commit(repoPath, "a", "2020-01-01T00:00:00Z");
+
+ expect(await repositoryHasCommits(repoPath)).toBe(true);
+ });
+ });
+
test("resumes past the commits it already scanned", async () => {
await withRepo(async (repoPath) => {
await commit(repoPath, "a", "2020-01-01T00:00:00Z");
diff --git a/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-fns.ts b/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-fns.ts
index 0d3cd0184b..fdf14646d9 100644
--- a/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-fns.ts
+++ b/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-fns.ts
@@ -175,6 +175,28 @@ export type TCommitBatch = {
prefixDigest: string;
};
+/**
+ * An empty repository has an unborn HEAD, which `git rev-list HEAD` cannot resolve and then reports
+ * as an argument-order error, so history is only enumerated or scanned once this returns true.
+ */
+export const repositoryHasCommits = async (repoPath: string) => {
+ try {
+ await execFileBounded("git", ["rev-parse", "--verify", "--quiet", "HEAD"], {
+ phase: SecretScanningExecPhase.Enumerate,
+ cwd: repoPath,
+ timeoutMs: SECRET_SCANNING_COMMIT_ENUMERATION_TIMEOUT,
+ env: GIT_PROCESS_ENV
+ });
+
+ return true;
+ } catch (error) {
+ // --quiet exits 1 when HEAD does not point at a commit; anything else is a real failure
+ if (error instanceof SecretScanningExecError && error.exitCode === 1) return false;
+
+ throw error;
+ }
+};
+
const COMMIT_LOG_OPTS = COMMIT_LIST_ARGS.slice(1).join(" ");
const buildCommitBatchLogOpts = ({ skip, maxCount }: TCommitBatch) =>
diff --git a/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-queue.ts b/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-queue.ts
index 73cc3e528b..bb19399987 100644
--- a/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-queue.ts
+++ b/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-queue.ts
@@ -11,6 +11,7 @@ import {
assertClonedRepositoryWithinSizeLimit,
parseScanErrorMessage,
planCommitBatches,
+ repositoryHasCommits,
scanGitRepositoryAndGetFindings
} from "@app/ee/services/secret-scanning-v2/secret-scanning-v2-fns";
import { KeyStorePrefixes, TKeyStoreFactory } from "@app/keystore/keystore";
@@ -407,6 +408,12 @@ export const secretScanningV2QueueServiceFactory = ({
logger.info(`secretScanningV2Queue: Full Scan Cloned ${logDetails} repoSizeMb=[${repoSizeMb ?? "unknown"}]`);
+ // nothing to scan, and both git history commands fail on an unborn HEAD
+ if (!(await repositoryHasCommits(scanPath))) {
+ logger.info(`secretScanningV2Queue: Full Scan found no commits, completing ${logDetails}`);
+ break;
+ }
+
const { SECRET_SCANNING_COMMIT_BATCH_SIZE: batchSize } = getConfig();
if (!batchSize) {