Reverse engineer anything with agents, from app behavior down to native binaries.
TypeScript agent-skillsai-agentsbinary-analysisclaude-codeclicodexcordisdecompilerdeveloper-toolsdshdsh-pluginghidrahopperllmmcpmodel-context-protocolreareverse-engineeringstatic-analysistouhou
fix(ghidra): use resolved type addresses for NativeAOT metadata
Ysopwnablee598b4656ad9
diff --git a/docs/ghidra-nativeaot.md b/docs/ghidra-nativeaot.mdindex 394d7fdf5..70c470d13 100644--- a/docs/ghidra-nativeaot.md+++ b/docs/ghidra-nativeaot.md@@ -69,6 +69,12 @@ Pass a returned MethodTable address to `inspect_native_data_type`. A direct PEquery also derives the snapshot metadata from the authenticated Ghidra sessionhandshake, so it does not require a preceding load-image call. In a persistentMCP session, load-image followed by type inspection reuses that same derivation.+The bridge resolves the caller's address spelling once; metadata lookup uses+its canonical default-space identity. Bare hexadecimal, prefixed hexadecimal,+and encoded default-space selectors therefore select the same MethodTable.+Other address spaces and unresolved identities are not matched by offset alone.+Metadata already supplied by the engine is retained without reading or deriving+an additional source snapshot.The database result remains `unavailable` when Ghidra has no DataType at thataddress; its `metadata_recovery.source` is `read-only-derived-overlay` andcarries related type, interface, slot, and target observations. Generateddiff --git a/src/ghidra/GhidraProvider.behavior.test.ts b/src/ghidra/GhidraProvider.behavior.test.tsindex ba22c7fc6..73c7524b7 100644--- a/src/ghidra/GhidraProvider.behavior.test.ts+++ b/src/ghidra/GhidraProvider.behavior.test.ts@@ -1408,8 +1408,34 @@ describe("Ghidra measured DOS load-image projection", () => {);});+const unavailableNativeAotDatabaseType = (address: string | null) => ({+ status: "unavailable",+ reason:+ "No exact database type or defined typed data exists at the selected identity",+ id: null,+ name: null,+ kind: "unavailable",+ source: "analysis-database",+ source_archive: null,+ address,+ size_bytes: null,+ alignment_bytes: null,+ packing_enabled: null,+ referenced_type: null,+ array_count: null,+ array_stride_bytes: null,+ fields: [],+ members: [],+ total_fields: 0,+ truncated: false,+ limitations: [],+});+it("returns read-only NativeAOT metadata inline and drills down by derived MethodTable address", async () => {const bytes = nativeAotPeFixture();+ const readSnapshot = vi.fn(async () =>+ ok({ kind: "captured" as const, bytes }),+ );const observations = fixtureDosLoadImage().observation;observations.image_base = "0x140000000";const factory: GhidraProviderClientFactory = () => ({@@ -1426,31 +1452,11 @@ it("returns read-only NativeAOT metadata inline and drills down by derived MethojsonValueSchema.parse(operation === "inspect_native_load_image"? observations- : {- status: "unavailable",- reason: "No Ghidra DataType is defined at this address.",- id: null,- name: null,- kind: "unavailable",- source: "analysis-database",- source_archive: null,- address: null,- size_bytes: null,- alignment_bytes: null,- packing_enabled: null,- referenced_type: null,- array_count: null,- array_stride_bytes: null,- fields: [],- members: [],- total_fields: 0,- truncated: false,- limitations: [],- },+ : unavailableNativeAotDatabaseType("0x140002280"),),),),- readTargetSnapshot: () => Promise.resolve(ok({ kind: "captured", bytes })),+ readTargetSnapshot: readSnapshot,close: () => Promise.resolve(ok(null)),});const ghidra = provider(installationHost(), factory);@@ -1479,67 +1485,155 @@ it("returns read-only NativeAOT metadata inline and drills down by derived MethorawResult: observations,},});- const detail = await client.execute("inspect_native_data_type", {- address: "0x140002280",- });- expect(detail).toMatchObject({- ok: true,- value: {- result: {- status: "unavailable",- source: "analysis-database",- metadata_recovery: {- source: "read-only-derived-overlay",- method_table_address: "0x140002280",- related_type: { address: "0x140002200", type: null },+ for (const address of [+ "0x140002280",+ "140002280",+ "ram:0x140002280",+ "%72am:0x140002280",+ "0X0140002280",+ ]) {+ const detail = await client.execute("inspect_native_data_type", {+ address,+ });+ expect(detail).toMatchObject({+ ok: true,+ value: {+ result: {+ status: "unavailable",+ source: "analysis-database",+ metadata_recovery: {+ source: "read-only-derived-overlay",+ method_table_address: "0x140002280",+ related_type: { address: "0x140002200", type: null },+ },},},- },- });+ });+ }+ expect(readSnapshot).toHaveBeenCalledOnce();await client.close();});-it("derives PE metadata for a direct type-address query without a load-image call", async () => {+it.each([+ ["0x140002280", "0x140002280", "0x140002280"],+ ["140002280", "0x140002280", "0x140002280"],+ ["ram:0x140002280", "0x140002280", "0x140002280"],+ ["%72am:0x140002280", "0x140002280", "0x140002280"],+ ["0X0140002280", "0x140002280", "0x140002280"],+ ["0x140002280", "0x140002200", "0x140002200"],+ ["0x140002280", null, null],+ ["0x140002280", "register:0x140002280", null],+ ["0x140002280", "overlay%3Aspace:0x140002280", null],+ ["0x140002280", "0x140002288", null],+ ["register:0x140002280", "register:0x140002280", null],+] as const)(+ "looks up NativeAOT type %s using resolved identity %s",+ async (address, resolvedAddress, expectedTable) => {+ const bytes = nativeAotPeFixture();+ const operations: string[] = [];+ const callerAddresses: unknown[] = [];+ const readSnapshot = vi.fn(async () =>+ ok({ kind: "captured" as const, bytes }),+ );+ const factory: GhidraProviderClientFactory = () => ({+ start: () =>+ Promise.resolve(+ ok({+ ...sessionInfo(),+ target: { ...sessionInfo().target, image_base: "0x140000000" },+ }),+ ),+ callTool: (operation, parameters) => {+ operations.push(operation);+ callerAddresses.push(parameters.address);+ return Promise.resolve(+ ok(+ jsonValueSchema.parse(+ unavailableNativeAotDatabaseType(resolvedAddress),+ ),+ ),+ );+ },+ readTargetSnapshot: readSnapshot,+ close: () => Promise.resolve(ok(null)),+ });+ const ghidra = provider(installationHost(), factory);+ const target = { ...peTarget("x86_64"), sha256: nativeAotPeDigest(bytes) };+ const profile = await ghidra.resolveAnalysisProfile(target);+ if (!profile.ok || profile.value.profile === null)+ throw new Error("Expected admitted PE profile");+ const client = ghidra.createClient(target, profile.value.profile);+ const detail = await client.execute("inspect_native_data_type", {+ address,+ });+ expect(detail.ok).toBe(true);+ if (!detail.ok) throw detail.error;+ expect(detail.value.result).toMatchObject({ address: resolvedAddress });+ if (expectedTable === null) {+ expect(detail.value.result).not.toHaveProperty("metadata_recovery");+ } else {+ expect(detail.value.result).toMatchObject({+ metadata_recovery: {+ source: "read-only-derived-overlay",+ method_table_address: expectedTable,+ },+ });+ }+ expect(callerAddresses).toEqual([address]);+ expect(readSnapshot).toHaveBeenCalledTimes(+ resolvedAddress === null ? 0 : 1,+ );+ expect(operations).toEqual(["inspect_native_data_type"]);+ await client.close();+ },+);++it("retains engine-provided NativeAOT metadata without deriving another snapshot", async () => {const bytes = nativeAotPeFixture();- const operations: string[] = [];+ const metadata = {+ format: "dotnet-nativeaot",+ source: "analysis-database",+ status: "partial",+ header_address: "0x140002000",+ format_major: 9,+ format_minor: 1,+ method_table_address: "0x140002280",+ name_origin: "generated",+ original_name: null,+ base_size_bytes: 32,+ related_type: null,+ interfaces: [],+ virtual_slots: [],+ derived_memory: null,+ diagnostics: ["Engine-provided fixture metadata"],+ limitations: ["Fixture has no original managed names"],+ };+ const readSnapshot = vi.fn(async () => {+ throw new Error("Unexpected source snapshot read");+ });const factory: GhidraProviderClientFactory = () => ({- start: () =>- Promise.resolve(- ok({- ...sessionInfo(),- target: { ...sessionInfo().target, image_base: "0x140000000" },+ start: async () =>+ ok({+ ...sessionInfo(),+ target: { ...sessionInfo().target, image_base: "0x140000000" },+ }),+ callTool: async () =>+ ok(+ jsonValueSchema.parse({+ ...unavailableNativeAotDatabaseType("0x140002280"),+ status: "available",+ reason: null,+ id: "/NativeAOT/Example_MT",+ name: "Example_MT",+ kind: "struct",+ size_bytes: 32,+ alignment_bytes: 8,+ packing_enabled: false,+ metadata_recovery: metadata,}),),- callTool: (operation) => {- operations.push(operation);- return Promise.resolve(- ok(- jsonValueSchema.parse({- status: "unavailable",- reason: "No Ghidra DataType is defined at this address.",- id: null,- name: null,- kind: "unavailable",- source: "analysis-database",- source_archive: null,- address: null,- size_bytes: null,- alignment_bytes: null,- packing_enabled: null,- referenced_type: null,- array_count: null,- array_stride_bytes: null,- fields: [],- members: [],- total_fields: 0,- truncated: false,- limitations: [],- }),- ),- );- },- readTargetSnapshot: () => Promise.resolve(ok({ kind: "captured", bytes })),- close: () => Promise.resolve(ok(null)),+ readTargetSnapshot: readSnapshot,+ close: async () => ok(null),});const ghidra = provider(installationHost(), factory);const target = { ...peTarget("x86_64"), sha256: nativeAotPeDigest(bytes) };@@ -1552,17 +1646,9 @@ it("derives PE metadata for a direct type-address query without a load-image cal});expect(detail).toMatchObject({ok: true,- value: {- result: {- metadata_recovery: {- source: "read-only-derived-overlay",- method_table_address: "0x140002280",- related_type: { address: "0x140002200", type: null },- },- },- },+ value: { result: { status: "available", metadata_recovery: metadata } },});- expect(operations).toEqual(["inspect_native_data_type"]);+ expect(readSnapshot).not.toHaveBeenCalled();await client.close();});@@ -1600,27 +1686,7 @@ it("shares one session snapshot across callers while isolating cancellation andjsonValueSchema.parse(operation === "inspect_native_load_image"? observation- : {- status: "unavailable",- reason: "No Ghidra DataType is defined at this address.",- id: null,- name: null,- kind: "unavailable",- source: "analysis-database",- source_archive: null,- address: null,- size_bytes: null,- alignment_bytes: null,- packing_enabled: null,- referenced_type: null,- array_count: null,- array_stride_bytes: null,- fields: [],- members: [],- total_fields: 0,- truncated: false,- limitations: [],- },+ : unavailableNativeAotDatabaseType("0x140002280"),),),);diff --git a/src/ghidra/GhidraProviderClient.ts b/src/ghidra/GhidraProviderClient.tsindex da81fca43..08b564a3d 100644--- a/src/ghidra/GhidraProviderClient.ts+++ b/src/ghidra/GhidraProviderClient.ts@@ -858,8 +858,16 @@ export const createGhidraProviderClient = (input: {if (!result.ok) return result;normalized = result.value;}- if (operation === "inspect_native_data_type") {- const address = input.value.address;+ if (+ operation === "inspect_native_data_type" &&+ normalized !== null &&+ typeof normalized === "object" &&+ !Array.isArray(normalized) &&+ normalized.metadata_recovery === undefined+ ) {+ // The bridge owns address-space resolution. Enrich its parsed identity;+ // request parameters retain the caller's spelling.+ const address = normalized.address;if (typeof address === "string") {if (target.format === "pe" && nativeAotOwner !== undefined) {const started = await client.start(@@ -883,23 +891,12 @@ export const createGhidraProviderClient = (input: {);if (!derived.ok) return derived;}- let metadata:- | ReturnType<NativeAotPeResult["readTypeDetail"]>- | undefined;- metadata = nativeAotOwner?.readTypeDetail(address);- if (- metadata !== undefined &&- normalized !== null &&- typeof normalized === "object" &&- !Array.isArray(normalized)- ) {- const nativeResult = normalized as Record<string, JsonValue>;- if (nativeResult.metadata_recovery === undefined)- normalized = jsonValueSchema.parse({- ...nativeResult,- metadata_recovery: metadata,- });- }+ const metadata = nativeAotOwner?.readTypeDetail(address);+ if (metadata !== undefined)+ normalized = jsonValueSchema.parse({+ ...normalized,+ metadata_recovery: metadata,+ });}}if (operation === "inspect_native_load_image") {