099a2d702e<!-- Provide a brief summary of your changes --> ## Motivation and Context <!-- Why is this change needed? What problem does it solve? --> The following PR eliminates duplicate struct definitions by migrating the publisher tool to use canonical types from pkg/model, creating a single source of truth across the codebase. The publisher tool previously had its own copies of structs that were duplicated, ie. ServerJSON, Package, Repository, VersionDetail, EnvironmentVariable, RuntimeArgument and a few others which was not optimal **Changes in the PR:** - Refactored the structs to single canonical types located at pkg/model - Refactor the implementation to use/build canonical structures directly - Remove all duplicate definitions (5 structs eliminated) - Publisher now uses model.ServerJSON, model.Package, model.Repository, etc. - Renamed some of the structs to better reflect their use case, i.e. ServerJSON instead of ServerDetail - Fixes an issue where the Remote property was missing from the previous publisher copy of the Server **Benefits:** - Single source of truth - Schema changes in one place - Type safety - Compiler catches mismatches - Enhanced validation - Field constraints and bson tags - Zero breaking changes - Same CLI interface and JSON output - Future-proof - New canonical fields automatically available Supersedes: #217 and #240 ## How Has This Been Tested? <!-- Have you tested this in a real application? Which scenarios were tested? --> Locally ## Breaking Changes <!-- Will users need to update their code or configurations? --> No ## Types of changes <!-- What types of changes does your code introduce? Put an `x` in all the boxes that apply: --> - [x] Bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds functionality) - [ ] 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. --> - [ ] I have read the [MCP Documentation](https://modelcontextprotocol.io) - [ ] My code follows the repository's style guidelines - [ ] New and existing tests pass locally - [ ] I have added appropriate error handling - [ ] I have added or updated documentation as needed ## Additional context <!-- Add any other context, implementation notes, or design decisions --> --------- Signed-off-by: Radoslav Dimitrov <radoslav@stacklok.com>
80 lines
2.2 KiB
Go
80 lines
2.2 KiB
Go
package auth
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"net/http"
|
|
|
|
"github.com/danielgtaylor/huma/v2"
|
|
v0 "github.com/modelcontextprotocol/registry/internal/api/handlers/v0"
|
|
"github.com/modelcontextprotocol/registry/internal/auth"
|
|
"github.com/modelcontextprotocol/registry/internal/config"
|
|
)
|
|
|
|
// NoneHandler handles anonymous authentication
|
|
type NoneHandler struct {
|
|
config *config.Config
|
|
jwtManager *auth.JWTManager
|
|
}
|
|
|
|
// NewNoneHandler creates a new anonymous authentication handler
|
|
func NewNoneHandler(cfg *config.Config) *NoneHandler {
|
|
return &NoneHandler{
|
|
config: cfg,
|
|
jwtManager: auth.NewJWTManager(cfg),
|
|
}
|
|
}
|
|
|
|
// RegisterNoneEndpoint registers the anonymous authentication endpoint
|
|
func RegisterNoneEndpoint(api huma.API, cfg *config.Config) {
|
|
if !cfg.EnableAnonymousAuth {
|
|
return
|
|
}
|
|
|
|
handler := NewNoneHandler(cfg)
|
|
|
|
// Anonymous token endpoint
|
|
huma.Register(api, huma.Operation{
|
|
OperationID: "get-anonymous-token",
|
|
Method: http.MethodPost,
|
|
Path: "/v0/auth/none",
|
|
Summary: "Get anonymous Registry JWT",
|
|
Description: "Get a short-lived Registry JWT token for publishing to io.modelcontextprotocol.anonymous/* namespace",
|
|
Tags: []string{"auth"},
|
|
}, func(ctx context.Context, _ *struct{}) (*v0.Response[auth.TokenResponse], error) {
|
|
response, err := handler.GetAnonymousToken(ctx)
|
|
if err != nil {
|
|
return nil, huma.Error500InternalServerError("Failed to generate token", err)
|
|
}
|
|
|
|
return &v0.Response[auth.TokenResponse]{
|
|
Body: *response,
|
|
}, nil
|
|
})
|
|
}
|
|
|
|
// GetAnonymousToken generates an anonymous Registry JWT token
|
|
func (h *NoneHandler) GetAnonymousToken(ctx context.Context) (*auth.TokenResponse, error) {
|
|
// Build permissions for anonymous namespace only
|
|
permissions := []auth.Permission{
|
|
{
|
|
Action: auth.PermissionActionPublish,
|
|
ResourcePattern: "io.modelcontextprotocol.anonymous/*",
|
|
},
|
|
}
|
|
|
|
// Create JWT claims for anonymous user
|
|
claims := auth.JWTClaims{
|
|
AuthMethod: auth.MethodNone,
|
|
AuthMethodSubject: "anonymous",
|
|
Permissions: permissions,
|
|
}
|
|
|
|
// Generate Registry JWT token
|
|
tokenResponse, err := h.jwtManager.GenerateTokenResponse(ctx, claims)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("failed to generate JWT token: %w", err)
|
|
}
|
|
|
|
return tokenResponse, nil
|
|
}
|