From 0b46571c6e5579c41689d833aa0d00f108190d96 Mon Sep 17 00:00:00 2001 From: Rudy Celekli Date: Fri, 23 Oct 2026 22:39:51 -0400 Subject: [PATCH] fix(httpapi): match the Bearer auth scheme case-insensitively Co-authored-by: Cursor --- internal/httpapi/bearer_scheme_case_test.go | 35 +++++++++++++++++++++ internal/httpapi/server.go | 24 ++++++++------ internal/httpapi/sse_scope.go | 6 +--- 3 files changed, 50 insertions(+), 15 deletions(-) create mode 100644 internal/httpapi/bearer_scheme_case_test.go diff --git a/internal/httpapi/bearer_scheme_case_test.go b/internal/httpapi/bearer_scheme_case_test.go new file mode 100644 index 000000000..59388e668 --- /dev/null +++ b/internal/httpapi/bearer_scheme_case_test.go @@ -0,0 +1,35 @@ +package httpapi + +import ( + "net/http" + "net/http/httptest" + "testing" + + "github.com/stretchr/testify/assert" + "go.uber.org/zap" + + "github.com/smart-mcp-proxy/mcpproxy-go/internal/config" +) + +// The Authorization scheme name is case-insensitive (RFC 7235 §2.1), so a +// client that sends "bearer " must be treated like "Bearer ". +func TestBearerScheme_CaseInsensitive(t *testing.T) { + const apiKey = "admin-key-12345" + + for _, scheme := range []string{"Bearer", "bearer", "BEARER"} { + t.Run(scheme, func(t *testing.T) { + req := httptest.NewRequest("GET", "/api/v1/status", nil) + req.Header.Set("Authorization", scheme+" "+apiKey) + assert.Equal(t, apiKey, ExtractToken(req)) + + srv := NewServer(&testControllerWithConfig{cfg: &config.Config{APIKey: apiKey}}, zap.NewNop().Sugar(), nil) + w := httptest.NewRecorder() + srv.ServeHTTP(w, req) + assert.Equal(t, http.StatusOK, w.Code, "admin key sent with %q scheme should authenticate", scheme) + }) + } + + req := httptest.NewRequest("GET", "/api/v1/status", nil) + req.Header.Set("Authorization", "Basic "+apiKey) + assert.Equal(t, "", ExtractToken(req), "non-Bearer schemes must not yield a token") +} diff --git a/internal/httpapi/server.go b/internal/httpapi/server.go index 0831b1cdc..6155d1131 100644 --- a/internal/httpapi/server.go +++ b/internal/httpapi/server.go @@ -679,10 +679,7 @@ func (s *Server) authenticateExplicitToken(w http.ResponseWriter, r *http.Reques // global admin key, or a user JWT resolved as a session principal // (kind=bearer_jwt) through the edition hook. func (s *Server) authenticateBearer(w http.ResponseWriter, r *http.Request, next http.Handler, cfg *config.Config, authHeader string) { - var token string - if strings.HasPrefix(authHeader, "Bearer ") { - token = strings.TrimPrefix(authHeader, "Bearer ") - } + token := bearerToken(authHeader) if token != "" && strings.HasPrefix(token, auth.ClientTokenPrefixStr) { s.rejectClientCredentialOnREST(w, r) @@ -813,12 +810,8 @@ func ExtractToken(r *http.Request) string { } // 2. Check Authorization: Bearer header - if authHeader := r.Header.Get("Authorization"); authHeader != "" { - if strings.HasPrefix(authHeader, "Bearer ") { - if token := strings.TrimPrefix(authHeader, "Bearer "); token != "" { - return token - } - } + if token := bearerToken(r.Header.Get("Authorization")); token != "" { + return token } // 3. Check query parameter (for SSE and Web UI initial load) @@ -829,6 +822,17 @@ func ExtractToken(r *http.Request) string { return "" } +// bearerToken returns the credential from an Authorization header value that +// uses the Bearer scheme, or "" otherwise. The scheme name is matched +// case-insensitively (RFC 7235 §2.1, RFC 6750 §2.1). +func bearerToken(authHeader string) string { + const scheme = "Bearer " + if len(authHeader) < len(scheme) || !strings.EqualFold(authHeader[:len(scheme)], scheme) { + return "" + } + return authHeader[len(scheme):] +} + // correlationIDMiddleware injects correlation ID and request source into context func (s *Server) correlationIDMiddleware() func(http.Handler) http.Handler { return func(next http.Handler) http.Handler { diff --git a/internal/httpapi/sse_scope.go b/internal/httpapi/sse_scope.go index a0996ecdb..0d52dddbe 100644 --- a/internal/httpapi/sse_scope.go +++ b/internal/httpapi/sse_scope.go @@ -83,11 +83,7 @@ func sessionCredentialValue(r *http.Request, kind auth.CredentialKind) string { } return "" case auth.CredentialKindBearerJWT: - authHeader := r.Header.Get("Authorization") - if len(authHeader) > len("Bearer ") && authHeader[:7] == "Bearer " { - return authHeader[7:] - } - return "" + return bearerToken(r.Header.Get("Authorization")) default: return "" }