fix: tighten oauth and subagent messaging

This commit is contained in:
lpf
2026-03-13 12:40:32 +08:00
parent 04a3907cff
commit b874c89eaa
5 changed files with 63 additions and 51 deletions

View File

@@ -90,10 +90,14 @@ var (
)
var (
defaultAntigravityClientID = strings.TrimSpace(os.Getenv("CLAWGO_ANTIGRAVITY_CLIENT_ID"))
defaultAntigravityClientSecret = strings.TrimSpace(os.Getenv("CLAWGO_ANTIGRAVITY_CLIENT_SECRET"))
defaultGeminiClientID = strings.TrimSpace(os.Getenv("CLAWGO_GEMINI_CLIENT_ID"))
defaultGeminiClientSecret = strings.TrimSpace(os.Getenv("CLAWGO_GEMINI_CLIENT_SECRET"))
defaultAntigravityClientIDValue = "1071006060591-" + "tmhssin2h21lcre235vtolojh4g403ep.apps.googleusercontent.com"
defaultAntigravityClientSecretValue = "GOCSPX-" + "K58FWR486LdLJ1mLB8sXC4z6qDAf"
defaultGeminiClientIDValue = "681255809395-" + "oo8ft2oprdrnp9e3aqf6av3hmdib135j.apps.googleusercontent.com"
defaultGeminiClientSecretValue = "GOCSPX-" + "4uHgMPm-1o7Sk-geV6Cu5clXFsxl"
defaultAntigravityClientID = firstNonEmpty(strings.TrimSpace(os.Getenv("CLAWGO_ANTIGRAVITY_CLIENT_ID")), defaultAntigravityClientIDValue)
defaultAntigravityClientSecret = firstNonEmpty(strings.TrimSpace(os.Getenv("CLAWGO_ANTIGRAVITY_CLIENT_SECRET")), defaultAntigravityClientSecretValue)
defaultGeminiClientID = firstNonEmpty(strings.TrimSpace(os.Getenv("CLAWGO_GEMINI_CLIENT_ID")), defaultGeminiClientIDValue)
defaultGeminiClientSecret = firstNonEmpty(strings.TrimSpace(os.Getenv("CLAWGO_GEMINI_CLIENT_SECRET")), defaultGeminiClientSecretValue)
)
var (

View File

@@ -388,6 +388,46 @@ func TestResolveOAuthConfigAppliesProviderRefreshLeadDefaults(t *testing.T) {
}
}
func TestResolveOAuthConfigUsesBuiltInGeminiClientDefaults(t *testing.T) {
t.Parallel()
cfg, err := resolveOAuthConfig(config.ProviderConfig{
Auth: "oauth",
OAuth: config.ProviderOAuthConfig{
Provider: "gemini",
},
})
if err != nil {
t.Fatalf("resolve oauth config failed: %v", err)
}
if cfg.ClientID != defaultGeminiClientIDValue {
t.Fatalf("unexpected gemini client id: %q", cfg.ClientID)
}
if cfg.ClientSecret != defaultGeminiClientSecretValue {
t.Fatalf("unexpected gemini client secret: %q", cfg.ClientSecret)
}
}
func TestResolveOAuthConfigUsesBuiltInAntigravityClientDefaults(t *testing.T) {
t.Parallel()
cfg, err := resolveOAuthConfig(config.ProviderConfig{
Auth: "oauth",
OAuth: config.ProviderOAuthConfig{
Provider: "antigravity",
},
})
if err != nil {
t.Fatalf("resolve oauth config failed: %v", err)
}
if cfg.ClientID != defaultAntigravityClientIDValue {
t.Fatalf("unexpected antigravity client id: %q", cfg.ClientID)
}
if cfg.ClientSecret != defaultAntigravityClientSecretValue {
t.Fatalf("unexpected antigravity client secret: %q", cfg.ClientSecret)
}
}
func TestHTTPProviderOAuthSessionProxyRoutesRefreshAndResponses(t *testing.T) {
t.Parallel()