@smithers-orchestrator/accounts 0.21.0 → 0.23.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smithers-orchestrator/accounts",
-  "version": "0.21.0",
+  "version": "0.23.0",
   "description": "Manage multiple Claude/Antigravity/Codex/Gemini/Kimi subscription and API-key accounts that Smithers agents can round-robin through.",
   "type": "module",
   "sideEffects": false,
@@ -20,7 +20,7 @@
     "src/"
   ],
   "dependencies": {
-    "@smithers-orchestrator/errors": "0.21.0"
+    "@smithers-orchestrator/errors": "0.23.0"
   },
   "devDependencies": {
     "@types/bun": "latest",

package/src/defaultConfigDir.js

@@ -1,6 +1,15 @@
-import { join } from "node:path";
+import { SmithersError } from "@smithers-orchestrator/errors/SmithersError";
+import { join, resolve } from "node:path";
 import { accountsRoot } from "./accountsRoot.js";
 
+/**
+ * Account labels are used as a path segment under `~/.smithers/accounts`, so
+ * they must be a single, safe segment. This mirrors the wizard's input regex
+ * (`agentAddWizard.js`) and rejects anything that could escape the accounts
+ * root (`..`, `/`, `\`, etc.).
+ */
+const LABEL_PATTERN = /^[A-Za-z0-9._-]+$/;
+
 /**
  * Default location for a per-account CLI config dir, e.g.
  * `~/.smithers/accounts/claude-work`.
@@ -10,5 +19,24 @@ import { accountsRoot } from "./accountsRoot.js";
  * @returns {string}
  */
 export function defaultConfigDir(label, env = process.env) {
-    return join(accountsRoot(env), "accounts", label);
+    if (typeof label !== "string" || !LABEL_PATTERN.test(label) || label === "." || label === "..") {
+        throw new SmithersError(
+            "ACCOUNT_INVALID",
+            `Invalid account label ${JSON.stringify(label)}: use only letters, digits, '.', '_' or '-' (no path separators or '..').`,
+        );
+    }
+    const root = accountsRoot(env);
+    const dir = join(root, "accounts", label);
+    // Defense-in-depth: a valid label can never escape, but assert the resolved
+    // path stays under the accounts root so a future regex change can't silently
+    // reintroduce traversal.
+    const base = resolve(root, "accounts");
+    const resolved = resolve(dir);
+    if (resolved !== join(base, label) && !resolved.startsWith(base + "/")) {
+        throw new SmithersError(
+            "ACCOUNT_INVALID",
+            `Invalid account label ${JSON.stringify(label)}: resolved path escapes the accounts directory.`,
+        );
+    }
+    return dir;
 }