mirror of
https://github.com/morluto/rea.git
synced 2026-11-19 21:23:45 +00:00
fix(android): report method disassembly failure as unavailable body (#12090)
* fix(android): report method disassembly failure as unavailable body Catch JADX bridge get_method_body failures in inspectMethod and project as an unavailable body with disassembly_failed marker, avoiding generic execution_failure with irrelevant rea doctor remediation. Fixes #10482 * fix(android): preserve method identity when disassembly is unavailable * fix(android): retain method identity when smali generation fails --------- Co-authored-by: morluto <76467478+morluto@users.noreply.github.com>
This commit is contained in:
1 parent
486470ec9b
commit
dc6799d488
10 files changed
+251
-65
No files matched your search
@@ -437,11 +437,22 @@ const inspectMethod = async (
|
||||
class_name: summary.full_name,
|
||||
method: selected,
|
||||
overload_count: candidates.length,
|
||||
representation: body.mode,
|
||||
body_status: body.body.length === 0 ? "not_available" : "available",
|
||||
fell_back: body.fell_back,
|
||||
markers: body.markers,
|
||||
source: normalizeJadxText(body.body),
|
||||
...(body.mode === "unavailable"
|
||||
? {
|
||||
representation: null,
|
||||
body_status: "not_available",
|
||||
body_unavailable_reason: body.body_unavailable_reason,
|
||||
fell_back: false,
|
||||
markers: ["disassembly_failed"],
|
||||
source: null,
|
||||
}
|
||||
: {
|
||||
representation: body.mode,
|
||||
body_status: body.body.length === 0 ? "not_available" : "available",
|
||||
fell_back: body.fell_back,
|
||||
markers: body.markers,
|
||||
source: normalizeJadxText(body.body),
|
||||
}),
|
||||
...mappingOf(mapping, () => [
|
||||
classQuery(summary),
|
||||
...methodQueries(summary).filter(
|
||||
|
||||
@@ -139,18 +139,28 @@ export const jadxExternalReferenceSummarySchema = z.object({
|
||||
observed_method_count: count,
|
||||
prototypes: z.array(jadxMethodMetadataSchema).min(1),
|
||||
});
|
||||
export const jadxMethodSchema = z.object({
|
||||
const jadxMethodIdentity = {
|
||||
class_name: z.string(),
|
||||
method_name: z.string(),
|
||||
full_name: z.string(),
|
||||
overload_index: count,
|
||||
overload_count: count,
|
||||
dex_descriptor: dexDescriptorSchema,
|
||||
mode: z.enum(["java", "smali"]),
|
||||
fell_back: z.boolean(),
|
||||
markers: z.array(z.string()),
|
||||
body: z.string(),
|
||||
});
|
||||
};
|
||||
export const jadxMethodSchema = z.discriminatedUnion("mode", [
|
||||
z.object({
|
||||
...jadxMethodIdentity,
|
||||
mode: z.enum(["java", "smali"]),
|
||||
fell_back: z.boolean(),
|
||||
markers: z.array(z.string()),
|
||||
body: z.string(),
|
||||
}),
|
||||
z.strictObject({
|
||||
...jadxMethodIdentity,
|
||||
mode: z.literal("unavailable"),
|
||||
body_unavailable_reason: z.string().min(1),
|
||||
}),
|
||||
]);
|
||||
export const jadxXrefsSchema = z.object({
|
||||
target: z.string(),
|
||||
reference_target: z.literal("external").optional(),
|
||||
|
||||
@@ -217,21 +217,38 @@ it.each(["inspect_android_class", "inspect_android_method"] as const)(
|
||||
},
|
||||
);
|
||||
|
||||
it("preserves native absence and optional historical omission without inventing mapping facts", () => {
|
||||
const { mapping: _mapping, ...native } = methodReport();
|
||||
const facts = {
|
||||
...native,
|
||||
body_status: "not_available",
|
||||
it.each([
|
||||
{
|
||||
markers: ["native_method"],
|
||||
source: { status: "complete", text: "", reported_total_bytes: 0 },
|
||||
};
|
||||
const { parent } = fixture("inspect_android_method", facts);
|
||||
const result = projectAnalysisView(parent, { kind: "summary" });
|
||||
if (!result.ok) throw result.error;
|
||||
const view = androidMethodSummaryViewResultSchema.parse(result.value);
|
||||
expect(view.summary).toEqual(facts);
|
||||
expect(Object.hasOwn(view.summary, "mapping")).toBe(false);
|
||||
});
|
||||
},
|
||||
{
|
||||
representation: null,
|
||||
body_unavailable_reason:
|
||||
"Selected method disassembly is incomplete: update()V",
|
||||
markers: ["disassembly_failed"],
|
||||
source: null,
|
||||
},
|
||||
])(
|
||||
"preserves method absence with $markers and historical omission of mapping",
|
||||
(absence) => {
|
||||
const { mapping: _mapping, ...method } = methodReport();
|
||||
const facts = {
|
||||
...method,
|
||||
body_status: "not_available",
|
||||
fell_back: false,
|
||||
...absence,
|
||||
};
|
||||
const { parent } = fixture("inspect_android_method", facts);
|
||||
const result = projectAnalysisView(parent, { kind: "summary" });
|
||||
if (!result.ok) throw result.error;
|
||||
const view = androidMethodSummaryViewResultSchema.parse(result.value);
|
||||
expect(view.summary).toEqual(facts);
|
||||
expect(Object.hasOwn(view.summary, "mapping")).toBe(false);
|
||||
if (absence.source === null)
|
||||
expect(view.unknowns).toContain(absence.body_unavailable_reason);
|
||||
},
|
||||
);
|
||||
|
||||
it.each(["inspect_android_class", "inspect_android_method"] as const)(
|
||||
"rejects malformed historical %s facts with a typed source error",
|
||||
|
||||
@@ -127,7 +127,10 @@ export const projectAndroidSymbolSummary = (
|
||||
summary: parsed.value,
|
||||
unknowns: [
|
||||
...shared.unknowns,
|
||||
...(parsed.value.source.status === "partial"
|
||||
...(parsed.value.source === null
|
||||
? [parsed.value.body_unavailable_reason]
|
||||
: []),
|
||||
...(parsed.value.source?.status === "partial"
|
||||
? [
|
||||
"The selected method source is partial; retained text does not establish a complete method body.",
|
||||
]
|
||||
|
||||
@@ -223,6 +223,14 @@ const engine = z.strictObject({
|
||||
const common = { engine };
|
||||
|
||||
/** Portable observations with explicit decompiler and identity limitations. */
|
||||
const methodInspectionIdentity = {
|
||||
...common,
|
||||
class_name: z.string(),
|
||||
method,
|
||||
overload_count: z.int().positive(),
|
||||
mapping: androidMappingReportSchema.exactOptional(),
|
||||
};
|
||||
|
||||
export const androidResultSchemas = {
|
||||
inspect_android_jni_bindings: androidJniReportSchema.extend(common),
|
||||
inspect_android_package: z.strictObject({
|
||||
@@ -267,18 +275,25 @@ export const androidResultSchemas = {
|
||||
inner_classes: z.array(z.string()),
|
||||
mapping: androidMappingReportSchema.exactOptional(),
|
||||
}),
|
||||
inspect_android_method: z.strictObject({
|
||||
...common,
|
||||
class_name: z.string(),
|
||||
method: method,
|
||||
overload_count: z.int().positive(),
|
||||
representation: z.enum(["java", "smali"]),
|
||||
body_status: z.enum(["available", "not_available"]),
|
||||
fell_back: z.boolean(),
|
||||
markers: z.array(z.string()),
|
||||
source: textCoverage,
|
||||
mapping: androidMappingReportSchema.exactOptional(),
|
||||
}),
|
||||
inspect_android_method: z.union([
|
||||
z.strictObject({
|
||||
...methodInspectionIdentity,
|
||||
representation: z.enum(["java", "smali"]),
|
||||
body_status: z.enum(["available", "not_available"]),
|
||||
fell_back: z.boolean(),
|
||||
markers: z.array(z.string()),
|
||||
source: textCoverage,
|
||||
}),
|
||||
z.strictObject({
|
||||
...methodInspectionIdentity,
|
||||
representation: z.null(),
|
||||
body_status: z.literal("not_available"),
|
||||
body_unavailable_reason: z.string().min(1),
|
||||
fell_back: z.literal(false),
|
||||
markers: z.array(z.string()),
|
||||
source: z.null(),
|
||||
}),
|
||||
]),
|
||||
trace_android_references: z.strictObject({
|
||||
...common,
|
||||
target_definition: z.enum(["defined", "external"]),
|
||||
|
||||
Reference in new issue
Block a user