diff --git a/app/config.example.yml b/app/config.example.yml index 304ec4b..b914373 100644 --- a/app/config.example.yml +++ b/app/config.example.yml @@ -76,6 +76,8 @@ auth: # users 留空 = 不启用登 users: - user: admin # 默认账号 password: "admin" # 默认密码,请务必修改 + role: admin # admin=管理员(全部设置 + 用户管理);user 或缺省=普通用户(仅账户页) + # model: qwen-tp/qwen3.8-flash # 选填:该用户新建会话时锁定的模型(内部键「平台名/模型id」) # 外部 MCP 服务列表:每项 {name?, url, headers?, enable?(默认 true), timeout_ms?, tools_allow?, tools_deny?}。 mcp_servers: [] diff --git a/app/server/auth.js b/app/server/auth.js index a43cd30..87d7a4b 100644 --- a/app/server/auth.js +++ b/app/server/auth.js @@ -94,13 +94,21 @@ function isSignedDownload(req) { return req.method === 'GET' && /\/files\/(download(-name\/.+)?|zip(-name\/.+)?)$/.test(req.path) && !!req.query.t; } -// cfg.auth = { users: [{user, password}], secret?, ttl_ms? } +// cfg.auth = { users: [{user, password, role?, model?}], secret?, ttl_ms? } // users 为空则整个认证关闭(cfg.auth 为 null)。 function createAuth(cfg) { const router = express.Router(); - const users = (cfg.auth && cfg.auth.users) || []; + let users = (cfg.auth && cfg.auth.users) || []; if (!users.length) { - return { enabled: false, middleware: (req, res, next) => next(), router }; + // 未启用认证 = 单用户自用:管理接口按「本机主人」放行,用户 CRUD 由 routes/users.js 自己拒绝。 + return { + enabled: false, + middleware: (req, res, next) => next(), + router, + requireAdmin: (req, res, next) => next(), + refreshUsers: () => {}, + isAdmin: () => false, + }; } const secret = (cfg.auth.secret && String(cfg.auth.secret)) || crypto.randomBytes(32).toString('hex'); @@ -108,7 +116,21 @@ function createAuth(cfg) { log.warn('auth', '未配置 auth.secret,已使用随机密钥:进程重启后所有登录态失效'); } const ttlMs = Number(cfg.auth.ttl_ms) || DEFAULT_TTL_MS; - const validUsers = new Map(users.map(u => [String(u.user), String(u.password)])); + let validUsers = new Map(users.map(u => [String(u.user), String(u.password)])); + + function userRow(name) { + const n = String(name == null ? '' : name); + return users.find(u => String(u.user) === n) || null; + } + function isAdmin(name) { + const u = userRow(name); + return !!u && u.role === 'admin'; + } + // 用户增删改后由 routes/users.js 调用:重建登录校验表(删除的用户旧 token 随即失效)。 + function refreshUsers(next) { + users = Array.isArray(next) ? next : []; + validUsers = new Map(users.map(u => [String(u.user), String(u.password)])); + } function setAuthCookie(res, username) { const token = signToken(username, Date.now() + ttlMs, secret); @@ -205,7 +227,9 @@ function createAuth(cfg) { router.get('/api/me', (req, res) => { // 与中间件同一解析顺序(cookie 优先),保证 /api/me 显示的用户与业务路由认定的用户一致 - res.json({ user: authUser(req) }); + const name = authUser(req); + const row = name ? userRow(name) : null; + res.json({ user: name, role: row ? row.role : '', model: row ? (row.model || '') : '' }); }); // ----- 登录页 / 登出跳转 ----- @@ -231,7 +255,14 @@ function createAuth(cfg) { return res.redirect('/login?next=' + encodeURIComponent(req.originalUrl)); }; - return { enabled: true, middleware, router }; + // 管理接口门禁(挂在 auth.middleware 之后):仅 admin 可进。 + function requireAdmin(req, res, next) { + if (!req.user) return res.status(401).json({ error: '未登录' }); + if (!isAdmin(req.user)) return res.status(403).json({ error: '需要管理员权限' }); + next(); + } + + return { enabled: true, middleware, router, requireAdmin, refreshUsers, isAdmin }; } module.exports = { createAuth, COOKIE_NAME }; diff --git a/app/server/config.js b/app/server/config.js index b0698e9..ae0f699 100644 --- a/app/server/config.js +++ b/app/server/config.js @@ -309,14 +309,22 @@ function parseAndValidate(rawText, configPath) { cfg.skills.timeout_ms = (cfg.skills.timeout_ms == null) ? 120000 : cfg.skills.timeout_ms; } - // auth 规范化:多用户 auth.users: [{user, password}];兼容旧的单用户 auth.{user,password} + // auth 规范化:多用户 auth.users: [{user, password, role?, model?}];兼容旧的单用户 auth.{user,password} if (cfg.auth && !Array.isArray(cfg.auth.users)) { - cfg.auth.users = cfg.auth.user ? [{ user: cfg.auth.user, password: cfg.auth.password }] : []; + cfg.auth.users = cfg.auth.user ? [{ user: cfg.auth.user, password: cfg.auth.password, role: cfg.auth.role, model: cfg.auth.model }] : []; } if (cfg.auth && Array.isArray(cfg.auth.users)) { cfg.auth.users = cfg.auth.users .filter(u => u && u.user) - .map(u => ({ user: String(u.user), password: String(u.password == null ? '' : u.password) })); + .map(u => ({ + user: String(u.user), + password: String(u.password == null ? '' : u.password), + // 角色:admin = 管理员(设置页全部功能 + 用户管理);缺省 user = 普通用户(设置只开账户页)。 + role: u.role === 'admin' ? 'admin' : 'user', + // 选填:该用户新建会话时锁定的模型(内部唯一键「平台名/模型id」,如 qwen-tp/qwen3.8-flash)。 + // 未配/空串 = 按原逻辑(前端预选或全局自动选择);配了但模型无效/被禁用时同样退回原逻辑。 + model: u.model ? String(u.model).trim() : '', + })); if (!cfg.auth.users.length) cfg.auth = null; } diff --git a/app/server/engine.js b/app/server/engine.js index 25d0627..cdbf0d3 100644 --- a/app/server/engine.js +++ b/app/server/engine.js @@ -286,6 +286,13 @@ function platformModels(platform) { return out; } +// 用户在 auth.users[].model 里锁定的模型(选填):新建会话时优先于前端预选。 +// 空串 = 未锁定(未启用认证时 user 为空串,同样不命中)。 +function lockedModelOf(user) { + const u = ((cfg.auth && cfg.auth.users) || []).find(x => String(x.user) === String(user || '')); + return (u && u.model) || ''; +} + // 在 key 所属平台的模型里选一个:preferred(会话上次用过的同平台模型)优先; // 否则取平台内当前绑定会话数最少的(打平按配置顺序),同平台多模型也轮转摊平。 function chooseModel(platform, preferred) { @@ -995,7 +1002,13 @@ function sleep(ms) { return new Promise(r => setTimeout(r, ms)); } // 新建即绑模(无排队):指定了优先模型(welcome 预选)就取其平台「最不 active」的 key; // 模型无效或平台无槽位退回全局优先级选。池完全为空直接报错(配置问题),不建吊儿郎当的会话。 function createSession(title, preferModelId, assistantType, user) { - const want = String(preferModelId || ''); + // 用户锁定模型(auth.users[].model)优先于前端预选;锁定值无效/被禁用时退回原逻辑(用前端预选或全局自动选择)。 + const lock = lockedModelOf(user); + const lockValid = !!lock && platformModels(platformOf(lock)).includes(lock); + if (lock && !lockValid) { + log.warn('model', '用户 ' + (user || '-') + ' 锁定的模型 ' + lock + ' 无效或已禁用,按原逻辑选择'); + } + const want = String((lockValid ? lock : preferModelId) || ''); let key = null, modelId = ''; if (want && platformModels(platformOf(want)).includes(want)) { key = chooseKey(platformOf(want), true); diff --git a/app/server/public/index.html b/app/server/public/index.html index 30fbfcc..b8f5e8e 100644 --- a/app/server/public/index.html +++ b/app/server/public/index.html @@ -286,6 +286,28 @@ + + +