fix supervised and local regressions

Rhys Sullivan committed 5 months ago

Commit 831bfbd1 parent 498e4a614 files · +997 −52Browse files

Showing the changes to apps/cli/src (3 of 14 files). Show all

Unified · Split

3 files

@@ -89,8 +89,8 @@ export const isExecutorServerReachable = ( · 88 unmodified lines
89	// misconfigured base URL can't leak the bearer token to a third-party host.	89	// misconfigured base URL can't leak the bearer token to a third-party host.
90	const url = new URL("/api/health", input.baseUrl);	90	const url = new URL("/api/health", input.baseUrl);
91	const response = await fetch(url, { signal: AbortSignal.timeout(2000) });	91	const response = await fetch(url, { signal: AbortSignal.timeout(2000) });
92	await response.body?.cancel();	92	const body = await response.text();
93	return response.ok;	93	return response.ok && body.trim() === "ok";
94	}).pipe(Effect.catchCause(() => Effect.succeed(false)));	94	}).pipe(Effect.catchCause(() => Effect.succeed(false)));
95		95
96	// ---------------------------------------------------------------------------	96	// ---------------------------------------------------------------------------

@@ -2270,8 +2270,8 @@ const openInBrowser = (url: string): Effect.Effect<void> => · 2269 unmodified lines
2270	*/	2270	*/
2271	const openCommand = Command.make("open", {}, () =>	2271	const openCommand = Command.make("open", {}, () =>
2272	Effect.gen(function* () {	2272	Effect.gen(function* () {
2273	const manifest = yield* readLocalServerManifest();	2273	const manifest = yield* readActiveLocalServerManifest().pipe(Effect.orElseSucceed(() => null));
2274	if (!manifest \|\| !isPidAlive(manifest.pid)) {	2274	if (!manifest) {
2275	console.log("No local Executor server is running.");	2275	console.log("No local Executor server is running.");
2276	console.log(`Start one with: ${cliPrefix} web`);	2276	console.log(`Start one with: ${cliPrefix} web`);
2277	return;	2277	return;

   readonly stderrPath: string;
 }
+const SYSTEMD_BARE_VALUE = /^[A-Za-z0-9_@%+=:,./-]+$/;
+const systemdQuote = (value: string): string => {
+  if (SYSTEMD_BARE_VALUE.test(value)) return value;
+  const escaped = value
+    .replaceAll("\\", "\\\\")
+    .replaceAll('"', '\\"')
+    .replaceAll("\n", "\\n")
+    .replaceAll("\r", "\\r")
+    .replaceAll("\t", "\\t");
+  return `"${escaped}"`;
+};
 /** Render a systemd --user unit. Pure (snapshot-tested). */
 export const generateSystemdUnit = (options: SystemdUnitOptions): string => {
-  const execStart = options.execStart.map((arg) => (/\s/.test(arg) ? `"${arg}"` : arg)).join(" ");
+  const execStart = options.execStart.map(systemdQuote).join(" ");
   const env = Object.entries(options.environment)
-    .map(([key, value]) => `Environment=${key}=${value}`)
+    .map(([key, value]) => `Environment=${systemdQuote(`${key}=${value}`)}`)
     .join("\n");
   return `[Unit]
 Description=Executor supervised daemon
 Type=simple
 ExecStart=${execStart}
 ${env}
-WorkingDirectory=${options.workingDirectory}
+WorkingDirectory=${systemdQuote(options.workingDirectory)}
-StandardOutput=append:${options.stdoutPath}
+StandardOutput=${systemdQuote(`append:${options.stdoutPath}`)}
-StandardError=append:${options.stderrPath}
+StandardError=${systemdQuote(`append:${options.stderrPath}`)}
 Restart=on-failure
 RestartSec=5s

Keyboard shortcuts