mirror of
https://github.com/router-for-me/CLIProxyAPI.git
synced 2026-11-17 07:08:01 +08:00
- Replace the wildcard Access-Control-Allow-Headers value with an explicit list covering Authorization, Content-Type, and the API key and Anthropic headers the API accepts, since Fetch treats Authorization as a non-wildcard request-header name. - Echo requested headers on preflight responses so arbitrary custom client headers keep working without widening allowed origins or enabling credentials. - Add real-server preflight regression tests for the models, chat completions, alternative credential, and Anthropic header cases. Closes: #6999
116 lines
4.2 KiB
Go
116 lines
4.2 KiB
Go
package api
|
|
|
|
import (
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"strings"
|
|
"testing"
|
|
)
|
|
|
|
// TestCORSPreflightExplicitlyAllowsAuthorization covers issue #6999: the
|
|
// Fetch standard classifies Authorization as a CORS non-wildcard
|
|
// request-header name, so "Access-Control-Allow-Headers: *" does not cover
|
|
// it when a browser enforces the strict rule. The preflight response must
|
|
// name Authorization (and the other request headers the API accepts)
|
|
// explicitly, otherwise strict-mode browsers block the actual request.
|
|
func TestCORSPreflightExplicitlyAllowsAuthorization(t *testing.T) {
|
|
server := newTestServer(t)
|
|
|
|
cases := []struct {
|
|
name string
|
|
method string
|
|
path string
|
|
requestHeaders string
|
|
wantAllowed []string
|
|
}{
|
|
{
|
|
name: "models get with authorization",
|
|
method: http.MethodGet,
|
|
path: "/v1/models",
|
|
requestHeaders: "authorization",
|
|
wantAllowed: []string{"Authorization"},
|
|
},
|
|
{
|
|
name: "chat completions post with authorization and content type",
|
|
method: http.MethodPost,
|
|
path: "/v1/chat/completions",
|
|
requestHeaders: "authorization,content-type",
|
|
wantAllowed: []string{"Authorization", "Content-Type"},
|
|
},
|
|
{
|
|
name: "alternative credential headers",
|
|
method: http.MethodGet,
|
|
path: "/v1/models",
|
|
requestHeaders: "x-api-key,x-goog-api-key",
|
|
wantAllowed: []string{"X-Api-Key", "X-Goog-Api-Key"},
|
|
},
|
|
{
|
|
name: "anthropic headers",
|
|
method: http.MethodPost,
|
|
path: "/v1/messages",
|
|
requestHeaders: "x-api-key,anthropic-version,anthropic-beta",
|
|
wantAllowed: []string{"X-Api-Key", "Anthropic-Version", "Anthropic-Beta"},
|
|
},
|
|
}
|
|
|
|
for _, tc := range cases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
req := httptest.NewRequest(http.MethodOptions, tc.path, nil)
|
|
req.Header.Set("Origin", "http://127.0.0.1:8765")
|
|
req.Header.Set("Access-Control-Request-Method", tc.method)
|
|
req.Header.Set("Access-Control-Request-Headers", tc.requestHeaders)
|
|
recorder := httptest.NewRecorder()
|
|
server.engine.ServeHTTP(recorder, req)
|
|
|
|
if recorder.Code != http.StatusNoContent {
|
|
t.Fatalf("preflight status = %d, want %d", recorder.Code, http.StatusNoContent)
|
|
}
|
|
allowHeaders := recorder.Header().Get("Access-Control-Allow-Headers")
|
|
if allowHeaders == "*" {
|
|
t.Fatalf("Access-Control-Allow-Headers = %q, want an explicit list including %v", allowHeaders, tc.wantAllowed)
|
|
}
|
|
allowed := make(map[string]bool)
|
|
for _, name := range strings.Split(allowHeaders, ",") {
|
|
allowed[http.CanonicalHeaderKey(strings.TrimSpace(name))] = true
|
|
}
|
|
for _, want := range tc.wantAllowed {
|
|
if !allowed[http.CanonicalHeaderKey(want)] {
|
|
t.Errorf("Access-Control-Allow-Headers %q does not explicitly allow %s", allowHeaders, want)
|
|
}
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
// TestCORSPreflightEchoesRequestedAllowHeaders verifies that a preflight for
|
|
// arbitrary custom headers a client may send (SDK telemetry, session, and
|
|
// tracing headers) is answered with those headers explicitly allowed,
|
|
// instead of relying on the wildcard that strict non-wildcard rules reject.
|
|
func TestCORSPreflightEchoesRequestedAllowHeaders(t *testing.T) {
|
|
server := newTestServer(t)
|
|
|
|
req := httptest.NewRequest(http.MethodOptions, "/v1/chat/completions", nil)
|
|
req.Header.Set("Origin", "http://127.0.0.1:8765")
|
|
req.Header.Set("Access-Control-Request-Method", http.MethodPost)
|
|
req.Header.Set("Access-Control-Request-Headers", "authorization, x-custom-sdk-header")
|
|
recorder := httptest.NewRecorder()
|
|
server.engine.ServeHTTP(recorder, req)
|
|
|
|
if recorder.Code != http.StatusNoContent {
|
|
t.Fatalf("preflight status = %d, want %d", recorder.Code, http.StatusNoContent)
|
|
}
|
|
allowHeaders := recorder.Header().Get("Access-Control-Allow-Headers")
|
|
if allowHeaders == "*" {
|
|
t.Fatalf("Access-Control-Allow-Headers = %q, want the requested headers echoed explicitly", allowHeaders)
|
|
}
|
|
allowed := make(map[string]bool)
|
|
for _, name := range strings.Split(allowHeaders, ",") {
|
|
allowed[http.CanonicalHeaderKey(strings.TrimSpace(name))] = true
|
|
}
|
|
for _, want := range []string{"Authorization", "X-Custom-Sdk-Header"} {
|
|
if !allowed[want] {
|
|
t.Errorf("Access-Control-Allow-Headers %q does not explicitly allow %s", allowHeaders, want)
|
|
}
|
|
}
|
|
}
|