Skip to content

armgit / rea

Public Imported from GitHub
0

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

fix(setup): replace managed Hopper on reinstall

morluto0ca93f9779bc
diff --git a/src/application/MacHopper.ts b/src/application/MacHopper.ts
index 62e217719..17286aa91 100644
--- a/src/application/MacHopper.ts
+++ b/src/application/MacHopper.ts
@@ -55,6 +55,7 @@ export interface MacHopperInstallHost {
source: string,
destination: string,
stage: string,
+ replaceExisting: boolean,
): Promise<boolean>;
launcherReady(path: string): Promise<boolean>;
openApplication(path: string): Promise<void>;
@@ -64,6 +65,7 @@ export interface MacHopperInstallHost {
/** Download, verify, and install Hopper into the current user's Applications directory. */
export const installMacHopper = async (
+ options: { readonly replaceExisting?: boolean } = {},
host: MacHopperInstallHost = systemMacHopperInstallHost(),
): Promise<MacHopperInstallResult> => {
let temporary: string | undefined;
@@ -83,7 +85,8 @@ export const installMacHopper = async (
return { status: "failed", reason: "integrity" };
const destination = host.destination();
- if (await host.destinationExists(destination))
+ const destinationExists = await host.destinationExists(destination);
+ if (destinationExists && options.replaceExisting !== true)
return { status: "failed", reason: "destination_exists" };
temporary = await host.createTemporaryDirectory();
const packagePath = join(temporary, "hopper.dmg");
@@ -97,7 +100,9 @@ export const installMacHopper = async (
if (source === undefined || !(await host.validBundle(source)))
return { status: "failed", reason: "bundle" };
const stage = `${destination}.rea-stage`;
- if (!(await host.installBundle(source, destination, stage)))
+ if (
+ !(await host.installBundle(source, destination, stage, destinationExists))
+ )
return { status: "failed", reason: "copy" };
const launcherPath = join(destination, "Contents/MacOS/hopper");
if (!(await host.launcherReady(launcherPath)))
@@ -181,15 +186,27 @@ const systemMacHopperInstallHost = (): MacHopperInstallHost => ({
return false;
}
},
- async installBundle(source, destination, stage) {
+ async installBundle(source, destination, stage, replaceExisting) {
+ const previous = `${stage}-previous`;
try {
await mkdir(join(homedir(), "Applications"), { recursive: true });
await rm(stage, { recursive: true, force: true });
+ await rm(previous, { recursive: true, force: true });
await execFileAsync("ditto", [source, stage]);
+ await access(join(stage, "Contents/MacOS/hopper"));
+ if (replaceExisting) await rename(destination, previous);
await rename(stage, destination);
+ if (replaceExisting) await rm(previous, { recursive: true, force: true });
return true;
} catch {
await rm(stage, { recursive: true, force: true });
+ if (replaceExisting) {
+ try {
+ await rename(previous, destination);
+ } catch {
+ // The original destination was not moved, or rollback is impossible.
+ }
+ }
return false;
}
},
diff --git a/src/application/Setup.ts b/src/application/Setup.ts
index 4d06275d6..fb4fca45c 100644
--- a/src/application/Setup.ts
+++ b/src/application/Setup.ts
@@ -69,7 +69,7 @@ export interface SetupHost {
macosVersion(): Promise<string | undefined>;
linuxDistribution(): Promise<LinuxDistribution | undefined>;
hopperPath(): Promise<string | undefined>;
- installHopper(): Promise<SetupHopperInstallResult>;
+ installHopper(replaceExisting: boolean): Promise<SetupHopperInstallResult>;
detectedClients(): Promise<readonly SetupClient[]>;
configureClient(
client: SetupClient,
@@ -170,7 +170,7 @@ export const runSetup = async (
};
if (installHopper && (interactiveApproval || options.installHopper)) {
- const installed = await host.installHopper();
+ const installed = await host.installHopper(options.installHopper);
if (installed.status === "failed")
return {
status: "needs_human",
@@ -320,11 +320,11 @@ const systemSetupHost = (): SetupHost => {
macosVersion: () => doctorHost.macosVersion(),
linuxDistribution: readLinuxDistribution,
hopperPath: async () => (await runDoctor(undefined, doctorHost)).hopperPath,
- installHopper: async () => {
+ installHopper: async (replaceExisting) => {
const result =
process.platform === "linux"
? await installLinuxHopper()
- : await installMacHopper();
+ : await installMacHopper({ replaceExisting });
if (result.status === "installed") return result;
return setupInstallFailure(result.reason);
},
diff --git a/tests/macHopper.test.ts b/tests/macHopper.test.ts
index 7647f274f..61bc1f26d 100644
--- a/tests/macHopper.test.ts
+++ b/tests/macHopper.test.ts
@@ -19,6 +19,7 @@ class FakeMacHopperHost implements MacHopperInstallHost {
unmounts = 0;
cleanups = 0;
opens = 0;
+ replaces = false;
download = (url: string) =>
Promise.resolve(
@@ -51,7 +52,15 @@ class FakeMacHopperHost implements MacHopperInstallHost {
appBundle = () => Promise.resolve("/mounted/Hopper Disassembler.app");
validBundle = () => Promise.resolve(this.valid);
destinationExists = () => Promise.resolve(this.existing);
- installBundle = () => Promise.resolve(this.copySucceeds);
+ installBundle = (
+ _source: string,
+ _destination: string,
+ _stage: string,
+ replaceExisting: boolean,
+ ) => {
+ this.replaces = replaceExisting;
+ return Promise.resolve(this.copySucceeds);
+ };
launcherReady = () => Promise.resolve(this.launcherSucceeds);
openApplication = () => {
this.opens += 1;
@@ -67,7 +76,7 @@ class FakeMacHopperHost implements MacHopperInstallHost {
describe("macOS Hopper installation", () => {
it("installs, verifies, opens, and cleans the official package", async () => {
const host = new FakeMacHopperHost();
- await expect(installMacHopper(host)).resolves.toEqual({
+ await expect(installMacHopper({}, host)).resolves.toEqual({
status: "installed",
launcherPath:
"/home/user/Applications/Hopper Disassembler.app/Contents/MacOS/hopper",
@@ -80,7 +89,7 @@ describe("macOS Hopper installation", () => {
it("rejects an integrity mismatch before mounting", async () => {
const host = new FakeMacHopperHost();
host.badHash = true;
- await expect(installMacHopper(host)).resolves.toEqual({
+ await expect(installMacHopper({}, host)).resolves.toEqual({
status: "failed",
reason: "integrity",
});
@@ -91,16 +100,26 @@ describe("macOS Hopper installation", () => {
it("refuses to overwrite an existing application", async () => {
const host = new FakeMacHopperHost();
host.existing = true;
- await expect(installMacHopper(host)).resolves.toEqual({
+ await expect(installMacHopper({}, host)).resolves.toEqual({
status: "failed",
reason: "destination_exists",
});
});
+ it("replaces the managed application when explicitly requested", async () => {
+ const host = new FakeMacHopperHost();
+ host.existing = true;
+
+ await expect(
+ installMacHopper({ replaceExisting: true }, host),
+ ).resolves.toMatchObject({ status: "installed" });
+ expect(host.replaces).toBe(true);
+ });
+
it("cleans and detaches after bundle validation fails", async () => {
const host = new FakeMacHopperHost();
host.valid = false;
- await expect(installMacHopper(host)).resolves.toEqual({
+ await expect(installMacHopper({}, host)).resolves.toEqual({
status: "failed",
reason: "bundle",
});
diff --git a/tests/setup.test.ts b/tests/setup.test.ts
index 670c79912..23c0e22c2 100644
--- a/tests/setup.test.ts
+++ b/tests/setup.test.ts
@@ -22,6 +22,7 @@ class FakeSetupHost implements SetupHost {
clients: readonly SetupClient[] = [];
clientResults = new Map<string, ClientConfigurationResult>();
hopperInstalls = 0;
+ hopperReplaceRequests: boolean[] = [];
configurations = 0;
skillInstalls = 0;
checkedHopperPaths: Array<string | undefined> = [];
@@ -38,8 +39,11 @@ class FakeSetupHost implements SetupHost {
linuxDistribution = (): Promise<LinuxDistribution | undefined> =>
Promise.resolve(this.distribution);
hopperPath = (): Promise<string | undefined> => Promise.resolve(this.hopper);
- installHopper = (): Promise<SetupHopperInstallResult> => {
+ installHopper = (
+ replaceExisting: boolean,
+ ): Promise<SetupHopperInstallResult> => {
this.hopperInstalls += 1;
+ this.hopperReplaceRequests.push(replaceExisting);
this.linuxDemoRuntimeMissing = false;
if (this.hopperInstallSucceeds) {
this.hopper = "/manual/Hopper";
@@ -248,6 +252,7 @@ describe("setup workflow", () => {
]);
expect(result.appliedActions).toEqual(["installed_hopper"]);
expect(host.hopperInstalls).toBe(1);
+ expect(host.hopperReplaceRequests).toEqual([true]);
expect(host.configurations).toBe(0);
expect(host.checkedHopperPaths).toEqual(["/manual/Hopper"]);
});