dsh-isolation-gate 0.3.1 → 0.4.0

package/lib/index.js

@@ -44,10 +44,18 @@ import {
   setGroupLevel,
   setLevel,
 } from './service.js';
-import { clearAudit } from './audit.js';
+import { clearAudit } from './audit.js';
 import { collectTargets } from './toolgate.js';
-import { decideWithProfiles, knownDirBindings, loadProfileState } from './profiles-runtime.js';
-import { DEFAULT_LEVEL } from './store.js';
+import { decideWithProfiles, knownDirBindings, loadProfileState, __clearProfileCaches } from './profiles-runtime.js';
+import {
+  DEFAULT_LEVEL,
+  readState,
+  writeState,
+  withProfile,
+  withoutProfile,
+  withSessionProfile,
+} from './store.js';
+import { isValidProfileName, readProfiles } from './profiles.js';
 
 export const name = 'dsh-isolation-gate';
 /** `tools` 是硬依赖：工具执行门没有它就不成立。 */
@@ -181,6 +189,7 @@ export function apply(ctx, config) {
   function pickWithWindowsDialog() {
     return new Promise((resolve, reject) => {
       const script = [
+        '[Console]::OutputEncoding = [System.Text.Encoding]::UTF8;',
         'Add-Type -AssemblyName System.Windows.Forms;',
         '$d = New-Object System.Windows.Forms.FolderBrowserDialog;',
         "$d.Description = '选择要加入门禁的目录';",
@@ -219,6 +228,9 @@ export function apply(ctx, config) {
           `GET ${BASE}/ping`,
           `GET ${BASE}/state`,
           `GET ${BASE}/profiles`,
+          `POST ${BASE}/profile/save`,
+          `POST ${BASE}/profile/delete`,
+          `POST ${BASE}/session-profile`,
           `POST ${BASE}/level`,
           `POST ${BASE}/roster`,
           `POST ${BASE}/group-level`,
@@ -243,17 +255,87 @@ export function apply(ctx, config) {
     {
       method: 'GET',
       path: `${BASE}/profiles`,
-      handler: async () => {
+      handler: async (_req, _res, url) => {
         const state = loadProfileState(cfg.statePath)
+        const sid = url?.searchParams?.get('sessionId') ?? ''
         const profiles = [...state.profiles.values()].map((profile) => ({
           name: profile.name,
+          label: profile.label || profile.name,
           mode: profile.mode,
           allow: profile.allow,
           network: profile.network,
           unknownTool: profile.unknownTool,
+          builtin: profile.builtin === true,
           isDefault: profile.name === state.defaultProfile,
         }))
-        return { ok: true, defaultProfile: state.defaultProfile, profiles, dirBindings: knownDirBindings() }
+        return {
+          ok: true,
+          defaultProfile: state.defaultProfile,
+          profiles,
+          sessionOverrides: state.sessionOverrides,
+          currentSessionProfile: sid ? state.sessionOverrides[sid] ?? null : null,
+          dirBindings: knownDirBindings(),
+        }
+      },
+    },
+    {
+      method: 'POST',
+      path: `${BASE}/profile/save`,
+      handler: async (req) => {
+        const body = await readJsonBody(req)
+        const checked = isValidProfileName(body.name)
+        if (!checked.ok) return { ok: false, error: checked.reason }
+        const allow = Array.isArray(body.allow) ? body.allow : []
+        const loaded = readState(cfg.statePath)
+        const next = withProfile(loaded.state, checked.name, {
+          label: body.label,
+          mode: body.mode,
+          allow,
+          network: body.network,
+          unknownTool: body.unknownTool,
+        })
+        if (body.asDefault === true) next.defaultProfile = checked.name
+        writeState(cfg.statePath, next)
+        __clearProfileCaches()
+        console.log(`[dsh-isolation-gate] 档「${checked.name}」已保存（${allow.length} 条清单）`)
+        return { ok: true, name: checked.name, report: report() }
+      },
+    },
+    {
+      method: 'POST',
+      path: `${BASE}/profile/delete`,
+      handler: async (req) => {
+        const body = await readJsonBody(req)
+        const name = typeof body.name === 'string' ? body.name.trim() : ''
+        if (name === '') return { ok: false, error: '缺少档名' }
+        const loaded = readState(cfg.statePath)
+        const isBuiltin = loaded.state.profiles[name] === undefined && ['normal', 'strict', 'sealed'].includes(name)
+        if (isBuiltin) return { ok: false, error: '内置三档不能删（可以复制一份再改）' }
+        const next = withoutProfile(loaded.state, name)
+        writeState(cfg.statePath, next)
+        __clearProfileCaches()
+        console.log(`[dsh-isolation-gate] 档「${name}」已删除（挂在它上面的会话绑定一并清除）`)
+        return { ok: true, name, report: report() }
+      },
+    },
+    {
+      method: 'POST',
+      path: `${BASE}/session-profile`,
+      handler: async (req) => {
+        const body = await readJsonBody(req)
+        const sessionId = typeof body.sessionId === 'string' ? body.sessionId.trim() : ''
+        if (sessionId === '') return { ok: false, error: '缺少会话 id' }
+        const name = typeof body.profile === 'string' ? body.profile.trim() : ''
+        const loaded = readState(cfg.statePath)
+        if (name !== '') {
+          const profiles = readProfiles(loaded.state)
+          if (!profiles.profiles.has(name)) return { ok: false, error: `没有这个档：${name}` }
+        }
+        const next = withSessionProfile(loaded.state, sessionId, name)
+        writeState(cfg.statePath, next)
+        __clearProfileCaches()
+        console.log(`[dsh-isolation-gate] 会话 ${sessionId} → ${name === '' ? '不额外限制（只走全局名单）' : name}`)
+        return { ok: true, sessionId, profile: name === '' ? null : name, report: report() }
       },
     },
     {

package/lib/profiles.js

@@ -90,11 +90,29 @@ export class ProfileError extends Error {}
  * `.dsh-gate.json` 在**自己的子树内**填允许项（见 narrowProfile）。
  */
 export const BUILTIN_PROFILES = {
-  normal: { mode: 'blocklist' },
-  strict: { mode: 'allowlist', allow: [] },
-  sealed: { mode: 'sealed', allow: [] },
+  normal: { mode: 'blocklist', label: '宽松' },
+  strict: { mode: 'allowlist', allow: [], label: '严格' },
+  sealed: { mode: 'sealed', allow: [], label: '全封' },
 };
 
+/**
+ * 2026-10-22：档从"写死的三个"改成**用户可编辑的模板**。
+ *   · builtin 三档仍作为新建时的基准（clone 出来再改）；
+ *   · 自定义档可以随时改名/改条目/删除；
+ *   · 会话只**挂**一个档，没挂 = 不额外限制（只走全局名单）。
+ */
+export const PROFILE_NAME_MAX = 40;
+
+/** 档名的合法性：非空、≤40 字、不含路径分隔符与花括号（写进 JSON 当键用）。 */
+export function isValidProfileName(name) {
+  if (typeof name !== 'string') return { ok: false, reason: '名字必须是字符串' };
+  const trimmed = name.trim();
+  if (!trimmed) return { ok: false, reason: '名字不能为空' };
+  if (trimmed.length > PROFILE_NAME_MAX) return { ok: false, reason: `名字最长 ${PROFILE_NAME_MAX} 字` };
+  if (/[\\/{}"']/.test(trimmed)) return { ok: false, reason: '名字不能含 \\ / { } " \'' };
+  return { ok: true, name: trimmed };
+}
+
 function asArray(value) {
   return Array.isArray(value) ? value : [];
 }
@@ -124,7 +142,9 @@ export function normalizeProfile(name, raw) {
   const sealed = mode === 'sealed';
   const network = sealed ? 'deny' : def.network === 'deny' ? 'deny' : 'allow';
   const unknownTool = sealed || def.unknownTool === 'deny' ? 'deny' : 'allow';
-  return { name, mode, allow, network, unknownTool };
+  const label = typeof def.label === 'string' && def.label.trim() ? def.label.trim() : name;
+  const builtin = BUILTIN_PROFILES[name] !== undefined;
+  return { name, label, mode, allow, network, unknownTool, builtin };
 }
 
 /**
@@ -134,24 +154,28 @@ export function normalizeProfile(name, raw) {
 export function readProfiles(state) {
   const src = state && typeof state === 'object' ? state : {};
   const profiles = new Map();
+  // 内置三档永远在（作为新建模板的基准）；存盘的档覆盖同名内置。
+  for (const [name, def] of Object.entries(BUILTIN_PROFILES)) {
+    profiles.set(name, normalizeProfile(name, def));
+  }
   if (src.profiles && typeof src.profiles === 'object') {
     for (const [name, def] of Object.entries(src.profiles)) {
-      profiles.set(name, normalizeProfile(name, def));
-    }
-  }
-  if (profiles.size === 0) {
-    // v2 兼容：objects 直接当 blocklist 档；同时带上内置的 strict / sealed 模板档。
-    profiles.set('normal', normalizeProfile('normal', { mode: 'blocklist', objects: src.objects }));
-    for (const [name, def] of Object.entries(BUILTIN_PROFILES)) {
-      if (name !== 'normal') profiles.set(name, normalizeProfile(name, def));
+      const checked = isValidProfileName(name);
+      if (!checked.ok) continue;
+      profiles.set(checked.name, normalizeProfile(checked.name, def));
     }
   }
   const defaultProfile =
     typeof src.defaultProfile === 'string' && profiles.has(src.defaultProfile)
       ? src.defaultProfile
-      : profiles.keys().next().value;
-  const sessionOverrides =
-    src.sessionOverrides && typeof src.sessionOverrides === 'object' ? { ...src.sessionOverrides } : {};
+      : 'normal';
+  const sessionOverrides = {};
+  if (src.sessionOverrides && typeof src.sessionOverrides === 'object') {
+    for (const [sid, name] of Object.entries(src.sessionOverrides)) {
+      if (typeof sid !== 'string' || !sid.trim()) continue;
+      if (typeof name === 'string' && profiles.has(name)) sessionOverrides[sid] = name;
+    }
+  }
   return { profiles, defaultProfile, sessionOverrides };
 }
 
@@ -287,7 +311,27 @@ export function evaluateCall(profile, call) {
   const tool = typeof call.tool === 'string' ? call.tool : '';
   const targets = asArray(call.targets).filter((t) => t && typeof t.path === 'string');
 
-  if (p.mode === 'blocklist') return { allowed: true, reason: 'blocklist 档不限制未列出的对象' };
+  // 2026-10-22：blocklist 档不再"一律放行" —— 它按**自己那份清单**判：
+  //   命中 deny ⇒ 拒；命中 read ⇒ 只许读；未命中 ⇒ 放行。
+  //   （此前这里直接 return allowed:true，导致「宽松」模板里编的清单根本不生效。）
+  if (p.mode === 'blocklist') {
+    for (const t of targets) {
+      const hit = matchAllow(p, t.path);
+      if (!hit) continue;
+      if (hit.level === 'deny') {
+        return { allowed: false, reason: `「${p.label || p.name}」把这个目录设为禁：${hit.path}`, matched: hit.path };
+      }
+      const need = t.op === 'read' || t.op === 'traverse' ? 'read' : 'full';
+      if (LEVEL_RANK[hit.level] < LEVEL_RANK[need]) {
+        return {
+          allowed: false,
+          reason: `「${p.label || p.name}」只给 ${hit.path} 到 ${hit.level}，本次需要 ${need}`,
+          matched: hit.path,
+        };
+      }
+    }
+    return { allowed: true, reason: '未命中本档的禁/只读清单' };
+  }
 
   // allowlist / sealed：有路径就必须落在 allow 内
   if (targets.length > 0) {

package/lib/store.js

@@ -36,7 +36,7 @@ import { looksLikeAbsolutePath, normalizePathKey } from './roster.js';
 export const DEFAULT_STATE_PATH = 'D:\\.agents\\门禁-授权.json';
 
 /** 当前磁盘格式代。 */
-export const STATE_VERSION = 2;
+export const STATE_VERSION = 3;
 
 /** 三级状态，顺序即"由紧到松"，UI 按此顺序排按钮。 */
 export const LEVELS = ['deny', 'read', 'full'];
@@ -80,6 +80,8 @@ export function emptyState(now) {
     updatedBy: 'unknown',
     groups: {},
     objects: {},
+    profiles: {},
+    sessionOverrides: {},
   };
   // 旧读法别名：只在内存里，不写盘。
   Object.defineProperty(state, 'harnesses', {
@@ -164,6 +166,37 @@ function normalizeGroups(raw) {
  * 把任意 JSON 收敛成合法状态（v1 → v2 迁移在这里）。
  * 多出来的字段丢弃，缺的补默认；**不丢级别、不丢组名**。
  */
+/** 档（模板）原样保留 —— 深归一化交给 profiles.js 的 normalizeProfile（单一真身）。 */
+function copyProfiles(raw) {
+  const out = {};
+  if (raw !== null && typeof raw === 'object' && !Array.isArray(raw)) {
+    for (const [key, value] of Object.entries(raw)) {
+      if (typeof key !== 'string' || key.trim() === '') continue;
+      if (value === null || typeof value !== 'object' || Array.isArray(value)) continue;
+      out[key.trim()] = {
+        label: typeof value.label === 'string' ? value.label : '',
+        mode: typeof value.mode === 'string' ? value.mode : 'sealed',
+        allow: Array.isArray(value.allow) ? value.allow.filter((e) => e && typeof e === 'object') : [],
+        network: value.network === 'deny' ? 'deny' : 'allow',
+        unknownTool: value.unknownTool === 'deny' ? 'deny' : 'allow',
+      };
+    }
+  }
+  return out;
+}
+
+/** 会话 → 档名 的绑定表（值是档名；空/非法丢弃）。 */
+function copySessionOverrides(raw) {
+  const out = {};
+  if (raw !== null && typeof raw === 'object' && !Array.isArray(raw)) {
+    for (const [key, value] of Object.entries(raw)) {
+      if (typeof key !== 'string' || key.trim() === '') continue;
+      if (typeof value === 'string' && value.trim() !== '') out[key] = value.trim();
+    }
+  }
+  return out;
+}
+
 export function normalizeState(raw) {
   const base = emptyState();
   if (raw === null || typeof raw !== 'object' || Array.isArray(raw)) {
@@ -210,6 +243,8 @@ export function normalizeState(raw) {
     updatedBy: typeof raw.updatedBy === 'string' ? raw.updatedBy : 'unknown',
     groups,
     objects,
+    profiles: copyProfiles(raw.profiles),
+    sessionOverrides: copySessionOverrides(raw.sessionOverrides),
   };
   // 迁移痕迹（只读，不写盘）：供 UI 显示"旧格式已自动迁移"。
   if (raw.version !== STATE_VERSION || (raw.objects === undefined && raw.harnesses !== undefined)) {
@@ -282,6 +317,8 @@ export function writeState(filePath, state, now) {
     updatedBy: typeof state?.updatedBy === 'string' && state.updatedBy !== '' ? state.updatedBy : 'gui',
     groups: normalized.groups,
     objects: normalized.objects,
+    profiles: normalized.profiles,
+    sessionOverrides: normalized.sessionOverrides,
   };
   const text = `${JSON.stringify(payload, null, 2)}\n`;
   mkdirSync(dirname(filePath), { recursive: true });
@@ -478,6 +515,49 @@ export function pruneState(state, rosterKeys, options = {}) {
 }
 
 /** 组表：名字 + 成员数（给 UI / CLI）。 */
+/** 新增/覆盖一个档（模板）。深归一化仍由 profiles.js 负责。 */
+export function withProfile(state, name, def, options = {}) {
+  const next = normalizeState(state);
+  const key = String(name ?? '').trim();
+  if (key === '') throw new Error('档名不能为空');
+  const src = def !== null && typeof def === 'object' ? def : {};
+  next.profiles[key] = {
+    label: typeof src.label === 'string' ? src.label : '',
+    mode: ['blocklist', 'allowlist', 'sealed'].includes(src.mode) ? src.mode : 'sealed',
+    allow: Array.isArray(src.allow) ? src.allow.filter((e) => e && typeof e === 'object') : [],
+    network: src.network === 'deny' ? 'deny' : 'allow',
+    unknownTool: src.unknownTool === 'deny' ? 'deny' : 'allow',
+  };
+  next.updatedBy = typeof options.by === 'string' && options.by !== '' ? options.by : 'gui';
+  return next;
+}
+
+/** 删档，并把挂在它上面的会话绑定一起清掉（避免留下指向空档的绑定）。 */
+export function withoutProfile(state, name, options = {}) {
+  const next = normalizeState(state);
+  const key = String(name ?? '').trim();
+  if (key !== '') {
+    delete next.profiles[key];
+    for (const [sid, bound] of Object.entries(next.sessionOverrides)) {
+      if (bound === key) delete next.sessionOverrides[sid];
+    }
+  }
+  next.updatedBy = typeof options.by === 'string' && options.by !== '' ? options.by : 'gui';
+  return next;
+}
+
+/** 给某个会话挂档；name 为空 = 取消挂载（回到"只走全局名单"）。 */
+export function withSessionProfile(state, sessionId, name, options = {}) {
+  const next = normalizeState(state);
+  const sid = String(sessionId ?? '').trim();
+  if (sid === '') throw new Error('缺少会话 id');
+  const key = typeof name === 'string' ? name.trim() : '';
+  if (key === '') delete next.sessionOverrides[sid];
+  else next.sessionOverrides[sid] = key;
+  next.updatedBy = typeof options.by === 'string' && options.by !== '' ? options.by : 'gui';
+  return next;
+}
+
 export function groupsOf(state) {
   const base = normalizeState(state);
   const counts = {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-isolation-gate",
-  "version": "0.3.1",
+  "version": "0.4.0",
   "description": "门禁 · 目录访问管制（隔离区授权台）：一屏管理「哪些目录受管、各自什么级别」，三级=禁/只读/可读写删；判定同时挂在受管辖通道（bin/gate.mjs）与宿主工具执行门（ctx.tools.guard）上，默认禁、名单缺失一律拒绝（fail-closed）、审计可查、agent 可自查；支持分组批量切、目录选择器与状态文件自动迁移。",
   "keywords": [
     "dsh",