@mrrisega/dsh-remote 0.6.0-beta.8 → 0.6.0

package/packages/dsh-remote-web/lib/index.js

@@ -4,7 +4,8 @@
 //   - 读写配置目录下 .dsh-config.json（0600）
 //   - 查询/启停 bridge（launchctl，plist 缺失时自动生成，逻辑与 dsh-setup.mjs 一致）
 //   - 代理 relay API（captcha / register / login / public-config），直连、不走系统代理；
-//     另代理企业端一次性访问密钥 / 授权设备（/api/auth-key、/api/mobile-sessions、…/revoke，Bearer）供面板「📱 远程访问」卡使用
+//     另代理企业端一次性访问密钥 / 授权设备（/api/auth-key、/api/mobile-sessions、…/revoke、
+//     DELETE …/:id、POST …/purge，Bearer）供面板「📱 远程访问」卡使用
 //   - 自管理 self*（版本可见 / 新版检测 / 一键在线更新 / 彻底卸载）：插件市场没有更新卸载按钮，
 //     面板内即官方管理入口；更新=后台 npx 按 dist-tag(默认 latest,DSH_UPDATE_TAG 可切 beta/alpha)（幂等补齐运行环境并重启 bridge）；
 //     彻底卸载=profile 插件清理（uninstallSelf）+ 运行时清理（uninstallRuntime：停 bridge 自启动 /
@@ -16,7 +17,7 @@
 import { readFileSync, writeFileSync, mkdirSync, existsSync, realpathSync, accessSync, chmodSync, openSync, closeSync, rmSync, constants as fsConstants } from "node:fs";
 import { join, dirname, sep } from "node:path";
 import { execSync, spawn } from "node:child_process";
-import { homedir, hostname, platform } from "node:os";
+import { homedir, platform } from "node:os";
 import { fileURLToPath } from "node:url";
 
 /** 本插件在 host 侧的服务依赖。 */
@@ -652,7 +653,7 @@ async function relayAccount(relayDir) {
   if (!r.ok || !r.body || !r.body.user) return null;
   const u = r.body.user;
   return {
-    phone: u.phone || "",
+    phone: maskPhone(u.phone || ""),
     plan: u.plan || "free",
     plan_source: u.plan_source || "plan",
     plan_ends_at: u.plan_ends_at ?? null,
@@ -802,6 +803,51 @@ async function proxyRevokeMobileSession(relayDir, req, res) {
   return sendJson(res, 200, { ok: true, relayStatus: (r && r.status) || 200 });
 }
 
+/**
+ * DELETE /dsh-remote/mobile-sessions/delete（body {id}）→ 删除本机该设备的授权记录
+ * （企业端 DELETE /api/mobile-sessions/:id，Bearer：本人整行删除并拉黑 jti）。
+ */
+async function proxyDeleteMobileSession(relayDir, req, res) {
+  const body = await readJsonBody(req);
+  if (body.__parseError) return sendJson(res, 400, { ok: false, error: "JSON 解析失败" });
+  const id = String(body.id ?? "").trim();
+  if (!id) return sendJson(res, 400, { ok: false, error: "缺少参数 id（会话 ID）" });
+  const token = await relayToken(relayDir).catch(() => "");
+  if (!token) return sendJson(res, 401, notLoggedInJson());
+  const r = await relayFetch(relayDir, `/api/mobile-sessions/${encodeURIComponent(id)}`, {
+    method: "DELETE",
+    headers: { authorization: `Bearer ${token}` },
+  });
+  const d = flattenRelayBody(r);
+  const ok = !!(r.ok && d.ok !== false);
+  if (!ok) {
+    return sendJson(res, (r && r.status) || 502, { ok: false, error: relayErrorMessage(r), relayStatus: (r && r.status) || 0 });
+  }
+  return sendJson(res, 200, { ok: true, relayStatus: (r && r.status) || 200 });
+}
+
+/**
+ * POST /dsh-remote/mobile-sessions/purge → 清理本人所有已解绑（revoked）记录
+ * （企业端 POST /api/mobile-sessions/purge，Bearer）。
+ */
+async function proxyPurgeMobileSessions(relayDir, res) {
+  const token = await relayToken(relayDir).catch(() => "");
+  if (!token) return sendJson(res, 401, notLoggedInJson());
+  const r = await relayFetch(relayDir, "/api/mobile-sessions/purge", {
+    method: "POST",
+    headers: { authorization: `Bearer ${token}` },
+  });
+  const d = flattenRelayBody(r);
+  const ok = !!(r.ok && d.ok !== false);
+  if (!ok) {
+    return sendJson(res, (r && r.status) || 502, { ok: false, error: relayErrorMessage(r), relayStatus: (r && r.status) || 0 });
+  }
+  const removed = Number.isInteger(d.removed) ? d.removed : null;
+  const payload = { ok: true, relayStatus: (r && r.status) || 200 };
+  if (removed !== null) payload.removed = removed;
+  return sendJson(res, 200, payload);
+}
+
 // ---------- 综合状态 ----------
 
 /**
@@ -829,6 +875,15 @@ export function readE2eeStateFile(relayDir) {
   }
 }
 
+/**
+ * 手机号脱敏(隐私审计 2026-09):面板/镜像 UI 一律不下发明文手机号。
+ * 明文只在 bridge 本机 config / 服务端账号体系内流转,浏览器侧仅见掩码。
+ */
+function maskPhone(p) {
+  const s = String(p || "");
+  return s.length >= 7 ? s.slice(0, 3) + "****" + s.slice(-4) : (s ? s.slice(0, 1) + "****" : "");
+}
+
 async function composeStatus(relayDir) {
   const cfg = loadConfig(relayDir);
   const launchd = launchdStatus();
@@ -847,7 +902,8 @@ async function composeStatus(relayDir) {
   return {
     ok: true,
     config: {
-      phone: cfg.phone || "",
+      phone: maskPhone(cfg.phone || ""),
+      hasPhone: Boolean(cfg.phone),
       hasPassword: Boolean(cfg.password),
       deviceId: cfg.device_id || "",
       apiUrl,
@@ -867,7 +923,7 @@ async function composeStatus(relayDir) {
       // {enabled, reason, profile, epoch, caps}，供面板「📱 远程访问」卡展示加密状态。
       e2ee: readE2eeStateFile(relayDir),
     },
-    host: hostname(),
+    // 隐私审计(2026-09):不再下发真实 hostname(移除 host 字段)——设备标识统一走 deviceId/服务端登记名
   };
 }
 
@@ -974,7 +1030,7 @@ const PLUGIN_ID = "dsh-remote-web";
 const PLUGIN_LEGACY_IDS = ["dsh-remote-ui"];
 const PLUGIN_ALL_IDS = [PLUGIN_ID, ...PLUGIN_LEGACY_IDS];
 /** 插件自身发布版本（与 dsh-remote 根包同步递增）。 */
-const PLUGIN_VERSION = "0.6.0-beta.8";
+const PLUGIN_VERSION = "0.6.0";
 const UPDATE_LOG = ".dsh-update.log";
 const UPDATE_MARKER = ".dsh-update-running";
 
@@ -1250,6 +1306,22 @@ function registerRoutes(ctx, relayDir) {
         await proxyRevokeMobileSession(relayDir, req, res);
       },
     },
+    // 删除已授权设备记录（整行删除并拉黑 jti；企业端 DELETE /api/mobile-sessions/:id，Bearer）
+    {
+      method: "DELETE",
+      path: "/dsh-remote/mobile-sessions/delete",
+      handler: async (req, res) => {
+        await proxyDeleteMobileSession(relayDir, req, res);
+      },
+    },
+    // 清理本人全部已解绑（revoked）记录（企业端 POST /api/mobile-sessions/purge，Bearer）
+    {
+      method: "POST",
+      path: "/dsh-remote/mobile-sessions/purge",
+      handler: async (_req, res) => {
+        await proxyPurgeMobileSessions(relayDir, res);
+      },
+    },
     {
       method: "POST",
       path: "/dsh-remote/config",
@@ -1320,7 +1392,11 @@ function registerRoutes(ctx, relayDir) {
       handler: async (req, res) => {
         const body = await readJsonBody(req);
         if (body.__parseError) return sendJson(res, 400, { ok: false, error: "JSON 解析失败" });
-        const phone = String(body.phone ?? "").trim();
+        let phone = String(body.phone ?? "").trim();
+        if (!phone) {
+          // 隐私审计(2026-09):账号卡修改密码不再下发明文手机号——服务端以本机账号为准
+          phone = String((loadConfig(relayDir).phone) || "").trim();
+        }
         if (!phone) return sendJson(res, 400, { ok: false, error: "手机号必填" });
         const r = await relayFetch(relayDir, "/api/sms-code", {
           method: "POST", headers: { "content-type": "application/json" },
@@ -1329,6 +1405,31 @@ function registerRoutes(ctx, relayDir) {
         sendJson(res, r.status || 502, { ok: r.ok, status: r.status, body: r.body });
       },
     },
+    {
+      method: "POST",
+      path: "/dsh-remote/password/reset",
+      handler: async (req, res) => {
+        // 公开 POST /api/password/reset（无需 Bearer）：短信验证码重置密码。
+        // 成功 → 企业端使该账号全部授权设备/会话失效（含 E2EE 派生口令）。
+        const body = await readJsonBody(req);
+        if (body.__parseError) return sendJson(res, 400, { ok: false, error: "JSON 解析失败" });
+        let phone = String(body.phone ?? "").trim();
+        if (!phone) {
+          // 隐私审计(2026-09):同上,账号卡改密不传明文手机号,服务端回填本机账号
+          phone = String((loadConfig(relayDir).phone) || "").trim();
+        }
+        const smsCode = String(body.sms_code ?? "").trim();
+        const newPassword = String(body.new_password ?? body.password ?? "");
+        if (!phone || !smsCode || !newPassword) return sendJson(res, 400, { ok: false, error: "手机号、短信验证码与新密码必填" });
+        const r = await relayFetch(relayDir, "/api/password/reset", {
+          method: "POST",
+          headers: { "content-type": "application/json" },
+          body: JSON.stringify({ phone, sms_code: smsCode, new_password: newPassword }),
+        });
+        // 透传企业端 ok/error（成功 200 {ok:true}；失败保留 status 与错误体）
+        sendJson(res, r.status || 502, { ok: r.ok, status: r.status, body: r.body });
+      },
+    },
     {
       method: "GET",
       path: "/dsh-remote/captcha",
@@ -1421,7 +1522,7 @@ function registerRoutes(ctx, relayDir) {
           feedbackUrl: api,
           reachable,
           deviceId: cfg.device_id || "",
-          phone: cfg.phone || "",
+          phone: maskPhone(cfg.phone || ""), // 隐私:浏览器端只见掩码(代理提交时服务端另附真号)
           // 登录态（已配置账号或自建密钥）→ 节点半自动附加 JWT，免图形验证码
           auth: cfg.local_key || (cfg.phone && cfg.password) ? "account" : "anonymous"
         });

package/packages/dsh-remote-web/test/access-key-sessions.test.mjs

@@ -1,5 +1,7 @@
 // 插件 node 半新增代理回归：/dsh-remote/access-key | mobile-sessions | mobile-sessions/revoke
-// （企业端 E1 契约：POST /api/auth-key、POST /api/mobile-sessions、POST /api/mobile-sessions/:id/revoke，Bearer device-login JWT）
+// | mobile-sessions/delete | mobile-sessions/purge
+// （企业端 E1 契约：POST /api/auth-key、GET /api/mobile-sessions、POST /api/mobile-sessions/:id/revoke、
+//  DELETE /api/mobile-sessions/:id、POST /api/mobile-sessions/purge，Bearer device-login JWT）
 // 覆盖：Bearer 透传、字段扁平化、未登录 401、qr 缺失容错、上游错误透传。
 import assert from "node:assert/strict";
 import http from "node:http";
@@ -41,6 +43,9 @@ function startFakeRelay(opts = {}) {
     }
     if (req.method === "POST" && url.pathname === "/api/mobile-sessions/ms_1/revoke") return send(200, { ok: true });
     if (req.method === "POST" && url.pathname === "/api/mobile-sessions/ghost/revoke") return send(404, { error: { message: "not_found" } });
+    if (req.method === "DELETE" && url.pathname === "/api/mobile-sessions/ms_1") return send(200, { ok: true });
+    if (req.method === "DELETE" && url.pathname === "/api/mobile-sessions/ghost") return send(404, { error: { message: "not_found" } });
+    if (req.method === "POST" && url.pathname === "/api/mobile-sessions/purge") return send(200, { ok: true, removed: 2 });
     send(404, { error: { code: "not_found" } });
   });
   return new Promise((resolve) => srv.listen(0, "127.0.0.1", () => resolve({ srv, seen, port: srv.address().port })));
@@ -155,7 +160,66 @@ test("mobile-sessions/revoke 路由：body {id} 转发到 /api/mobile-sessions/:
   }
 });
 
-test("未登录（无账号配置）→ 三条路由统一 401 提示登录，不请求企业端", async () => {
+test("mobile-sessions/delete 路由：DELETE body {id} 转发到企业端 DELETE /api/mobile-sessions/:id（拉黑 jti）", async () => {
+  const relay = await startFakeRelay();
+  const { host, base, tempDir } = await bootRelay(relay.port);
+  try {
+    const r = await (await fetch(`${base}/dsh-remote/mobile-sessions/delete`, {
+      method: "DELETE",
+      headers: { "content-type": "application/json" },
+      body: JSON.stringify({ id: "ms_1" }),
+    })).json();
+    assert.equal(r.ok, true);
+    const up = relay.seen.find((s) => s.path === "/api/mobile-sessions/ms_1" && s.method === "DELETE");
+    assert.ok(up, "应转发到企业端 DELETE /api/mobile-sessions/ms_1");
+    assert.equal(up.authorization, "Bearer jwt-abc");
+
+    // 缺 id → 400；不存在的会话 → 透传 404 文案
+    const bad = await (await fetch(`${base}/dsh-remote/mobile-sessions/delete`, {
+      method: "DELETE",
+      headers: { "content-type": "application/json" },
+      body: JSON.stringify({}),
+    })).json();
+    assert.equal(bad.ok, false);
+    assert.match(String(bad.error), /id/);
+
+    const ghost = await (await fetch(`${base}/dsh-remote/mobile-sessions/delete`, {
+      method: "DELETE",
+      headers: { "content-type": "application/json" },
+      body: JSON.stringify({ id: "ghost" }),
+    })).json();
+    assert.equal(ghost.ok, false);
+    assert.match(String(ghost.error), /not_found/);
+  } finally {
+    host.close();
+    relay.srv.close();
+    await rm(tempDir, { recursive: true, force: true });
+  }
+});
+
+test("mobile-sessions/purge 路由：POST → 企业端 POST /api/mobile-sessions/purge，removed 透传", async () => {
+  const relay = await startFakeRelay();
+  const { host, base, tempDir } = await bootRelay(relay.port);
+  try {
+    const r = await (await fetch(`${base}/dsh-remote/mobile-sessions/purge`, {
+      method: "POST",
+      headers: { "content-type": "application/json" },
+      body: JSON.stringify({}),
+    })).json();
+    assert.equal(r.ok, true);
+    assert.equal(r.removed, 2, "企业端返回的 removed 清理条数应透传");
+    const up = relay.seen.find((s) => s.path === "/api/mobile-sessions/purge");
+    assert.ok(up, "应转发到 /api/mobile-sessions/purge");
+    assert.equal(up.method, "POST");
+    assert.equal(up.authorization, "Bearer jwt-abc");
+  } finally {
+    host.close();
+    relay.srv.close();
+    await rm(tempDir, { recursive: true, force: true });
+  }
+});
+
+test("未登录（无账号配置）→ 五条路由统一 401 提示登录，不请求企业端", async () => {
   const relay = await startFakeRelay();
   const tempDir = await mkdtemp(path.join(os.tmpdir(), "dsh-aks-401-"));
   await writeFile(path.join(tempDir, ".dsh-config.json"), JSON.stringify({ api_url: `http://127.0.0.1:${relay.port}` }));
@@ -179,13 +243,19 @@ test("未登录（无账号配置）→ 三条路由统一 401 提示登录，
       assert.equal((await (await fetch(`${base}${p}`, { method }))).status, 401, `${p} 应返回 401`);
       assert.match(String(r.error), /尚未登录/);
     }
-    const rev = await (await fetch(`${base}/dsh-remote/mobile-sessions/revoke`, {
-      method: "POST",
-      headers: { "content-type": "application/json" },
-      body: JSON.stringify({ id: "ms_1" }),
-    })).json();
-    assert.equal(rev.ok, false);
-    assert.match(String(rev.error), /尚未登录/);
+    for (const [method, p] of [
+      ["POST", "/dsh-remote/mobile-sessions/revoke"],
+      ["DELETE", "/dsh-remote/mobile-sessions/delete"],
+      ["POST", "/dsh-remote/mobile-sessions/purge"],
+    ]) {
+      const r = await (await fetch(`${base}${p}`, {
+        method,
+        headers: { "content-type": "application/json" },
+        body: JSON.stringify({ id: "ms_1" }),
+      })).json();
+      assert.equal(r.ok, false);
+      assert.match(String(r.error), /尚未登录/);
+    }
     assert.ok(!relay.seen.some((s) => s.path.startsWith("/api/auth-key") || s.path.startsWith("/api/mobile-sessions")), "未登录不应请求企业端");
   } finally {
     host.close();

package/packages/dsh-remote-web/test/e2ee-state.test.mjs

@@ -122,7 +122,7 @@ test("composeStatus：.e2ee-state.json 启用 → /dsh-remote/status 的 service
       enabled: true, reason: "ok", profile: "pbkdf2-sha256-600k", epoch: 2, caps: ["e2ee-v2"],
     });
 
-    // 2) bridge 未启用（服务端灰度关）→ 原样上报 reason，供面板映射可读文案
+    // 2) bridge 未启用（服务端关闭/不支持）→ 原样上报 reason，供面板映射可读文案
     await writeFile(stateFile, JSON.stringify({ enabled: false, reason: "server_disabled", profile: "", epoch: 0, caps: [] }));
     status = await (await fetch(`${boot.base}/dsh-remote/status`)).json();
     assert.equal(status.service.e2ee.enabled, false);

package/packages/dsh-remote-web/test/feedback-proxy.test.mjs

@@ -104,7 +104,8 @@ test("反馈配置：默认走 api_url（生产 relay-api 同源反馈端点）
     assert.equal(body.ok, true);
     assert.equal(body.reachable, true);
     assert.equal(body.deviceId, "dev-cfgcheck");
-    assert.equal(body.phone, "13900000000");
+    // 隐私契约(2026-09):反馈配置不下发明文手机号,只给掩码(提交时服务端另附 x-dsh-phone 真号)
+    assert.equal(body.phone, "139****0000");
     // 代理把 /dsh-remote/feedback/api/feedback/captcha 映射到 {api_url}/api/feedback/captcha
     const cap = await fetch(`http://127.0.0.1:${host.address().port}/dsh-remote/feedback/api/feedback/captcha`);
     assert.equal(cap.status, 201);