Skip to content

Commit ad7fd46

Browse files
committed
fix(ssh): preserve service discovery and managed process checks
1 parent 20841d4 commit ad7fd46

4 files changed

Lines changed: 52 additions & 4 deletions

File tree

‎apps/server/src/cli/sshHelper.ts‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,23 @@ export const resolveSshServerHome = Effect.gen(function* () {
2929
const path = yield* Path.Path;
3030
const home = yield* HostProcess.HomeDirectory;
3131
const platform = yield* HostProcess.Platform;
32+
const uid = yield* HostProcess.UserId;
33+
const processRunner = yield* ProcessRunner.ProcessRunner;
34+
const userManagerEnv =
35+
platform === "linux" &&
36+
!environment.XDG_RUNTIME_DIR &&
37+
uid !== undefined &&
38+
!(uid === 0 && environment.SUDO_USER)
39+
? { XDG_RUNTIME_DIR: `/run/user/${uid}` }
40+
: undefined;
41+
const runner: ProcessRunner.ProcessRunner["Service"] = {
42+
run: (request) => processRunner.run({ ...request, env: { ...userManagerEnv, ...request.env } }),
43+
};
3244
const serviceFile =
3345
platform === "darwin"
3446
? path.join(home, "Library", "LaunchAgents", BOOT_SERVICE_PLIST_FILE)
3547
: path.join(
36-
(yield* readSystemdUnitDirectory(yield* ProcessRunner.ProcessRunner, path)) ??
48+
(yield* readSystemdUnitDirectory(runner, path)) ??
3749
defaultSystemdUnitDir(path, home, environment.XDG_CONFIG_HOME ?? ""),
3850
BOOT_SERVICE_UNIT_FILE,
3951
);

‎apps/server/src/cloud/bootService.test.ts‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1400,6 +1400,32 @@ it.effect.each(["linux", "darwin"] as const)(
14001400
yield* fs.makeDirectory(path.join(xdgConfigHome, "systemd/user"), { recursive: true });
14011401
yield* fs.rename(servicePath, path.join(xdgConfigHome, "systemd/user/t3code.service"));
14021402
assert.strictEqual(yield* resolve({ XDG_CONFIG_HOME: xdgConfigHome }), serviceHome);
1403+
const managerDirectory = path.join(xdgConfigHome, "systemd/user");
1404+
const managerRunner = ProcessRunner.ProcessRunner.of({
1405+
run: (request) =>
1406+
Effect.succeed({
1407+
stdout: JSON.stringify({ data: [managerDirectory, managerDirectory + ".control"] }),
1408+
stderr: "",
1409+
code: ChildProcessSpawner.ExitCode(
1410+
request.env?.XDG_RUNTIME_DIR === "/run/user/1234" ? 0 : 1,
1411+
),
1412+
timedOut: false,
1413+
stdoutTruncated: false,
1414+
stderrTruncated: false,
1415+
stdoutInvalidUtf8: false,
1416+
stderrInvalidUtf8: false,
1417+
}),
1418+
});
1419+
assert.strictEqual(
1420+
yield* resolveSshServerHome.pipe(
1421+
Effect.provideService(ProcessRunner.ProcessRunner, managerRunner),
1422+
Effect.provideService(HostProcess.HomeDirectory, directory),
1423+
Effect.provideService(HostProcess.Platform, "linux"),
1424+
Effect.provideService(HostProcess.UserId, 1234),
1425+
Effect.provideService(HostProcess.Environment, {}),
1426+
),
1427+
serviceHome,
1428+
);
14031429
}
14041430
}).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
14051431
);

‎packages/ssh/src/tunnel.test.ts‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,16 @@ process.stdout.write(args[0] === "__ssh-helper"
245245
// This fixture owns its PID. Even a broken ownership guard cannot signal
246246
// the test runner or a real T3 environment.
247247
const external = yield* realSpawner.spawn(
248-
ChildProcess.make(process.execPath, ["-e", "process.stdin.resume()"]),
248+
ChildProcess.make(process.execPath, [
249+
"-e",
250+
"process.stdin.resume()",
251+
"--",
252+
"serve",
253+
"--host",
254+
"127.0.0.1",
255+
"--port",
256+
"41773",
257+
]),
249258
);
250259
yield* fs.writeFileString(
251260
path.join(customHome, "userdata/server-runtime.json"),
@@ -1079,6 +1088,7 @@ server.listen(Number(flag("--port") ?? 0), "127.0.0.1", () => {
10791088
process.kill(firstPid, "SIGKILL");
10801089
yield* fs.remove(`${home}/.t3/userdata/server-runtime.json`);
10811090
yield* fs.writeFileString(`${stateDir}/pid`, `${staleId}\n`);
1091+
yield* fs.writeFileString(`${stateDir}/server-home`, `${home}/old-home`);
10821092
yield* fs.writeFileString(`${stateDir}/port`, `${holderPort}\n`);
10831093

10841094
const relaunched = yield* launch;

‎packages/ssh/src/tunnel.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -650,12 +650,13 @@ server_running() {
650650
*Z*) return 1 ;;
651651
esac
652652
}
653+
@@T3_MANAGED_SERVER_RUNNING_SCRIPT@@
653654
PREVIOUS_SERVER_HOME="$(cat "$SERVER_HOME_FILE" 2>/dev/null || printf '%s' "$HOME/.t3")"
654655
# A home change must not redirect pairing to another environment while the
655656
# previously managed server is still running. Leave it for an explicit stop.
656657
if [ "$PREVIOUS_SERVER_HOME" != "$DEFAULT_SERVER_HOME" ] && [ "$(cat "$MANAGED_FILE" 2>/dev/null || true)" = "managed" ]; then
657658
PREVIOUS_PID="$(cat "$PID_FILE" 2>/dev/null || true)"
658-
if server_running "$PREVIOUS_PID"; then
659+
if managed_server_running "$PREVIOUS_PID"; then
659660
printf 'The SSH-managed server still uses %s. Stop it before changing the T3 home to %s.\\n' "$PREVIOUS_SERVER_HOME" "$DEFAULT_SERVER_HOME" >&2
660661
exit 1
661662
fi
@@ -692,7 +693,6 @@ wait_for_pid_exit() {
692693
sleep 0.1
693694
done
694695
}
695-
@@T3_MANAGED_SERVER_RUNNING_SCRIPT@@
696696
resolve_default_runtime_port() {
697697
if [ "$T3_ARCHIVE_MODE" = "1" ]; then
698698
"$RUNNER_FILE" __ssh-helper runtime-port "$DEFAULT_RUNTIME_FILE"

0 commit comments

Comments
 (0)