c3b72ef3a6<!-- Provide a brief summary of your changes --> The changes are intended to create validators for all the free-form fields. Please find the details of the validation of different field below. - Repository.Source: only github and gitlab is accepted. - Repository.Url - It should be a valid github or gitlab URL. Created regex for both. - Server.Name - Max 200 char can be there. Reverse domain name verification is part of another PR (not owned by me). - Package.Name - Max 200 char and no spaces. - Server.Description - Max 100 char. - Remote.Url - It should be valid URL. ## Motivation and Context <!-- Why is this change needed? What problem does it solve? --> The motivation was to make the code clean and add base code for more validator for different objects like Repository etc. https://github.com/modelcontextprotocol/registry/issues/97 ## How Has This Been Tested? It's tested via UTs. Added UT's for all the validations. ## Breaking Changes Yes ## 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) - [ ] New feature (non-breaking change which adds functionality) - [x] Breaking change (fix or feature that would cause existing functionality to change) - [ ] 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) - [ ] My code follows the repository's style guidelines - [x] New and existing tests pass locally - [x] I have added appropriate error handling - [ ] I have added or updated documentation as needed Co-authored-by: Avish Porwal <avishporwal@microsoft.com> Co-authored-by: Adam Jones <adamj+git@anthropic.com>
89 lines
3.2 KiB
Go
89 lines
3.2 KiB
Go
package v0
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"net/http"
|
|
"strings"
|
|
|
|
"github.com/danielgtaylor/huma/v2"
|
|
"github.com/modelcontextprotocol/registry/internal/auth"
|
|
"github.com/modelcontextprotocol/registry/internal/config"
|
|
"github.com/modelcontextprotocol/registry/internal/model"
|
|
"github.com/modelcontextprotocol/registry/internal/service"
|
|
"github.com/modelcontextprotocol/registry/internal/validators"
|
|
)
|
|
|
|
// PublishServerInput represents the input for publishing a server
|
|
type PublishServerInput struct {
|
|
Authorization string `header:"Authorization" doc:"Registry JWT token (obtained from /v0/auth/token/github)" required:"true"`
|
|
RawBody []byte `body:"raw"`
|
|
}
|
|
|
|
// RegisterPublishEndpoint registers the publish endpoint
|
|
func RegisterPublishEndpoint(api huma.API, registry service.RegistryService, cfg *config.Config) {
|
|
// Create JWT manager for token validation
|
|
jwtManager := auth.NewJWTManager(cfg)
|
|
|
|
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.ServerResponse], 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):]
|
|
|
|
// Validate Registry JWT token
|
|
claims, err := jwtManager.ValidateToken(ctx, token)
|
|
if err != nil {
|
|
return nil, huma.Error401Unauthorized("Invalid or expired Registry JWT token", err)
|
|
}
|
|
|
|
// Validate that only allowed extension fields are present
|
|
if err := model.ValidatePublishRequestExtensions(input.RawBody); err != nil {
|
|
return nil, huma.Error400BadRequest("Invalid request format", err)
|
|
}
|
|
|
|
// Parse the validated request body
|
|
var publishRequest model.PublishRequest
|
|
if err := json.Unmarshal(input.RawBody, &publishRequest); err != nil {
|
|
return nil, huma.Error400BadRequest("Invalid JSON format", err)
|
|
}
|
|
|
|
// Get server details from request body
|
|
serverDetail := publishRequest.Server
|
|
|
|
// Validate the server detail
|
|
validator := validators.NewObjectValidator()
|
|
if err := validator.Validate(&serverDetail); err != nil {
|
|
return nil, huma.Error400BadRequest(err.Error())
|
|
}
|
|
|
|
// Verify that the token's repository matches the server being published
|
|
if !jwtManager.HasPermission(serverDetail.Name, auth.PermissionActionPublish, claims.Permissions) {
|
|
return nil, huma.Error403Forbidden("You do not have permission to publish this server")
|
|
}
|
|
|
|
// Publish the server with extensions
|
|
publishedServer, err := registry.Publish(publishRequest)
|
|
if err != nil {
|
|
return nil, huma.Error400BadRequest("Failed to publish server", err)
|
|
}
|
|
|
|
// Return the published server in extension wrapper format
|
|
return &Response[model.ServerResponse]{
|
|
Body: *publishedServer,
|
|
}, nil
|
|
})
|
|
}
|