Add CORS headers and cross-origin protection tests

Author: RossTarrant

pkg/http/handler_test.go

@@ -7,6 +7,7 @@ import (
 	"net/http/httptest"
 	"slices"
 	"sort"
+	"strings"
 	"testing"
 
 	ghcontext "github.com/github/github-mcp-server/pkg/context"
@@ -660,3 +661,160 @@ func buildStaticInventoryFromTools(cfg *ServerConfig, tools []inventory.ServerTo
 	ctx := context.Background()
 	return inv.AvailableTools(ctx), inv.AvailableResourceTemplates(ctx), inv.AvailablePrompts(ctx)
 }
+
+func TestSetCorsHeaders(t *testing.T) {
+	inner := http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
+		w.WriteHeader(http.StatusOK)
+	})
+	handler := SetCorsHeaders(inner)
+
+	t.Run("OPTIONS preflight returns 200 with CORS headers", func(t *testing.T) {
+		req := httptest.NewRequest(http.MethodOptions, "/", nil)
+		req.Header.Set("Origin", "http://localhost:6274")
+		rr := httptest.NewRecorder()
+		handler.ServeHTTP(rr, req)
+
+		assert.Equal(t, http.StatusOK, rr.Code)
+		assert.Equal(t, "*", rr.Header().Get("Access-Control-Allow-Origin"))
+		assert.Contains(t, rr.Header().Get("Access-Control-Allow-Methods"), "POST")
+		assert.Contains(t, rr.Header().Get("Access-Control-Allow-Headers"), "Authorization")
+		assert.Contains(t, rr.Header().Get("Access-Control-Allow-Headers"), "Content-Type")
+		assert.Contains(t, rr.Header().Get("Access-Control-Allow-Headers"), "Mcp-Session-Id")
+		assert.Contains(t, rr.Header().Get("Access-Control-Expose-Headers"), "Mcp-Session-Id")
+	})
+
+	t.Run("POST request includes CORS headers", func(t *testing.T) {
+		req := httptest.NewRequest(http.MethodPost, "/", nil)
+		req.Header.Set("Origin", "http://localhost:6274")
+		rr := httptest.NewRecorder()
+		handler.ServeHTTP(rr, req)
+
+		assert.Equal(t, http.StatusOK, rr.Code)
+		assert.Equal(t, "*", rr.Header().Get("Access-Control-Allow-Origin"))
+	})
+}
+
+func TestCrossOriginProtection(t *testing.T) {
+	jsonRPCBody := `{"jsonrpc":"2.0","id":1,"method":"initialize","params":{"protocolVersion":"2025-03-26","capabilities":{},"clientInfo":{"name":"test","version":"0.1"}}}`
+
+	newHandler := func(t *testing.T, crossOriginProtection *http.CrossOriginProtection) http.Handler {
+		t.Helper()
+
+		apiHost, err := utils.NewAPIHost("https://api.githubcopilot.com")
+		require.NoError(t, err)
+
+		handler := NewHTTPMcpHandler(
+			context.Background(),
+			&ServerConfig{
+				Version:               "test",
+				CrossOriginProtection: crossOriginProtection,
+			},
+			nil,
+			translations.NullTranslationHelper,
+			slog.Default(),
+			apiHost,
+			WithInventoryFactory(func(_ *http.Request) (*inventory.Inventory, error) {
+				return inventory.NewBuilder().Build()
+			}),
+			WithGitHubMCPServerFactory(func(_ *http.Request, _ github.ToolDependencies, _ *inventory.Inventory, _ *github.MCPServerConfig) (*mcp.Server, error) {
+				return mcp.NewServer(&mcp.Implementation{Name: "test", Version: "0.0.1"}, nil), nil
+			}),
+			WithScopeFetcher(allScopesFetcher{}),
+		)
+
+		r := chi.NewRouter()
+		handler.RegisterMiddleware(r)
+		handler.RegisterRoutes(r)
+		return r
+	}
+
+	tests := []struct {
+		name                  string
+		crossOriginProtection *http.CrossOriginProtection
+		secFetchSite          string
+		origin                string
+		expectedStatusCode    int
+	}{
+		{
+			name:               "SDK default rejects cross-site when no bypass configured",
+			secFetchSite:       "cross-site",
+			origin:             "https://evil.example.com",
+			expectedStatusCode: http.StatusForbidden,
+		},
+		{
+			name:               "SDK default allows same-origin request",
+			secFetchSite:       "same-origin",
+			expectedStatusCode: http.StatusOK,
+		},
+		{
+			name:               "SDK default allows request without Sec-Fetch-Site (native client)",
+			secFetchSite:       "",
+			expectedStatusCode: http.StatusOK,
+		},
+		{
+			name: "bypass protection allows cross-site request",
+			crossOriginProtection: func() *http.CrossOriginProtection {
+				p := http.NewCrossOriginProtection()
+				p.AddInsecureBypassPattern("/")
+				return p
+			}(),
+			secFetchSite:       "cross-site",
+			origin:             "https://example.com",
+			expectedStatusCode: http.StatusOK,
+		},
+		{
+			name: "bypass protection still allows same-origin request",
+			crossOriginProtection: func() *http.CrossOriginProtection {
+				p := http.NewCrossOriginProtection()
+				p.AddInsecureBypassPattern("/")
+				return p
+			}(),
+			secFetchSite:       "same-origin",
+			expectedStatusCode: http.StatusOK,
+		},
+		{
+			name: "bypass protection allows request without Sec-Fetch-Site (native client)",
+			crossOriginProtection: func() *http.CrossOriginProtection {
+				p := http.NewCrossOriginProtection()
+				p.AddInsecureBypassPattern("/")
+				return p
+			}(),
+			secFetchSite:       "",
+			expectedStatusCode: http.StatusOK,
+		},
+		{
+			// Mirrors RunHTTPServer's auto-bypass: nil config → create bypass.
+			name: "server default allows cross-site request (nil triggers auto-bypass)",
+			crossOriginProtection: func() *http.CrossOriginProtection {
+				p := http.NewCrossOriginProtection()
+				p.AddInsecureBypassPattern("/")
+				return p
+			}(),
+			secFetchSite:       "cross-site",
+			origin:             "https://example.com",
+			expectedStatusCode: http.StatusOK,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			h := newHandler(t, tt.crossOriginProtection)
+
+			req := httptest.NewRequest(http.MethodPost, "/", strings.NewReader(jsonRPCBody))
+			req.Header.Set("Content-Type", "application/json")
+			req.Header.Set("Accept", "application/json, text/event-stream")
+			req.Header.Set(headers.AuthorizationHeader, "Bearer github_pat_xyz")
+			if tt.secFetchSite != "" {
+				req.Header.Set("Sec-Fetch-Site", tt.secFetchSite)
+			}
+			if tt.origin != "" {
+				req.Header.Set("Origin", tt.origin)
+			}
+
+			rr := httptest.NewRecorder()
+			h.ServeHTTP(rr, req)
+
+			assert.Equal(t, tt.expectedStatusCode, rr.Code, "unexpected status code; body: %s", rr.Body.String())
+		})
+	}
+}