feat(claude-code): 增加 TLS 指纹伪装、Cache TTL 统一、CLI 限制与流超时冷却

- 新增 curl_cffi Transport,支持真实浏览器 TLS 指纹伪装 (Chrome/Node.js)
- 增加 Cache TTL Override 功能,强制统一 cache_control 类型防止行为指纹差异
- 增加 CLI-only 客户端限制,支持仅允许 Claude Code CLI 访问
- 池健康策略增加 stream timeout 计数与自动冷却机制
- OAuth 账号 Region 选择改为从 AWS API 动态获取,支持搜索和自定义输入
- 前端 PoolConfigDialog 增加对应配置 UI
This commit is contained in:
fawney19
2026-02-27 18:10:27 +08:00
parent 76a6d0ce8e
commit d2450cbdc1
19 changed files with 870 additions and 15 deletions

View File

@@ -8,3 +8,4 @@ export * from './models'
export * from './adaptive' export * from './adaptive'
export * from './global-models' export * from './global-models'
export * from './pool' export * from './pool'
export * from './system'

View File

@@ -0,0 +1,12 @@
import { client } from '../client'
// AWS Regions
let _awsRegionsCache: string[] | null = null
export async function getAwsRegions(): Promise<string[]> {
if (_awsRegionsCache) return _awsRegionsCache
const resp = await client.get<{ regions: string[] }>('/api/admin/system/aws-regions')
_awsRegionsCache = resp.data.regions
return _awsRegionsCache
}

View File

@@ -450,6 +450,11 @@ export interface ClaudeCodeAdvancedConfig {
enable_tls_fingerprint?: boolean enable_tls_fingerprint?: boolean
// 会话 ID 伪装(固定 metadata.user_id 中 session 片段) // 会话 ID 伪装(固定 metadata.user_id 中 session 片段)
session_id_masking_enabled?: boolean session_id_masking_enabled?: boolean
// Cache TTL 统一(强制所有 cache_control 使用相同 TTL 类型)
cache_ttl_override_enabled?: boolean
cache_ttl_override_target?: string
// 仅允许 CLI 客户端
cli_only_enabled?: boolean
} }
export interface PoolAdvancedConfig { export interface PoolAdvancedConfig {

View File

@@ -227,6 +227,52 @@
@update:model-value="(v: boolean) => claudeForm.session_id_masking_enabled = v" @update:model-value="(v: boolean) => claudeForm.session_id_masking_enabled = v"
/> />
</div> </div>
<div class="space-y-3 p-3 border rounded-lg bg-muted/50">
<div class="flex items-center justify-between">
<div class="space-y-0.5">
<span class="text-sm font-medium">Cache TTL 统一</span>
<p class="text-xs text-muted-foreground">
强制统一所有请求的 cache_control 类型,避免多人共用时行为指纹不一致
</p>
</div>
<Switch
:model-value="claudeForm.cache_ttl_override_enabled"
@update:model-value="(v: boolean) => claudeForm.cache_ttl_override_enabled = v"
/>
</div>
<div
v-if="claudeForm.cache_ttl_override_enabled"
class="space-y-1.5"
>
<Label class="text-xs">目标 TTL 类型</Label>
<select
:value="claudeForm.cache_ttl_override_target"
class="flex h-9 w-full rounded-md border border-input bg-transparent px-3 py-1 text-sm shadow-sm transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring"
@change="(e) => claudeForm.cache_ttl_override_target = (e.target as HTMLSelectElement).value"
>
<option value="ephemeral">
ephemeral (5 分钟)
</option>
<option value="1h">
1h (1 小时)
</option>
</select>
</div>
</div>
<div class="flex items-center justify-between p-3 border rounded-lg bg-muted/50">
<div class="space-y-0.5">
<span class="text-sm font-medium">仅限 CLI 客户端</span>
<p class="text-xs text-muted-foreground">
仅允许 Claude Code CLI 客户端访问,拒绝非 CLI 流量
</p>
</div>
<Switch
:model-value="claudeForm.cli_only_enabled"
@update:model-value="(v: boolean) => claudeForm.cli_only_enabled = v"
/>
</div>
</div> </div>
</template> </template>
</form> </form>
@@ -290,6 +336,9 @@ interface ClaudeFormState {
session_idle_timeout_minutes: number session_idle_timeout_minutes: number
enable_tls_fingerprint: boolean enable_tls_fingerprint: boolean
session_id_masking_enabled: boolean session_id_masking_enabled: boolean
cache_ttl_override_enabled: boolean
cache_ttl_override_target: string
cli_only_enabled: boolean
} }
const claudeForm = ref<ClaudeFormState>({ const claudeForm = ref<ClaudeFormState>({
@@ -298,6 +347,9 @@ const claudeForm = ref<ClaudeFormState>({
session_idle_timeout_minutes: 5, session_idle_timeout_minutes: 5,
enable_tls_fingerprint: true, enable_tls_fingerprint: true,
session_id_masking_enabled: true, session_id_masking_enabled: true,
cache_ttl_override_enabled: false,
cache_ttl_override_target: 'ephemeral',
cli_only_enabled: false,
}) })
function parseNum(v: string | number): number | undefined { function parseNum(v: string | number): number | undefined {
@@ -334,6 +386,9 @@ watch(() => props.modelValue, (v) => {
session_idle_timeout_minutes: cc.session_idle_timeout_minutes ?? 5, session_idle_timeout_minutes: cc.session_idle_timeout_minutes ?? 5,
enable_tls_fingerprint: cc.enable_tls_fingerprint ?? true, enable_tls_fingerprint: cc.enable_tls_fingerprint ?? true,
session_id_masking_enabled: cc.session_id_masking_enabled ?? true, session_id_masking_enabled: cc.session_id_masking_enabled ?? true,
cache_ttl_override_enabled: cc.cache_ttl_override_enabled ?? false,
cache_ttl_override_target: cc.cache_ttl_override_target ?? 'ephemeral',
cli_only_enabled: cc.cli_only_enabled ?? false,
} }
} else { } else {
// 默认值:全部开启 // 默认值:全部开启
@@ -343,6 +398,9 @@ watch(() => props.modelValue, (v) => {
session_idle_timeout_minutes: 5, session_idle_timeout_minutes: 5,
enable_tls_fingerprint: true, enable_tls_fingerprint: true,
session_id_masking_enabled: true, session_id_masking_enabled: true,
cache_ttl_override_enabled: false,
cache_ttl_override_target: 'ephemeral',
cli_only_enabled: false,
} }
} }
} }
@@ -375,6 +433,11 @@ async function handleSave() {
: null, : null,
enable_tls_fingerprint: claudeForm.value.enable_tls_fingerprint, enable_tls_fingerprint: claudeForm.value.enable_tls_fingerprint,
session_id_masking_enabled: claudeForm.value.session_id_masking_enabled, session_id_masking_enabled: claudeForm.value.session_id_masking_enabled,
cache_ttl_override_enabled: claudeForm.value.cache_ttl_override_enabled,
cache_ttl_override_target: claudeForm.value.cache_ttl_override_enabled
? claudeForm.value.cache_ttl_override_target
: 'ephemeral',
cli_only_enabled: claudeForm.value.cli_only_enabled,
} }
} }

View File

@@ -144,19 +144,48 @@
</div> </div>
<div class="space-y-1.5"> <div class="space-y-1.5">
<label class="text-xs font-medium">Region</label> <label class="text-xs font-medium">Region</label>
<div class="grid grid-cols-2 gap-1.5"> <ComboboxRoot
<button :model-value="device.region"
v-for="r in (['eu-north-1', 'us-east-1'] as const)" :open="regionComboboxOpen"
:key="r" @update:model-value="(v: string) => { if (v) device.region = v }"
class="h-8 text-xs font-medium font-mono rounded-md border transition-colors" @update:open="(v: boolean) => { regionComboboxOpen = v; if (v) ensureAwsRegions() }"
:class="device.region === r >
? 'border-primary bg-primary/5 text-foreground' <ComboboxAnchor class="relative w-full">
: 'border-border text-muted-foreground hover:text-foreground hover:border-foreground/20'" <ComboboxInput
@click="device.region = r" :display-value="() => device.region"
placeholder="输入或选择 Region"
class="w-full h-8 px-2 pr-7 text-xs rounded-md border border-border bg-background font-mono focus:outline-none focus:ring-1 focus:ring-ring"
spellcheck="false"
@input="(e: Event) => regionSearch = (e.target as HTMLInputElement).value"
@keydown.enter.prevent="onRegionEnter"
/>
<ComboboxTrigger class="absolute right-1.5 top-1/2 -translate-y-1/2 text-muted-foreground hover:text-foreground">
<ChevronsUpDown class="w-3.5 h-3.5" />
</ComboboxTrigger>
</ComboboxAnchor>
<ComboboxContent
position="popper"
class="z-[99] mt-1 max-h-[200px] w-[--radix-combobox-trigger-width] overflow-y-auto rounded-md border border-border bg-popover shadow-md"
> >
{{ r }} <ComboboxViewport>
</button> <ComboboxEmpty class="px-2 py-1.5 text-xs text-muted-foreground">
</div> {{ awsRegionsLoaded ? '无匹配结果,回车使用自定义值' : '加载中...' }}
</ComboboxEmpty>
<ComboboxItem
v-for="r in filteredRegions"
:key="r"
:value="r"
class="flex items-center gap-1.5 px-2 py-1.5 text-xs font-mono cursor-pointer rounded-sm outline-none data-[highlighted]:bg-accent data-[highlighted]:text-accent-foreground"
>
<Check
class="w-3 h-3 shrink-0"
:class="device.region === r ? 'opacity-100' : 'opacity-0'"
/>
{{ r }}
</ComboboxItem>
</ComboboxViewport>
</ComboboxContent>
</ComboboxRoot>
</div> </div>
<div class="space-y-1.5"> <div class="space-y-1.5">
<label class="text-xs font-medium text-muted-foreground">TOTP Secret (可选, 2FA认证)</label> <label class="text-xs font-medium text-muted-foreground">TOTP Secret (可选, 2FA认证)</label>
@@ -501,7 +530,17 @@
<script setup lang="ts"> <script setup lang="ts">
import { ref, computed, watch, onBeforeUnmount } from 'vue' import { ref, computed, watch, onBeforeUnmount } from 'vue'
import { Dialog, Button, Textarea, Popover, PopoverTrigger, PopoverContent } from '@/components/ui' import { Dialog, Button, Textarea, Popover, PopoverTrigger, PopoverContent } from '@/components/ui'
import { UserPlus, Copy, ExternalLink, Upload, Globe, AlertCircle, ShieldCheck } from 'lucide-vue-next' import {
ComboboxAnchor,
ComboboxContent,
ComboboxEmpty,
ComboboxInput,
ComboboxItem,
ComboboxRoot,
ComboboxTrigger,
ComboboxViewport,
} from 'radix-vue'
import { UserPlus, Copy, ExternalLink, Upload, Globe, AlertCircle, ShieldCheck, ChevronsUpDown, Check } from 'lucide-vue-next'
import { useToast } from '@/composables/useToast' import { useToast } from '@/composables/useToast'
import { useClipboard } from '@/composables/useClipboard' import { useClipboard } from '@/composables/useClipboard'
import { useTotp } from '@/composables/useTotp' import { useTotp } from '@/composables/useTotp'
@@ -513,6 +552,7 @@ import {
batchImportOAuth, batchImportOAuth,
startDeviceAuthorize, startDeviceAuthorize,
pollDeviceAuthorize, pollDeviceAuthorize,
getAwsRegions,
} from '@/api/endpoints' } from '@/api/endpoints'
import ProxyNodeSelect from './ProxyNodeSelect.vue' import ProxyNodeSelect from './ProxyNodeSelect.vue'
import { useProxyNodesStore } from '@/stores/proxy-nodes' import { useProxyNodesStore } from '@/stores/proxy-nodes'
@@ -537,6 +577,38 @@ const totp = useTotp()
const proxyPopoverOpen = ref(false) const proxyPopoverOpen = ref(false)
const selectedProxyNodeId = ref('') const selectedProxyNodeId = ref('')
// AWS Regions (动态获取 + 进程内缓存)
const awsRegions = ref<string[]>([])
const awsRegionsLoaded = ref(false)
const regionSearch = ref('')
const regionComboboxOpen = ref(false)
const filteredRegions = computed(() => {
const q = regionSearch.value.trim().toLowerCase()
if (!q) return awsRegions.value
return awsRegions.value.filter(r => r.includes(q))
})
async function ensureAwsRegions() {
if (awsRegionsLoaded.value) return
try {
awsRegions.value = await getAwsRegions()
} catch {
awsRegions.value = ['us-east-1', 'us-east-2', 'us-west-1', 'us-west-2', 'eu-north-1']
}
awsRegionsLoaded.value = true
}
function onRegionEnter() {
// If no matching item is highlighted, accept the raw input as a custom region value.
const raw = regionSearch.value.trim()
if (raw && !filteredRegions.value.includes(raw)) {
device.value.region = raw
regionComboboxOpen.value = false
regionSearch.value = ''
}
}
/** 获取已选代理节点的显示名称 */ /** 获取已选代理节点的显示名称 */
function getSelectedNodeLabel(): string { function getSelectedNodeLabel(): string {
if (!selectedProxyNodeId.value) return '' if (!selectedProxyNodeId.value) return ''

View File

@@ -57,6 +57,7 @@ dev = [
] ]
tls = [ tls = [
"tls-client>=1.0.1", # 可选:用于 Claude OAuth token 请求的 TLS 指纹伪装 "tls-client>=1.0.1", # 可选:用于 Claude OAuth token 请求的 TLS 指纹伪装
"curl_cffi>=0.7.0", # 可选:用于上游请求的真实 TLS 指纹伪装 (Chrome/Firefox)
] ]
[project.urls] [project.urls]

View File

@@ -2658,3 +2658,67 @@ class AdminPurgeStatsAdapter(AdminApiAdapter):
return { return {
"message": "聚合统计数据已清空", "message": "聚合统计数据已清空",
} }
# ---------------------------------------------------------------------------
# AWS Regions (从 AWS Regional Table API 获取Redis 缓存 24h)
# ---------------------------------------------------------------------------
_AWS_REGIONS_CACHE_KEY = "aws_regions"
_AWS_REGIONS_CACHE_TTL = 86400 # 24h
_AWS_REGIONAL_TABLE_URL = "https://api.regional-table.region-services.aws.a2z.com"
# 内存级 fallback进程生命周期内有效Redis 不可用时兜底)
_aws_regions_mem_cache: list[str] | None = None
async def _fetch_aws_regions() -> list[str]:
"""从 AWS Regional Table API 提取去重排序的 region 列表"""
import httpx as _httpx
from src.clients.http_client import HTTPClientPool
client = await HTTPClientPool.get_default_client_async()
resp = await client.get(
_AWS_REGIONAL_TABLE_URL,
timeout=_httpx.Timeout(connect=10, read=15),
)
resp.raise_for_status()
data = resp.json()
regions: set[str] = set()
for item in data.get("prices", []):
region = item.get("attributes", {}).get("aws:region", "")
if region:
regions.add(region)
return sorted(regions)
@router.get("/aws-regions")
async def get_aws_regions() -> Any:
"""获取 AWS 全部可用 Region 列表(缓存 24h"""
global _aws_regions_mem_cache
# 1. 尝试 Redis 缓存
from src.core.cache_service import CacheService
cached = await CacheService.get(_AWS_REGIONS_CACHE_KEY)
if cached and isinstance(cached, list):
return {"regions": cached}
# 2. 尝试内存 fallback
if _aws_regions_mem_cache:
return {"regions": _aws_regions_mem_cache}
# 3. 远程获取
try:
regions = await _fetch_aws_regions()
except Exception as e:
logger.warning("获取 AWS Regions 失败: {}", e)
# 返回最基础的 fallback
return {"regions": ["us-east-1", "us-east-2", "us-west-1", "us-west-2", "eu-north-1"]}
# 写入缓存
_aws_regions_mem_cache = regions
await CacheService.set(_AWS_REGIONS_CACHE_KEY, regions, ttl_seconds=_AWS_REGIONS_CACHE_TTL)
return {"regions": regions}

View File

@@ -73,6 +73,15 @@ class CliAdapterBase(HandlerAdapterBase):
original_headers = context.original_headers original_headers = context.original_headers
query_params = context.query_params query_params = context.query_params
# Store original headers for downstream envelope checks (e.g. CLI-only restriction).
# Only relevant for Claude Code CLI format; skip for others to avoid unnecessary coupling.
if self.FORMAT_ID == "claude:cli":
from src.services.provider.adapters.claude_code.client_restriction import (
set_original_request_headers,
)
set_original_request_headers(original_headers)
original_request_body = context.ensure_json_body() original_request_body = context.ensure_json_body()
# 合并 path_params 到请求体(如 Gemini API 的 model 在 URL 路径中) # 合并 path_params 到请求体(如 Gemini API 的 model 在 URL 路径中)

View File

@@ -805,6 +805,34 @@ class CliStreamMixin:
prefetched_chunks, prefetched_chunks,
) )
@staticmethod
def _fire_stream_timeout_policy(ctx: StreamContext) -> None:
"""Fire-and-forget: record stream timeout for pool health policy."""
if not ctx.provider_id or not ctx.key_id:
return
try:
from src.services.provider.adapters.claude_code.context import (
get_claude_code_request_context,
)
cc_ctx = get_claude_code_request_context()
pool_cfg = cc_ctx.pool_config if cc_ctx else None
if not pool_cfg:
return
from src.services.provider.pool.health_policy import apply_stream_timeout_policy
task = asyncio.create_task(
apply_stream_timeout_policy(
provider_id=ctx.provider_id,
key_id=ctx.key_id,
config=pool_cfg,
)
)
task.add_done_callback(lambda t: t.exception() if not t.cancelled() else None)
except Exception as exc:
logger.debug("Stream timeout policy trigger failed: {}", exc)
async def _create_response_stream( async def _create_response_stream(
self, self,
ctx: StreamContext, ctx: StreamContext,
@@ -900,6 +928,9 @@ class CliStreamMixin:
f"elapsed={elapsed:.1f}s, " f"elapsed={elapsed:.1f}s, "
f"chunk_count={ctx.chunk_count}, data_count=0" f"chunk_count={ctx.chunk_count}, data_count=0"
) )
self._fire_stream_timeout_policy(ctx)
error_event = { error_event = {
"type": "error", "type": "error",
"error": { "error": {

View File

@@ -0,0 +1,233 @@
"""curl_cffi-based httpx AsyncTransport for TLS fingerprint impersonation.
When ``curl_cffi`` is installed, this transport can replace the default httpx
transport to send upstream requests with a browser-grade TLS fingerprint
(JA3/JA4), making the traffic indistinguishable from a real browser or
Node.js client.
The transport is used exclusively when ``tls_profile == "claude_code_nodejs"``
and ``curl_cffi`` is available. Otherwise, the system falls back to the
default httpx SSL context (best-effort cipher ordering only).
Design notes:
- curl_cffi AsyncSession instances are **reused** per (impersonate, proxy) pair
to avoid rebuilding the TLS session on every request.
- Streaming is supported via ``aiter_content()`` on the curl_cffi response.
- The transport implements ``httpx.AsyncBaseTransport`` so it plugs into
the existing ``HTTPClientPool`` without changing callers.
"""
from __future__ import annotations
import asyncio
from typing import Any
import httpx
from src.core.logger import logger
# ---------------------------------------------------------------------------
# Availability check
# ---------------------------------------------------------------------------
try:
from curl_cffi.requests import AsyncSession # type: ignore[import-untyped]
CURL_CFFI_AVAILABLE = True
except ImportError:
CURL_CFFI_AVAILABLE = False
# ---------------------------------------------------------------------------
# Default impersonate profile
# ---------------------------------------------------------------------------
# "chrome120" closely matches the TLS fingerprint of Node.js 20.x on Linux
# (which Claude Code CLI uses). If the upstream introduces fingerprint
# rotation, this can be made configurable per-profile.
DEFAULT_IMPERSONATE = "chrome120"
# ---------------------------------------------------------------------------
# Session pool (module-level, async-safe)
# ---------------------------------------------------------------------------
_session_pool: dict[str, AsyncSession] = {}
_pool_lock = asyncio.Lock()
def _session_key(impersonate: str, proxy: str | None) -> str:
return f"{impersonate}::{proxy or '__direct__'}"
async def _get_or_create_session(
impersonate: str = DEFAULT_IMPERSONATE,
proxy: str | None = None,
) -> AsyncSession:
"""Get or create a cached curl_cffi AsyncSession."""
key = _session_key(impersonate, proxy)
async with _pool_lock:
session = _session_pool.get(key)
if session is not None:
return session
kwargs: dict[str, Any] = {
"impersonate": impersonate,
"verify": True,
}
if proxy:
kwargs["proxy"] = proxy
session = AsyncSession(**kwargs)
_session_pool[key] = session
logger.info(
"curl_cffi session created: impersonate={}, proxy={}",
impersonate,
proxy or "direct",
)
return session
async def close_all_sessions() -> None:
"""Close all cached curl_cffi sessions (called at shutdown)."""
async with _pool_lock:
sessions = list(_session_pool.values())
_session_pool.clear()
for s in sessions:
try:
await s.close()
except Exception:
pass
# ---------------------------------------------------------------------------
# Exception mapping (curl_cffi -> httpx)
# ---------------------------------------------------------------------------
def _map_curl_exception(exc: Exception) -> httpx.HTTPError:
"""Map curl_cffi exceptions to the closest httpx equivalents.
This lets the upstream failover / error_classifier distinguish between
transient timeouts (retryable) and hard connection failures.
"""
if CURL_CFFI_AVAILABLE:
from curl_cffi.requests.exceptions import ConnectionError as CurlConnectionError
from curl_cffi.requests.exceptions import ProxyError as CurlProxyError
from curl_cffi.requests.exceptions import Timeout as CurlTimeout
if isinstance(exc, CurlTimeout):
return httpx.ReadTimeout(f"curl_cffi timeout: {exc}")
if isinstance(exc, CurlProxyError):
return httpx.ProxyError(f"curl_cffi proxy error: {exc}")
if isinstance(exc, CurlConnectionError):
return httpx.ConnectError(f"curl_cffi connection error: {exc}")
return httpx.ConnectError(f"curl_cffi request failed: {exc}")
# ---------------------------------------------------------------------------
# httpx AsyncTransport implementation
# ---------------------------------------------------------------------------
class CurlCffiStream(httpx.AsyncByteStream):
"""Async byte stream backed by curl_cffi response content iterator."""
def __init__(self, curl_response: Any) -> None:
self._response = curl_response
self._consumed = False
async def __aiter__(self) -> Any: # type: ignore[override]
if self._consumed:
return
try:
async for chunk in self._response.aiter_content():
yield chunk
finally:
self._consumed = True
async def aclose(self) -> None:
self._consumed = True
close_fn = getattr(self._response, "aclose", None)
if close_fn and callable(close_fn):
try:
await close_fn()
except Exception:
pass
class CurlCffiTransport(httpx.AsyncBaseTransport):
"""httpx-compatible async transport using curl_cffi for TLS impersonation.
Usage::
transport = CurlCffiTransport(proxy="http://proxy:8080")
client = httpx.AsyncClient(transport=transport)
resp = await client.post(url, json=payload, headers=headers)
"""
def __init__(
self,
impersonate: str = DEFAULT_IMPERSONATE,
proxy: str | None = None,
) -> None:
self._impersonate = impersonate
self._proxy = proxy
async def handle_async_request(self, request: httpx.Request) -> httpx.Response:
session = await _get_or_create_session(self._impersonate, self._proxy)
# Build headers dict (skip host header, curl_cffi handles it).
headers: dict[str, str] = {}
for key, value in request.headers.raw:
k = key.decode("latin-1").lower()
if k in ("host", "content-length", "transfer-encoding"):
continue
headers[key.decode("latin-1")] = value.decode("latin-1")
body = request.content if request.content else None
method = request.method.upper()
url = str(request.url)
# Determine timeout from request extensions.
timeout = 60.0
if hasattr(request, "extensions") and isinstance(request.extensions, dict):
raw_timeout = request.extensions.get("timeout")
if isinstance(raw_timeout, dict):
# httpx timeout pool format: {"connect": ..., "read": ..., "write": ..., "pool": ...}
read_timeout = raw_timeout.get("read")
if isinstance(read_timeout, (int, float)) and read_timeout > 0:
timeout = float(read_timeout)
elif isinstance(raw_timeout, (int, float)) and raw_timeout > 0:
timeout = float(raw_timeout)
try:
# Use stream=True for all requests so we can support streaming responses.
curl_resp = await session.request(
method,
url,
headers=headers,
data=body,
timeout=timeout,
stream=True,
)
except Exception as exc:
raise _map_curl_exception(exc) from exc
# Build response headers.
resp_headers_list: list[tuple[bytes, bytes]] = []
if hasattr(curl_resp, "headers") and curl_resp.headers:
for k, v in curl_resp.headers.multi_items():
resp_headers_list.append((k.encode("latin-1"), v.encode("latin-1")))
return httpx.Response(
status_code=curl_resp.status_code,
headers=resp_headers_list,
stream=CurlCffiStream(curl_resp),
request=request,
)
__all__ = [
"CURL_CFFI_AVAILABLE",
"CurlCffiTransport",
"close_all_sessions",
"DEFAULT_IMPERSONATE",
]

View File

@@ -242,6 +242,44 @@ class HTTPClientPool:
# 淘汰旧客户端(如果超过上限) # 淘汰旧客户端(如果超过上限)
await cls._evict_lru_proxy_client() await cls._evict_lru_proxy_client()
# 添加代理配置
proxy_url = build_proxy_url(proxy_config) if proxy_config else None
# curl_cffi Transport: real TLS fingerprint impersonation.
# When tls_profile requires fingerprint impersonation and curl_cffi
# is available, use CurlCffiTransport instead of the default httpx
# transport. This gives us a genuine browser/Node.js TLS handshake.
if tls_profile_key == "claude_code_nodejs":
from src.clients.curl_cffi_transport import (
CURL_CFFI_AVAILABLE,
CurlCffiTransport,
)
if CURL_CFFI_AVAILABLE:
transport = CurlCffiTransport(proxy=proxy_url)
client = httpx.AsyncClient(
transport=transport,
follow_redirects=True,
timeout=httpx.Timeout(
connect=config.http_connect_timeout,
read=config.http_read_timeout,
write=config.http_write_timeout,
pool=config.http_pool_timeout,
),
)
cls._proxy_clients[cache_key] = (client, time.time())
logger.info(
"创建 curl_cffi TLS 指纹客户端: profile={}, proxy={}",
tls_profile_key,
proxy_url or "direct",
)
return client
else:
logger.warning(
"curl_cffi 不可用,回退到 best-effort TLS 配置 (profile={})",
tls_profile_key,
)
# 创建新客户端(使用默认超时,请求时可覆盖) # 创建新客户端(使用默认超时,请求时可覆盖)
client_config: dict[str, Any] = { client_config: dict[str, Any] = {
"http2": False, "http2": False,
@@ -260,8 +298,6 @@ class HTTPClientPool:
), ),
} }
# 添加代理配置
proxy_url = build_proxy_url(proxy_config) if proxy_config else None
proxy_param = make_proxy_param(proxy_url) proxy_param = make_proxy_param(proxy_url)
if proxy_param: if proxy_param:
client_config["proxy"] = proxy_param client_config["proxy"] = proxy_param
@@ -315,6 +351,17 @@ class HTTPClientPool:
logger.warning("关闭 tunnel 客户端失败: {}", e) logger.warning("关闭 tunnel 客户端失败: {}", e)
cls._tunnel_clients.clear() cls._tunnel_clients.clear()
# 关闭 curl_cffi session 缓存
try:
from src.clients.curl_cffi_transport import CURL_CFFI_AVAILABLE, close_all_sessions
if CURL_CFFI_AVAILABLE:
await close_all_sessions()
logger.debug("curl_cffi sessions 已关闭")
except Exception as e:
logger.debug("关闭 curl_cffi sessions 失败: {}", e)
logger.info("所有HTTP客户端已关闭") logger.info("所有HTTP客户端已关闭")
@classmethod @classmethod

View File

@@ -147,6 +147,18 @@ class ClaudeCodeAdvancedConfig(BaseModel):
session_id_masking_enabled: bool = Field( session_id_masking_enabled: bool = Field(
False, description="是否启用会话 ID 伪装(固定 metadata.user_id 中 session 片段)" False, description="是否启用会话 ID 伪装(固定 metadata.user_id 中 session 片段)"
) )
cache_ttl_override_enabled: bool = Field(
False, description="是否启用 Cache TTL 强制替换(统一所有请求的 cache_control 类型)"
)
cache_ttl_override_target: str = Field(
"ephemeral",
description="Cache TTL 目标类型: ephemeral (5min) 或 1h",
pattern="^(ephemeral|1h)$",
)
cli_only_enabled: bool = Field(
False,
description="是否仅允许 Claude Code CLI 客户端访问(非 CLI 流量返回 403",
)
@model_validator(mode="after") @model_validator(mode="after")
def normalize_session_control(self) -> "ClaudeCodeAdvancedConfig": def normalize_session_control(self) -> "ClaudeCodeAdvancedConfig":

View File

@@ -0,0 +1,96 @@
"""Claude Code CLI client restriction.
When cli_only_enabled is True, only requests from genuine Claude Code CLI
clients are allowed. Non-CLI traffic receives a 403 response.
"""
from __future__ import annotations
import contextvars
from typing import Any
from src.core.logger import logger
# Contextvar to carry the original request headers into the envelope layer.
_original_request_headers: contextvars.ContextVar[dict[str, str] | None] = contextvars.ContextVar(
"claude_code_original_request_headers",
default=None,
)
def set_original_request_headers(headers: dict[str, str] | None) -> None:
_original_request_headers.set(headers)
def get_original_request_headers() -> dict[str, str] | None:
return _original_request_headers.get()
# Known Claude Code CLI User-Agent patterns.
_CLI_USER_AGENT_PATTERNS = (
"claude-code",
"claudecode",
"claude_code",
)
# Known originator / x-app values indicating CLI usage.
_CLI_APP_VALUES = {"cli"}
def is_claude_code_client(headers: dict[str, Any]) -> bool:
"""Detect whether the request originates from a Claude Code CLI client.
Detection signals (any match is sufficient):
1. User-Agent contains a known Claude Code CLI pattern
2. x-app header equals "cli"
"""
# Normalize header keys to lowercase for case-insensitive matching.
lower_headers = {k.lower(): v for k, v in headers.items()}
# Check User-Agent
ua = str(lower_headers.get("user-agent", "")).lower()
for pattern in _CLI_USER_AGENT_PATTERNS:
if pattern in ua:
return True
# Check x-app header
x_app = str(lower_headers.get("x-app", "")).strip().lower()
if x_app in _CLI_APP_VALUES:
return True
return False
def enforce_cli_only(cli_only_enabled: bool) -> None:
"""Enforce CLI-only restriction if enabled.
Reads original request headers from contextvar, checks whether the
client is a Claude Code CLI, and raises HTTPException(403) if not.
"""
if not cli_only_enabled:
return
headers = get_original_request_headers()
if headers is None:
# No headers available; skip enforcement (should not happen in normal flow).
logger.debug("CLI-only check skipped: no request headers in context")
return
if is_claude_code_client(headers):
return
from fastapi import HTTPException
logger.info("CLI-only restriction: rejected non-CLI client")
raise HTTPException(
status_code=403,
detail="This endpoint only accepts requests from Claude Code CLI clients.",
)
__all__ = [
"enforce_cli_only",
"get_original_request_headers",
"is_claude_code_client",
"set_original_request_headers",
]

View File

@@ -24,6 +24,9 @@ class ClaudeCodeRequestContext:
session_idle_timeout_minutes: int = 5 session_idle_timeout_minutes: int = 5
enable_tls_fingerprint: bool = False enable_tls_fingerprint: bool = False
session_id_masking_enabled: bool = False session_id_masking_enabled: bool = False
cache_ttl_override_enabled: bool = False
cache_ttl_override_target: str = "ephemeral"
cli_only_enabled: bool = False
# Account Pool fields # Account Pool fields
provider_id: str | None = None provider_id: str | None = None
pool_config: PoolConfig | None = None pool_config: PoolConfig | None = None
@@ -88,6 +91,15 @@ def build_claude_code_request_context(
session_id_masking_enabled = ( session_id_masking_enabled = (
bool(advanced_config.session_id_masking_enabled) if advanced_config else False bool(advanced_config.session_id_masking_enabled) if advanced_config else False
) )
cache_ttl_override_enabled = (
bool(advanced_config.cache_ttl_override_enabled) if advanced_config else False
)
cache_ttl_override_target = (
str(advanced_config.cache_ttl_override_target or "ephemeral")
if advanced_config
else "ephemeral"
)
cli_only_enabled = bool(advanced_config.cli_only_enabled) if advanced_config else False
# Parse pool config (None = non-pool provider, keep as None for semantic consistency) # Parse pool config (None = non-pool provider, keep as None for semantic consistency)
pool_cfg = parse_pool_config(provider_config_dict) pool_cfg = parse_pool_config(provider_config_dict)
@@ -100,6 +112,9 @@ def build_claude_code_request_context(
session_idle_timeout_minutes=idle_timeout_minutes, session_idle_timeout_minutes=idle_timeout_minutes,
enable_tls_fingerprint=enable_tls_fingerprint, enable_tls_fingerprint=enable_tls_fingerprint,
session_id_masking_enabled=session_id_masking_enabled, session_id_masking_enabled=session_id_masking_enabled,
cache_ttl_override_enabled=cache_ttl_override_enabled,
cache_ttl_override_target=cache_ttl_override_target,
cli_only_enabled=cli_only_enabled,
provider_id=str(provider_id or "").strip() or None, provider_id=str(provider_id or "").strip() or None,
pool_config=pool_cfg, pool_config=pool_cfg,
) )

View File

@@ -218,6 +218,59 @@ def _apply_session_id_masking(request_body: dict[str, Any], *, scope_key: str) -
) )
# -- Cache TTL Override -------------------------------------------------------
_VALID_CACHE_TTL_TARGETS = {"ephemeral", "1h"}
def _override_cache_control_in_blocks(blocks: list[Any], target: str) -> int:
"""Override cache_control in a list of content blocks. Returns count of overrides."""
count = 0
for block in blocks:
if not isinstance(block, dict):
continue
cc = block.get("cache_control")
if isinstance(cc, dict):
if cc.get("type") != target:
cc["type"] = target
count += 1
return count
def _apply_cache_ttl_override(request_body: dict[str, Any], target: str) -> None:
"""Force all cache_control entries to use a unified TTL type.
Prevents multi-user behavioral fingerprinting when sharing an OAuth account.
"""
if target not in _VALID_CACHE_TTL_TARGETS:
return
overridden = 0
# system prompt (can be string or list of blocks)
system = request_body.get("system")
if isinstance(system, list):
overridden += _override_cache_control_in_blocks(system, target)
# messages
messages = request_body.get("messages")
if isinstance(messages, list):
for msg in messages:
if not isinstance(msg, dict):
continue
content = msg.get("content")
if isinstance(content, list):
overridden += _override_cache_control_in_blocks(content, target)
# tools
tools = request_body.get("tools")
if isinstance(tools, list):
overridden += _override_cache_control_in_blocks(tools, target)
if overridden:
logger.debug("Cache TTL override: {} block(s) -> {}", overridden, target)
def _register_or_reject_session( def _register_or_reject_session(
*, *,
scope_key: str, scope_key: str,
@@ -446,6 +499,15 @@ class ClaudeCodeEnvelope:
ctx = get_claude_code_request_context() ctx = get_claude_code_request_context()
if ctx is None: if ctx is None:
ctx = ClaudeCodeRequestContext() ctx = ClaudeCodeRequestContext()
# CLI-only restriction: reject non-CLI clients early.
if ctx.cli_only_enabled:
from src.services.provider.adapters.claude_code.client_restriction import (
enforce_cli_only,
)
enforce_cli_only(ctx.cli_only_enabled)
# Extract session_uuid from metadata.user_id for pool sticky session. # Extract session_uuid from metadata.user_id for pool sticky session.
session_uuid: str | None = None session_uuid: str | None = None
user_id = _get_metadata_user_id(request_body) user_id = _get_metadata_user_id(request_body)
@@ -456,6 +518,10 @@ class ClaudeCodeEnvelope:
_sanitize_thinking_blocks(request_body) _sanitize_thinking_blocks(request_body)
# Cache TTL override: unify cache_control types to prevent behavioral fingerprinting.
if ctx.cache_ttl_override_enabled:
_apply_cache_ttl_override(request_body, ctx.cache_ttl_override_target)
_enforce_session_controls( _enforce_session_controls(
request_body, request_body,
ctx, ctx,

View File

@@ -51,6 +51,11 @@ class PoolConfig:
# -- Temporary Unschedulable Rules ---------------------------------------- # -- Temporary Unschedulable Rules ----------------------------------------
unschedulable_rules: list[UnschedulableRule] = field(default_factory=list) unschedulable_rules: list[UnschedulableRule] = field(default_factory=list)
# -- Stream Timeout Auto-Pause --------------------------------------------
stream_timeout_threshold: int = 3 # N timeouts within window trigger cooldown
stream_timeout_window_seconds: int = 1800 # 30 min counting window
stream_timeout_cooldown_seconds: int = 300 # 5 min cooldown
# -- Pluggable Strategies ------------------------------------------------- # -- Pluggable Strategies -------------------------------------------------
strategies: tuple[str, ...] = () strategies: tuple[str, ...] = ()
@@ -127,6 +132,9 @@ def parse_pool_config(provider_config: Any) -> PoolConfig | None:
proactive_refresh_seconds=_int_or("proactive_refresh_seconds", 180), proactive_refresh_seconds=_int_or("proactive_refresh_seconds", 180),
health_policy_enabled=_bool_or("health_policy_enabled", True), health_policy_enabled=_bool_or("health_policy_enabled", True),
unschedulable_rules=rules, unschedulable_rules=rules,
stream_timeout_threshold=_int_or("stream_timeout_threshold", 3),
stream_timeout_window_seconds=_int_or("stream_timeout_window_seconds", 1800),
stream_timeout_cooldown_seconds=_int_or("stream_timeout_cooldown_seconds", 300),
strategies=_parse_strategies(raw_advanced.get("strategies")), strategies=_parse_strategies(raw_advanced.get("strategies")),
) )

View File

@@ -202,3 +202,56 @@ async def _apply(
rule.duration_minutes, rule.duration_minutes,
) )
return return
async def apply_stream_timeout_policy(
*,
provider_id: str,
key_id: str,
config: PoolConfig,
) -> None:
"""Record a stream timeout event and apply cooldown if threshold is reached.
Called when an upstream stream response times out (no data within the
configured interval). Increments a per-key counter in Redis and sets
a cooldown if the count reaches the configured threshold.
"""
if not config.health_policy_enabled:
return
try:
count = await redis_ops.incr_stream_timeout_count(
provider_id,
key_id,
config.stream_timeout_window_seconds,
)
if count >= config.stream_timeout_threshold:
ttl = config.stream_timeout_cooldown_seconds
await redis_ops.set_cooldown(
provider_id,
key_id,
f"stream_timeout_x{count}",
ttl=ttl,
)
logger.warning(
"Pool[{}]: key {} stream timeout count {} >= threshold {}, cooldown {}s",
provider_id[:8],
key_id[:8],
count,
config.stream_timeout_threshold,
ttl,
)
else:
logger.info(
"Pool[{}]: key {} stream timeout count {}/{}",
provider_id[:8],
key_id[:8],
count,
config.stream_timeout_threshold,
)
except Exception as exc:
logger.warning(
"Pool stream timeout policy failed for key {}: {}",
key_id[:8],
str(exc),
)

View File

@@ -468,3 +468,45 @@ async def batch_get_cooldown_ttls(provider_id: str, key_ids: list[str]) -> dict[
return out return out
except Exception: except Exception:
return {k: None for k in key_ids} return {k: None for k in key_ids}
# ---------------------------------------------------------------------------
# Stream timeout counter
# ---------------------------------------------------------------------------
_STREAM_TIMEOUT_KEY_FMT = f"{PREFIX}:{{}}:stream_timeout:{{}}"
def _stream_timeout_key(provider_id: str, key_id: str) -> str:
return _STREAM_TIMEOUT_KEY_FMT.format(provider_id, key_id)
async def incr_stream_timeout_count(
provider_id: str,
key_id: str,
window_seconds: int,
) -> int:
"""Increment stream timeout counter and return count within the window.
Uses a ZSET with timestamps as scores. Old entries beyond the window
are pruned on each call. Returns the count of timeouts in the window.
"""
redis = await _get_redis()
if redis is None:
return 0
try:
now = time.time()
window_start = now - window_seconds
key = _stream_timeout_key(provider_id, key_id)
member = f"{uuid.uuid4().hex}"
pipe = redis.pipeline()
pipe.zremrangebyscore(key, "-inf", window_start)
pipe.zadd(key, {member: now})
pipe.zcard(key)
pipe.expire(key, window_seconds + 60)
results = await pipe.execute()
count = int(results[2]) if results[2] else 0
return count
except Exception:
logger.debug("Pool: stream timeout INCR failed for key {}", key_id[:8])
return 0

25
uv.lock generated
View File

@@ -41,6 +41,7 @@ dev = [
{ name = "pytest-asyncio" }, { name = "pytest-asyncio" },
] ]
tls = [ tls = [
{ name = "curl-cffi" },
{ name = "tls-client" }, { name = "tls-client" },
] ]
@@ -71,6 +72,7 @@ requires-dist = [
{ name = "bcrypt", specifier = ">=5.0.0" }, { name = "bcrypt", specifier = ">=5.0.0" },
{ name = "certifi", specifier = ">=2026.1.4" }, { name = "certifi", specifier = ">=2026.1.4" },
{ name = "cryptography", specifier = ">=46.0.4" }, { name = "cryptography", specifier = ">=46.0.4" },
{ name = "curl-cffi", marker = "extra == 'tls'", specifier = ">=0.7.0" },
{ name = "fastapi", extras = ["standard"], specifier = ">=0.128.0" }, { name = "fastapi", extras = ["standard"], specifier = ">=0.128.0" },
{ name = "gunicorn", specifier = ">=24.1.1" }, { name = "gunicorn", specifier = ">=24.1.1" },
{ name = "httpx", marker = "extra == 'dev'", specifier = ">=0.25.0" }, { name = "httpx", marker = "extra == 'dev'", specifier = ">=0.25.0" },
@@ -727,6 +729,29 @@ wheels = [
{ url = "https://files.pythonhosted.org/packages/3a/6a/bd2e7caa2facffedf172a45c1a02e551e6d7d4828658c9a245516a598d94/cryptography-46.0.4-cp38-abi3-win_amd64.whl", hash = "sha256:fa0900b9ef9c49728887d1576fd8d9e7e3ea872fa9b25ef9b64888adc434e976", size = 3466633 }, { url = "https://files.pythonhosted.org/packages/3a/6a/bd2e7caa2facffedf172a45c1a02e551e6d7d4828658c9a245516a598d94/cryptography-46.0.4-cp38-abi3-win_amd64.whl", hash = "sha256:fa0900b9ef9c49728887d1576fd8d9e7e3ea872fa9b25ef9b64888adc434e976", size = 3466633 },
] ]
[[package]]
name = "curl-cffi"
version = "0.14.0"
source = { registry = "https://pypi.org/simple" }
dependencies = [
{ name = "certifi" },
{ name = "cffi" },
]
sdist = { url = "https://files.pythonhosted.org/packages/9b/c9/0067d9a25ed4592b022d4558157fcdb6e123516083700786d38091688767/curl_cffi-0.14.0.tar.gz", hash = "sha256:5ffbc82e59f05008ec08ea432f0e535418823cda44178ee518906a54f27a5f0f", size = 162633 }
wheels = [
{ url = "https://files.pythonhosted.org/packages/aa/f0/0f21e9688eaac85e705537b3a87a5588d0cefb2f09d83e83e0e8be93aa99/curl_cffi-0.14.0-cp39-abi3-macosx_14_0_arm64.whl", hash = "sha256:e35e89c6a69872f9749d6d5fda642ed4fc159619329e99d577d0104c9aad5893", size = 3087277 },
{ url = "https://files.pythonhosted.org/packages/ba/a3/0419bd48fce5b145cb6a2344c6ac17efa588f5b0061f212c88e0723da026/curl_cffi-0.14.0-cp39-abi3-macosx_15_0_x86_64.whl", hash = "sha256:5945478cd28ad7dfb5c54473bcfb6743ee1d66554d57951fdf8fc0e7d8cf4e45", size = 5804650 },
{ url = "https://files.pythonhosted.org/packages/e2/07/a238dd062b7841b8caa2fa8a359eb997147ff3161288f0dd46654d898b4d/curl_cffi-0.14.0-cp39-abi3-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:c42e8fa3c667db9ccd2e696ee47adcd3cd5b0838d7282f3fc45f6c0ef3cfdfa7", size = 8231918 },
{ url = "https://files.pythonhosted.org/packages/7c/d2/ce907c9b37b5caf76ac08db40cc4ce3d9f94c5500db68a195af3513eacbc/curl_cffi-0.14.0-cp39-abi3-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:060fe2c99c41d3cb7f894de318ddf4b0301b08dca70453d769bd4e74b36b8483", size = 8654624 },
{ url = "https://files.pythonhosted.org/packages/f2/ae/6256995b18c75e6ef76b30753a5109e786813aa79088b27c8eabb1ef85c9/curl_cffi-0.14.0-cp39-abi3-manylinux_2_28_armv7l.manylinux_2_31_armv7l.whl", hash = "sha256:b158c41a25388690dd0d40b5bc38d1e0f512135f17fdb8029868cbc1993d2e5b", size = 8010654 },
{ url = "https://files.pythonhosted.org/packages/fb/10/ff64249e516b103cb762e0a9dca3ee0f04cf25e2a1d5d9838e0f1273d071/curl_cffi-0.14.0-cp39-abi3-manylinux_2_28_i686.whl", hash = "sha256:1439fbef3500fb723333c826adf0efb0e2e5065a703fb5eccce637a2250db34a", size = 7781969 },
{ url = "https://files.pythonhosted.org/packages/51/76/d6f7bb76c2d12811aa7ff16f5e17b678abdd1b357b9a8ac56310ceccabd5/curl_cffi-0.14.0-cp39-abi3-manylinux_2_34_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:e7176f2c2d22b542e3cf261072a81deb018cfa7688930f95dddef215caddb469", size = 7969133 },
{ url = "https://files.pythonhosted.org/packages/23/7c/cca39c0ed4e1772613d3cba13091c0e9d3b89365e84b9bf9838259a3cd8f/curl_cffi-0.14.0-cp39-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:03f21ade2d72978c2bb8670e9b6de5260e2755092b02d94b70b906813662998d", size = 9080167 },
{ url = "https://files.pythonhosted.org/packages/75/03/a942d7119d3e8911094d157598ae0169b1c6ca1bd3f27d7991b279bcc45b/curl_cffi-0.14.0-cp39-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:58ebf02de64ee5c95613209ddacb014c2d2f86298d7080c0a1c12ed876ee0690", size = 9520464 },
{ url = "https://files.pythonhosted.org/packages/a2/77/78900e9b0833066d2274bda75cba426fdb4cef7fbf6a4f6a6ca447607bec/curl_cffi-0.14.0-cp39-abi3-win_amd64.whl", hash = "sha256:6e503f9a103f6ae7acfb3890c843b53ec030785a22ae7682a22cc43afb94123e", size = 1677416 },
{ url = "https://files.pythonhosted.org/packages/5c/7c/d2ba86b0b3e1e2830bd94163d047de122c69a8df03c5c7c36326c456ad82/curl_cffi-0.14.0-cp39-abi3-win_arm64.whl", hash = "sha256:2eed50a969201605c863c4c31269dfc3e0da52916086ac54553cfa353022425c", size = 1425067 },
]
[[package]] [[package]]
name = "distro" name = "distro"
version = "1.9.0" version = "1.9.0"