ai/gitea-mcp
1
0
Fork 0
mirror of https://gitea.com/gitea/gitea-mcp.git synced 2026-03-13 16:35:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Partially revert #149: remove Content-Type middleware, keep ErrServerClosed fix (#150)

Browse Source 
Reverts the Content-Type middleware and custom server/mux plumbing from #149, keeping only the `http.ErrServerClosed` fix which is a legitimate bug.

The middleware is unnecessary because rmcp's `post_message` already returns early for 202/204 before any Content-Type validation. Both Go MCP SDKs (`modelcontextprotocol/go-sdk` used by GitHub's MCP server, and `mark3labs/mcp-go` used here) intentionally omit Content-Type on 202 responses per the MCP spec. See #148 for the full analysis.

*PR written by Claude on behalf of @silverwind*

Reviewed-on: https://gitea.com/gitea/gitea-mcp/pulls/150
Reviewed-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: silverwind <me@silverwind.io>
Co-committed-by: silverwind <me@silverwind.io>
This commit is contained in:
silverwind
2026-03-13 09:31:26 +00:00
committed by silverwind
parent e0abd256a3
commit 22fc663387
2 changed files with 3 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
operation/operation.go
View File

@@ -31,23 +31,6 @@ import (
var mcpServer *server.MCPServer
type noBodyContentTypeResponseWriter struct {
http.ResponseWriter
}
func (w *noBodyContentTypeResponseWriter) WriteHeader(statusCode int) {
if (statusCode == http.StatusAccepted || statusCode == http.StatusNoContent) && w.Header().Get("Content-Type") == "" {
w.Header().Set("Content-Type", "application/json")
}
w.ResponseWriter.WriteHeader(statusCode)
}
func withNoBodyContentType(handler http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
handler.ServeHTTP(&noBodyContentTypeResponseWriter{ResponseWriter: w}, r)
})
}
func RegisterTool(s *server.MCPServer) {
// User Tool
s.AddTools(user.Tool.Tools()...)
@@ -130,16 +113,12 @@ func Run() error {
return err
}
case "http":
mux := http.NewServeMux()
httpServer := &http.Server{Handler: mux}
streamableHTTPServer := server.NewStreamableHTTPServer(
httpServer := server.NewStreamableHTTPServer(
mcpServer,
server.WithLogger(log.New()),
server.WithHeartbeatInterval(30*time.Second),
server.WithHTTPContextFunc(getContextWithToken),
server.WithStreamableHTTPServer(httpServer),
)
mux.Handle("/mcp", withNoBodyContentType(streamableHTTPServer))
log.Infof("Gitea MCP HTTP server listening on :%d", flag.Port)
// Graceful shutdown setup
@@ -152,13 +131,13 @@ func Run() error {
log.Infof("Shutdown signal received, gracefully stopping HTTP server...")
shutdownCtx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
defer cancel()
if err := streamableHTTPServer.Shutdown(shutdownCtx); err != nil {
if err := httpServer.Shutdown(shutdownCtx); err != nil {
log.Errorf("HTTP server shutdown error: %v", err)
}
close(shutdownDone)
}()
if err := streamableHTTPServer.Start(fmt.Sprintf(":%d", flag.Port)); err != nil && !errors.Is(err, http.ErrServerClosed) {
if err := httpServer.Start(fmt.Sprintf(":%d", flag.Port)); err != nil && !errors.Is(err, http.ErrServerClosed) {
return err
}
<-shutdownDone // Wait for shutdown to finish

77
operation/operation_http_headers_test.go
View File

@@ -1,77 +0,0 @@
package operation
import (
"net/http"
"net/http/httptest"
"testing"
)
func TestWithNoBodyContentTypeAddsContentTypeForAcceptedAndNoContent(t *testing.T) {
tests := []struct {
name string
status int
}{
{
name: "accepted",
status: http.StatusAccepted,
},
{
name: "no_content",
status: http.StatusNoContent,
},
}
for _, tc := range tests {
t.Run(tc.name, func(t *testing.T) {
handler := withNoBodyContentType(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
w.WriteHeader(tc.status)
}))
req := httptest.NewRequest(http.MethodPost, "/mcp", nil)
rr := httptest.NewRecorder()
handler.ServeHTTP(rr, req)
if rr.Code != tc.status {
t.Fatalf("expected status %d, got %d", tc.status, rr.Code)
}
if got := rr.Header().Get("Content-Type"); got != "application/json" {
t.Fatalf("expected Content-Type application/json, got %q", got)
}
})
}
}
func TestWithNoBodyContentTypePreservesExistingContentType(t *testing.T) {
handler := withNoBodyContentType(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
w.Header().Set("Content-Type", "text/plain")
w.WriteHeader(http.StatusAccepted)
}))
req := httptest.NewRequest(http.MethodPost, "/mcp", nil)
rr := httptest.NewRecorder()
handler.ServeHTTP(rr, req)
if rr.Code != http.StatusAccepted {
t.Fatalf("expected status %d, got %d", http.StatusAccepted, rr.Code)
}
if got := rr.Header().Get("Content-Type"); got != "text/plain" {
t.Fatalf("expected Content-Type text/plain, got %q", got)
}
}
func TestWithNoBodyContentTypeDoesNotModifyOtherStatusCodes(t *testing.T) {
handler := withNoBodyContentType(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
w.WriteHeader(http.StatusOK)
}))
req := httptest.NewRequest(http.MethodPost, "/mcp", nil)
rr := httptest.NewRecorder()
handler.ServeHTTP(rr, req)
if rr.Code != http.StatusOK {
t.Fatalf("expected status %d, got %d", http.StatusOK, rr.Code)
}
if got := rr.Header().Get("Content-Type"); got != "" {
t.Fatalf("expected empty Content-Type, got %q", got)
}
}