mirror of
https://github.com/Wei-Shaw/sub2api.git
synced 2026-11-14 06:47:19 +00:00
将账号级请求头覆写从 anthropic/openai 的 api_key 账号扩展到 Grok 的 api_key 与 oauth 账号,并放开 Grok OAuth 账号的自定义上游地址(仅作用于 转发端点,授权与 token 刷新链路不变)。 后端: - IsHeaderOverrideEligible 扩展到 Grok(api_key+oauth),禁止名单新增 x-grok-conv-id(逐请求会话路由头)。 - 所有 Grok 上游请求路径接线 ApplyHeaderOverrides(Responses/Chat 桥/ 媒体/配额探测/billing 探测/连通性测试),统一置于内置默认头之后。 - GetGrokBaseURL/GetGrokMediaBaseURL 放开 OAuth 自定义地址:官方地址 视同未定制回落官方网关,仅显式第三方 host 改发转发流量。 - 非官方 host 允许任意 path 前缀,官方 host 仍强制 /v1。 - OAuth base_url 校验按 host 判定官方/自定义,自定义 host 恒受运营方 URL 策略约束,不受 XAI_ALLOW_UNSAFE_URL_OVERRIDES 调试开关放宽。 - 给 GrokQuotaService 注入 config,使配额/billing 探测与转发共用同一 URL 策略。 前端: - Edit 模态为 Grok OAuth 账号新增「自定义上游地址」开关。 - 请求头表单新增 JSON 快速导入与按 JSON 一键复制(复用 useClipboard, 兼容非安全上下文 HTTP 页面)。 - 门控改为平台×类型判定,Bulk 批量 base_url 增加格式校验,zh/en 文案同步。
421 lines
11 KiB
Go
421 lines
11 KiB
Go
//go:build unit
|
|
|
|
package service
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"github.com/Wei-Shaw/sub2api/internal/pkg/xai"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestGetBaseURL(t *testing.T) {
|
|
tests := []struct {
|
|
name string
|
|
account Account
|
|
expected string
|
|
}{
|
|
{
|
|
name: "non-apikey type returns empty",
|
|
account: Account{
|
|
Type: AccountTypeOAuth,
|
|
Platform: PlatformAnthropic,
|
|
},
|
|
expected: "",
|
|
},
|
|
{
|
|
name: "apikey without base_url returns default anthropic",
|
|
account: Account{
|
|
Type: AccountTypeAPIKey,
|
|
Platform: PlatformAnthropic,
|
|
Credentials: map[string]any{},
|
|
},
|
|
expected: "https://api.anthropic.com",
|
|
},
|
|
{
|
|
name: "apikey with custom base_url",
|
|
account: Account{
|
|
Type: AccountTypeAPIKey,
|
|
Platform: PlatformAnthropic,
|
|
Credentials: map[string]any{"base_url": "https://custom.example.com"},
|
|
},
|
|
expected: "https://custom.example.com",
|
|
},
|
|
{
|
|
name: "antigravity apikey auto-appends /antigravity",
|
|
account: Account{
|
|
Type: AccountTypeAPIKey,
|
|
Platform: PlatformAntigravity,
|
|
Credentials: map[string]any{"base_url": "https://upstream.example.com"},
|
|
},
|
|
expected: "https://upstream.example.com/antigravity",
|
|
},
|
|
{
|
|
name: "antigravity apikey trims trailing slash before appending",
|
|
account: Account{
|
|
Type: AccountTypeAPIKey,
|
|
Platform: PlatformAntigravity,
|
|
Credentials: map[string]any{"base_url": "https://upstream.example.com/"},
|
|
},
|
|
expected: "https://upstream.example.com/antigravity",
|
|
},
|
|
{
|
|
name: "antigravity non-apikey returns empty",
|
|
account: Account{
|
|
Type: AccountTypeOAuth,
|
|
Platform: PlatformAntigravity,
|
|
Credentials: map[string]any{"base_url": "https://upstream.example.com"},
|
|
},
|
|
expected: "",
|
|
},
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
result := tt.account.GetBaseURL()
|
|
if result != tt.expected {
|
|
t.Errorf("GetBaseURL() = %q, want %q", result, tt.expected)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestGetGeminiBaseURL(t *testing.T) {
|
|
const defaultGeminiURL = "https://generativelanguage.googleapis.com"
|
|
|
|
tests := []struct {
|
|
name string
|
|
account Account
|
|
expected string
|
|
}{
|
|
{
|
|
name: "apikey without base_url returns default",
|
|
account: Account{
|
|
Type: AccountTypeAPIKey,
|
|
Platform: PlatformGemini,
|
|
Credentials: map[string]any{},
|
|
},
|
|
expected: defaultGeminiURL,
|
|
},
|
|
{
|
|
name: "apikey with custom base_url",
|
|
account: Account{
|
|
Type: AccountTypeAPIKey,
|
|
Platform: PlatformGemini,
|
|
Credentials: map[string]any{"base_url": "https://custom-gemini.example.com"},
|
|
},
|
|
expected: "https://custom-gemini.example.com",
|
|
},
|
|
{
|
|
name: "antigravity apikey auto-appends /antigravity",
|
|
account: Account{
|
|
Type: AccountTypeAPIKey,
|
|
Platform: PlatformAntigravity,
|
|
Credentials: map[string]any{"base_url": "https://upstream.example.com"},
|
|
},
|
|
expected: "https://upstream.example.com/antigravity",
|
|
},
|
|
{
|
|
name: "antigravity apikey trims trailing slash",
|
|
account: Account{
|
|
Type: AccountTypeAPIKey,
|
|
Platform: PlatformAntigravity,
|
|
Credentials: map[string]any{"base_url": "https://upstream.example.com/"},
|
|
},
|
|
expected: "https://upstream.example.com/antigravity",
|
|
},
|
|
{
|
|
name: "antigravity oauth does NOT append /antigravity",
|
|
account: Account{
|
|
Type: AccountTypeOAuth,
|
|
Platform: PlatformAntigravity,
|
|
Credentials: map[string]any{"base_url": "https://upstream.example.com"},
|
|
},
|
|
expected: "https://upstream.example.com",
|
|
},
|
|
{
|
|
name: "oauth without base_url returns default",
|
|
account: Account{
|
|
Type: AccountTypeOAuth,
|
|
Platform: PlatformAntigravity,
|
|
Credentials: map[string]any{},
|
|
},
|
|
expected: defaultGeminiURL,
|
|
},
|
|
{
|
|
name: "nil credentials returns default",
|
|
account: Account{
|
|
Type: AccountTypeAPIKey,
|
|
Platform: PlatformGemini,
|
|
},
|
|
expected: defaultGeminiURL,
|
|
},
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
result := tt.account.GetGeminiBaseURL(defaultGeminiURL)
|
|
if result != tt.expected {
|
|
t.Errorf("GetGeminiBaseURL() = %q, want %q", result, tt.expected)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestGetGrokBaseURLUsesSubscriptionProxyForOAuth(t *testing.T) {
|
|
tests := []struct {
|
|
name string
|
|
account Account
|
|
expected string
|
|
}{
|
|
{
|
|
name: "oauth without base_url uses CLI subscription proxy",
|
|
account: Account{
|
|
Type: AccountTypeOAuth,
|
|
Platform: PlatformGrok,
|
|
Credentials: map[string]any{},
|
|
},
|
|
expected: xai.DefaultCLIBaseURL,
|
|
},
|
|
{
|
|
name: "oauth legacy API default is migrated at runtime to CLI subscription proxy",
|
|
account: Account{
|
|
Type: AccountTypeOAuth,
|
|
Platform: PlatformGrok,
|
|
Credentials: map[string]any{
|
|
"base_url": xai.DefaultBaseURL,
|
|
},
|
|
},
|
|
expected: xai.DefaultCLIBaseURL,
|
|
},
|
|
{
|
|
name: "oauth legacy API default with trailing slash is migrated at runtime",
|
|
account: Account{
|
|
Type: AccountTypeOAuth,
|
|
Platform: PlatformGrok,
|
|
Credentials: map[string]any{
|
|
"base_url": xai.DefaultBaseURL + "/",
|
|
},
|
|
},
|
|
expected: xai.DefaultCLIBaseURL,
|
|
},
|
|
{
|
|
name: "oauth legacy API root is migrated at runtime",
|
|
account: Account{
|
|
Type: AccountTypeOAuth,
|
|
Platform: PlatformGrok,
|
|
Credentials: map[string]any{
|
|
"base_url": "https://api.x.ai",
|
|
},
|
|
},
|
|
expected: xai.DefaultCLIBaseURL,
|
|
},
|
|
{
|
|
name: "oauth legacy API root with canonical HTTPS port is migrated at runtime",
|
|
account: Account{
|
|
Type: AccountTypeOAuth,
|
|
Platform: PlatformGrok,
|
|
Credentials: map[string]any{
|
|
"base_url": "HTTPS://API.X.AI:443/",
|
|
},
|
|
},
|
|
expected: xai.DefaultCLIBaseURL,
|
|
},
|
|
{
|
|
name: "oauth legacy API canonical port with leading zeroes is migrated at runtime",
|
|
account: Account{
|
|
Type: AccountTypeOAuth,
|
|
Platform: PlatformGrok,
|
|
Credentials: map[string]any{
|
|
"base_url": "https://api.x.ai:0443/v1",
|
|
},
|
|
},
|
|
expected: xai.DefaultCLIBaseURL,
|
|
},
|
|
{
|
|
name: "oauth legacy API encoded version path is migrated at runtime",
|
|
account: Account{
|
|
Type: AccountTypeOAuth,
|
|
Platform: PlatformGrok,
|
|
Credentials: map[string]any{
|
|
"base_url": "https://api.x.ai/%76%31",
|
|
},
|
|
},
|
|
expected: xai.DefaultCLIBaseURL,
|
|
},
|
|
{
|
|
name: "oauth legacy API encoded trailing slash is migrated at runtime",
|
|
account: Account{
|
|
Type: AccountTypeOAuth,
|
|
Platform: PlatformGrok,
|
|
Credentials: map[string]any{
|
|
"base_url": "https://api.x.ai/v1%2F",
|
|
},
|
|
},
|
|
expected: xai.DefaultCLIBaseURL,
|
|
},
|
|
{
|
|
name: "oauth non-default API port remains pinned to CLI proxy",
|
|
account: Account{
|
|
Type: AccountTypeOAuth,
|
|
Platform: PlatformGrok,
|
|
Credentials: map[string]any{
|
|
"base_url": "https://api.x.ai:8443/v1",
|
|
},
|
|
},
|
|
expected: xai.DefaultCLIBaseURL,
|
|
},
|
|
{
|
|
name: "oauth explicit custom base_url redirects forwarding traffic",
|
|
account: Account{
|
|
Type: AccountTypeOAuth,
|
|
Platform: PlatformGrok,
|
|
Credentials: map[string]any{
|
|
"base_url": "https://custom.example.com/v1",
|
|
},
|
|
},
|
|
expected: "https://custom.example.com/v1",
|
|
},
|
|
{
|
|
name: "oauth custom base_url with path prefix redirects forwarding traffic",
|
|
account: Account{
|
|
Type: AccountTypeOAuth,
|
|
Platform: PlatformGrok,
|
|
Credentials: map[string]any{
|
|
"base_url": "https://relay.example.com/xai/v1",
|
|
},
|
|
},
|
|
expected: "https://relay.example.com/xai/v1",
|
|
},
|
|
{
|
|
name: "API key without base_url uses official credit-backed API",
|
|
account: Account{
|
|
Type: AccountTypeAPIKey,
|
|
Platform: PlatformGrok,
|
|
Credentials: map[string]any{},
|
|
},
|
|
expected: xai.DefaultBaseURL,
|
|
},
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
require.Equal(t, tt.expected, tt.account.GetGrokBaseURL())
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestGetGrokBaseURLHonorsOAuthCustomRegardlessOfUnsafeOverrides(t *testing.T) {
|
|
t.Setenv(xai.EnvAllowUnsafeURLOverrides, "true")
|
|
account := Account{
|
|
Type: AccountTypeOAuth,
|
|
Platform: PlatformGrok,
|
|
Credentials: map[string]any{
|
|
"base_url": "https://custom.example.com/v1",
|
|
},
|
|
}
|
|
|
|
require.Equal(t, "https://custom.example.com/v1", account.GetGrokBaseURL())
|
|
}
|
|
|
|
func TestGetGrokMediaBaseURLPinsOAuthMediaToCLIProxy(t *testing.T) {
|
|
tests := []struct {
|
|
name string
|
|
account Account
|
|
expected string
|
|
}{
|
|
{
|
|
name: "oauth without base_url uses CLI subscription proxy",
|
|
account: Account{
|
|
Type: AccountTypeOAuth,
|
|
Platform: PlatformGrok,
|
|
Credentials: map[string]any{},
|
|
},
|
|
expected: xai.DefaultCLIBaseURL,
|
|
},
|
|
{
|
|
name: "oauth stored CLI proxy stays on CLI subscription proxy",
|
|
account: Account{
|
|
Type: AccountTypeOAuth,
|
|
Platform: PlatformGrok,
|
|
Credentials: map[string]any{
|
|
"base_url": xai.DefaultCLIBaseURL,
|
|
},
|
|
},
|
|
expected: xai.DefaultCLIBaseURL,
|
|
},
|
|
{
|
|
name: "oauth stored CLI proxy variant is canonicalized to CLI proxy",
|
|
account: Account{
|
|
Type: AccountTypeOAuth,
|
|
Platform: PlatformGrok,
|
|
Credentials: map[string]any{
|
|
"base_url": "HTTPS://CLI-CHAT-PROXY.GROK.COM:443/%76%31/",
|
|
},
|
|
},
|
|
expected: xai.DefaultCLIBaseURL,
|
|
},
|
|
{
|
|
name: "oauth legacy official API is pinned to CLI proxy",
|
|
account: Account{
|
|
Type: AccountTypeOAuth,
|
|
Platform: PlatformGrok,
|
|
Credentials: map[string]any{
|
|
"base_url": xai.DefaultBaseURL,
|
|
},
|
|
},
|
|
expected: xai.DefaultCLIBaseURL,
|
|
},
|
|
{
|
|
name: "oauth custom base_url redirects media traffic",
|
|
account: Account{
|
|
Type: AccountTypeOAuth,
|
|
Platform: PlatformGrok,
|
|
Credentials: map[string]any{
|
|
"base_url": "https://custom.example.com/v1",
|
|
},
|
|
},
|
|
expected: "https://custom.example.com/v1",
|
|
},
|
|
{
|
|
name: "API key retains its configured media API",
|
|
account: Account{
|
|
Type: AccountTypeAPIKey,
|
|
Platform: PlatformGrok,
|
|
Credentials: map[string]any{
|
|
"base_url": "https://grok.example.com/v1",
|
|
},
|
|
},
|
|
expected: "https://grok.example.com/v1",
|
|
},
|
|
{
|
|
name: "non-Grok account has no Grok media base URL",
|
|
account: Account{
|
|
Type: AccountTypeOAuth,
|
|
Platform: PlatformOpenAI,
|
|
Credentials: map[string]any{},
|
|
},
|
|
expected: "",
|
|
},
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
require.Equal(t, tt.expected, tt.account.GetGrokMediaBaseURL())
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestGetGrokMediaBaseURLHonorsOAuthCustomRegardlessOfUnsafeOverrides(t *testing.T) {
|
|
t.Setenv(xai.EnvAllowUnsafeURLOverrides, "true")
|
|
account := Account{
|
|
Type: AccountTypeOAuth,
|
|
Platform: PlatformGrok,
|
|
Credentials: map[string]any{
|
|
"base_url": "https://custom.example.com/v1",
|
|
},
|
|
}
|
|
|
|
require.Equal(t, "https://custom.example.com/v1", account.GetGrokMediaBaseURL())
|
|
}
|