6bb62d160eResolves #419 where URLs with trailing slashes like `/v0/servers/` would return empty responses instead of proper data. **Changes**: - Added TrailingSlashMiddleware that redirects trailing slash URLs with 301 status - Preserves root path ('/') without redirecting - Uses HTTP 301 Moved Permanently to indicate canonical form - Added comprehensive test coverage for the middleware This follows REST API best practices and is consistent with how major Go web frameworks handle trailing slash normalization. Generated with [Claude Code](https://claude.ai/code) --------- Co-authored-by: claude[bot] <209825114+claude[bot]@users.noreply.github.com> Co-authored-by: adam jones <domdomegg@users.noreply.github.com>
77 lines
2.1 KiB
Go
77 lines
2.1 KiB
Go
package api
|
|
|
|
import (
|
|
"context"
|
|
"log"
|
|
"net/http"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/danielgtaylor/huma/v2"
|
|
|
|
"github.com/modelcontextprotocol/registry/internal/api/router"
|
|
"github.com/modelcontextprotocol/registry/internal/config"
|
|
"github.com/modelcontextprotocol/registry/internal/service"
|
|
"github.com/modelcontextprotocol/registry/internal/telemetry"
|
|
)
|
|
|
|
// TrailingSlashMiddleware redirects requests with trailing slashes to their canonical form
|
|
func TrailingSlashMiddleware(next http.Handler) http.Handler {
|
|
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
// Only redirect if the path is not "/" and ends with a "/"
|
|
if r.URL.Path != "/" && strings.HasSuffix(r.URL.Path, "/") {
|
|
// Create a copy of the URL and remove the trailing slash
|
|
newURL := *r.URL
|
|
newURL.Path = strings.TrimSuffix(r.URL.Path, "/")
|
|
|
|
// Use 308 Permanent Redirect to preserve the request method
|
|
http.Redirect(w, r, newURL.String(), http.StatusPermanentRedirect)
|
|
return
|
|
}
|
|
|
|
next.ServeHTTP(w, r)
|
|
})
|
|
}
|
|
|
|
// Server represents the HTTP server
|
|
type Server struct {
|
|
config *config.Config
|
|
registry service.RegistryService
|
|
humaAPI huma.API
|
|
server *http.Server
|
|
}
|
|
|
|
// NewServer creates a new HTTP server
|
|
func NewServer(cfg *config.Config, registryService service.RegistryService, metrics *telemetry.Metrics) *Server {
|
|
// Create HTTP mux and Huma API
|
|
mux := http.NewServeMux()
|
|
|
|
api := router.NewHumaAPI(cfg, registryService, mux, metrics)
|
|
|
|
// Wrap the mux with trailing slash middleware
|
|
handler := TrailingSlashMiddleware(mux)
|
|
|
|
server := &Server{
|
|
config: cfg,
|
|
registry: registryService,
|
|
humaAPI: api,
|
|
server: &http.Server{
|
|
Addr: cfg.ServerAddress,
|
|
Handler: handler,
|
|
ReadHeaderTimeout: 10 * time.Second,
|
|
},
|
|
}
|
|
|
|
return server
|
|
}
|
|
|
|
// Start begins listening for incoming HTTP requests
|
|
func (s *Server) Start() error {
|
|
log.Printf("HTTP server starting on %s", s.config.ServerAddress)
|
|
return s.server.ListenAndServe()
|
|
}
|
|
|
|
// Shutdown gracefully shuts down the server
|
|
func (s *Server) Shutdown(ctx context.Context) error {
|
|
return s.server.Shutdown(ctx)
|
|
}
|