diff --git a/src/routes/api.js b/src/routes/api.js index 37e12949..7a73bf94 100644 --- a/src/routes/api.js +++ b/src/routes/api.js @@ -899,23 +899,6 @@ router.post('/v1/messages/count_tokens', authenticateApiKey, async (req, res) => logger.info(`🔢 Processing token count request for key: ${req.apiKey.name}`) - // 模型限制(黑名单)校验:统一在此处处理(去除供应商前缀) - if ( - req.apiKey.enableModelRestriction && - Array.isArray(req.apiKey.restrictedModels) && - req.apiKey.restrictedModels.length > 0 - ) { - const effectiveModel = getEffectiveModel(req.body.model || '') - if (req.apiKey.restrictedModels.includes(effectiveModel)) { - return res.status(403).json({ - error: { - type: 'forbidden', - message: '暂无该模型访问权限' - } - }) - } - } - // 生成会话哈希用于sticky会话 const sessionHash = sessionHelper.generateSessionHash(req.body) diff --git a/src/services/claudeRelayService.js b/src/services/claudeRelayService.js index b2680626..2c91b63f 100644 --- a/src/services/claudeRelayService.js +++ b/src/services/claudeRelayService.js @@ -79,34 +79,6 @@ class ClaudeRelayService { requestedModel: requestBody.model }) - // 检查模型限制(restrictedModels 作为允许列表) - if ( - apiKeyData.enableModelRestriction && - apiKeyData.restrictedModels && - apiKeyData.restrictedModels.length > 0 - ) { - const requestedModel = requestBody.model - logger.info( - `🔒 Model restriction check - Requested model: ${requestedModel}, Restricted models: ${JSON.stringify(apiKeyData.restrictedModels)}` - ) - - if (requestedModel && apiKeyData.restrictedModels.includes(requestedModel)) { - logger.warn( - `🚫 Model restriction violation for key ${apiKeyData.name}: Attempted to use restricted model ${requestedModel}` - ) - return { - statusCode: 403, - headers: { 'Content-Type': 'application/json' }, - body: JSON.stringify({ - error: { - type: 'forbidden', - message: '暂无该模型访问权限' - } - }) - } - } - } - // 生成会话哈希用于sticky会话 const sessionHash = sessionHelper.generateSessionHash(requestBody) @@ -866,36 +838,6 @@ class ClaudeRelayService { requestedModel: requestBody.model }) - // 检查模型限制(restrictedModels 作为允许列表) - if ( - apiKeyData.enableModelRestriction && - apiKeyData.restrictedModels && - apiKeyData.restrictedModels.length > 0 - ) { - const requestedModel = requestBody.model - logger.info( - `🔒 [Stream] Model restriction check - Requested model: ${requestedModel}, Restricted models: ${JSON.stringify(apiKeyData.restrictedModels)}` - ) - - if (requestedModel && apiKeyData.restrictedModels.includes(requestedModel)) { - logger.warn( - `🚫 Model restriction violation for key ${apiKeyData.name}: Attempted to use restricted model ${requestedModel}` - ) - - // 对于流式响应,需要写入错误并结束流 - const errorResponse = JSON.stringify({ - error: { - type: 'forbidden', - message: '暂无该模型访问权限' - } - }) - - responseStream.writeHead(403, { 'Content-Type': 'application/json' }) - responseStream.end(errorResponse) - return - } - } - // 生成会话哈希用于sticky会话 const sessionHash = sessionHelper.generateSessionHash(requestBody)