Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 62 additions & 0 deletions internal/api/cors_preflight_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
package api_test

import (
"crypto/ed25519"
"crypto/rand"
"encoding/hex"
"net/http"
"net/http/httptest"
"testing"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"github.com/modelcontextprotocol/registry/internal/api"
v0 "github.com/modelcontextprotocol/registry/internal/api/handlers/v0"
"github.com/modelcontextprotocol/registry/internal/config"
"github.com/modelcontextprotocol/registry/internal/telemetry"
)

// TestCORSPreflightAllowedMethods checks that the CORS layer permits every HTTP
// method the API actually routes. The status endpoints
// (PATCH /v0/servers/{name}/status and .../versions/{version}/status) are served
// with PATCH, so a cross-origin browser preflight for PATCH has to be allowed or
// the browser refuses to send the real request. Guards against a routed method
// being missing from AllowedMethods.
func TestCORSPreflightAllowedMethods(t *testing.T) {
seed := make([]byte, ed25519.SeedSize)
_, err := rand.Read(seed)
require.NoError(t, err)

cfg := config.NewConfig()
cfg.JWTPrivateKey = hex.EncodeToString(seed)

shutdownTelemetry, metrics, err := telemetry.InitMetrics("test")
require.NoError(t, err)
defer func() { _ = shutdownTelemetry(nil) }()

// registryService is nil on purpose: a CORS preflight is answered by the
// middleware before any route handler runs, so business logic is never hit.
srv := api.NewServer(cfg, nil, metrics, &v0.VersionBody{Version: "test"})

for _, method := range []string{
http.MethodGet,
http.MethodPost,
http.MethodPut,
http.MethodPatch,
http.MethodDelete,
} {
t.Run(method, func(t *testing.T) {
req := httptest.NewRequest(http.MethodOptions, "/v0/servers/example/status", nil)
req.Header.Set("Origin", "https://example.com")
req.Header.Set("Access-Control-Request-Method", method)

w := httptest.NewRecorder()
srv.Handler().ServeHTTP(w, req)

allow := w.Header().Get("Access-Control-Allow-Methods")
assert.Contains(t, allow, method,
"CORS preflight for %s should be allowed, got Access-Control-Allow-Methods=%q", method, allow)
})
}
}
7 changes: 7 additions & 0 deletions internal/api/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ func NewServer(cfg *config.Config, registryService service.RegistryService, metr
http.MethodGet,
http.MethodPost,
http.MethodPut,
http.MethodPatch,
http.MethodDelete,
http.MethodOptions,
},
Expand Down Expand Up @@ -147,6 +148,12 @@ func NewServer(cfg *config.Config, registryService service.RegistryService, metr
return server
}

// Handler returns the fully wrapped HTTP handler (middleware stack plus routes).
// Exposed so tests can exercise the middleware, e.g. CORS, without binding a port.
func (s *Server) Handler() http.Handler {
return s.server.Handler
}

// Start begins listening for incoming HTTP requests
func (s *Server) Start() error {
log.Printf("HTTP server starting on %s", s.config.ServerAddress)
Expand Down
Loading