arisa 5.1.8 → 5.1.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arisa",
-  "version": "5.1.8",
+  "version": "5.1.10",
   "description": "Telegram + Pi Agent modular assistant",
   "type": "module",
   "main": "src/index.js",

package/src/runtime/slave-cli.js

@@ -165,6 +165,14 @@ export function formatSlaveStatus({ systemd, diagnostic }) {
   ].join("\n");
 }
 
+function explainSlaveBootstrapError(error) {
+  if (error?.message !== "Socket closed before the protocol completed") return error;
+  return new Error(
+    "Master ended the pairing handshake before it completed. The bootstrap URL may be expired, rotated, already used, or invalid. Generate a new bootstrap URL on Master and retry before it expires.",
+    { cause: error }
+  );
+}
+
 export async function runSlaveBootstrap(url, {
   paths = getSlavePaths(resolveSlaveHome()),
   ask = askFromTerminal,
@@ -181,11 +189,16 @@ export async function runSlaveBootstrap(url, {
   const account = await selectAccount({ ask });
   await ensureSlaveConfig(paths);
   await ensureTool(paths);
-  const result = await withSecureRequestFile({
-    directory: paths.tmpDir,
-    prefix: "bootstrap",
-    value: { url }
-  }, (bootstrapFile) => invokeTool(paths, { action: "slave.bootstrap", bootstrapFile }));
+  let result;
+  try {
+    result = await withSecureRequestFile({
+      directory: paths.tmpDir,
+      prefix: "bootstrap",
+      value: { url }
+    }, (bootstrapFile) => invokeTool(paths, { action: "slave.bootstrap", bootstrapFile }));
+  } catch (error) {
+    throw explainSlaveBootstrapError(error);
+  }
   await installService({ account, slaveHome: paths.home, entryFile });
   await writeSlaveServiceDescriptor(paths, { version: 1, account, installedAt: new Date().toISOString() });
   output.log(`Arisa Slave paired and running as ${account.user}${account.root ? " (root)" : ""}.`);

package/src/runtime/slave-service.js

@@ -65,7 +65,21 @@ export async function selectSlaveServiceAccount({
 }
 
 function quoteSystemd(value) {
-  return `"${String(value).replaceAll("\\", "\\\\").replaceAll('"', '\\"')}"`;
+  return `"${String(value).replaceAll("\\", "\\\\").replaceAll('"', '\\"').replaceAll("%", "%%")}"`;
+}
+
+function escapeSystemdPath(value) {
+  const text = String(value);
+  if (text.includes("\0")) throw new Error("Systemd paths cannot contain NUL bytes");
+  return [...text].map((character) => {
+    if (character === "\\") return "\\\\";
+    if (character === "%") return "%%";
+    const codePoint = character.codePointAt(0);
+    if (codePoint <= 0x20 || codePoint === 0x7f || character === '"' || character === "'") {
+      return `\\x${codePoint.toString(16).padStart(2, "0")}`;
+    }
+    return character;
+  }).join("");
 }
 
 export function buildSlaveSystemdUnit({ account, slaveHome, entryFile, nodePath = process.execPath }) {
@@ -84,10 +98,10 @@ export function buildSlaveSystemdUnit({ account, slaveHome, entryFile, nodePath
     userDirective.trimEnd(),
     `Environment=${quoteSystemd(`ARISA_HOME=${paths.home}`)}`,
     `Environment=${quoteSystemd(`ARISA_SLAVE_HOME=${paths.home}`)}`,
-    `WorkingDirectory=${quoteSystemd(paths.home)}`,
+    `WorkingDirectory=${escapeSystemdPath(paths.home)}`,
     `ExecStart=${quoteSystemd(nodePath)} ${quoteSystemd(entryFile)} slave --service-runner`,
-    `StandardOutput=append:${paths.logFile}`,
-    `StandardError=append:${paths.logFile}`,
+    `StandardOutput=append:${escapeSystemdPath(paths.logFile)}`,
+    `StandardError=append:${escapeSystemdPath(paths.logFile)}`,
     "Restart=on-failure",
     "RestartSec=2",
     "",

package/test/slave-cli.test.js

@@ -82,11 +82,23 @@ test("builds a dedicated headless systemd service with isolated state", () => {
   });
   assert.match(unit, /User=arisa-slave/);
   assert.match(unit, /Environment="ARISA_HOME=\/var\/lib\/arisa-slave"/);
+  assert.match(unit, /^WorkingDirectory=\/var\/lib\/arisa-slave$/m);
   assert.match(unit, /ExecStart="\/usr\/bin\/node" "\/opt\/arisa\/src\/index\.js" slave --service-runner/);
   assert.match(unit, /StandardOutput=append:\/var\/lib\/arisa-slave\/state\/arisa-slave\.log/);
   assert.doesNotMatch(unit, /Telegram|Pi Agent/);
 });
 
+test("escapes systemd WorkingDirectory paths without quoting the entire value", () => {
+  const unit = buildSlaveSystemdUnit({
+    account: { scope: "user", user: "tester" },
+    slaveHome: "/srv/arisa slave",
+    entryFile: "/opt/arisa/src/index.js",
+    nodePath: "/usr/bin/node"
+  });
+  assert.match(unit, /^WorkingDirectory=\/srv\/arisa\\x20slave$/m);
+  assert.match(unit, /^StandardOutput=append:\/srv\/arisa\\x20slave\/state\/arisa-slave\.log$/m);
+});
+
 test("refuses to replace the PID of an active Slave host", async (t) => {
   const home = await mkdtemp(path.join(os.tmpdir(), "arisa-slave-pid-"));
   t.after(() => rm(home, { recursive: true, force: true }));
@@ -164,6 +176,26 @@ test("validates before effects and keeps the bootstrap secret out of service met
   assert.deepEqual(calls, []);
 });
 
+test("explains an incomplete Master pairing handshake", async (t) => {
+  const home = await mkdtemp(path.join(os.tmpdir(), "arisa-slave-handshake-"));
+  t.after(() => rm(home, { recursive: true, force: true }));
+  await assert.rejects(
+    () => runSlaveBootstrap(`tcp://198.51.100.12:4719/${secret}`, {
+      paths: getSlavePaths(home),
+      entryFile: "/opt/arisa/src/index.js",
+      platform: "linux",
+      selectAccount: async () => ({ scope: "user", user: "tester", root: false, dedicated: false }),
+      ensureTool: async () => {},
+      installService: async () => assert.fail("service must not be installed after a failed handshake"),
+      invokeTool: async () => {
+        throw new Error("Socket closed before the protocol completed");
+      },
+      output: { log: () => {} }
+    }),
+    /bootstrap URL may be expired, rotated, already used, or invalid.*before it expires/i
+  );
+});
+
 test("ships an immutable verified master-slave bootstrap lock", async (t) => {
   const home = await mkdtemp(path.join(os.tmpdir(), "arisa-slave-lock-"));
   t.after(() => rm(home, { recursive: true, force: true }));