lisone/ds2api
1
0
Fork 0
mirror of https://github.com/CJackHwang/ds2api.git synced 2026-05-05 17:05:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: Add support for x-goog-api-key header and api_key query parameter for API key detection.

Browse Source
This commit is contained in:
CJACK
2026-02-22 22:14:09 +08:00
parent 7da012a4d8
commit 6baf687ecf
2 changed files with 41 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
internal/auth/request.go
View File

@@ -190,9 +190,16 @@ func extractCallerToken(req *http.Request) string {
if key := strings.TrimSpace(req.Header.Get("x-api-key")); key != "" {
return key
}
// Gemini/Google clients commonly send API key via x-goog-api-key.
if key := strings.TrimSpace(req.Header.Get("x-goog-api-key")); key != "" {
return key
}
// Gemini AI Studio compatibility: allow query key fallback only when no
// header-based credential is present.
return strings.TrimSpace(req.URL.Query().Get("key"))
if key := strings.TrimSpace(req.URL.Query().Get("key")); key != "" {
return key
}
return strings.TrimSpace(req.URL.Query().Get("api_key"))
}
func callerTokenID(token string) string {

33
internal/auth/request_test.go
View File

@@ -130,6 +130,39 @@ func TestDetermineWithQueryKeyUsesDirectToken(t *testing.T) {
}
}
func TestDetermineWithXGoogAPIKeyUsesDirectToken(t *testing.T) {
r := newTestResolver(t)
req, _ := http.NewRequest(http.MethodPost, "/v1beta/models/gemini-2.5-pro:streamGenerateContent?alt=sse", nil)
req.Header.Set("x-goog-api-key", "goog-header-key")
a, err := r.Determine(req)
if err != nil {
t.Fatalf("determine failed: %v", err)
}
if a.UseConfigToken {
t.Fatalf("expected direct token mode")
}
if a.DeepSeekToken != "goog-header-key" {
t.Fatalf("unexpected token: %q", a.DeepSeekToken)
}
}
func TestDetermineWithAPIKeyQueryParamUsesDirectToken(t *testing.T) {
r := newTestResolver(t)
req, _ := http.NewRequest(http.MethodPost, "/v1beta/models/gemini-2.5-pro:generateContent?api_key=direct-api-key", nil)
a, err := r.Determine(req)
if err != nil {
t.Fatalf("determine failed: %v", err)
}
if a.UseConfigToken {
t.Fatalf("expected direct token mode")
}
if a.DeepSeekToken != "direct-api-key" {
t.Fatalf("unexpected token: %q", a.DeepSeekToken)
}
}
func TestDetermineHeaderTokenPrecedenceOverQueryKey(t *testing.T) {
r := newTestResolver(t)
req, _ := http.NewRequest(http.MethodPost, "/v1beta/models/gemini-2.5-pro:generateContent?key=query-key", nil)