perf(sidebar): fs.tree 22.8ms→3.8ms + 删除工作区路径检测(放开权限)+ 树展开状态按会话
用户实测反馈:
1) `/sidebar/api/fs.tree` 性能极差 —— 先测后改(10k 条目目录、热缓存、中位数):
- 冷调用 cap=1000:22.76ms → **3.77ms**;TTL 内重复:≈23ms → **0.000ms**
- 改法:opendir for-await → readdir(withFileTypes) 一次取回;只为 cap 条建行
(slice + 定长数组);路径用字符串拼接而非 path.join;排序弃 localeCompare
(14.6ms/10k → 0.35ms)改小写比较 + 原名码点兜底;新增 1.5s 目录级缓存
(键 绝对路径\0cap,上限 512),由 fs.write/rename/remove/mkdir/upload 与
fs-watch 的变更通知显式失效
- 契约逐字不变;新增 tests/fs-tree.spec.ts 6 例 + fs-watch 失效用例(判别性验证)
2) 删除工作区路径检测(默认不检测、放开权限):
- path-security 变纯词法解析(realpath/包含性判定删除)、fs-operations 去 fence
分支、所有 fs 路由不再读 fence、403 分支消失、config 删 workspaceFence 字段
(schemastery 容忍未知键,旧 profile 不会加载失败)、settings 开关删除
- ⚠️ 安全影响:插件 fs 路由(tree/read/write/rename/remove/mkdir/媒体/HTML/
upload/archive)现在可读写宿主用户可访问的任意路径,只受 OS 权限约束;
指南 §8.1 已加醒目声明
- 死代码清理:FenceErrorNotice 组件 + EditorHost 分支 + 4 个词条(settingsFence*、
fenceErrorReason、fenceDisableAction)+ isOutsideWorkspace* 助手 + TreePanel 的
store prop + 相关 CSS 块
3) 批量列举路由 `fs.trees`(单层失败只在该层带 error)+ 客户端批量加载:
挂载/刷新时的 N+1 请求变为 1 个(8 个展开目录:9 → 1,探针断言)
refreshTick 不再先清缓存(旧行保留到新答案;失败保留旧行 + warn 提示)
4) 修复「关闭文件后返回文件树,展开状态被重置」:
原生承载面的展开集合原来存在每个 tab 的记录里(drop 即丢),改为**每会话状态**
的投影(ensure 从会话态读、toggleExpanded 写回会话态、registerNativeSurface 用
attachStore 订阅);同一会话多 tab 共享、不同会话隔离;revealed 保持 per-tab
验证:typecheck / lint / test(136 文件 / 1484 通过 / 9 跳过)/ build 全绿;
DSH_CMD='npx -y --package @deepseek-ai/dsh@0.1.7-rc.1 dsh' pnpm test:mount 7/7 通过;
版本镜像同步(dsh.plugin.json + SIDEBAR_SERVICE_VERSION)
This commit is contained in:
1 parent
f29743f03f
commit
5c95002641
68 files changed
+1313
-747
No files matched your search
+27
-33
@@ -826,7 +826,27 @@ describe('archive task flow (build → status → download)', () => {
|
||||
expect(byName.get('b/index.ts')!.data.toString('utf8')).toBe('from b\n')
|
||||
})
|
||||
|
||||
it('never follows a symlink out of the workspace', async () => {
|
||||
it('zips a path outside the session workspace (fence removed)', async () => {
|
||||
const root = tempRoot()
|
||||
const workspace = join(root, 'workspace')
|
||||
const outside = join(root, 'outside')
|
||||
mkdirSync(workspace)
|
||||
mkdirSync(outside)
|
||||
writeFileSync(join(outside, 'secret.txt'), 'secret')
|
||||
const { download } = await archiveFlow({
|
||||
sessionId: 's-zip',
|
||||
cwd: workspace,
|
||||
paths: [join(outside, 'secret.txt')],
|
||||
})
|
||||
// ⚠️ PERMISSION CHANGE: an absolute path outside the workspace is now a
|
||||
// normal selection (no 403 branch exists any more).
|
||||
expect(download.status).toBe(200)
|
||||
const entries = readZip(download.body)
|
||||
expect(entries.map(entry => entry.name)).toEqual(['secret.txt'])
|
||||
expect(entries[0]!.data.toString('utf8')).toBe('secret')
|
||||
})
|
||||
|
||||
it('skips a symlink row while walking a directory (no escape by following)', async () => {
|
||||
const root = tempRoot()
|
||||
const workspace = join(root, 'workspace')
|
||||
const outside = join(root, 'outside')
|
||||
@@ -835,46 +855,20 @@ describe('archive task flow (build → status → download)', () => {
|
||||
writeFileSync(join(outside, 'secret.txt'), 'secret')
|
||||
try {
|
||||
symlinkSync(outside, join(workspace, 'link'))
|
||||
// A file INSIDE the workspace, so the archive itself is readable.
|
||||
writeFileSync(join(workspace, 'keep.txt'), 'keep')
|
||||
} catch {
|
||||
return // symlink creation needs privileges on Windows
|
||||
}
|
||||
const { api, download } = mountHost()
|
||||
// Selecting the escaping link refuses at the workspace fence (the build
|
||||
// canonicalizes before walking), so its target is never read…
|
||||
const linked = await post(api, 'archive.build', { sessionId: 's-zip', cwd: workspace, paths: [join(workspace, 'link')] })
|
||||
expect(linked.ok).toBe(false)
|
||||
expect(linked.status).toBe(403)
|
||||
// …and walking the containing directory reports the link as an entry-less
|
||||
// row instead of descending into it.
|
||||
const build = await post(api, 'archive.build', { sessionId: 's-zip', cwd: workspace, paths: [workspace] })
|
||||
const id = (build.value as { id: string }).id
|
||||
await waitForReady(api, id, 's-zip')
|
||||
const walked = await get(download, `/sidebar/archive?sessionId=s-zip&id=${encodeURIComponent(id)}`)
|
||||
expect(walked.status).toBe(200)
|
||||
const entries = readZip(walked.body)
|
||||
// A DIRECTORY walk still never descends through a link (that rule is about
|
||||
// cycles, not containment): the link row is reported as an entry-less row,
|
||||
// so the archive holds no bytes from its target.
|
||||
const { download } = await archiveFlow({ sessionId: 's-zip', cwd: workspace, paths: [workspace] })
|
||||
expect(download.status).toBe(200)
|
||||
const entries = readZip(download.body)
|
||||
expect(entries.map(entry => entry.name)).toEqual(['workspace/', 'workspace/keep.txt'])
|
||||
expect(entries.some(entry => entry.data.toString('utf8').includes('secret'))).toBe(false)
|
||||
})
|
||||
|
||||
it('refuses a path outside the workspace with 403', async () => {
|
||||
const root = tempRoot()
|
||||
const workspace = join(root, 'workspace')
|
||||
const outside = join(root, 'outside')
|
||||
mkdirSync(workspace)
|
||||
mkdirSync(outside)
|
||||
writeFileSync(join(outside, 'secret.txt'), 'secret')
|
||||
const { api } = mountHost()
|
||||
const response = await post(api, 'archive.build', {
|
||||
sessionId: 's-zip',
|
||||
cwd: workspace,
|
||||
paths: [join(outside, 'secret.txt')],
|
||||
})
|
||||
expect(response.status).toBe(403)
|
||||
expect(response.error?.code).toBe('forbidden')
|
||||
})
|
||||
|
||||
it('rejects an empty path list and a download without sessionId/id (400)', async () => {
|
||||
const root = tempRoot()
|
||||
const workspace = join(root, 'workspace')
|
||||
|
||||
Reference in new issue
Block a user