jishushell 0.4.24 → 0.5.15

package/dist/services/app-passwords.js

@@ -0,0 +1,173 @@
+/**
+ * App passwords for WebDAV / external clients (M3 W4).
+ *
+ * The panel's master password is too valuable to hand to iOS Files,
+ * macOS Finder, etc. — those clients persist credentials and have a
+ * long blast radius if leaked. App passwords are independent tokens:
+ *   - bcrypt hashed
+ *   - per-token scope (path prefix) and mode (ro/rw)
+ *   - revocable individually without affecting other clients
+ *   - last_used_at tracked so suspicious tokens can be spotted
+ *
+ * Stored under ~/.jishushell/app-passwords.json (atomic safe write).
+ *
+ * Vision: G7 — WebDAV uses app-passwords, NOT the panel password.
+ */
+import * as fs from "node:fs";
+import { randomBytes, timingSafeEqual } from "node:crypto";
+import bcrypt from "bcryptjs";
+import { JISHUSHELL_HOME } from "../config.js";
+import { join } from "node:path";
+import { safeWriteJson } from "../utils/safe-json.js";
+const STORE_PATH = join(JISHUSHELL_HOME, "app-passwords.json");
+function readStore() {
+    if (!fs.existsSync(STORE_PATH))
+        return { version: 1, passwords: [] };
+    try {
+        const raw = JSON.parse(fs.readFileSync(STORE_PATH, "utf8"));
+        if (raw && Array.isArray(raw.passwords))
+            return raw;
+    }
+    catch (e) {
+        console.warn(`[app-passwords] failed to load: ${e.message}`);
+    }
+    return { version: 1, passwords: [] };
+}
+function writeStore(data) {
+    fs.mkdirSync(JISHUSHELL_HOME, { recursive: true });
+    safeWriteJson(STORE_PATH, data);
+}
+/**
+ * Generate a new app password. Returns the plaintext token exactly
+ * once — caller MUST surface it to the user immediately, after which
+ * only the hash is recoverable.
+ */
+export async function createAppPassword(opts) {
+    const trimmedName = (opts.name ?? "").trim();
+    if (!trimmedName)
+        throw new Error("name is required");
+    if (trimmedName.length > 64)
+        throw new Error("name too long");
+    const id = randomBytes(8).toString("hex"); // 16 hex chars
+    const token = randomBytes(32).toString("hex"); // 64 hex chars (~256 bits)
+    const hash = await bcrypt.hash(token, 10);
+    const record = {
+        id,
+        name: trimmedName,
+        hash,
+        scope: opts.scope ?? { kind: "all" },
+        mode: opts.mode ?? "rw",
+        created_at: Math.floor(Date.now() / 1000),
+        revoked: false,
+    };
+    const store = readStore();
+    store.passwords.push(record);
+    writeStore(store);
+    return { id, token, record };
+}
+/**
+ * Verify a Basic Auth credential pair against the store. Returns the
+ * matching record when valid, null otherwise. Updates last_used_at on
+ * success.
+ *
+ * Username is the password id (16 hex chars from createAppPassword).
+ * Password is the plaintext token.
+ */
+export async function verifyAppPassword(username, password) {
+    if (!username || !password)
+        return null;
+    const store = readStore();
+    const record = store.passwords.find((p) => p.id === username);
+    if (!record || record.revoked) {
+        // Run a dummy bcrypt to keep timing constant whether or not the id exists
+        await bcrypt.compare(password, "$2a$10$0123456789012345678901abcdefghijklmnopqrstuvwxyz");
+        return null;
+    }
+    const ok = await bcrypt.compare(password, record.hash);
+    if (!ok)
+        return null;
+    record.last_used_at = Math.floor(Date.now() / 1000);
+    writeStore(store);
+    return record;
+}
+/**
+ * Returns the public view of all stored passwords (no hashes / tokens).
+ */
+export function listAppPasswords() {
+    const store = readStore();
+    return store.passwords.map(({ hash: _ignored, ...rest }) => rest);
+}
+export function revokeAppPassword(id) {
+    const store = readStore();
+    const record = store.passwords.find((p) => p.id === id);
+    if (!record)
+        return false;
+    record.revoked = true;
+    writeStore(store);
+    return true;
+}
+export function deleteAppPassword(id) {
+    const store = readStore();
+    const before = store.passwords.length;
+    store.passwords = store.passwords.filter((p) => p.id !== id);
+    if (store.passwords.length === before)
+        return false;
+    writeStore(store);
+    return true;
+}
+/**
+ * Check whether `relPath` is allowed by `record.scope` and `record.mode`.
+ * `relPath` is files/-relative.
+ */
+export function isAllowed(record, relPath, needsWrite) {
+    if (record.revoked)
+        return { allowed: false, reason: "revoked" };
+    if (needsWrite && record.mode === "ro") {
+        return { allowed: false, reason: "read-only credential" };
+    }
+    if (record.scope.kind === "all")
+        return { allowed: true };
+    // path scope: relPath must equal prefix or start with prefix + '/'
+    const prefix = record.scope.prefix;
+    if (!prefix)
+        return { allowed: true };
+    if (relPath === prefix)
+        return { allowed: true };
+    if (relPath.startsWith(prefix + "/"))
+        return { allowed: true };
+    if (prefix === "")
+        return { allowed: true };
+    return { allowed: false, reason: "outside scope" };
+}
+/**
+ * Parse a Basic Auth header into [username, password] or null.
+ */
+export function parseBasicAuth(header) {
+    if (!header || typeof header !== "string")
+        return null;
+    const [scheme, value] = header.split(" ", 2);
+    if (!scheme || scheme.toLowerCase() !== "basic" || !value)
+        return null;
+    let decoded;
+    try {
+        decoded = Buffer.from(value, "base64").toString("utf8");
+    }
+    catch {
+        return null;
+    }
+    const idx = decoded.indexOf(":");
+    if (idx < 0)
+        return null;
+    const username = decoded.slice(0, idx);
+    const password = decoded.slice(idx + 1);
+    return [username, password];
+}
+/**
+ * Constant-time compare helper for callers that need it (token == token).
+ */
+export function tokenEquals(a, b) {
+    if (a.length !== b.length)
+        return false;
+    return timingSafeEqual(Buffer.from(a), Buffer.from(b));
+}
+//# sourceMappingURL=app-passwords.js.map

package/dist/services/app-passwords.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"app-passwords.js","sourceRoot":"","sources":["../../src/services/app-passwords.ts"],"names":[],"mappings":"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"}

package/dist/services/backup-manager.d.ts

@@ -3,6 +3,17 @@
  * Ported from OpenClaw official: encodeAbsolutePathForBackupArchive.
  */
 export declare function encodeAbsolutePathForArchive(sourcePath: string): string;
+/**
+ * Decode a path produced by {@link encodeAbsolutePathForArchive} back to
+ * the original absolute filesystem path.
+ *
+ * - `"posix/Users/arm/foo"` → `"/Users/arm/foo"`
+ * - `"windows/C/Users/foo"` → `"C:\\Users\\foo"`
+ * - `"relative/some/path"`  → `"some/path"`
+ *
+ * Returns the input unchanged when the prefix is unrecognised.
+ */
+export declare function decodeArchivePath(encodedPath: string): string;
 export interface CallOpenclawBackupResult {
     ok: boolean;
     archivePath?: string;

package/dist/services/backup-manager.js

@@ -1,7 +1,7 @@
 import { execFileSync, spawn as spawnChild } from "child_process";
 import { createHash, randomUUID } from "crypto";
-import { copyFileSync, existsSync, lstatSync, mkdirSync, readdirSync, readFileSync, readlinkSync, realpathSync, renameSync, rmSync, statSync, symlinkSync, writeFileSync } from "fs";
-import { dirname, join } from "path";
+import { copyFileSync, existsSync, lstatSync, mkdirSync, readdirSync, readFileSync, readlinkSync, realpathSync, renameSync, rmSync, statSync, symlinkSync, unlinkSync, writeFileSync } from "fs";
+import { dirname, join, relative } from "path";
 import { posix as pathPosix } from "path";
 import { BACKUPS_DIR, INSTANCES_DIR, TMP_DIR } from "../config.js";
 /**
@@ -20,6 +20,156 @@ export function encodeAbsolutePathForArchive(sourcePath) {
         return pathPosix.join("posix", normalized.slice(1));
     return pathPosix.join("relative", normalized);
 }
+/**
+ * Decode a path produced by {@link encodeAbsolutePathForArchive} back to
+ * the original absolute filesystem path.
+ *
+ * - `"posix/Users/arm/foo"` → `"/Users/arm/foo"`
+ * - `"windows/C/Users/foo"` → `"C:\\Users\\foo"`
+ * - `"relative/some/path"`  → `"some/path"`
+ *
+ * Returns the input unchanged when the prefix is unrecognised.
+ */
+export function decodeArchivePath(encodedPath) {
+    const normalized = encodedPath.replaceAll("\\", "/");
+    if (normalized.startsWith("posix/")) {
+        return "/" + normalized.slice("posix/".length);
+    }
+    if (normalized.startsWith("windows/")) {
+        const rest = normalized.slice("windows/".length);
+        const slashIdx = rest.indexOf("/");
+        const drive = slashIdx >= 0 ? rest.slice(0, slashIdx) : rest;
+        // Drive letter must be a single alphabetic character
+        if (!/^[A-Za-z]$/.test(drive))
+            return encodedPath;
+        const tail = slashIdx >= 0 ? rest.slice(slashIdx + 1) : "";
+        return `${drive}:\\${tail.replaceAll("/", "\\")}`;
+    }
+    if (normalized.startsWith("relative/")) {
+        return normalized.slice("relative/".length);
+    }
+    return encodedPath;
+}
+/**
+ * Validate that a decoded `oldHome` path is safe to use with `replaceAll`.
+ *
+ * Guards against catastrophic replacements when the inferred path is empty,
+ * a filesystem root, or relative (which would match too broadly).
+ */
+function isValidOldHome(path) {
+    if (!path || path === "." || path === "..")
+        return false;
+    // POSIX: must start with / and not be root itself
+    if (path.startsWith("/"))
+        return path.length > 1;
+    // Windows: must be drive:\something (at least one segment after drive)
+    const winMatch = path.match(/^[A-Za-z]:[/\\](.+)$/);
+    if (winMatch)
+        return true;
+    return false;
+}
+const MAX_REWRITE_FILE_SIZE = 100 * 1024 * 1024; // 100 MB
+/**
+ * Rewrite absolute paths in session data and symlinks after copying from a
+ * backup archive. Best-effort per file: individual failures produce warnings
+ * but do not block the import or affect other files.
+ *
+ * Walks all `.json` and `.jsonl` files under {@link targetDir} recursively
+ * and replaces occurrences of {@link oldHome} with {@link newHome}. Also
+ * rewrites symlink targets that contain {@link oldHome}.
+ */
+function rewriteInstancePaths(targetDir, oldHome, newHome, warnings) {
+    if (oldHome === newHome)
+        return;
+    if (!isValidOldHome(oldHome)) {
+        warnings.push(`Path rewrite skipped: inferred source path "${oldHome}" is invalid or too broad`);
+        return;
+    }
+    const walkDir = (dir) => {
+        if (!existsSync(dir))
+            return;
+        let entries;
+        try {
+            entries = readdirSync(dir);
+        }
+        catch {
+            return;
+        }
+        for (const entry of entries) {
+            const fullPath = join(dir, entry);
+            let s;
+            try {
+                s = lstatSync(fullPath);
+            }
+            catch {
+                continue;
+            }
+            // Rewrite symlink targets
+            if (s.isSymbolicLink()) {
+                try {
+                    const target = readlinkSync(fullPath);
+                    if (target.includes(oldHome)) {
+                        unlinkSync(fullPath);
+                        symlinkSync(target.replaceAll(oldHome, newHome), fullPath);
+                    }
+                }
+                catch (e) {
+                    warnings.push(`Symlink rewrite failed for ${entry}: ${e.message}`);
+                }
+                continue;
+            }
+            if (s.isDirectory()) {
+                walkDir(fullPath);
+                continue;
+            }
+            // Only process .json and .jsonl regular files
+            if (!s.isFile())
+                continue;
+            if (!entry.endsWith(".json") && !entry.endsWith(".jsonl"))
+                continue;
+            if (s.size > MAX_REWRITE_FILE_SIZE) {
+                warnings.push(`Skipped path rewrite for large file: ${entry} (${s.size} bytes)`);
+                continue;
+            }
+            try {
+                const content = readFileSync(fullPath, "utf-8");
+                if (content.includes(oldHome)) {
+                    writeFileSync(fullPath, content.replaceAll(oldHome, newHome));
+                }
+            }
+            catch (e) {
+                warnings.push(`Path rewrite failed for ${entry}: ${e.message}`);
+            }
+        }
+    };
+    walkDir(targetDir);
+}
+/**
+ * Detect the original `openclawHome` path that was used when the backup
+ * archive was created.
+ *
+ * Priority:
+ * 1. `manifest.source_home` (written by newer selfPackOfficialFormat)
+ * 2. Fallback: decode the encoded path from the payload/ directory structure
+ */
+function detectOldHome(manifest, payloadDir, extractedStateDir) {
+    // Priority 1: manifest metadata
+    if (manifest?.source_home && typeof manifest.source_home === "string") {
+        return manifest.source_home;
+    }
+    // Priority 2: decode from payload/ path structure
+    try {
+        const extractedHomeDir = dirname(extractedStateDir);
+        const relativeToPayload = relative(payloadDir, extractedHomeDir);
+        // Reject if relative() produced a `..` traversal (unexpected layout)
+        if (relativeToPayload.startsWith(".."))
+            return null;
+        return decodeArchivePath(relativeToPayload);
+    }
+    catch {
+        return null;
+    }
+}
 /**
  * Try to create a backup by calling the official `openclaw backup create` CLI.
  * Returns ok:false if the binary is missing or the command fails.
@@ -795,6 +945,7 @@ export async function selfPackOfficialFormat(instanceId, outputPath, opts) {
             paths: {
                 stateDir: `payload/${encodedPath}/.openclaw`,
             },
+            source_home: openclawHome,
             has_sessions: hasSessions,
             checksum: `sha256:${checksum}`,
             checksum_scope: "content-excluding-manifest",
@@ -996,6 +1147,12 @@ export async function restoreInstance(instanceId, backupFilePath) {
             }
         }
         touchInstanceLock(instanceId);
+        // Rewrite absolute paths in session data and symlinks when the backup
+        // originates from a different machine or instance (cross-machine restore).
+        const oldHome = detectOldHome(manifest, payloadDir, extractedStateDir);
+        if (oldHome) {
+            rewriteInstancePaths(effectiveScope === "home" ? openclawHome : stateDir, oldHome, openclawHome, warnings);
+        }
         // Step 10: Rebuild runtime state
         try {
             const { bootstrapInstanceProxy } = await import("./llm-proxy/index.js");
@@ -1071,9 +1228,10 @@ export async function createFromBackup(backupFilePath, opts) {
         // openclaw-home tree, not just .openclaw (see importInstance for the
         // rationale).
         let archiveScope = "state";
+        let manifest = null;
         const manifestPath = join(archiveRoot, "manifest.json");
         if (existsSync(manifestPath)) {
-            const manifest = JSON.parse(readFileSync(manifestPath, "utf-8"));
+            manifest = JSON.parse(readFileSync(manifestPath, "utf-8"));
             if (manifest.has_api_keys === false || !manifest.has_api_keys) {
                 warnings.push("No API Key in this backup. You will need to configure one.");
             }
@@ -1126,6 +1284,13 @@ export async function createFromBackup(backupFilePath, opts) {
                 return true;
             });
         }
+        // Rewrite absolute paths in session data and symlinks from the source
+        // instance to the new instance (fixes ENOENT crash on Docker import
+        // and silent cross-instance data leakage on local import).
+        const oldHome = detectOldHome(manifest, payloadDir, extractedStateDir);
+        if (oldHome) {
+            rewriteInstancePaths(archiveScope === "home" ? newOpenclawHome : newStateDir, oldHome, newOpenclawHome, warnings);
+        }
         // Scrub channel credentials from copied openclaw.json (new instance should not inherit IM bindings)
         await scrubNewInstanceConfig(join(newStateDir, "openclaw.json"));
         // DO NOT copy model.env — bootstrapInstanceProxy will generate a new proxy token
@@ -1490,10 +1655,11 @@ export async function importInstance(tempId, opts) {
         // backup silently drops the runtime/app tree that motivated the
         // home-scope in the first place.
         let archiveScope = "state";
+        let manifest = null;
         const manifestPath = join(archiveRoot, "manifest.json");
         if (existsSync(manifestPath)) {
             try {
-                const manifest = JSON.parse(readFileSync(manifestPath, "utf-8"));
+                manifest = JSON.parse(readFileSync(manifestPath, "utf-8"));
                 if (manifest?.scope === "home")
                     archiveScope = "home";
             }
@@ -1541,6 +1707,13 @@ export async function importInstance(tempId, opts) {
                 return true;
             });
         }
+        // Rewrite absolute paths in session data and symlinks from the source
+        // instance to the new instance (fixes ENOENT crash on Docker import
+        // and silent cross-instance data leakage on local import).
+        const oldHome = detectOldHome(manifest, payloadDir, extractedStateDir);
+        if (oldHome) {
+            rewriteInstancePaths(archiveScope === "home" ? newOpenclawHome : newStateDir, oldHome, newOpenclawHome, warnings);
+        }
         // Scrub channel credentials from copied openclaw.json (new instance should not inherit IM bindings)
         await scrubNewInstanceConfig(join(newStateDir, "openclaw.json"));
         // DO NOT copy model.env, provider.env, instance.json