From b34d51432da2e6d68ed2ec1c134ae039bd28867a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=98=BF=E7=99=BD=E5=8F=94?= <11794527+absfan@user.noreply.gitee.com> Date: Sat, 17 Oct 2026 13:59:19 +0800 Subject: [PATCH] feat(storage): simplify shared path setup and allow passwordless access --- README.md | 3 +- docs/business-configuration.md | 9 +++--- docs/storage-simple-setup-2026-10-17.md | 18 ++++++++++++ src/storage-files.cjs | 2 +- src/storage-store.cjs | 38 +++++++++++++++++++------ tests/storage-http.test.cjs | 2 ++ tests/storage-ui.test.cjs | 5 ++-- tests/storage.test.cjs | 24 ++++++++++++++++ web/storage.js | 21 ++++++++++++-- 9 files changed, 101 insertions(+), 21 deletions(-) create mode 100644 docs/storage-simple-setup-2026-10-17.md diff --git a/README.md b/README.md index 3df3e6b..2756f9e 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,8 @@ ## 存储服务器与业务通知 -- **存储服务器**:管理员配置 SMB 主机、共享名称、归档子目录及独立账号密码。密码加密保存在部署机,留空编辑保留原值;更换主机、共享或账号需重新录入。保存配置不连接服务器,点击“检查读写”会创建、读取并清理一个随机探测文件。账号维护要求部署机回环地址或可信 HTTPS。 +- **存储服务器**:管理员粘贴完整 Windows 共享路径(例如 `\\210服务器\订单\归档`),自动识别主机、共享和子目录;名称可留空自动生成。默认“免填账号密码(使用 Windows 权限)”,直接复用部署机现有 SMB 会话或运行服务账号的共享访问权限,适用于已获授权和系统允许的免密共享。需要独立凭据时选择“指定账号”;无密码账号勾选“此账号无密码”。密码加密保存在部署机,编辑留空保留原密码;更换主机、共享或账号需重新录入。旧配置按指定账号方式继续使用。保存配置不连接服务器,点击“检查读写”会创建、读取并清理一个随机探测文件。配置维护要求部署机回环地址或可信 HTTPS。 +- **免填模式说明**:使用服务部署机上的权限及既有 SMB 会话,不是网页访问者电脑的身份。切换模式会清除托管凭据、重置检查状态并暂停该服务器的自动归档,但不会强制断开 Windows 已有共享会话;若已有其他账号连接,实际访问可能继续使用该会话,需由部署机管理员处理。服务器要求认证或 Windows 禁止来宾/空密码访问时仍可能被拒绝,本工具不自动更改这些系统设置。 - **文件管理**:管理员与操作员可浏览归档目录、创建子目录、下载文件和内嵌预览,将已有成功导出的 PDF 归档。目标存在相同内容时幂等完成;不同内容保留新文件,原件不覆盖。只读成员查看服务器和归档记录。启用自动归档后仅处理新导出的 PDF,历史文件由人选择归档;失败记录可通过重新选择同一任务重试。 - **文件预览**:在已托管服务器的目录中点击“预览”,支持 PDF、PNG/JPEG/GIF/WebP/BMP、文本(含 UTF-8、UTF-16 与 GB18030)、DOCX 和 XLSX。支持全屏、图片缩放与工作表切换;文本仅按原文显示。单文件预览及下载上限 64 MiB,文本预览上限 2 MiB;Office 展开内容最多 64 MiB、4096 个条目,Excel 每张表最多预览前 500 行、50 列。旧 DOC/XLS 与其他未支持格式可下载原文件。Office 预览以内容阅读为主,不保证与桌面 Office 排版完全一致,Excel 数值按原始值展示,不执行宏或重新计算公式。PDF 已关闭公网补充字体,缺少内嵌字体的文档可能出现字体替代。 - **开源预览组件**:适配 [OpenList Frontend](https://github.com/OpenListTeam/OpenList-Frontend/tree/v4.2.7) 的 DOCX/XLSX 预览思路,采用 EmbedPDF、docx-preview、ExcelJS 与 PhotoSwipe;脚本和 PDFium WASM 由本机提供,界面使用系统字体,不调用公网 Office 在线服务。文件经现有登录权限读取,在独立沙箱中渲染。选型及许可见 [预览选型记录](docs/storage-preview-open-source-research-2026-10-17.md) 和 [第三方许可](licenses/storage-preview-NOTICES.md)。 diff --git a/docs/business-configuration.md b/docs/business-configuration.md index c3ba00b..9102da2 100644 --- a/docs/business-configuration.md +++ b/docs/business-configuration.md @@ -7,11 +7,10 @@ | 项目 | 需要整理的内容 | |---|---| | 名称 | 便于同事识别的服务器名称 | -| 地址 | 主机名或 IPv4 地址,不带共享路径 | -| 共享名称 | `\\主机\共享名称` 中的共享部分 | -| 归档子目录 | 共享目录下已有的归档根目录,可留空 | -| 登录账号 | 独立账号,域账号可使用 `域\账号` | -| 密码 | 管理员在工作台录入,不放在业务资料表中 | +| 共享路径 | 从文件资源管理器复制完整路径,如 `\\服务器\共享\归档`,名称可自动生成 | +| 访问方式 | 默认免填账号密码,复用部署机现有 Windows SMB 会话/权限;或指定账号 | +| 登录账号 | 指定账号时填写,域账号可使用 `域\账号` | +| 密码 | 指定账号时由管理员在工作台录入;无密码账号明确勾选“此账号无密码”,不放资料表中 | | 自动归档 | 是否作为新导出 PDF 的自动归档目标 | ## 业务通知来源 diff --git a/docs/storage-simple-setup-2026-10-17.md b/docs/storage-simple-setup-2026-10-17.md new file mode 100644 index 0000000..b89d488 --- /dev/null +++ b/docs/storage-simple-setup-2026-10-17.md @@ -0,0 +1,18 @@ +# SMB 添加流程简化与验证 + +日期:2026-10-17。 + +添加服务器改为粘贴完整 Windows UNC 共享路径,服务端解析主机、共享及子目录,名称可自动生成。默认 Windows 访问方式免填凭据,SmbClient 直接使用 UNC 文件访问,复用部署机已有 SMB 会话或服务账号的访问权限。指定账号模式继续支持加密托管,明确勾选“此账号无密码”才提交空密码;编辑普通账号留空密码继续保留旧值。旧加密记录未带访问方式时按指定账号兼容。 + +切换至 Windows 方式清空托管账号及密码、重置检查结果,并暂停该服务器已启用的自动归档;不会强制断开任何 Windows SMB 会话,实际身份可能受已有共享连接影响。系统不允许的来宾或空密码访问仍会失败,不修改系统安全策略。 + +## 验证 + +- `node --test tests/storage.test.cjs`:7 项通过,覆盖完整路径、路径限制、无凭据保存、模式切换、密码清除、普通账号兼容及 Windows 方式不发起新登录。 +- `node --test --test-concurrency=2 tests/storage-http.test.cjs tests/storage-preview.test.cjs tests/storage-preview-http.test.cjs`:8 项通过。 +- `node --test tests/storage-ui.test.cjs`:1 项通过,验证默认隐藏账号、指定凭据保存、密码留空、明确空密码、切回 Windows、创建目录与 PDF 归档。 +- `node --test --test-timeout=200000 output/verify-smb-quick.cjs`:1 项现场验证通过。在本机实际 SMB Share 下建立独立随机子目录,通过工作台只填写共享路径,保存 201、真实读写检查、文本预览、PDF 归档及原文对比均成功;使用默认 SmbClient,没有注入 FileArea 或替代连接。现场脚本和截图仅保留在忽略目录 output。 + +共 17 项通过,未运行全量测试集。现场共享目录测试结束后清理,未向正式工作台添加测试服务器或账号。指定空密码账号仅完成行为和参数验证,未对真实空密码账号进行登录验收。 + +本地截图:`output/verification/storage-quick-add.png`、`storage-quick-success.png`。独立只读审查未发现阻塞问题;已有 SMB 会话复用限制已写入表单提示及 README。 diff --git a/src/storage-files.cjs b/src/storage-files.cjs index f7017cb..fc063a8 100644 --- a/src/storage-files.cjs +++ b/src/storage-files.cjs @@ -74,6 +74,6 @@ class FileArea{ } } class SmbClient{ - async area(server){await native.connect(server);const boundary=path.win32.join('\\\\'+server.host,server.share),root=path.win32.join(boundary,...segments(server.directory));return new FileArea(root,{boundary});} + async area(server){if(server.authMode!=='windows')await native.connect(server);const boundary=path.win32.join('\\\\'+server.host,server.share),root=path.win32.join(boundary,...segments(server.directory));return new FileArea(root,{boundary});} } module.exports={FileArea,SmbClient,segments,inside,MAX_FILE}; diff --git a/src/storage-store.cjs b/src/storage-store.cjs index 5ea6325..33867b0 100644 --- a/src/storage-store.cjs +++ b/src/storage-store.cjs @@ -19,22 +19,42 @@ class StorageStore{ UPDATE archives SET status='interrupted' WHERE status='running';`); } row(id){if(typeof id!=='string')fail('请选择存储服务器。');const row=this.db.prepare('SELECT * FROM servers WHERE id=?').get(id);if(!row)fail('存储服务器不存在。',404);return row;} - secret(id){const row=this.row(id);try{return {...this.vault.decode(id,row.payload),id,version:row.version,state:JSON.parse(row.state)};}catch{fail('存储凭据无法解密,请联系管理员。',503);}} + secret(id){const row=this.row(id);try{const saved=this.vault.decode(id,row.payload);return {authMode:'credentials',passwordless:false,...saved,id,version:row.version,state:JSON.parse(row.state)};}catch{fail('存储凭据无法解密,请联系管理员。',503);}} publicServer(id){const {password,...server}=this.secret(id);return {...server,hasPassword:!!password};} servers(){return this.db.prepare('SELECT id FROM servers ORDER BY rowid').all().map(r=>this.publicServer(r.id));} saveServer(input){ - const fields=['id','version','name','host','share','directory','username','password','enabled','state','hasPassword','createdAt','updatedAt']; + const fields=['id','version','name','host','share','directory','username','password','enabled','state','hasPassword','createdAt','updatedAt','address','authMode','passwordless']; if(!input||typeof input!=='object'||Array.isArray(input)||Object.keys(input).some(k=>!fields.includes(k)))fail('存储服务器配置无效。'); const old=input.id?this.secret(input.id):null;if(old&&input.version!==old.version)fail('服务器已被修改,请刷新后重试。',409); - const host=text(input.host,'服务器地址',253).toLowerCase();if(!/^[a-z0-9](?:[a-z0-9.-]*[a-z0-9])?$/.test(host)||host.includes('..'))fail('服务器地址只填写主机名或 IPv4 地址。'); - const share=text(input.share,'共享名称',80);if(segments(share).length!==1)fail('共享名称不能包含路径。'); - const username=text(input.username,'登录账号',200),directory=segments(input.directory).join('/'); + let hostInput=input.host,shareInput=input.share,directoryInput=input.directory; + if(input.address!==undefined){ + const separator=String.fromCharCode(92);let address=text(input.address,'共享路径',1800); + while(address.endsWith(separator))address=address.slice(0,-1); + if(!address.startsWith(separator.repeat(2)))fail('请粘贴完整的 Windows 共享路径,需包含服务器和共享名称。'); + const parts=address.slice(2).split(separator);hostInput=parts.shift(); + const directories=segments(parts.join('/'));if(!directories.length)fail('共享路径需要包含共享名称。'); + shareInput=directories[0];directoryInput=directories.slice(1).join('/'); + } + const host=text(hostInput,'服务器地址',253).toLowerCase();if(!/^[a-z0-9](?:[a-z0-9.-]*[a-z0-9])?$/.test(host)||host.includes('..'))fail('服务器地址只填写主机名或 IPv4 地址。'); + const share=text(shareInput,'共享名称',80);if(segments(share).length!==1)fail('共享名称不能包含路径。'); + const directory=segments(directoryInput).join('/'),authMode=input.authMode??old?.authMode??'credentials'; + if(!['windows','credentials'].includes(authMode))fail('请选择有效的访问方式。'); + if(input.passwordless!==undefined&&typeof input.passwordless!=='boolean')fail('请选择账号是否无密码。'); + let username='',password='',passwordless=false; + if(authMode==='credentials'){ + username=text(input.username,'登录账号',200);passwordless=input.passwordless??old?.passwordless??false; + if(!passwordless){ + const changedIdentity=old&&(host!==old.host||share!==old.share||username!==old.username||old.authMode!=='credentials'); + if(changedIdentity&&input.password==='')fail('更换服务器、共享或登录账号时,请重新填写密码。'); + password=input.password===''&&old&&!changedIdentity?old.password:input.password; + if(typeof password!=='string'||!password||password.length>2048)fail('请输入 SMB 登录密码,或勾选此账号无密码。'); + } + } if(typeof input.enabled!=='boolean')fail('请选择服务器是否启用。'); - if(old&&input.password===''&&(host!==old.host||share!==old.share||username!==old.username))fail('更换服务器、共享或登录账号时,请重新填写密码。'); - const password=input.password===''&&old?old.password:input.password;if(typeof password!=='string'||!password||password.length>2048)fail('请输入 SMB 登录密码。'); - const id=old?.id||crypto.randomUUID(),saved={name:text(input.name,'服务器名称',80),host,share,directory,username,password,enabled:input.enabled,createdAt:old?.createdAt||now(),updatedAt:now()}; + const name=input.name===undefined||input.name===''?(host+' / '+share).slice(0,80):text(input.name,'服务器名称',80); + const id=old?.id||crypto.randomUUID(),saved={name,host,share,directory,authMode,passwordless,username,password,enabled:input.enabled,createdAt:old?.createdAt||now(),updatedAt:now()}; let payload;try{payload=this.vault.encode(id,saved);}catch{fail('存储凭据加密不可用,请联系管理员。',503);} - const changed=!old||['host','share','directory','username','password'].some(k=>saved[k]!==old[k]); + const changed=!old||['host','share','directory','authMode','username','password'].some(k=>saved[k]!==old[k]); const state=changed?{checkedAt:null,readable:false,writable:false,message:'待检查连接'}:old.state; this.db.prepare('INSERT INTO servers VALUES(?,?,?,?) ON CONFLICT(id) DO UPDATE SET version=excluded.version,payload=excluded.payload,state=excluded.state').run(id,(old?.version||0)+1,payload,JSON.stringify(state)); if(old&&(!saved.enabled||changed)&&this.settings().serverId===id)this.saveSettings({serverId:id,enabled:false}); diff --git a/tests/storage-http.test.cjs b/tests/storage-http.test.cjs index fcf0aa6..797a248 100644 --- a/tests/storage-http.test.cjs +++ b/tests/storage-http.test.cjs @@ -8,6 +8,8 @@ test('storage HTTP enforces roles, redacts passwords and archives only successfu const {dir,outputDir,store,storageStore,call,login}=await fixture(t);assert.equal((await call('/api/storage')).status,401); const admin=await login('admin'),operator=await login('operator'),viewer=await login('viewer'); assert.equal((await call('/api/storage/servers',config,operator)).status,403);assert.equal((await call('/api/storage/servers',config,admin,'https://evil.test')).status,403); + const quick=await call('/api/storage/servers',{address:String.raw`\\storage.company.test\orders`,authMode:'windows',enabled:true},admin);assert.equal(quick.status,201);const quickServer=await quick.json();assert.equal(quickServer.authMode,'windows');assert.equal(quickServer.hasPassword,false);assert.equal(quickServer.username,'');assert.equal((await call(`/api/storage/servers/${quickServer.id}/check`,{},admin)).status,200); + const invalid=await call('/api/storage/servers',{address:String.raw`\\storage.company.test\orders\..\outside`,authMode:'windows',enabled:true},admin);assert.equal(invalid.status,400); const saved=await call('/api/storage/servers',config,admin);assert.equal(saved.status,201);const server=await saved.json();assert.equal(server.password,undefined); assert.doesNotMatch(JSON.stringify(await(await call('/api/storage',undefined,viewer)).json()),/Private-storage/); assert.equal((await call(`/api/storage/servers/${server.id}/files`,undefined,viewer)).status,403); diff --git a/tests/storage-ui.test.cjs b/tests/storage-ui.test.cjs index f31f569..95311be 100644 --- a/tests/storage-ui.test.cjs +++ b/tests/storage-ui.test.cjs @@ -3,6 +3,7 @@ const {test}=require('node:test');const assert=require('node:assert/strict');con const {Store}=require('../src/dashboard-store.cjs');const {StorageStore}=require('../src/storage-store.cjs');const {StorageService}=require('../src/storage-service.cjs');const {FileArea}=require('../src/storage-files.cjs');const {createDashboard}=require('../src/dashboard.cjs');const {loadPlaywright,browserOptions}=require('../src/runtime.cjs'); test('storage page edits redacted credentials, checks files and archives an exported PDF', {timeout:150000}, async t=>{ const dir=await fs.mkdtemp(path.join(os.tmpdir(),'storage-ui-')),remote=path.join(dir,'remote'),output=path.join(dir,'output');await fs.mkdir(remote);await fs.mkdir(output);const store=new Store(path.join(dir,'users'));store.bootstrap('admin','Test-password-123');await fs.writeFile(path.join(output,'order.pdf'),'%PDF-1.7\nUI test');store.recordJob({jobId:'ui-job',filename:'order.pdf',path:path.join(output,'order.pdf'),status:'success'});const storageStore=new StorageStore(path.join(dir,'storage')),storage=new StorageService({store:storageStore,jobs:store,outputDir:output,client:{area:async()=>new FileArea(remote)}}),server=createDashboard({store,storage,outputDir:output});await new Promise(r=>server.listen(0,'127.0.0.1',r));let browser;t.after(async()=>{await browser?.close();await storage.stop();server.closeAllConnections();await new Promise(r=>server.close(r));storageStore.close();await fs.rm(dir,{recursive:true,force:true});});browser=await loadPlaywright().chromium.launch(browserOptions());const page=await browser.newPage({viewport:{width:1440,height:1000}});page.setDefaultTimeout(30000);const errors=[];page.on('pageerror',e=>errors.push(e.message));await page.goto('http://127.0.0.1:'+server.address().port+'/#storage');await page.getByLabel('账号',{exact:true}).fill('admin');await page.getByLabel('密码',{exact:true}).fill('Test-password-123');await page.getByRole('button',{name:'登录',exact:true}).click();await page.getByRole('button',{name:'添加服务器',exact:true}).click(); - for(const [label,value]of Object.entries({'服务器名称':'210 归档','服务器地址':'storage.company.test','共享名称':'orders','登录账号':'archive','SMB 密码':'UI-test-password'}))await page.getByLabel(label,{exact:true}).fill(value); - const saveResponse=page.waitForResponse(r=>r.url().endsWith('/api/storage/servers')&&r.request().method()==='POST',{timeout:45000});await page.getByRole('button',{name:'保存服务器',exact:true}).click();const savedResponse=await saveResponse;assert.equal(savedResponse.status(),201,await savedResponse.text());await page.getByRole('button',{name:'检查读写',exact:true}).click();await page.getByText('共享目录读写正常',{exact:true}).waitFor();await page.getByRole('button',{name:'管理服务器',exact:true}).click();assert.equal(await page.getByLabel('SMB 密码',{exact:true}).inputValue(),'');await page.getByRole('button',{name:'取消编辑',exact:true}).click();await page.getByRole('button',{name:'浏览目录',exact:true}).click();await page.getByLabel('新目录名称',{exact:true}).fill('产业A');await page.getByRole('button',{name:'创建目录',exact:true}).click();await page.getByText('产业A',{exact:true}).waitFor();await page.getByLabel('归档 PDF',{exact:true}).selectOption('ui-job');await page.getByRole('button',{name:'归档到当前目录',exact:true}).click();await page.getByText('PDF 已归档。',{exact:true}).waitFor();assert.equal(await fs.readFile(path.join(remote,'order.pdf'),'utf8'),'%PDF-1.7\nUI test');await fs.mkdir(path.resolve('output/verification'),{recursive:true});await page.evaluate(()=>window.scrollTo(0,0));await page.screenshot({path:path.resolve('output/verification/storage-desktop.png'),fullPage:true});await page.setViewportSize({width:390,height:844});assert.equal(await page.evaluate(()=>document.documentElement.scrollWidth<=innerWidth),true);assert.deepEqual(errors,[]); + assert.equal(await page.getByLabel('访问方式',{exact:true}).inputValue(),'windows');assert.equal(await page.getByLabel('登录账号',{exact:true}).isVisible(),false);await page.getByLabel('访问方式',{exact:true}).selectOption('credentials'); + for(const [label,value]of Object.entries({'服务器名称':'210 归档','共享路径':String.raw`\\storage.company.test\orders`,'登录账号':'archive','SMB 密码':'UI-test-password'}))await page.getByLabel(label,{exact:true}).fill(value); + const saveResponse=page.waitForResponse(r=>r.url().endsWith('/api/storage/servers')&&r.request().method()==='POST',{timeout:45000});await page.getByRole('button',{name:'保存服务器',exact:true}).click();const savedResponse=await saveResponse;assert.equal(savedResponse.status(),201,await savedResponse.text());await page.getByRole('button',{name:'检查读写',exact:true}).click();await page.getByText('共享目录读写正常',{exact:true}).waitFor();await page.getByRole('button',{name:'管理服务器',exact:true}).click();assert.equal(await page.getByLabel('SMB 密码',{exact:true}).inputValue(),'');await page.getByLabel('此账号无密码',{exact:true}).check();await page.getByRole('button',{name:'保存服务器',exact:true}).click();await page.getByRole('button',{name:'管理服务器',exact:true}).waitFor();assert.equal(storageStore.secret(storageStore.servers()[0].id).password,'');await page.getByRole('button',{name:'管理服务器',exact:true}).click();await page.getByLabel('访问方式',{exact:true}).selectOption('windows');await page.getByRole('button',{name:'保存服务器',exact:true}).click();await page.getByRole('button',{name:'管理服务器',exact:true}).waitFor();assert.equal(storageStore.servers()[0].authMode,'windows');await page.getByRole('button',{name:'浏览目录',exact:true}).click();await page.getByLabel('新目录名称',{exact:true}).fill('产业A');await page.getByRole('button',{name:'创建目录',exact:true}).click();await page.getByText('产业A',{exact:true}).waitFor();await page.getByLabel('归档 PDF',{exact:true}).selectOption('ui-job');await page.getByRole('button',{name:'归档到当前目录',exact:true}).click();await page.getByText('PDF 已归档。',{exact:true}).waitFor();assert.equal(await fs.readFile(path.join(remote,'order.pdf'),'utf8'),'%PDF-1.7\nUI test');await fs.mkdir(path.resolve('output/verification'),{recursive:true});await page.evaluate(()=>window.scrollTo(0,0));await page.screenshot({path:path.resolve('output/verification/storage-desktop.png'),fullPage:true});await page.setViewportSize({width:390,height:844});assert.equal(await page.evaluate(()=>document.documentElement.scrollWidth<=innerWidth),true);assert.deepEqual(errors,[]); }); diff --git a/tests/storage.test.cjs b/tests/storage.test.cjs index 7de0de4..73b249a 100644 --- a/tests/storage.test.cjs +++ b/tests/storage.test.cjs @@ -56,3 +56,27 @@ test('configured archive root cannot escape through an intermediate directory ju await assert.rejects(area.list(''),e=>e.status===400); assert.deepEqual(await fs.readdir(path.join(outside,'nested')),[]); }); + + +test('storage accepts a complete UNC path and Windows identity without credentials',async t=>{ + let store;t.after(()=>store?.close());const dir=await fixture(t);store=new StorageStore(dir); + const saved=store.saveServer({address:String.raw`\\files.example.test\orders\归档`,authMode:'windows',enabled:true}); + assert.equal(saved.host,'files.example.test');assert.equal(saved.share,'orders');assert.equal(saved.directory,'归档');assert.equal(saved.name,'files.example.test / orders');assert.equal(saved.authMode,'windows');assert.equal(saved.hasPassword,false);assert.equal(store.secret(saved.id).password,''); + for(const address of [String.raw`\\server`,String.raw`\\server\orders\..\secret`,'C:/local','https://server/orders'])assert.throws(()=>store.saveServer({address,authMode:'windows',enabled:true}),e=>e.status===400); + const credentials=store.saveServer(config);const switched=store.saveServer({...credentials,authMode:'windows'});assert.equal(store.secret(switched.id).password,'');assert.equal(switched.username,''); +}); + +test('explicit passwordless account does not accidentally retain a saved password',async t=>{ + let store;t.after(()=>store?.close());const dir=await fixture(t);store=new StorageStore(dir);const saved=store.saveServer(config); + const passwordless=store.saveServer({...saved,authMode:'credentials',passwordless:true,password:''});assert.equal(store.secret(saved.id).password,'');assert.equal(passwordless.hasPassword,false); + assert.equal(store.saveServer({...passwordless,password:''}).passwordless,true); + assert.throws(()=>store.saveServer({...store.publicServer(saved.id),passwordless:false,password:''}),e=>e.status===400); +}); + +test('Windows identity mode uses UNC access without requesting a new SMB login',async t=>{ + const native=require('../src/smb-native.cjs');let calls=0;t.mock.method(native,'connect',async()=>{calls++;}); + const {SmbClient}=require('../src/storage-files.cjs'),client=new SmbClient(); + const area=await client.area({host:'files.example.test',share:'orders',directory:'archive',authMode:'windows'});assert.equal(calls,0);assert.equal(area.root,path.resolve(String.raw`\\files.example.test\orders\archive`)); + await client.area({...config,authMode:'credentials'});assert.equal(calls,1); + await client.area(config);assert.equal(calls,2); +}); diff --git a/web/storage.js b/web/storage.js index 8ca3bd6..834c0f4 100644 --- a/web/storage.js +++ b/web/storage.js @@ -8,9 +8,24 @@ const admin=user.role==='admin',canFiles=user.role!=='viewer'; container.innerHTML=`
| 文件 / 服务器 | 状态 | 时间 |
|---|---|---|
| ${esc(a.relativePath||a.jobId)} ${esc(a.serverName||data.servers.find(s=>s.id===a.serverId)?.name||'—')} | ${esc(labels[a.status]||a.status)}${a.error?` ${esc(a.error)} `:''} | ${formatDate(a.finishedAt||a.startedAt)} |
| 暂无归档记录 | ||