218b0b422d## Summary This PR implements the flattened `_meta` format for server extensions as discussed in #284, replacing the confusing wrapper format with a clean single-file approach. **Before (wrapper format):** ```json { "server": { "name": "my-server", "description": "..." }, "x-publisher": { "build_info": "..." }, "x-io.modelcontextprotocol.registry": { "id": "...", "published_at": "..." } } ``` **After (flattened format):** ```json { "name": "my-server", "description": "...", "_meta": { "publisher": { "build_info": "..." }, "io.modelcontextprotocol.registry": { "id": "...", "published_at": "..." } } } ``` ## Key Changes - **Flattened Format**: Single `ServerJSON` file with structured `_meta` field - **Better DX**: Publishers maintain one file instead of separate server.json + extensions.json - **MCP Compliance**: Uses standard `_meta` mechanism instead of `x-*` prefixes - **Simplified Database**: PostgreSQL now uses simple `id, value` table structure - **Type Safety**: Structured `ServerMeta` with known extension fields ## Database Migration Added migration `003_simplify_to_key_value.sql` that drops the complex relational structure and creates a simple key-value table. This significantly simplifies database management. ## Testing - All core tests passing (validators, service layer) - Schema validation working for all 10 examples - Seed data successfully migrated (396 entries) - Publishing functionality verified Fixes #284
98 lines
3.5 KiB
Go
98 lines
3.5 KiB
Go
package v0
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"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/database"
|
|
"github.com/modelcontextprotocol/registry/internal/service"
|
|
"github.com/modelcontextprotocol/registry/internal/validators"
|
|
apiv0 "github.com/modelcontextprotocol/registry/pkg/api/v0"
|
|
"github.com/modelcontextprotocol/registry/pkg/model"
|
|
)
|
|
|
|
// EditServerInput represents the input for editing a server
|
|
type EditServerInput struct {
|
|
Authorization string `header:"Authorization" doc:"Registry JWT token with edit permissions" required:"true"`
|
|
ID string `path:"id" doc:"Server ID (UUID)" format:"uuid"`
|
|
Body apiv0.ServerJSON `body:""`
|
|
}
|
|
|
|
// RegisterEditEndpoints registers the edit endpoint
|
|
func RegisterEditEndpoints(api huma.API, registry service.RegistryService, cfg *config.Config) {
|
|
jwtManager := auth.NewJWTManager(cfg)
|
|
|
|
// Edit server endpoint
|
|
huma.Register(api, huma.Operation{
|
|
OperationID: "edit-server",
|
|
Method: http.MethodPut,
|
|
Path: "/v0/servers/{id}",
|
|
Summary: "Edit MCP server",
|
|
Description: "Update an existing MCP server (admin only)",
|
|
Tags: []string{"admin"},
|
|
Security: []map[string][]string{
|
|
{"bearer": {}},
|
|
},
|
|
}, func(ctx context.Context, input *EditServerInput) (*Response[apiv0.ServerJSON], 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)
|
|
}
|
|
|
|
// Get current server to check permissions against existing name
|
|
currentServer, err := registry.GetByID(input.ID)
|
|
if err != nil {
|
|
if errors.Is(err, database.ErrNotFound) {
|
|
return nil, huma.Error404NotFound("Server not found")
|
|
}
|
|
return nil, huma.Error500InternalServerError("Failed to get current server", err)
|
|
}
|
|
|
|
// Verify edit permissions for this server using the existing server name
|
|
if !jwtManager.HasPermission(currentServer.Name, auth.PermissionActionEdit, claims.Permissions) {
|
|
return nil, huma.Error403Forbidden("You do not have edit permissions for this server")
|
|
}
|
|
|
|
// Perform all schema validation
|
|
if err := validators.ValidatePublishRequest(input.Body); err != nil {
|
|
return nil, huma.Error400BadRequest(err.Error())
|
|
}
|
|
|
|
// Prevent renaming servers
|
|
if currentServer.Name != input.Body.Name {
|
|
return nil, huma.Error400BadRequest("Cannot rename server")
|
|
}
|
|
|
|
// Prevent undeleting servers - once deleted, they stay deleted
|
|
if currentServer.Status == model.StatusDeleted && input.Body.Status != model.StatusDeleted {
|
|
return nil, huma.Error400BadRequest("Cannot change status of deleted server. Deleted servers cannot be undeleted.")
|
|
}
|
|
|
|
// Edit the server
|
|
updatedServer, err := registry.EditServer(input.ID, input.Body)
|
|
if err != nil {
|
|
if errors.Is(err, database.ErrNotFound) {
|
|
return nil, huma.Error404NotFound("Server not found")
|
|
}
|
|
return nil, huma.Error400BadRequest("Failed to edit server", err)
|
|
}
|
|
|
|
return &Response[apiv0.ServerJSON]{
|
|
Body: *updatedServer,
|
|
}, nil
|
|
})
|
|
}
|