feat: 实现全局模型白名单功能 (#301)

* feat: 实现全局模型白名单功能 ## 功能概述实现全局模型白名单，允许管理员配置只启用特定模型的路由，实现精细化的模型访问控制。 ## 主要变更 ### 后端实现 - config.ts: 新增 globalAllowedModels 配置项 - settings.ts: - 新增 RuntimeSettingsBody 类型支持 - 实现数据库加载和持久化 - 配置变更自动触发路由重建 - modelService.ts: - 在路由重建中添加白名单过滤逻辑 - 大小写不敏感匹配，自动trim空格 - 空白名单时允许所有模型（向后兼容） - stats.ts: - 候选API过滤 models/modelsWithoutToken/modelsMissingTokenGroups ### 前端实现 - Settings.tsx: - 新增"全局模型白名单"配置卡片 - 支持手动输入和点击选择两种添加方式 - 绿色徽章显示已选模型，支持删除 - 保存后自动触发路由重建 ## 技术特性 - ✅ 向后兼容（默认为空数组，允许所有模型） - ✅ 大小写不敏感匹配 - ✅ 自动trim和去重 - ✅ 输入验证（类型检查、空值过滤） - ✅ 配置变更自动重建路由 ## 测试验证 - 白名单为空时所有模型可见 - 白名单有值时只显示白名单模型 - 路由重建正确过滤模型 - 候选API正确返回过滤结果 - 前端UI交互正常 Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix: add getModelTokenCandidates mock to Settings tests * fix: add getModelTokenCandidates mock to proxy-transport test --------- Co-authored-by: Ding <ding@local> Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-30 17:19:02 +08:00
parent 01481be511
commit fa25a501a8
11 changed files with 720 additions and 3 deletions
@@ -133,6 +133,7 @@ export function buildConfig(env: NodeJS.ProcessEnv) {
    proxyErrorKeywords: parseCsvList(env.PROXY_ERROR_KEYWORDS),
    proxyEmptyContentFailEnabled: parseBoolean(env.PROXY_EMPTY_CONTENT_FAIL, false),
    globalBlockedBrands: [] as string[],
+    globalAllowedModels: [] as string[],
    codexResponsesWebsocketBeta: parseOptionalSecret(env.CODEX_RESPONSES_WEBSOCKET_BETA) || 'responses_websockets=2026-02-06',
    codexHeaderDefaults: {
      userAgent: parseOptionalSecret(env.CODEX_HEADER_DEFAULTS_USER_AGENT),
@@ -85,6 +85,7 @@ interface RuntimeSettingsBody {
  proxyErrorKeywords?: string[] | string;
  proxyEmptyContentFailEnabled?: boolean;
  globalBlockedBrands?: string[];
+  globalAllowedModels?: string[];
 }

 interface DatabaseMigrationBody {
@@ -505,6 +506,29 @@ function applyImportedSettingToRuntime(key: string, value: unknown) {
      }
      return;
    }
+    case 'global_allowed_models': {
+      try {
+        const parsed = typeof value === 'string' ? JSON.parse(value) : value;
+        if (Array.isArray(parsed)) {
+          const nextModels = parsed.filter((m): m is string => typeof m === 'string').map((m) => m.trim()).filter(Boolean);
+          const prev = JSON.stringify(config.globalAllowedModels);
+          config.globalAllowedModels = nextModels;
+          if (prev !== JSON.stringify(nextModels)) {
+            startBackgroundTask(
+              {
+                type: 'maintenance',
+                title: '模型白名单变更后重建路由',
+                dedupeKey: 'refresh-models-and-rebuild-routes',
+              },
+              async () => routeRefreshWorkflow.refreshModelsAndRebuildRoutes(),
+            );
+          }
+        }
+      } catch {
+        return;
+      }
+      return;
+    }
    case 'webhook_url': {
      if (typeof value !== 'string') return;
      config.webhookUrl = value.trim();
@@ -685,6 +709,7 @@ function getRuntimeSettingsResponse(currentAdminIp = '') {
    proxyEmptyContentFailEnabled: config.proxyEmptyContentFailEnabled,
    proxyTokenMasked: maskSecret(config.proxyToken),
    globalBlockedBrands: config.globalBlockedBrands,
+    globalAllowedModels: config.globalAllowedModels,
  };
 }

@@ -1263,6 +1288,31 @@ export async function settingsRoutes(app: FastifyInstance) {
      }
    }

+    if (body.globalAllowedModels !== undefined) {
+      if (!Array.isArray(body.globalAllowedModels)) {
+        return reply.code(400).send({ error: 'globalAllowedModels must be an array of strings' });
+      }
+      const nextModels = body.globalAllowedModels.filter((m): m is string => typeof m === 'string').map((m) => m.trim()).filter(Boolean);
+      const uniqueModels = Array.from(new Set(nextModels));
+      const prev = JSON.stringify(config.globalAllowedModels);
+      const next = JSON.stringify(uniqueModels);
+      if (prev !== next) {
+        changedLabels.push('全局模型白名单');
+      }
+      config.globalAllowedModels = uniqueModels;
+      upsertSetting('global_allowed_models', JSON.stringify(uniqueModels));
+      if (prev !== next) {
+        startBackgroundTask(
+          {
+            type: 'maintenance',
+            title: '模型白名单变更后重建路由',
+            dedupeKey: 'refresh-models-and-rebuild-routes',
+          },
+          async () => routeRefreshWorkflow.refreshModelsAndRebuildRoutes(),
+        );
+      }
+    }
+
    if (body.webhookUrl !== undefined) {
      if (String(body.webhookUrl || '').trim() !== config.webhookUrl) {
        changedLabels.push('Webhook 地址');
@@ -1,6 +1,7 @@
 import { FastifyInstance } from 'fastify';
 import { db, schema } from '../../db/index.js';
 import { and, desc, eq, gte, lt, sql } from 'drizzle-orm';
+import { config } from '../../config.js';
 import { refreshModelsForAccount } from '../../services/modelService.js';
 import * as routeRefreshWorkflow from '../../services/routeRefreshWorkflow.js';
 import { buildModelAnalysis } from '../../services/modelAnalysisService.js';
@@ -1165,6 +1166,11 @@ export async function statsRoutes(app: FastifyInstance) {
      return name;
    };

+    // Load global allowed models whitelist
+    const globalAllowedModels = new Set(
+      config.globalAllowedModels.map((m) => m.toLowerCase().trim()).filter(Boolean),
+    );
+
    const rows = await db.select().from(schema.tokenModelAvailability)
      .innerJoin(schema.accountTokens, eq(schema.tokenModelAvailability.tokenId, schema.accountTokens.id))
      .innerJoin(schema.accounts, eq(schema.accountTokens.accountId, schema.accounts.id))
@@ -1395,10 +1401,41 @@ export async function statsRoutes(app: FastifyInstance) {
      }
    }

+    // Apply model whitelist filter if configured
+    const filteredResult: typeof result = {};
+    const filteredModelsWithoutToken: typeof modelsWithoutToken = {};
+    const filteredModelsMissingTokenGroups: typeof modelsMissingTokenGroups = {};
+
+    if (globalAllowedModels.size > 0) {
+      // Filter result
+      for (const [modelName, candidates] of Object.entries(result)) {
+        if (globalAllowedModels.has(modelName.toLowerCase().trim())) {
+          filteredResult[modelName] = candidates;
+        }
+      }
+      // Filter modelsWithoutToken
+      for (const [modelName, accounts] of Object.entries(modelsWithoutToken)) {
+        if (globalAllowedModels.has(modelName.toLowerCase().trim())) {
+          filteredModelsWithoutToken[modelName] = accounts;
+        }
+      }
+      // Filter modelsMissingTokenGroups
+      for (const [modelName, accounts] of Object.entries(modelsMissingTokenGroups)) {
+        if (globalAllowedModels.has(modelName.toLowerCase().trim())) {
+          filteredModelsMissingTokenGroups[modelName] = accounts;
+        }
+      }
+    } else {
+      // No whitelist configured, return all models (backward compatible)
+      Object.assign(filteredResult, result);
+      Object.assign(filteredModelsWithoutToken, modelsWithoutToken);
+      Object.assign(filteredModelsMissingTokenGroups, modelsMissingTokenGroups);
+    }
+
    return {
-      models: result,
-      modelsWithoutToken,
-      modelsMissingTokenGroups,
+      models: filteredResult,
+      modelsWithoutToken: filteredModelsWithoutToken,
+      modelsMissingTokenGroups: filteredModelsMissingTokenGroups,
      endpointTypesByModel,
    };
  });
@@ -956,10 +956,23 @@ export async function rebuildTokenRoutesFromAvailability() {
  // Load global brand filter
  const blockedBrandRules = getBlockedBrandRules(config.globalBlockedBrands);

+  // Load global allowed models whitelist
+  const globalAllowedModels = new Set(
+    config.globalAllowedModels.map((m) => m.toLowerCase().trim()).filter(Boolean),
+  );
+
+  function isModelAllowedByWhitelist(modelName: string): boolean {
+    // If whitelist is empty, allow all models (backward compatible)
+    if (globalAllowedModels.size === 0) return true;
+    // Check if model is in whitelist (case-insensitive)
+    return globalAllowedModels.has(modelName.toLowerCase().trim());
+  }
+
  const modelCandidates = new Map<string, Map<string, { accountId: number; tokenId: number | null }>>();
  const addModelCandidate = (modelNameRaw: string | null | undefined, accountId: number, tokenId: number | null, siteId: number) => {
    const modelName = (modelNameRaw || '').trim();
    if (!modelName) return;
+    if (!isModelAllowedByWhitelist(modelName)) return;
    if (isModelDisabledForSite(siteId, modelName)) return;
    if (blockedBrandRules.length > 0 && isModelBlockedByBrand(modelName, blockedBrandRules)) return;
    if (!modelCandidates.has(modelName)) modelCandidates.set(modelName, new Map());
@@ -62,6 +62,7 @@ type RuntimeSettings = {
  adminIpAllowlist?: string[];
  currentAdminIp?: string;
  globalBlockedBrands?: string[];
+  globalAllowedModels?: string[];
 };

 type SystemProxyTestState =
@@ -220,6 +221,10 @@ export default function Settings() {
  const [allBrandNames, setAllBrandNames] = useState<string[] | null>(null);
  const [blockedBrands, setBlockedBrands] = useState<string[]>([]);
  const [savingBrandFilter, setSavingBrandFilter] = useState(false);
+  const [availableModels, setAvailableModels] = useState<string[] | null>(null);
+  const [allowedModels, setAllowedModels] = useState<string[]>([]);
+  const [allowedModelsInput, setAllowedModelsInput] = useState('');
+  const [savingAllowedModels, setSavingAllowedModels] = useState(false);
  const [savingSecurity, setSavingSecurity] = useState(false);
  const [adminIpAllowlistText, setAdminIpAllowlistText] = useState('');
  const [clearingCache, setClearingCache] = useState(false);
@@ -445,8 +450,10 @@ export default function Settings() {
          : [],
        currentAdminIp: typeof runtimeInfo.currentAdminIp === 'string' ? runtimeInfo.currentAdminIp : '',
        globalBlockedBrands: Array.isArray(runtimeInfo.globalBlockedBrands) ? runtimeInfo.globalBlockedBrands : [],
+        globalAllowedModels: Array.isArray(runtimeInfo.globalAllowedModels) ? runtimeInfo.globalAllowedModels : [],
      });
      setBlockedBrands(Array.isArray(runtimeInfo.globalBlockedBrands) ? runtimeInfo.globalBlockedBrands : []);
+      setAllowedModels(Array.isArray(runtimeInfo.globalAllowedModels) ? runtimeInfo.globalAllowedModels : []);
      setProxyErrorKeywordsText(
        Array.isArray(runtimeInfo.proxyErrorKeywords)
          ? runtimeInfo.proxyErrorKeywords.filter((item: unknown) => typeof item === 'string').join('\n')
@@ -493,6 +500,14 @@ export default function Settings() {
    api.getBrandList()
      .then((res: any) => setAllBrandNames(Array.isArray(res?.brands) ? res.brands : []))
      .catch(() => setAllBrandNames([]));
+    // Load available models in background (non-blocking, best-effort)
+    api.getModelTokenCandidates()
+      .then((res: any) => {
+        const models = res?.models || {};
+        const modelNames = Object.keys(models);
+        setAvailableModels(modelNames.sort());
+      })
+      .catch(() => setAvailableModels([]));
  };

  useEffect(() => {
@@ -864,6 +879,27 @@ export default function Settings() {
    }
  };

+  const handleSaveAllowedModels = async () => {
+    setSavingAllowedModels(true);
+    try {
+      const res = await api.updateRuntimeSettings({ globalAllowedModels: allowedModels });
+      const resolved = Array.isArray(res?.globalAllowedModels) ? res.globalAllowedModels : allowedModels;
+      setRuntime((prev) => ({ ...prev, globalAllowedModels: resolved }));
+      setAllowedModels(resolved);
+      toast.success('模型白名单设置已保存');
+      try {
+        await api.rebuildRoutes(false);
+        toast.success('路由已重建');
+      } catch {
+        toast.error('模型白名单已保存，但路由重建失败，请手动重建');
+      }
+    } catch (err: any) {
+      toast.error(err?.message || '保存模型白名单设置失败');
+    } finally {
+      setSavingAllowedModels(false);
+    }
+  };
+
  const saveSecuritySettings = async () => {
    setSavingSecurity(true);
    try {
@@ -1589,7 +1625,118 @@ export default function Settings() {
          </button>
        </div>

+        {/* Global Allowed Models Whitelist */}
        <div className="card animate-slide-up stagger-7" style={{ padding: 20 }}>
+          <div style={{ fontWeight: 600, fontSize: 14, marginBottom: 8 }}>全局模型白名单</div>
+          <div style={{ fontSize: 12, color: 'var(--color-text-muted)', marginBottom: 12, lineHeight: 1.6 }}>
+            配置白名单后，路由重建和候选生成将只针对白名单中的模型。留空表示允许所有模型（向后兼容）。保存后自动触发路由重建。
+          </div>
+          <div style={{ marginBottom: 12 }}>
+            <div style={{ display: 'flex', gap: 8, marginBottom: 8 }}>
+              <input
+                type="text"
+                placeholder="输入模型名称，如：gpt-4"
+                value={allowedModelsInput}
+                onChange={(e) => setAllowedModelsInput(e.target.value)}
+                onKeyDown={(e) => {
+                  if (e.key === 'Enter' && allowedModelsInput.trim()) {
+                    const model = allowedModelsInput.trim();
+                    if (!allowedModels.includes(model)) {
+                      setAllowedModels((prev) => [...prev, model]);
+                    }
+                    setAllowedModelsInput('');
+                  }
+                }}
+                style={{ flex: 1, ...inputStyle }}
+              />
+              <button
+                onClick={() => {
+                  if (allowedModelsInput.trim()) {
+                    const model = allowedModelsInput.trim();
+                    if (!allowedModels.includes(model)) {
+                      setAllowedModels((prev) => [...prev, model]);
+                    }
+                    setAllowedModelsInput('');
+                  }
+                }}
+                className="btn btn-ghost"
+                style={{ border: '1px solid var(--color-border)', fontSize: 12, padding: '6px 12px' }}
+              >
+                添加
+              </button>
+            </div>
+            {availableModels && availableModels.length > 0 && (
+              <div style={{ marginBottom: 12 }}>
+                <div style={{ fontSize: 12, color: 'var(--color-text-muted)', marginBottom: 6 }}>
+                  或从当前可用模型中选择：
+                </div>
+                <div style={{ display: 'flex', flexWrap: 'wrap', gap: 6, maxHeight: 120, overflowY: 'auto', border: '1px solid var(--color-border)', padding: 8, borderRadius: 4 }}>
+                  {availableModels.map((model) => {
+                    const isAllowed = allowedModels.includes(model);
+                    return (
+                      <button
+                        key={model}
+                        type="button"
+                        onClick={() => {
+                          if (isAllowed) {
+                            setAllowedModels((prev) => prev.filter((m) => m !== model));
+                          } else {
+                            setAllowedModels((prev) => [...prev, model]);
+                          }
+                        }}
+                        className={`badge ${isAllowed ? 'badge-success' : 'badge-muted'}`}
+                        style={{
+                          fontSize: 11, cursor: 'pointer', border: 'none', padding: '4px 10px',
+                          transition: 'all 0.15s ease',
+                        }}
+                      >
+                        {model}
+                      </button>
+                    );
+                  })}
+                </div>
+              </div>
+            )}
+            {allowedModels.length > 0 && (
+              <div>
+                <div style={{ fontSize: 12, color: 'var(--color-text-muted)', marginBottom: 6 }}>
+                  已选择 {allowedModels.length} 个模型：
+                </div>
+                <div style={{ display: 'flex', flexWrap: 'wrap', gap: 6 }}>
+                  {allowedModels.map((model) => (
+                    <div
+                      key={model}
+                      className="badge badge-success"
+                      style={{ fontSize: 11, padding: '4px 10px', display: 'flex', alignItems: 'center', gap: 4 }}
+                    >
+                      {model}
+                      <button
+                        onClick={() => setAllowedModels((prev) => prev.filter((m) => m !== model))}
+                        style={{
+                          background: 'none',
+                          border: 'none',
+                          color: 'inherit',
+                          cursor: 'pointer',
+                          padding: 0,
+                          fontSize: 14,
+                          lineHeight: 1,
+                        }}
+                        title="移除"
+                      >
+                        ×
+                      </button>
+                    </div>
+                  ))}
+                </div>
+              </div>
+            )}
+          </div>
+          <button onClick={handleSaveAllowedModels} disabled={savingAllowedModels} className="btn btn-primary" style={{ fontSize: 12, padding: '6px 16px' }}>
+            {savingAllowedModels ? <><span className="spinner spinner-sm" style={{ borderTopColor: 'white', borderColor: 'rgba(255,255,255,0.3)' }} /> 保存中...</> : '保存模型白名单'}
+          </button>
+        </div>
+
+        <div className="card animate-slide-up stagger-8" style={{ padding: 20 }}>
          <div style={{ fontWeight: 600, fontSize: 14, marginBottom: 10 }}>数据库迁移（SQLite / MySQL / PostgreSQL）</div>
          <div style={{ fontSize: 12, color: 'var(--color-text-muted)', marginBottom: 12 }}>
            可先测试连接，再迁移数据；迁移完成后可保存为运行数据库配置（重启容器后生效）。
@@ -13,6 +13,7 @@ const { apiMock } = vi.hoisted(() => ({
    getRuntimeDatabaseConfig: vi.fn(),
    getBrandList: vi.fn(),
    factoryReset: vi.fn(),
+    getModelTokenCandidates: vi.fn(),
  },
 }));

@@ -85,6 +86,7 @@ describe('Settings factory reset', () => {
      restartRequired: false,
    });
    apiMock.factoryReset.mockResolvedValue({ success: true });
+    apiMock.getModelTokenCandidates.mockResolvedValue({ models: {} });

    storage = createStorage({
      auth_token: 'before-reset-token',
@@ -13,6 +13,7 @@ const { apiMock } = vi.hoisted(() => ({
    getRuntimeDatabaseConfig: vi.fn(),
    getBrandList: vi.fn(),
    updateRuntimeSettings: vi.fn(),
+    getModelTokenCandidates: vi.fn(),
  },
 }));

@@ -76,6 +77,7 @@ describe('Settings proxy transport', () => {
      proxySessionChannelConcurrencyLimit: 6,
      proxySessionChannelQueueWaitMs: 4200,
    });
+    apiMock.getModelTokenCandidates.mockResolvedValue({ models: {} });
  });

  afterEach(() => {
@@ -15,6 +15,7 @@ const { apiMock } = vi.hoisted(() => ({
    getBrandList: vi.fn(),
    updateRuntimeSettings: vi.fn(),
    triggerCheckinAll: vi.fn(),
+    getModelTokenCandidates: vi.fn(),
  },
 }));

@@ -70,6 +71,7 @@ describe('Settings log cleanup schedule', () => {
      restartRequired: false,
    });
    apiMock.updateRuntimeSettings.mockResolvedValue({ success: true });
+    apiMock.getModelTokenCandidates.mockResolvedValue({ models: {} });
  });

  afterEach(() => {
@@ -14,6 +14,7 @@ const { apiMock } = vi.hoisted(() => ({
    getBrandList: vi.fn(),
    updateRuntimeSettings: vi.fn(),
    testSystemProxy: vi.fn(),
+    getModelTokenCandidates: vi.fn(),
  },
 }));

@@ -80,6 +81,7 @@ describe('Settings system proxy', () => {
      statusCode: 204,
      latencyMs: 321,
    });
+    apiMock.getModelTokenCandidates.mockResolvedValue({ models: {} });
  });

  afterEach(() => {