remote-dsh 0.5.0 → 0.6.0

package/dist/bin.js

@@ -25,7 +25,8 @@ Usage:
   rdsh host leave             Unregister this machine from the hub
   rdsh host user ...          Manage gateway users (LAN/cloud password auth)
   rdsh hub serve              Start the hub server (cloud, multi-host)
-  rdsh hub user add|passwd|rm|ls
+  rdsh hub user add|passwd|rm|ls|unlock|reset-2fa
+  rdsh hub audit ls           Audit log (login/2FA/sharing/email events)
   rdsh hub host ls|revoke     List / revoke hosts (revoke drops the tunnel instantly)
   rdsh hub service ...        Run hub as a systemd/launchd service
 
@@ -60,7 +61,8 @@ Run the hub server or manage it.
 
 Subcommands:
   serve                 Start the hub server (TLS required)
-  user add|passwd|rm|ls Manage users (registration closed; admin creates accounts)
+  user add|passwd|rm|ls|unlock|reset-2fa   Manage users (admin creates accounts; unlock / reset-2fa)
+  audit ls [--user <n>] [--event <e>] [--since 24h|7d]   Query the audit log
   host ls|revoke        List / revoke hosts (revoke drops the tunnel instantly)
   service install|status|uninstall   Run hub as a systemd/launchd service
 
@@ -436,6 +438,56 @@ async function openHubDb(configPath) {
     const config = await loadHubConfig(hubConfigPath);
     return new HubDb(config.dbPath);
 }
+/** `rdsh hub audit ls [--user <name>] [--event <e>] [--since 24h|7d]`。 */
+async function handleHubAudit(args, configPath) {
+    const db = await openHubDb(configPath);
+    try {
+        // 兼容 `audit ls` 与 `audit`（ls 为可选位置参数）
+        const opts = args[0] === "ls" ? args.slice(1) : args;
+        const filter = {};
+        for (let i = 0; i < opts.length; i++) {
+            const flag = opts[i];
+            if (flag === "--user") {
+                const name = opts[++i];
+                if (name === undefined)
+                    throw new Error("missing value for --user");
+                const u = db.getUserByName(name);
+                if (u === null)
+                    throw new Error(`user '${name}' not found`);
+                filter.userId = u.id;
+            }
+            else if (flag === "--event") {
+                filter.event = opts[++i];
+                if (filter.event === undefined)
+                    throw new Error("missing value for --event");
+            }
+            else if (flag === "--since") {
+                const v = opts[++i];
+                if (v === undefined)
+                    throw new Error("missing value for --since");
+                const m = /^(\d+)([hd])$/.exec(v);
+                if (m === null)
+                    throw new Error(`invalid --since '${v}' (use like 24h or 7d)`);
+                filter.since = Date.now() - Number(m[1]) * (m[2] === "h" ? 3_600_000 : 86_400_000);
+            }
+            else {
+                throw new Error(`unknown option '${flag}'`);
+            }
+        }
+        const events = db.listAudit(filter);
+        if (events.length === 0) {
+            console.log("(no events)");
+            return;
+        }
+        for (const e of events) {
+            const user = e.userId !== null ? db.getUserById(e.userId) : null;
+            console.log(`${new Date(e.createdAt).toISOString()}  ${user?.name ?? "-"}  ${e.event}  ip=${e.ip}  ${e.detailJson}`);
+        }
+    }
+    finally {
+        db.close();
+    }
+}
 async function handleHub(args, configPath) {
     const sub = args[0];
     const rest = args.slice(1);
@@ -457,6 +509,10 @@ async function handleHub(args, configPath) {
             await handleHubHost(rest, configPath);
             return;
         }
+        case "audit": {
+            await handleHubAudit(rest, configPath);
+            return;
+        }
         case "service": {
             const action = rest[0];
             const hubConfigPath = resolveHubConfigPath(configPath);
@@ -476,7 +532,7 @@ async function handleHub(args, configPath) {
             }
         }
         default:
-            throw new Error("usage: rdsh hub serve|user|host|service");
+            throw new Error("usage: rdsh hub serve|user|host|audit|service");
     }
 }
 function parseHubServeArgs(args, configPath) {
@@ -572,8 +628,31 @@ async function handleHubUser(args, configPath) {
                 console.log(`rdsh: user '${name}' removed (their hosts removed)`);
                 return;
             }
+            case "unlock": {
+                const name = args[1];
+                if (name === undefined)
+                    throw new Error("usage: rdsh hub user unlock <name>");
+                const user = db.getUserByName(name);
+                if (user === null)
+                    throw new Error(`user '${name}' not found`);
+                db.unlockAccount(user.id);
+                console.log(`rdsh: user '${name}' unlocked`);
+                return;
+            }
+            case "reset-2fa": {
+                const name = args[1];
+                if (name === undefined)
+                    throw new Error("usage: rdsh hub user reset-2fa <name>");
+                const user = db.getUserByName(name);
+                if (user === null)
+                    throw new Error(`user '${name}' not found`);
+                db.clearTotpSecret(user.id);
+                db.bumpVersion(user.id);
+                console.log(`rdsh: 2FA reset for '${name}' (their sessions revoked)`);
+                return;
+            }
             default:
-                throw new Error("usage: rdsh hub user add|passwd|ls|rm");
+                throw new Error("usage: rdsh hub user add|passwd|ls|rm|unlock|reset-2fa");
         }
     }
     finally {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "remote-dsh",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "Secure remote access for DeepSeek Harness: rdsh serve / rdsh join / rdsh hub",
   "license": "MIT",
   "type": "module",
@@ -23,8 +23,8 @@
     "node": ">=22"
   },
   "dependencies": {
-    "rdsh-gateway": "0.3.0",
-    "rdsh-hub": "0.3.0"
+    "rdsh-gateway": "0.4.0",
+    "rdsh-hub": "0.4.0"
   },
   "scripts": {
     "build": "tsc -p tsconfig.json",