@@ -5,6 +5,8 @@ import { MountManager } from "../storage/managers/MountManager.js";
55import { ApiStatus } from "../constants/index.js" ;
66import { AppError , ValidationError , NotFoundError , DriverError } from "../http/errors.js" ;
77import { CAPABILITIES } from "../storage/interfaces/capabilities/index.js" ;
8+ import { invalidateFsCache } from "../cache/invalidation.js" ;
9+ import { FsSearchIndexStore } from "../storage/fs/search/FsSearchIndexStore.js" ;
810
911/**
1012 * 计算存储配置在 WebDAV 渠道下支持的策略列表
@@ -33,6 +35,81 @@ function computeWebDavSupportedPolicies(cfg) {
3335 // 去重
3436 return Array . from ( new Set ( policies ) ) ;
3537}
38+
39+ /**
40+ * 判断一个输入值是否像“掩码占位符”（例如 *****1234）
41+ * - 这是为了防止编辑表单时把 masked 值写回数据库，覆盖真实密钥
42+ * - 前端应该已做过滤，但后端必须兜底
43+ * @param {any } value
44+ * @returns {boolean }
45+ */
46+ function isMaskedSecretPlaceholder ( value ) {
47+ if ( typeof value !== "string" ) return false ;
48+ const s = value . trim ( ) ;
49+ if ( ! s ) return false ;
50+ // maskSecret 默认会生成很多个 * + 尾部少量可见字符
51+ // 这里用一个“非常保守但够用”的判定：至少 3 个 * 开头
52+ return / ^ \* { 3 , } .+ $ / . test ( s ) ;
53+ }
54+
55+ function getTypeConfigSchema ( storageType ) {
56+ if ( ! storageType ) return null ;
57+ const meta = StorageFactory . getTypeMetadata ( storageType ) ;
58+ return meta ?. configSchema || null ;
59+ }
60+
61+ function getSecretFieldDefsFromSchema ( schema ) {
62+ const fields = schema ?. fields ;
63+ if ( ! Array . isArray ( fields ) ) return [ ] ;
64+ return fields . filter ( ( f ) => f && typeof f === "object" && f . type === "secret" && typeof f . name === "string" && f . name ) ;
65+ }
66+
67+ function shouldSkipSecretWrite ( value , { allowEmpty = true } = { } ) {
68+ if ( value === undefined || value === null ) return true ;
69+ if ( typeof value === "string" ) {
70+ const s = value . trim ( ) ;
71+ if ( allowEmpty && s . length === 0 ) return true ;
72+ if ( isMaskedSecretPlaceholder ( s ) ) return true ;
73+ }
74+ return false ;
75+ }
76+
77+ async function encryptSecretsInConfigJson ( storageType , configJson , encryptionSecret , { requireRequiredSecrets = false } = { } ) {
78+ const schema = getTypeConfigSchema ( storageType ) ;
79+ const secretFields = getSecretFieldDefsFromSchema ( schema ) ;
80+ if ( ! secretFields . length ) return configJson ;
81+
82+ for ( const f of secretFields ) {
83+ const key = f . name ;
84+ const raw = configJson ?. [ key ] ;
85+
86+ // required 校验（仅用于 create）
87+ if ( requireRequiredSecrets ) {
88+ const missing =
89+ raw === undefined ||
90+ raw === null ||
91+ ( typeof raw === "string" && raw . trim ( ) . length === 0 ) ||
92+ isMaskedSecretPlaceholder ( raw ) ;
93+ if ( f . required === true && missing ) {
94+ throw new ValidationError ( `缺少必填字段: ${ key } ) ;
95+ }
96+ }
97+
98+ // 跳过空值（update 时应“保留原值”）
99+ if ( shouldSkipSecretWrite ( raw , { allowEmpty : true } ) ) {
100+ continue ;
101+ }
102+
103+ // 明确拒绝 masked 占位符写入（无论 create/update）
104+ if ( isMaskedSecretPlaceholder ( raw ) ) {
105+ throw new ValidationError ( `字段 ${ key } ) ;
106+ }
107+
108+ configJson [ key ] = await encryptValue ( String ( raw ) , encryptionSecret ) ;
109+ }
110+
111+ return configJson ;
112+ }
36113import { encryptValue , buildSecretView } from "../utils/crypto.js" ;
37114import { generateStorageConfigId } from "../utils/common.js" ;
38115
@@ -119,6 +196,9 @@ export async function createStorageConfig(db, configData, adminId, encryptionSec
119196 for ( const f of requiredS3 ) {
120197 if ( ! configData [ f ] ) throw new ValidationError ( `缺少必填字段: ${ f } ) ;
121198 }
199+ if ( isMaskedSecretPlaceholder ( configData . access_key_id ) || isMaskedSecretPlaceholder ( configData . secret_access_key ) ) {
200+ throw new ValidationError ( "S3 密钥字段疑似为掩码占位符（*****1234），请重新填写真实值" ) ;
201+ }
122202 const encryptedAccessKey = await encryptValue ( configData . access_key_id , encryptionSecret ) ;
123203 const encryptedSecretKey = await encryptValue ( configData . secret_access_key , encryptionSecret ) ;
124204 configJson = {
@@ -139,6 +219,9 @@ export async function createStorageConfig(db, configData, adminId, encryptionSec
139219 for ( const f of requiredWebDav ) {
140220 if ( ! configData [ f ] ) throw new ValidationError ( `缺少必填字段: ${ f } ) ;
141221 }
222+ if ( isMaskedSecretPlaceholder ( configData . password ) ) {
223+ throw new ValidationError ( "WebDAV 密码字段疑似为掩码占位符（*****1234），请重新填写真实值" ) ;
224+ }
142225
143226 let endpoint_url = String ( configData . endpoint_url ) . trim ( ) ;
144227 try {
@@ -173,8 +256,9 @@ export async function createStorageConfig(db, configData, adminId, encryptionSec
173256 total_storage_bytes : totalStorageBytes ,
174257 } ;
175258 } else {
176- const { name, storage_type, is_public, is_default, ...rest } = configData ;
259+ const { name, storage_type, is_public, is_default, remark , url_proxy , ...rest } = configData ;
177260 configJson = rest || { } ;
261+ await encryptSecretsInConfigJson ( configData . storage_type , configJson , encryptionSecret , { requireRequiredSecrets : true } ) ;
178262 }
179263 const createData = {
180264 id,
@@ -203,6 +287,10 @@ export async function updateStorageConfig(db, id, updateData, adminId, encryptio
203287 const exists = await repo . findByIdAndAdminWithSecrets ( id , adminId ) ;
204288 if ( ! exists ) throw new NotFoundError ( "存储配置不存在" ) ;
205289
290+ // 是否有“驱动私有配置”字段变化（比如 endpoint/bucket/token 等）
291+ // - 仅改 name/remark/is_public/is_default/status 这种“展示/开关”字段，不需要清索引
292+ // - 一旦改了驱动配置，旧索引可能对应的是“旧数据源/旧路径”，必须标记 not_ready 让你重建
293+ let driverConfigChanged = false ;
206294 const topPatch = { } ;
207295 if ( updateData . name ) topPatch . name = updateData . name ;
208296 if ( updateData . is_public !== undefined ) topPatch . is_public = updateData . is_public ? 1 : 0 ;
@@ -215,17 +303,32 @@ export async function updateStorageConfig(db, id, updateData, adminId, encryptio
215303 if ( exists ?. __config_json__ && typeof exists . __config_json__ === "object" ) {
216304 cfg = { ...exists . __config_json__ } ;
217305 }
306+
307+ // 本类型 schema 中声明的 secret 字段集合
308+ const schema = getTypeConfigSchema ( exists . storage_type ) ;
309+ const secretFieldSet = new Set ( getSecretFieldDefsFromSchema ( schema ) . map ( ( f ) => f . name ) ) ;
310+
218311 // 合并驱动 JSON 字段
219312 const boolKeys = new Set ( [ "path_style" , "tls_insecure_skip_verify" ] ) ;
220313 for ( const [ k , v ] of Object . entries ( updateData ) ) {
221314 if ( [ "name" , "storage_type" , "is_public" , "is_default" , "status" , "remark" , "url_proxy" ] . includes ( k ) ) continue ;
222- if ( k === "access_key_id" ) {
223- cfg . access_key_id = await encryptValue ( v , encryptionSecret ) ;
224- } else if ( k === "secret_access_key" ) {
225- cfg . secret_access_key = await encryptValue ( v , encryptionSecret ) ;
226- } else if ( k === "password" ) {
227- cfg . password = await encryptValue ( v , encryptionSecret ) ;
228- } else if ( k === "total_storage_bytes" ) {
315+
316+ // secret：空值/掩码占位符 -> 不提交（保留原值）；真实值 -> 加密写入
317+ if ( secretFieldSet . has ( k ) ) {
318+ if ( shouldSkipSecretWrite ( v , { allowEmpty : true } ) ) {
319+ continue ;
320+ }
321+ // shouldSkipSecretWrite 已涵盖 masked，这里再次兜底
322+ if ( isMaskedSecretPlaceholder ( v ) ) {
323+ continue ;
324+ }
325+ cfg [ k ] = await encryptValue ( String ( v ) , encryptionSecret ) ;
326+ driverConfigChanged = true ;
327+ continue ;
328+ }
329+
330+ driverConfigChanged = true ;
331+ if ( k === "total_storage_bytes" ) {
229332 const val = parseInt ( v , 10 ) ;
230333 cfg . total_storage_bytes = Number . isFinite ( val ) && val > 0 ? val : null ;
231334 } else if ( k === "signature_expires_in" ) {
@@ -264,6 +367,23 @@ export async function updateStorageConfig(db, id, updateData, adminId, encryptio
264367 const mountManager = new MountManager ( db , encryptionSecret , factory ) ;
265368 await mountManager . clearConfigCache ( exists . storage_type , id ) ;
266369 } catch { }
370+
371+ // 如果驱动配置变化：把依赖此存储配置的挂载点索引清掉 + 标记 not_ready
372+ if ( driverConfigChanged ) {
373+ try {
374+ const mountRepo = factory . getMountRepository ( ) ;
375+ const mounts = await mountRepo . findByStorageConfig ( id , exists . storage_type ) ;
376+ const store = new FsSearchIndexStore ( db ) ;
377+ for ( const m of mounts || [ ] ) {
378+ const mountId = String ( m ?. id || "" ) . trim ( ) ;
379+ if ( ! mountId ) continue ;
380+ await store . clearDerivedByMount ( mountId , { keepState : true } ) ;
381+ }
382+ invalidateFsCache ( { storageConfigId : id , reason : "storage-config-update" , bumpMountsVersion : true , db } ) ;
383+ } catch ( e ) {
384+ console . warn ( "updateStorageConfig: 清理相关挂载点索引失败（将继续返回更新成功）：" , e ) ;
385+ }
386+ }
267387}
268388
269389export async function deleteStorageConfig ( db , id , adminId , repositoryFactory = null ) {
@@ -283,7 +403,25 @@ export async function deleteStorageConfig(db, id, adminId, repositoryFactory = n
283403 }
284404 }
285405
406+ // 删除存储配置前：先把依赖它的挂载点与索引派生数据清掉
407+ // 否则会留下“挂载点指向不存在的存储配置”+ “索引残留”的脏数据
408+ try {
409+ const mountRepo = factory . getMountRepository ( ) ;
410+ const mounts = await mountRepo . findByStorageConfig ( id , exists . storage_type ) ;
411+ const store = new FsSearchIndexStore ( db ) ;
412+ for ( const m of mounts || [ ] ) {
413+ const mountId = String ( m ?. id || "" ) . trim ( ) ;
414+ if ( ! mountId ) continue ;
415+ await store . clearDerivedByMount ( mountId , { keepState : false } ) ;
416+ await mountRepo . deleteMount ( mountId ) ;
417+ invalidateFsCache ( { mountId, storageConfigId : id , reason : "mount-delete-by-storage-config" , bumpMountsVersion : true , db } ) ;
418+ }
419+ } catch ( error ) {
420+ console . warn ( "deleteStorageConfig: 清理挂载点/索引失败，将继续删除存储配置本身：" , error ) ;
421+ }
422+
286423 await repo . deleteConfig ( id ) ;
424+ invalidateFsCache ( { storageConfigId : id , reason : "storage-config-delete" , bumpMountsVersion : true , db } ) ;
287425}
288426
289427export async function setDefaultStorageConfig ( db , id , adminId , repositoryFactory = null ) {
0 commit comments