Skip to content

armgit / rea

Public Imported from GitHub
0

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

fix(ghidra): keep the NativeAOT target refusal's own recovery advice

Kaoru0822f198993f418e
diff --git a/src/domain/analysisErrorCore.ts b/src/domain/analysisErrorCore.ts
index e0ba89820..c13ba891d 100644
--- a/src/domain/analysisErrorCore.ts
+++ b/src/domain/analysisErrorCore.ts
@@ -7,13 +7,16 @@ import {
/** A readable supplied artifact lies outside this operation's supported target formats. */
export class AnalysisUnsupportedTargetError extends AnalysisError {
readonly _tag = "AnalysisUnsupportedTargetError";
+ /** Refusal-specific recovery, when the producer knows an available workflow. */
+ readonly remediationAction: string | undefined;
constructor(
readonly operation: string,
readonly path: string,
readonly reason: string,
- options?: AnalysisErrorOptions,
+ options?: AnalysisErrorOptions & { readonly remediationAction?: string },
) {
super(`Unsupported target for ${operation} at ${path}: ${reason}`, options);
+ this.remediationAction = options?.remediationAction;
}
}
diff --git a/src/domain/analysisErrorPresentation.ts b/src/domain/analysisErrorPresentation.ts
index cc3dc7e40..ca6359359 100644
--- a/src/domain/analysisErrorPresentation.ts
+++ b/src/domain/analysisErrorPresentation.ts
@@ -39,7 +39,10 @@ export const analysisErrorRemediationAction = (
if (error instanceof AnalysisSnapshotMismatchError)
return "Run analysis without this snapshot, then save a fresh snapshot using the intended artifact, provider, and analysis profile.";
if (error instanceof AnalysisUnsupportedTargetError)
- return "Select a target supported by this operation or choose an operation supporting the reported target format.";
+ return (
+ error.remediationAction ??
+ "Select a target supported by this operation or choose an operation supporting the reported target format."
+ );
if (error instanceof AnalysisResourceConstraintError)
return (
error.remediationAction ??
diff --git a/src/ghidra/extensions/GhidraExtensions.test.ts b/src/ghidra/extensions/GhidraExtensions.test.ts
index 0b4b8eb7b..98ea117b8 100644
--- a/src/ghidra/extensions/GhidraExtensions.test.ts
+++ b/src/ghidra/extensions/GhidraExtensions.test.ts
@@ -106,6 +106,9 @@ describe("optional Ghidra extension refusals", () => {
if (!architecture.ok)
expect(projectAnalysisError(architecture.error)).toMatchObject({
code: "unsupported_target",
+ remediation: {
+ action: expect.stringContaining("omit REA_GHIDRA_NATIVEAOT_JAR"),
+ },
details: {
operation: "resolve_analysis_profile",
path: target.path,
@@ -312,9 +315,11 @@ describe("Ghidra extension profile and producer validation", () => {
);
expect(resolved.ok).toBe(false);
if (!resolved.ok)
- expect(resolved.error).toMatchObject({
- _tag: "AnalysisUnsupportedTargetError",
- reason: expect.stringContaining("inspect_managed_artifact"),
+ expect(projectAnalysisError(resolved.error)).toMatchObject({
+ code: "unsupported_target",
+ remediation: {
+ action: expect.stringContaining("inspect_managed_artifact"),
+ },
});
});
it("does not substitute another artifact under an unchanged configured path", async () => {
diff --git a/src/ghidra/extensions/GhidraExtensions.ts b/src/ghidra/extensions/GhidraExtensions.ts
index fb878b522..25007bfa5 100644
--- a/src/ghidra/extensions/GhidraExtensions.ts
+++ b/src/ghidra/extensions/GhidraExtensions.ts
@@ -198,6 +198,8 @@ const extensionRefusalError = (
"resolve_analysis_profile",
target.path,
refusal.reason,
+ // The reason names the workflows that remain available.
+ { remediationAction: refusal.reason },
);
/** Snapshot committed extension bytes into the private runtime before Java loads them. */