6b84493ca9## Motivation and Context Currently there's a lot of unsafe manual JSON unmarshalling/marshalling, and we have to manually keep the openapi schema in sync. This PR migrates the API to [Huma](https://github.com/danielgtaylor/huma), which appears like a popular, well-maintained way to build APIs in Golang. I'm not a Golang expert, but seemed highly recommended by Reddit + Claude and has a decent star count. It provides automatic openapi spec generation and docs hosting, JSON parsing, as well as the ability to add auth middlewares etc. ## How Has This Been Tested? Running locally, and poking at the endpoints ## Breaking Changes Docs are served at `/docs` rather than `/v0/swagger/index.html` now ## Types of changes <!-- What types of changes does your code introduce? Put an `x` in all the boxes that apply: --> - [ ] Bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds functionality) - [x] Breaking change (fix or feature that would cause existing functionality to change) - [x] Documentation update ## Checklist <!-- Go over all the following points, and put an `x` in all the boxes that apply. --> - [x] I have read the [MCP Documentation](https://modelcontextprotocol.io) - [x] My code follows the repository's style guidelines - [x] New and existing tests pass locally - [x] I have added appropriate error handling - [x] I have added or updated documentation as needed ## Additional context <!-- Add any other context, implementation notes, or design decisions -->
96 lines
3 KiB
Go
96 lines
3 KiB
Go
package v0
|
|
|
|
import (
|
|
"context"
|
|
"net/http"
|
|
"strings"
|
|
|
|
"github.com/danielgtaylor/huma/v2"
|
|
"github.com/modelcontextprotocol/registry/internal/auth"
|
|
"github.com/modelcontextprotocol/registry/internal/model"
|
|
"github.com/modelcontextprotocol/registry/internal/service"
|
|
)
|
|
|
|
// PublishServerInput represents the input for publishing a server
|
|
type PublishServerInput struct {
|
|
Authorization string `header:"Authorization" doc:"GitHub OAuth token" required:"true"`
|
|
Body model.PublishRequest
|
|
}
|
|
|
|
|
|
// RegisterPublishEndpoint registers the publish endpoint
|
|
func RegisterPublishEndpoint(api huma.API, registry service.RegistryService, authService auth.Service) {
|
|
huma.Register(api, huma.Operation{
|
|
OperationID: "publish-server",
|
|
Method: http.MethodPost,
|
|
Path: "/v0/publish",
|
|
Summary: "Publish MCP server",
|
|
Description: "Publish a new MCP server to the registry or update an existing one",
|
|
Tags: []string{"publish"},
|
|
Security: []map[string][]string{
|
|
{"bearer": {}},
|
|
},
|
|
}, func(ctx context.Context, input *PublishServerInput) (*Response[model.Server], error) {
|
|
// Extract bearer token
|
|
const bearerPrefix = "Bearer "
|
|
authHeader := input.Authorization
|
|
if len(authHeader) < len(bearerPrefix) || !strings.EqualFold(authHeader[:len(bearerPrefix)], bearerPrefix) {
|
|
return nil, huma.Error401Unauthorized("Invalid Authorization header format. Expected 'Bearer <token>'")
|
|
}
|
|
token := authHeader[len(bearerPrefix):]
|
|
|
|
// Convert PublishRequest body to ServerDetail
|
|
serverDetail := input.Body.ServerDetail
|
|
|
|
// Huma handles validation automatically based on struct tags
|
|
// But we can add custom validation if needed
|
|
if serverDetail.Name == "" {
|
|
return nil, huma.Error400BadRequest("Name is required")
|
|
}
|
|
if serverDetail.VersionDetail.Version == "" {
|
|
return nil, huma.Error400BadRequest("Version is required")
|
|
}
|
|
|
|
// Determine authentication method based on server name prefix
|
|
var authMethod model.AuthMethod
|
|
if strings.HasPrefix(serverDetail.Name, "io.github") {
|
|
authMethod = model.AuthMethodGitHub
|
|
} else {
|
|
authMethod = model.AuthMethodNone
|
|
}
|
|
|
|
// Setup authentication info
|
|
a := model.Authentication{
|
|
Method: authMethod,
|
|
Token: token,
|
|
RepoRef: serverDetail.Name,
|
|
}
|
|
|
|
// Validate authentication
|
|
valid, err := authService.ValidateAuth(ctx, a)
|
|
if err != nil {
|
|
return nil, huma.Error401Unauthorized("Authentication failed", err)
|
|
}
|
|
if !valid {
|
|
return nil, huma.Error401Unauthorized("Invalid authentication credentials")
|
|
}
|
|
|
|
// Publish the server details
|
|
err = registry.Publish(&serverDetail)
|
|
if err != nil {
|
|
return nil, huma.Error500InternalServerError("Failed to publish server", err)
|
|
}
|
|
|
|
// Create response with the published server data
|
|
return &Response[model.Server]{
|
|
Body: model.Server{
|
|
ID: serverDetail.ID,
|
|
Name: serverDetail.Name,
|
|
Description: serverDetail.Description,
|
|
Status: serverDetail.Status,
|
|
Repository: serverDetail.Repository,
|
|
VersionDetail: serverDetail.VersionDetail,
|
|
},
|
|
}, nil
|
|
})
|
|
}
|