github/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-10 12:44:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Linux daemon install checks when systemd user bus env is missing (#34884)

Browse Source 
* daemon(systemd): fall back to machine user scope when user bus is missing

* test(systemd): cover machine scope fallback for user-bus errors

* test(systemd): reset execFile mock state across cases

* test(systemd): make machine-user fallback assertion portable

* fix(daemon): keep root sudo path on direct user scope

* test(systemd): cover sudo root user-scope behavior

* ci: use resolvable bun version in setup-node-env
This commit is contained in:
Vincent Koc
2026-03-04 11:54:03 -08:00
committed by GitHub
parent df0f2e349f
commit 53b2479eed
3 changed files with 168 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

116
src/daemon/systemd.test.ts
View File

@@ -18,7 +18,7 @@ import {
describe("systemd availability", () => {
beforeEach(() => {
execFileMock.mockClear();
execFileMock.mockReset();
});
it("returns true when systemctl --user succeeds", async () => {
@@ -40,11 +40,34 @@ describe("systemd availability", () => {
});
await expect(isSystemdUserServiceAvailable()).resolves.toBe(false);
});
it("falls back to machine user scope when --user bus is unavailable", async () => {
execFileMock
.mockImplementationOnce((_cmd, args, _opts, cb) => {
expect(args).toEqual(["--user", "status"]);
const err = new Error(
"Failed to connect to user scope bus via local transport",
) as Error & {
stderr?: string;
code?: number;
};
err.stderr =
"Failed to connect to user scope bus via local transport: $DBUS_SESSION_BUS_ADDRESS and $XDG_RUNTIME_DIR not defined";
err.code = 1;
cb(err, "", "");
})
.mockImplementationOnce((_cmd, args, _opts, cb) => {
expect(args).toEqual(["--machine", "debian@", "--user", "status"]);
cb(null, "", "");
});
await expect(isSystemdUserServiceAvailable({ USER: "debian" })).resolves.toBe(true);
});
});
describe("isSystemdServiceEnabled", () => {
beforeEach(() => {
execFileMock.mockClear();
execFileMock.mockReset();
});
it("returns false when systemctl is not present", async () => {
@@ -81,13 +104,23 @@ describe("isSystemdServiceEnabled", () => {
it("throws when systemctl is-enabled fails for non-state errors", async () => {
const { isSystemdServiceEnabled } = await import("./systemd.js");
execFileMock.mockImplementationOnce((_cmd, _args, _opts, cb) => {
const err = new Error("Failed to connect to bus") as Error & { code?: number };
err.code = 1;
cb(err, "", "Failed to connect to bus");
});
execFileMock
.mockImplementationOnce((_cmd, args, _opts, cb) => {
expect(args).toEqual(["--user", "is-enabled", "openclaw-gateway.service"]);
const err = new Error("Failed to connect to bus") as Error & { code?: number };
err.code = 1;
cb(err, "", "Failed to connect to bus");
})
.mockImplementationOnce((_cmd, args, _opts, cb) => {
expect(args[0]).toBe("--machine");
expect(String(args[1])).toMatch(/^[^@]+@$/);
expect(args.slice(2)).toEqual(["--user", "is-enabled", "openclaw-gateway.service"]);
const err = new Error("permission denied") as Error & { code?: number };
err.code = 1;
cb(err, "", "permission denied");
});
await expect(isSystemdServiceEnabled({ env: {} })).rejects.toThrow(
"systemctl is-enabled unavailable: Failed to connect to bus",
"systemctl is-enabled unavailable: permission denied",
);
});
@@ -216,7 +249,7 @@ describe("parseSystemdExecStart", () => {
describe("systemd service control", () => {
beforeEach(() => {
execFileMock.mockClear();
execFileMock.mockReset();
});
it("stops the resolved user unit", async () => {
@@ -292,4 +325,69 @@ describe("systemd service control", () => {
expect(write).toHaveBeenCalledTimes(1);
expect(String(write.mock.calls[0]?.[0])).toContain("Restarted systemd service");
});
it("keeps direct --user scope when SUDO_USER is root", async () => {
execFileMock
.mockImplementationOnce((_cmd, args, _opts, cb) => {
expect(args).toEqual(["--user", "status"]);
cb(null, "", "");
})
.mockImplementationOnce((_cmd, args, _opts, cb) => {
expect(args).toEqual(["--user", "restart", "openclaw-gateway.service"]);
cb(null, "", "");
});
const write = vi.fn();
const stdout = { write } as unknown as NodeJS.WritableStream;
await restartSystemdService({ stdout, env: { SUDO_USER: "root", USER: "root" } });
expect(write).toHaveBeenCalledTimes(1);
expect(String(write.mock.calls[0]?.[0])).toContain("Restarted systemd service");
});
it("falls back to machine user scope for restart when user bus env is missing", async () => {
execFileMock
.mockImplementationOnce((_cmd, args, _opts, cb) => {
expect(args).toEqual(["--user", "status"]);
const err = new Error("Failed to connect to user scope bus") as Error & {
stderr?: string;
code?: number;
};
err.stderr =
"Failed to connect to user scope bus via local transport: $DBUS_SESSION_BUS_ADDRESS and $XDG_RUNTIME_DIR not defined";
err.code = 1;
cb(err, "", "");
})
.mockImplementationOnce((_cmd, args, _opts, cb) => {
expect(args).toEqual(["--machine", "debian@", "--user", "status"]);
cb(null, "", "");
})
.mockImplementationOnce((_cmd, args, _opts, cb) => {
expect(args).toEqual(["--user", "restart", "openclaw-gateway.service"]);
const err = new Error("Failed to connect to user scope bus") as Error & {
stderr?: string;
code?: number;
};
err.stderr = "Failed to connect to user scope bus";
err.code = 1;
cb(err, "", "");
})
.mockImplementationOnce((_cmd, args, _opts, cb) => {
expect(args).toEqual([
"--machine",
"debian@",
"--user",
"restart",
"openclaw-gateway.service",
]);
cb(null, "", "");
});
const write = vi.fn();
const stdout = { write } as unknown as NodeJS.WritableStream;
await restartSystemdService({ stdout, env: { USER: "debian" } });
expect(write).toHaveBeenCalledTimes(1);
expect(String(write.mock.calls[0]?.[0])).toContain("Restarted systemd service");
});
});