Skip to content

armgit / rea

Public Imported from GitHub
0

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

fix(apple): pair bridge hypotheses within one application root

Kaoru08229226ade5114f
diff --git a/src/domain/appleApplication.test.ts b/src/domain/appleApplication.test.ts
index 8e61d8e2d..b9e1041b0 100644
--- a/src/domain/appleApplication.test.ts
+++ b/src/domain/appleApplication.test.ts
@@ -309,6 +309,17 @@ describe("Apple bundle layouts and containers", () => {
expect(
result.bundles.find(({ path }) => path === framework)?.info_plist_path,
).toBeNull();
+ // Only A has a plist, but Versions/Current may select B.
+ const onlyA = project(
+ inventoryEvidence("zip", "Fixture.zip", [
+ macho("Fixture.app/Contents/MacOS/Fixture"),
+ { path: `${framework}/Versions/A/Resources/Info.plist` },
+ macho(`${framework}/Versions/B/Core`),
+ ]),
+ );
+ expect(
+ onlyA.bundles.find(({ path }) => path === framework)?.info_plist_path,
+ ).toBeNull();
expect(result.limitations).toContainEqual(
expect.stringContaining("Versions/Current selects is unknown"),
);
@@ -438,3 +449,37 @@ describe("macOS application scope", () => {
});
});
});
+
+describe("Apple application bridge candidates", () => {
+ it("pairs scripts and native code only within one application root", () => {
+ const result = project(
+ inventoryEvidence("zip", "Suite.zip", [
+ macho("First.app/Contents/MacOS/First"),
+ {
+ path: "First.app/Contents/Resources/first.js",
+ format: "javascript-bundle",
+ },
+ macho("Second.app/Contents/MacOS/Second"),
+ {
+ path: "Second.app/Contents/Resources/second.js",
+ format: "javascript-bundle",
+ },
+ ]),
+ );
+ expect(result.application_roots).toEqual(["First.app", "Second.app"]);
+ expect(
+ result.bridge_candidates.map(
+ ({ source_path: source, native_path: target }) => [source, target],
+ ),
+ ).toEqual([
+ [
+ "First.app/Contents/Resources/first.js",
+ "First.app/Contents/MacOS/First",
+ ],
+ [
+ "Second.app/Contents/Resources/second.js",
+ "Second.app/Contents/MacOS/Second",
+ ],
+ ]);
+ });
+});
diff --git a/src/domain/appleApplication.ts b/src/domain/appleApplication.ts
index 4650fce72..42bc970b6 100644
--- a/src/domain/appleApplication.ts
+++ b/src/domain/appleApplication.ts
@@ -149,6 +149,7 @@ export const projectAppleApplication = (
...classified.executables,
...classified.native_libraries,
]),
+ roots,
);
const uninventoriedImage =
rootFormat === "dmg" && inventory.occurrences.length === 1;
@@ -305,18 +306,27 @@ const identifyRuntimeFamilies = (all: readonly Component[]) => {
return [...families].sort(compare);
};
+/** Pair scripts and native code only within the same application root. */
const identifyBridgeCandidates = (
scripts: readonly Component[],
native: readonly Component[],
-) => ({
- candidates: scripts.flatMap((script) =>
- native.map((item) => ({
- source_path: script.path,
- native_path: item.path,
- basis: bridgeBasis(item.path),
- })),
- ),
-});
+ roots: readonly string[],
+) => {
+ const owner = (path: string): string | null =>
+ roots.find((root) => isWithin(path, root)) ?? null;
+ return {
+ candidates: scripts.flatMap((script) => {
+ const root = owner(script.path);
+ return native
+ .filter(({ path }) => owner(path) === root)
+ .map((item) => ({
+ source_path: script.path,
+ native_path: item.path,
+ basis: bridgeBasis(item.path),
+ }));
+ }),
+ };
+};
const bridgeBasis = (
path: string,
@@ -360,7 +370,7 @@ const projectionLimitations = (facts: {
layout === "versioned-framework" && plist === null,
)
? [
- "A versioned framework has zero or several Versions/*/Resources/Info.plist files; the one Versions/Current selects is unknown because symlink targets are not inventoried.",
+ "A versioned framework has several version directories or no Versions/*/Resources/Info.plist; the Info.plist that Versions/Current selects is unknown because symlink targets are not inventoried.",
]
: []),
...(facts.symlinks
diff --git a/src/domain/appleBundleAnatomy.ts b/src/domain/appleBundleAnatomy.ts
index a70424908..766f1b515 100644
--- a/src/domain/appleBundleAnatomy.ts
+++ b/src/domain/appleBundleAnatomy.ts
@@ -234,7 +234,11 @@ const infoPlistPath = (
layout: Bundle["layout"],
tree: Tree,
): string | null => {
- const candidates = contentDirectories(bundle, layout, tree)
+ const directories = contentDirectories(bundle, layout, tree);
+ // With several real versions, Versions/Current (a symlink outside the
+ // inventory) decides which plist applies, so the plist stays unknown.
+ if (directories.length !== 1) return null;
+ const candidates = directories
.map((directory) =>
joinPath(
directory,