mirror of
https://github.com/Wei-Shaw/sub2api.git
synced 2026-11-08 08:55:22 +00:00
将 codex_cli_only 客户端识别从「单一 strict 开关 + 固定 OR 头集合」重构为 可逐项管理的引擎指纹信号列表,加固整条判定链,并补齐账号级 app-server 控制、 对齐前端设置文案。 判定链(每步可短路): - 账号未开 codex_cli_only → 不限制;gateway.force_codex_cli → 旁路放行 - 全局黑名单命中(OR 宽 deny)→ 立即拒 - 身份候选:官方 UA(strict,仅前缀)/ 官方 originator(OR)/ 全局白名单(双因子 AND) / 全局 app-server 开关 OR 账号 app-server 开关;均不命中 → 拒 - 版本门(仅官方候选):UA 须可解析引擎版本,再校验 [min,max] 区间 - 引擎指纹 AND 硬门:按信号列表逐条勾选 AND、每条行内变体 OR;无 Required 信号 → 放行 引擎指纹信号列表(唯一真源) - 新增 openai.EngineFingerprintSignal 类型 + EvaluateEngineFingerprint 求值器 (勾选 AND / 行内变体 OR / 无勾选 → 放行) - CodexRestrictionPolicy 增 EngineFingerprintSignals;信号列表单一决定是否启用指纹门, 不再保留独立「要求引擎指纹」总开关(与「信号全不选」语义重复) - 新设置键 codex_cli_only_engine_fingerprint_signals(默认只勾 x-codex- 前缀); 旧 body 指纹开关幂等迁移并入信号列表;wire 接线 - 黑/白名单自由条目、命名预设、版本区间 全局设置管线 - gateway 缺 settingService(仅测试/误配可达)时指纹门回退默认种子信号、失败关闭, 不再因零值 policy(nil 信号)失败开放 账号级 Codex app-server(替换已失效的 ClaudeCode 放行机制) - account.IsCodexCLIOnlyAppServerAllowed() 读 extra.codex_cli_only_allow_app_server, 仅在 codex_cli_only 开启时生效;候选身份门「全局 OR 账号」,与旧系统双层控制对齐 - 移除已无入口的 claude_code 预设机制(allowedClientRegistry / MatchAllowedClients / 账号 GetCodexCLIOnlyAllowedClients / reason);白名单 AllowedClientEntry / IsAllowedClientMatch 保留 门加固(反伪 + 写入校验) - 官方 UA 访问门改 strict:IsCodexOfficialClientRequestStrict 仅前缀匹配,收窄「浏览器前缀 + 中段 codex token」伪造面(strict 仍保留 Codex 家族前缀与 UA 尾部兜底,故对「任意前缀 + 官方尾部 (name;ver)」仍放行——与 UA 可伪造、真正反伪靠引擎指纹门的设计一致) - 官方客户端识别扩展:新增 codex-tui/、codex_vscode_copilot/ 前缀 + UA 尾部 (name;ver) 兜底 (恢复 CODEX_INTERNAL_ORIGINATOR_OVERRIDE 的真实 client,如 cccc→codex-tui),originator 改 精确集。该识别经 IsCodexOfficialClientByHeaders 被 passthrough 复用,故透传的官方判定一并 修正(codex-tui 等不再被误改写 UA)——非「行为不变」,属有意修正 - 白名单写入校验 ValidateCodexWhitelistEntriesJSON + AllowedClientEntry.IsWhitelistable: 双因子 AND 条目须可命中(非空 originator + 非空 ua_contains),拒绝写入会静默失效的死规则; 黑名单(OR 宽 deny,允许 originator-only)不受约束 管理端 / 前端 - handler / DTO / settings_view / 契约测试;gateway 接入判定链 - 信号列表编辑器(替换 body 开关)、api 类型、SettingsView;无勾选给常驻警告 - Create/Edit/Bulk 三弹窗「Codex Only」下新增 app-server 开关(OR 合并全局) - 文案:UA/Originator → User-Agent/Originator;黑/白名单重命名为 User-Agent/Originator 黑/白名单; 「允许 App Server 第三方客户端」→「Codex app-server」+ 简介示例;i18n zh/en 同步 - 移除死代码 HasCodex*Fingerprint helper 测试:引擎指纹求值器 / 账号 app-server(OR 语义)/ detector(含 N1 strict、失败关闭)/ 白名单写入校验 / BulkEdit spec 等;后端 build + service/openai/admin 单测全绿,前端 vue-tsc + vitest 全绿。 Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
100 lines
4.0 KiB
Go
100 lines
4.0 KiB
Go
package openai
|
|
|
|
import (
|
|
"net/http"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
// hdr 构造一个 http.Header(键值对)。
|
|
func hdr(kv ...string) http.Header {
|
|
h := http.Header{}
|
|
for i := 0; i+1 < len(kv); i += 2 {
|
|
h.Set(kv[i], kv[i+1])
|
|
}
|
|
return h
|
|
}
|
|
|
|
func TestEvaluateEngineFingerprint_DefaultSeed(t *testing.T) {
|
|
sigs := DefaultEngineFingerprintSignals // 仅 x-codex- 前缀 Required
|
|
cases := []struct {
|
|
name string
|
|
h http.Header
|
|
body string
|
|
want bool
|
|
}{
|
|
{"R1 真CLI 带x-codex-window-id", hdr("x-codex-window-id", "a1", "session-id", "u1"), ``, true},
|
|
{"R2 纯伪装 无指纹", hdr("user-agent", "codex/1"), ``, false},
|
|
{"R3 仅body有", hdr(), `{"client_metadata":{"x-codex-window-id":"c3"}}`, false},
|
|
{"R4 旧版 仅session_id无x-codex-", hdr("session_id", "u4"), ``, false},
|
|
}
|
|
for _, tc := range cases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
require.Equal(t, tc.want, EvaluateEngineFingerprint(tc.h, []byte(tc.body), sigs))
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestEvaluateEngineFingerprint_Rules(t *testing.T) {
|
|
exactSession := EngineFingerprintSignal{Type: FingerprintSignalHeaderExact, Match: []string{"session-id", "session_id"}, Required: true}
|
|
prefixCodex := EngineFingerprintSignal{Type: FingerprintSignalHeaderPrefix, Match: []string{"x-codex-"}, Required: true}
|
|
bodyWin := EngineFingerprintSignal{Type: FingerprintSignalBodyPath, Match: []string{"client_metadata.x-codex-window-id"}, Required: true}
|
|
|
|
t.Run("行内变体OR: 配置session-id 命中下划线session_id", func(t *testing.T) {
|
|
require.True(t, EvaluateEngineFingerprint(hdr("session_id", "x"), nil, []EngineFingerprintSignal{exactSession}))
|
|
})
|
|
t.Run("跨条AND: 勾x-codex-与session 缺一即拒", func(t *testing.T) {
|
|
both := []EngineFingerprintSignal{prefixCodex, exactSession}
|
|
require.True(t, EvaluateEngineFingerprint(hdr("x-codex-window-id", "a", "session-id", "b"), nil, both))
|
|
require.False(t, EvaluateEngineFingerprint(hdr("session-id", "b"), nil, both)) // 缺 x-codex-
|
|
})
|
|
t.Run("body_path 命中/ body空", func(t *testing.T) {
|
|
require.True(t, EvaluateEngineFingerprint(hdr(), []byte(`{"client_metadata":{"x-codex-window-id":"1"}}`), []EngineFingerprintSignal{bodyWin}))
|
|
require.False(t, EvaluateEngineFingerprint(hdr(), nil, []EngineFingerprintSignal{bodyWin}))
|
|
})
|
|
t.Run("无任何Required → true", func(t *testing.T) {
|
|
none := []EngineFingerprintSignal{{Type: FingerprintSignalHeaderPrefix, Match: []string{"x-codex-"}, Required: false}}
|
|
require.True(t, EvaluateEngineFingerprint(hdr(), nil, none))
|
|
require.True(t, EvaluateEngineFingerprint(hdr(), nil, nil))
|
|
})
|
|
}
|
|
|
|
func TestParseAndValidateEngineFingerprintSignals(t *testing.T) {
|
|
t.Run("空串=合法空", func(t *testing.T) {
|
|
sigs, ok := ParseEngineFingerprintSignals("")
|
|
require.True(t, ok)
|
|
require.Nil(t, sigs)
|
|
require.NoError(t, ValidateEngineFingerprintSignalsJSON(""))
|
|
})
|
|
t.Run("合法数组", func(t *testing.T) {
|
|
raw := `[{"type":"header_prefix","match":["x-codex-"],"required":true}]`
|
|
sigs, ok := ParseEngineFingerprintSignals(raw)
|
|
require.True(t, ok)
|
|
require.Len(t, sigs, 1)
|
|
require.NoError(t, ValidateEngineFingerprintSignalsJSON(raw))
|
|
})
|
|
t.Run("非法JSON", func(t *testing.T) {
|
|
_, ok := ParseEngineFingerprintSignals("not json")
|
|
require.False(t, ok)
|
|
require.Error(t, ValidateEngineFingerprintSignalsJSON("not json"))
|
|
})
|
|
t.Run("非法type 被校验拒绝", func(t *testing.T) {
|
|
require.Error(t, ValidateEngineFingerprintSignalsJSON(`[{"type":"bogus","match":["x"]}]`))
|
|
})
|
|
t.Run("match全空 被校验拒绝", func(t *testing.T) {
|
|
require.Error(t, ValidateEngineFingerprintSignalsJSON(`[{"type":"header_exact","match":["",""]}]`))
|
|
})
|
|
t.Run("默认种子JSON 可解析且只勾x-codex-", func(t *testing.T) {
|
|
sigs, ok := ParseEngineFingerprintSignals(DefaultEngineFingerprintSignalsJSON())
|
|
require.True(t, ok)
|
|
requiredTypes := []string{}
|
|
for _, s := range sigs {
|
|
if s.Required {
|
|
requiredTypes = append(requiredTypes, s.Type+":"+s.Match[0])
|
|
}
|
|
}
|
|
require.Equal(t, []string{"header_prefix:x-codex-"}, requiredTypes)
|
|
})
|
|
}
|