Skip to content

armgit / rea

Public Imported from GitHub
0

Reverse engineer anything with agents, from app behavior down to native binaries.

fix(pyinstaller): report changed admission as integrity (#6325)

MeskineMorty49bb6c84b003
diff --git a/src/artifacts/pyinstaller/PyInstallerFileAdmission.test.ts b/src/artifacts/pyinstaller/PyInstallerFileAdmission.test.ts
new file mode 100644
index 000000000..13f4ec1af
--- /dev/null
+++ b/src/artifacts/pyinstaller/PyInstallerFileAdmission.test.ts
@@ -0,0 +1,33 @@
+import { expect, it, vi } from "vitest";
+import {
+ openRegularFile,
+ RegularFileChangedError,
+} from "../../filesystem/RegularFile.js";
+import { PyInstallerArtifactReader } from "../PyInstallerArtifactReader.js";
+
+vi.mock("../../filesystem/RegularFile.js", async (importOriginal) => {
+ const actual =
+ await importOriginal<typeof import("../../filesystem/RegularFile.js")>();
+ return { ...actual, openRegularFile: vi.fn(actual.openRegularFile) };
+});
+
+it("classifies a source replacement during admission as an integrity failure", async () => {
+ const path = "/selected/app";
+ const changed = new RegularFileChangedError(path);
+ vi.mocked(openRegularFile).mockRejectedValueOnce(changed);
+ const reader = new PyInstallerArtifactReader(path);
+ try {
+ await expect(reader.prepareContainer("0".repeat(64))).rejects.toMatchObject(
+ {
+ reason: "integrity",
+ message: `PyInstaller source changed during admission: ${path}`,
+ },
+ );
+ expect(openRegularFile).toHaveBeenCalledWith(path, {
+ symlinks: "reject",
+ signal: expect.any(AbortSignal),
+ });
+ } finally {
+ await reader.close();
+ }
+});
diff --git a/src/artifacts/pyinstaller/PyInstallerFileAdmission.ts b/src/artifacts/pyinstaller/PyInstallerFileAdmission.ts
index a472459a4..dc3c50399 100644
--- a/src/artifacts/pyinstaller/PyInstallerFileAdmission.ts
+++ b/src/artifacts/pyinstaller/PyInstallerFileAdmission.ts
@@ -1,6 +1,7 @@
import {
NonRegularFileReadError,
RegularFileAdmissionFailure,
+ RegularFileChangedError,
RegularFileOperationCancelled,
} from "../../filesystem/RegularFile.js";
import { ArtifactReaderFailure } from "../ArtifactReader.js";
@@ -22,6 +23,12 @@ export const pyInstallerFileAdmissionFailure = (
pyInstallerFileAdmissionFailure(path, cause.cause),
ArtifactReaderFailure.cleanupObservation(cause.cleanupCause, path),
);
+ if (cause instanceof RegularFileChangedError)
+ return new ArtifactReaderFailure(
+ "integrity",
+ `PyInstaller source changed during admission: ${path}`,
+ { cause },
+ );
if (cause instanceof NonRegularFileReadError)
return new ArtifactReaderFailure(
"format",