## Motivation and Context Per discussion with @rdimitrov - all validation now happens in a new `/validate` endpoint. For details, see below. ## Breaking Changes None. Validation on /publish only validates schema version and semantic checks (manual checks) as before. We can add schema validation by changing a flag in the called to `ValidateJSONSchema` when we're ready. ## Types of changes - [X] New feature (non-breaking change which adds functionality) ## Checklist - [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 ## API Changes ### 1. New `/validate` Endpoint A new public endpoint was added for validating `server.json` files without publishing them. **Details:** - **Paths:** `/v0/validate` and `/v0.1/validate` - **Method:** `POST` - **Authentication:** None required (public endpoint) - **Request:** JSON body containing `ServerJSON` - **Response:** `200 OK` with `ValidationResult` containing: - `valid` (boolean) - `issues` (array of validation issues with type, path, message, severity, reference) **Implementation:** - New handler file: `internal/api/handlers/v0/validate.go` - Performs comprehensive validation using `ValidationAll` option: - Schema version validation - Full schema validation - Semantic validation - Always returns `200 OK` - validity is indicated in `result.Valid` field - Registered in router for both `/v0` and `/v0.1` prefixes ### 2. `/publish` Endpoint Validation Flow Changes The publish endpoint now validates earlier in the request flow and provides clearer error responses. **Before:** Validation was mixed into `ValidatePublishRequest()` (which also handled publisher extensions and registry ownership). **After:** 1. Validates `ServerJSON` structure first using `ValidateServerJSON()` (schema version + semantic validation) 2. Returns `422 Unprocessable Entity` with message: "Failed to publish server, invalid schema: call /validate for details" 3. Only proceeds to publisher extensions/registry validation if schema validation passes 4. No longer calls `ValidatePublishRequest()` internally for schema validation **Key Changes:** - Validation happens before `CreateServer()` call - Returns `422` on schema/semantic validation failures - Error message directs users to `/validate` endpoint for details - `ValidatePublishRequest()` no longer performs schema validation (added note in comments) ### 3. `/edit` Endpoint Validation Flow Changes Similar validation changes were applied to the edit endpoint. **Changes:** - Added `ValidateServerJSON()` call before server update - Returns `422` with same error message format on validation failure - Matches the `/publish` endpoint behavior ### 4. Validator Functions Refactoring Updated validator functions to reflect that schema validation is now done separately. **Changes to `ValidatePublishRequest()`:** - Removed internal `ValidateServerJSON()` call - Added note: "ValidateServerJSON should be called separately before this function" - Now only validates publisher extensions and registry ownership **Changes to `ValidateUpdateRequest()`:** - Same change (removed schema validation, added note) - Now only validates registry ownership ## CLI Changes ### 1. `validate` Command: Now Uses API Endpoint **Before:** Performed local validation using `validators.ValidateServerJSON()`. **After:** Calls the `/v0/validate` endpoint on the registry. **Details:** - Reads `server.json` and sends it to the registry API - Displays validation results returned by the server - Uses the same error formatting as before - Registry URL comes from token file (or default) - No authentication required (public endpoint) **Implementation:** - Added `validateViaAPI()` function that POSTs to `/v0/validate` - Parses `ValidationResult` response from server - Uses shared `printValidationIssues()` for formatting ### 2. `publish` Command: Validation Only on 422 Errors **Before:** Performed upfront local schema validation before publishing. **After:** Attempts publish first, then validates only if server returns 422. **Details:** - Attempts publish immediately (no upfront validation) - If publish returns 422 (Unprocessable Entity): - Calls `/v0/validate` endpoint to get detailed validation errors - Formats and displays them using same logic as `validate` command - Returns error with migration links - For non-422 errors (401, 403, etc.), returns original error (no validation call) **Implementation Changes:** - Removed upfront `runValidationAndPrintIssues()` call - Modified `publishToRegistry()` to return HTTP status code alongside response/error - Added 422 detection logic that calls `validateViaAPI()` ### 3. Shared Validation Error Formatting **Before:** `runValidationAndPrintIssues()` function handled both validation and printing together. **After:** Refactored to separate printing logic. **Details:** - Created `printValidationIssues()` function - just prints validation issues (no validation logic) - Removed `runValidationAndPrintIssues()` function (no longer used) - Both `validate` and `publish` commands use `printValidationIssues()` for consistent output **Behavior:** - Prints schema validation errors with migration guidance - Prints all other validation issues with formatting - Returns formatted error message string for schema issues ## Summary Both CLI commands now use the `/validate` API endpoint for validation instead of local validation. The `publish` command validates only after receiving a 422 error response, and both commands share the same error formatting via `printValidationIssues()`. ### Benefits - **Centralized validation logic** - All validation happens on the server - **Always up-to-date** - CLI always uses current server validation rules - **Consistent experience** - Same validation behavior whether using CLI or API directly - **Better separation of concerns** - Schema validation separated from publisher-specific validation
727 lines
23 KiB
Go
727 lines
23 KiB
Go
package validators
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"fmt"
|
|
"net/url"
|
|
"regexp"
|
|
"strings"
|
|
|
|
"github.com/modelcontextprotocol/registry/internal/config"
|
|
apiv0 "github.com/modelcontextprotocol/registry/pkg/api/v0"
|
|
"github.com/modelcontextprotocol/registry/pkg/model"
|
|
)
|
|
|
|
// Server name validation patterns
|
|
var (
|
|
// Component patterns for namespace and name parts
|
|
namespacePattern = `[a-zA-Z0-9][a-zA-Z0-9.-]*[a-zA-Z0-9]`
|
|
namePartPattern = `[a-zA-Z0-9][a-zA-Z0-9._-]*[a-zA-Z0-9]`
|
|
|
|
// Compiled regexes
|
|
namespaceRegex = regexp.MustCompile(`^` + namespacePattern + `$`)
|
|
namePartRegex = regexp.MustCompile(`^` + namePartPattern + `$`)
|
|
serverNameRegex = regexp.MustCompile(`^` + namespacePattern + `/` + namePartPattern + `$`)
|
|
)
|
|
|
|
// Regexes to detect semver range syntaxes
|
|
var (
|
|
// Case 1: comparator ranges
|
|
// - "^1.2.3",
|
|
// - "~1.2.3",
|
|
// - ">=1.0.0",
|
|
// - "<=1.0.0",
|
|
// - ">1.0.0",
|
|
// - "<1.0.0",
|
|
// - "=1.0.0",
|
|
comparatorRangeRe = regexp.MustCompile(`^\s*(?:\^|~|>=|<=|>|<|=)\s*v?\d+(?:\.\d+){0,3}(?:-[0-9A-Za-z.-]+)?\s*$`)
|
|
// Case 2: hyphen ranges
|
|
// - "1.2.3 - 2.0.0",
|
|
hyphenRangeRe = regexp.MustCompile(`^\s*v?\d+(?:\.\d+){0,3}(?:-[0-9A-Za-z.-]+)?\s-\s*v?\d+(?:\.\d+){0,3}(?:-[0-9A-Za-z.-]+)?\s*$`)
|
|
// Case 3: OR ranges
|
|
// - "1.2 || 1.3",
|
|
orRangeRe = regexp.MustCompile(`^\s*(?:v?\d+(?:\.\d+){0,3}(?:-[0-9A-Za-z.-]+)?\s*)(?:\|\|\s*v?\d+(?:\.\d+){0,3}(?:-[0-9A-Za-z.-]+)?\s*)+$`)
|
|
// Case 4: dotted version wildcards
|
|
// - "1.2.*",
|
|
// - "1.2.x",
|
|
// - "1.2.X",
|
|
// - "1.x",
|
|
// etc.
|
|
dottedVersionLikeRe = regexp.MustCompile(`^\s*(?:v?\d+|x|X|\*)(?:\.(?:\d+|x|X|\*)){1,2}(?:-[0-9A-Za-z.-]+)?\s*$`)
|
|
)
|
|
|
|
// ValidateServerJSON performs exhaustive validation and returns all issues found
|
|
// opts specifies which types of validation to perform. ValidateSchema implies ValidateSchemaVersion.
|
|
// Empty schema is always checked and always produces an error when schema validation is performed.
|
|
func ValidateServerJSON(serverJSON *apiv0.ServerJSON, opts ValidationOptions) *ValidationResult {
|
|
result := &ValidationResult{Valid: true, Issues: []ValidationIssue{}}
|
|
ctx := &ValidationContext{}
|
|
|
|
// Schema validation (version check and/or full validation)
|
|
if opts.ValidateSchemaVersion || opts.ValidateSchema {
|
|
schemaResult := validateServerJSONSchema(serverJSON, opts.ValidateSchema, opts.NonCurrentSchemaPolicy)
|
|
result.Merge(schemaResult)
|
|
}
|
|
|
|
// Semantic validation (only if requested)
|
|
if !opts.ValidateSemantic {
|
|
return result
|
|
}
|
|
|
|
// Validate server name exists and format
|
|
if _, err := parseServerName(*serverJSON); err != nil {
|
|
issue := NewValidationIssueFromError(
|
|
ValidationIssueTypeSemantic,
|
|
ctx.Field("name").String(),
|
|
err,
|
|
"invalid-server-name",
|
|
)
|
|
result.AddIssue(issue)
|
|
}
|
|
|
|
// Validate top-level server version is a specific version (not a range) & not "latest"
|
|
versionResult := validateVersion(ctx.Field("version"), serverJSON.Version)
|
|
result.Merge(versionResult)
|
|
|
|
// Validate repository
|
|
repoResult := validateRepository(ctx.Field("repository"), serverJSON.Repository)
|
|
result.Merge(repoResult)
|
|
|
|
// Validate website URL if provided
|
|
websiteResult := validateWebsiteURL(ctx.Field("websiteUrl"), serverJSON.WebsiteURL)
|
|
result.Merge(websiteResult)
|
|
|
|
// Validate title if provided
|
|
titleResult := validateTitle(ctx.Field("title"), serverJSON.Title)
|
|
result.Merge(titleResult)
|
|
|
|
// Validate icons if provided
|
|
iconsResult := validateIcons(ctx.Field("icons"), serverJSON.Icons)
|
|
result.Merge(iconsResult)
|
|
|
|
// Validate all packages (basic field validation)
|
|
// Detailed package validation (including registry checks) is done during publish
|
|
for i, pkg := range serverJSON.Packages {
|
|
pkgResult := validatePackageField(ctx.Field("packages").Index(i), &pkg)
|
|
result.Merge(pkgResult)
|
|
}
|
|
|
|
// Validate all remotes
|
|
for i, remote := range serverJSON.Remotes {
|
|
remoteResult := validateRemoteTransport(ctx.Field("remotes").Index(i), &remote)
|
|
result.Merge(remoteResult)
|
|
}
|
|
|
|
return result
|
|
}
|
|
|
|
func validateRepository(ctx *ValidationContext, obj *model.Repository) *ValidationResult {
|
|
result := &ValidationResult{Valid: true, Issues: []ValidationIssue{}}
|
|
|
|
// Skip validation if repository is nil or empty (optional field)
|
|
if obj == nil || (obj.URL == "" && obj.Source == "") {
|
|
return result
|
|
}
|
|
|
|
// validate the repository source
|
|
repoSource := RepositorySource(obj.Source)
|
|
if !IsValidRepositoryURL(repoSource, obj.URL) {
|
|
issue := NewValidationIssueFromError(
|
|
ValidationIssueTypeSemantic,
|
|
ctx.Field("url").String(),
|
|
fmt.Errorf("%w: %s", ErrInvalidRepositoryURL, obj.URL),
|
|
"invalid-repository-url",
|
|
)
|
|
result.AddIssue(issue)
|
|
}
|
|
|
|
// validate subfolder if present
|
|
if obj.Subfolder != "" && !IsValidSubfolderPath(obj.Subfolder) {
|
|
issue := NewValidationIssueFromError(
|
|
ValidationIssueTypeSemantic,
|
|
ctx.Field("subfolder").String(),
|
|
fmt.Errorf("%w: %s", ErrInvalidSubfolderPath, obj.Subfolder),
|
|
"invalid-subfolder-path",
|
|
)
|
|
result.AddIssue(issue)
|
|
}
|
|
|
|
return result
|
|
}
|
|
|
|
func validateWebsiteURL(ctx *ValidationContext, websiteURL string) *ValidationResult {
|
|
result := &ValidationResult{Valid: true, Issues: []ValidationIssue{}}
|
|
|
|
// Skip validation if website URL is not provided (optional field)
|
|
if websiteURL == "" {
|
|
return result
|
|
}
|
|
|
|
// Parse the URL to ensure it's valid
|
|
parsedURL, err := url.Parse(websiteURL)
|
|
if err != nil {
|
|
issue := NewValidationIssueFromError(
|
|
ValidationIssueTypeSemantic,
|
|
ctx.String(),
|
|
fmt.Errorf("invalid websiteUrl: %w", err),
|
|
"invalid-website-url",
|
|
)
|
|
result.AddIssue(issue)
|
|
return result
|
|
}
|
|
|
|
// Ensure it's an absolute URL with valid scheme
|
|
if !parsedURL.IsAbs() {
|
|
issue := NewValidationIssue(
|
|
ValidationIssueTypeSemantic,
|
|
ctx.String(),
|
|
fmt.Sprintf("websiteUrl must be absolute (include scheme): %s", websiteURL),
|
|
ValidationIssueSeverityError,
|
|
"website-url-must-be-absolute",
|
|
)
|
|
result.AddIssue(issue)
|
|
}
|
|
|
|
// Only allow HTTPS scheme for security
|
|
if parsedURL.Scheme != SchemeHTTPS {
|
|
issue := NewValidationIssue(
|
|
ValidationIssueTypeSemantic,
|
|
ctx.String(),
|
|
fmt.Sprintf("websiteUrl must use https scheme: %s", websiteURL),
|
|
ValidationIssueSeverityError,
|
|
"website-url-invalid-scheme",
|
|
)
|
|
result.AddIssue(issue)
|
|
}
|
|
|
|
return result
|
|
}
|
|
|
|
func validateTitle(ctx *ValidationContext, title string) *ValidationResult {
|
|
result := &ValidationResult{Valid: true, Issues: []ValidationIssue{}}
|
|
|
|
// Skip validation if title is not provided (optional field)
|
|
if title == "" {
|
|
return result
|
|
}
|
|
|
|
// Check that title is not only whitespace
|
|
if strings.TrimSpace(title) == "" {
|
|
issue := NewValidationIssueFromError(
|
|
ValidationIssueTypeSemantic,
|
|
ctx.String(),
|
|
fmt.Errorf("title cannot be only whitespace"),
|
|
"title-whitespace-only",
|
|
)
|
|
result.AddIssue(issue)
|
|
}
|
|
|
|
return result
|
|
}
|
|
|
|
func validateIcons(ctx *ValidationContext, icons []model.Icon) *ValidationResult {
|
|
result := &ValidationResult{Valid: true, Issues: []ValidationIssue{}}
|
|
|
|
// Skip validation if no icons are provided (optional field)
|
|
if len(icons) == 0 {
|
|
return result
|
|
}
|
|
|
|
// Validate each icon
|
|
for i, icon := range icons {
|
|
iconResult := validateIcon(ctx.Index(i), &icon)
|
|
result.Merge(iconResult)
|
|
}
|
|
|
|
return result
|
|
}
|
|
|
|
func validateIcon(ctx *ValidationContext, icon *model.Icon) *ValidationResult {
|
|
result := &ValidationResult{Valid: true, Issues: []ValidationIssue{}}
|
|
|
|
// Parse the URL to ensure it's valid
|
|
parsedURL, err := url.Parse(icon.Src)
|
|
if err != nil {
|
|
issue := NewValidationIssueFromError(
|
|
ValidationIssueTypeSemantic,
|
|
ctx.Field("src").String(),
|
|
fmt.Errorf("invalid icon src URL: %w", err),
|
|
"icon-src-invalid-url",
|
|
)
|
|
result.AddIssue(issue)
|
|
return result
|
|
}
|
|
|
|
// Ensure it's an absolute URL
|
|
if !parsedURL.IsAbs() {
|
|
issue := NewValidationIssueFromError(
|
|
ValidationIssueTypeSemantic,
|
|
ctx.Field("src").String(),
|
|
fmt.Errorf("icon src must be an absolute URL (include scheme): %s", icon.Src),
|
|
"icon-src-not-absolute",
|
|
)
|
|
result.AddIssue(issue)
|
|
}
|
|
|
|
// Only allow HTTPS scheme for security (no HTTP or data: URIs)
|
|
if parsedURL.Scheme != SchemeHTTPS {
|
|
issue := NewValidationIssueFromError(
|
|
ValidationIssueTypeSemantic,
|
|
ctx.Field("src").String(),
|
|
fmt.Errorf("icon src must use https scheme (got %s): %s", parsedURL.Scheme, icon.Src),
|
|
"icon-src-invalid-scheme",
|
|
)
|
|
result.AddIssue(issue)
|
|
}
|
|
|
|
return result
|
|
}
|
|
|
|
func validatePackageField(ctx *ValidationContext, obj *model.Package) *ValidationResult {
|
|
result := &ValidationResult{Valid: true, Issues: []ValidationIssue{}}
|
|
|
|
// Validate identifier has no spaces
|
|
if !HasNoSpaces(obj.Identifier) {
|
|
issue := NewValidationIssueFromError(
|
|
ValidationIssueTypeSemantic,
|
|
ctx.Field("identifier").String(),
|
|
ErrPackageNameHasSpaces,
|
|
"package-name-has-spaces",
|
|
)
|
|
result.AddIssue(issue)
|
|
}
|
|
|
|
// Validate version string
|
|
versionResult := validateVersion(ctx.Field("version"), obj.Version)
|
|
result.Merge(versionResult)
|
|
|
|
// Validate runtime arguments
|
|
for i, arg := range obj.RuntimeArguments {
|
|
argResult := validateArgument(ctx.Field("runtimeArguments").Index(i), &arg)
|
|
result.Merge(argResult)
|
|
}
|
|
|
|
// Validate package arguments
|
|
for i, arg := range obj.PackageArguments {
|
|
argResult := validateArgument(ctx.Field("packageArguments").Index(i), &arg)
|
|
result.Merge(argResult)
|
|
}
|
|
|
|
// Validate transport with template variable support
|
|
availableVariables := collectAvailableVariables(obj)
|
|
transportResult := validatePackageTransport(ctx.Field("transport"), &obj.Transport, availableVariables)
|
|
result.Merge(transportResult)
|
|
|
|
return result
|
|
}
|
|
|
|
// validateVersion validates the version string.
|
|
// NB: we decided that we would not enforce strict semver for version strings
|
|
func validateVersion(ctx *ValidationContext, version string) *ValidationResult {
|
|
result := &ValidationResult{Valid: true, Issues: []ValidationIssue{}}
|
|
|
|
if version == "latest" {
|
|
issue := NewValidationIssueFromError(
|
|
ValidationIssueTypeSemantic,
|
|
ctx.String(),
|
|
ErrReservedVersionString,
|
|
"reserved-version-string",
|
|
)
|
|
result.AddIssue(issue)
|
|
return result
|
|
}
|
|
|
|
// Reject semver range-like inputs
|
|
if looksLikeVersionRange(version) {
|
|
issue := NewValidationIssueFromError(
|
|
ValidationIssueTypeSemantic,
|
|
ctx.String(),
|
|
fmt.Errorf("%w: %q", ErrVersionLooksLikeRange, version),
|
|
"version-looks-like-range",
|
|
)
|
|
result.AddIssue(issue)
|
|
}
|
|
|
|
return result
|
|
}
|
|
|
|
// looksLikeVersionRange detects common semver range syntaxes and wildcard patterns.
|
|
// that indicate the value is not a single, specific version.
|
|
// Examples that should return true:
|
|
// - "^1.2.3",
|
|
// - "~1.2.3",
|
|
// - ">=1.0.0",
|
|
// - "1.x",
|
|
// - "1.2.*",
|
|
// - "1 - 2",
|
|
// - "1.2 || 1.3"
|
|
func looksLikeVersionRange(version string) bool {
|
|
trimmed := strings.TrimSpace(version)
|
|
if trimmed == "" {
|
|
return false
|
|
}
|
|
|
|
if comparatorRangeRe.MatchString(trimmed) {
|
|
return true
|
|
}
|
|
if hyphenRangeRe.MatchString(trimmed) {
|
|
return true
|
|
}
|
|
if orRangeRe.MatchString(trimmed) {
|
|
return true
|
|
}
|
|
if dottedVersionLikeRe.MatchString(trimmed) {
|
|
// wildcard in a dotted version (x/X/*) implies range-like intent
|
|
return strings.Contains(trimmed, "x") || strings.Contains(trimmed, "X") || strings.Contains(trimmed, "*")
|
|
}
|
|
return false
|
|
}
|
|
|
|
// validateArgument validates argument details
|
|
func validateArgument(ctx *ValidationContext, obj *model.Argument) *ValidationResult {
|
|
result := &ValidationResult{Valid: true, Issues: []ValidationIssue{}}
|
|
|
|
if obj.Type == model.ArgumentTypeNamed {
|
|
// Validate named argument name format
|
|
nameResult := validateNamedArgumentName(ctx.Field("name"), obj.Name)
|
|
result.Merge(nameResult)
|
|
|
|
// Validate value and default don't start with the name
|
|
valueResult := validateArgumentValueFields(ctx, obj.Name, obj.Value, obj.Default)
|
|
result.Merge(valueResult)
|
|
}
|
|
return result
|
|
}
|
|
|
|
func validateNamedArgumentName(ctx *ValidationContext, name string) *ValidationResult {
|
|
result := &ValidationResult{Valid: true, Issues: []ValidationIssue{}}
|
|
|
|
// Check if name is required for named arguments
|
|
if name == "" {
|
|
issue := NewValidationIssueFromError(
|
|
ValidationIssueTypeSemantic,
|
|
ctx.String(),
|
|
ErrNamedArgumentNameRequired,
|
|
"named-argument-name-required",
|
|
)
|
|
result.AddIssue(issue)
|
|
return result
|
|
}
|
|
|
|
// Check for invalid characters that suggest embedded values or descriptions
|
|
// Valid: "--directory", "--port", "-v", "config", "verbose"
|
|
// Invalid: "--directory <absolute_path_to_adfin_mcp_folder>", "--port 8080"
|
|
if strings.Contains(name, "<") || strings.Contains(name, ">") ||
|
|
strings.Contains(name, " ") || strings.Contains(name, "$") {
|
|
issue := NewValidationIssueFromError(
|
|
ValidationIssueTypeSemantic,
|
|
ctx.String(),
|
|
fmt.Errorf("%w: %s", ErrInvalidNamedArgumentName, name),
|
|
"invalid-named-argument-name",
|
|
)
|
|
result.AddIssue(issue)
|
|
}
|
|
|
|
return result
|
|
}
|
|
|
|
func validateArgumentValueFields(ctx *ValidationContext, name, value, defaultValue string) *ValidationResult {
|
|
result := &ValidationResult{Valid: true, Issues: []ValidationIssue{}}
|
|
|
|
// Check if value starts with the argument name (using startsWith, not contains)
|
|
if value != "" && strings.HasPrefix(value, name) {
|
|
issue := NewValidationIssueFromError(
|
|
ValidationIssueTypeSemantic,
|
|
ctx.Field("value").String(),
|
|
fmt.Errorf("%w: value starts with argument name '%s': %s", ErrArgumentValueStartsWithName, name, value),
|
|
"argument-value-starts-with-name",
|
|
)
|
|
result.AddIssue(issue)
|
|
}
|
|
|
|
if defaultValue != "" && strings.HasPrefix(defaultValue, name) {
|
|
issue := NewValidationIssueFromError(
|
|
ValidationIssueTypeSemantic,
|
|
ctx.Field("default").String(),
|
|
fmt.Errorf("%w: default starts with argument name '%s': %s", ErrArgumentDefaultStartsWithName, name, defaultValue),
|
|
"argument-default-starts-with-name",
|
|
)
|
|
result.AddIssue(issue)
|
|
}
|
|
|
|
return result
|
|
}
|
|
|
|
// collectAvailableVariables collects all available template variables from a package
|
|
func collectAvailableVariables(pkg *model.Package) []string {
|
|
var variables []string
|
|
|
|
// Add environment variable names
|
|
for _, env := range pkg.EnvironmentVariables {
|
|
variables = append(variables, env.Name)
|
|
}
|
|
|
|
// Add runtime argument names and value hints
|
|
for _, arg := range pkg.RuntimeArguments {
|
|
if arg.Name != "" {
|
|
variables = append(variables, arg.Name)
|
|
}
|
|
if arg.ValueHint != "" {
|
|
variables = append(variables, arg.ValueHint)
|
|
}
|
|
}
|
|
|
|
// Add package argument names and value hints
|
|
for _, arg := range pkg.PackageArguments {
|
|
if arg.Name != "" {
|
|
variables = append(variables, arg.Name)
|
|
}
|
|
if arg.ValueHint != "" {
|
|
variables = append(variables, arg.ValueHint)
|
|
}
|
|
}
|
|
|
|
return variables
|
|
}
|
|
|
|
// collectRemoteTransportVariables extracts available variable names from a remote transport
|
|
func collectRemoteTransportVariables(transport *model.Transport) []string {
|
|
var variables []string
|
|
|
|
// Add variable names from the Variables map
|
|
for variableName := range transport.Variables {
|
|
if variableName != "" {
|
|
variables = append(variables, variableName)
|
|
}
|
|
}
|
|
|
|
return variables
|
|
}
|
|
|
|
// validatePackageTransport validates a package's transport with templating support
|
|
func validatePackageTransport(ctx *ValidationContext, transport *model.Transport, availableVariables []string) *ValidationResult {
|
|
result := &ValidationResult{Valid: true, Issues: []ValidationIssue{}}
|
|
|
|
// Validate transport type is supported
|
|
switch transport.Type {
|
|
case model.TransportTypeStdio:
|
|
// Validate that URL is empty for stdio transport
|
|
if transport.URL != "" {
|
|
issue := NewValidationIssue(
|
|
ValidationIssueTypeSemantic,
|
|
ctx.Field("url").String(),
|
|
fmt.Sprintf("url must be empty for %s transport type, got: %s", transport.Type, transport.URL),
|
|
ValidationIssueSeverityError,
|
|
"stdio-transport-url-not-empty",
|
|
)
|
|
result.AddIssue(issue)
|
|
}
|
|
case model.TransportTypeStreamableHTTP, model.TransportTypeSSE:
|
|
// URL is required for streamable-http and sse
|
|
if transport.URL == "" {
|
|
issue := NewValidationIssue(
|
|
ValidationIssueTypeSemantic,
|
|
ctx.Field("url").String(),
|
|
fmt.Sprintf("url is required for %s transport type", transport.Type),
|
|
ValidationIssueSeverityError,
|
|
"streamable-transport-url-required",
|
|
)
|
|
result.AddIssue(issue)
|
|
} else if !IsValidTemplatedURL(transport.URL, availableVariables) {
|
|
// Check if it's a template variable issue or basic URL issue
|
|
templateVars := extractTemplateVariables(transport.URL)
|
|
var err error
|
|
if len(templateVars) > 0 {
|
|
err = fmt.Errorf("%w: template variables in URL %s reference undefined variables. Available variables: %v",
|
|
ErrInvalidPackageTransportURL, transport.URL, availableVariables)
|
|
} else {
|
|
err = fmt.Errorf("%w: %s", ErrInvalidPackageTransportURL, transport.URL)
|
|
}
|
|
issue := NewValidationIssueFromError(
|
|
ValidationIssueTypeSemantic,
|
|
ctx.Field("url").String(),
|
|
err,
|
|
"invalid-templated-url",
|
|
)
|
|
result.AddIssue(issue)
|
|
}
|
|
default:
|
|
issue := NewValidationIssue(
|
|
ValidationIssueTypeSemantic,
|
|
ctx.Field("type").String(),
|
|
fmt.Sprintf("unsupported transport type: %s", transport.Type),
|
|
ValidationIssueSeverityError,
|
|
"unsupported-transport-type",
|
|
)
|
|
result.AddIssue(issue)
|
|
}
|
|
|
|
return result
|
|
}
|
|
|
|
// validateRemoteTransport validates a remote transport with optional templating
|
|
func validateRemoteTransport(ctx *ValidationContext, obj *model.Transport) *ValidationResult {
|
|
result := &ValidationResult{Valid: true, Issues: []ValidationIssue{}}
|
|
|
|
// Validate transport type is supported - remotes only support streamable-http and sse
|
|
switch obj.Type {
|
|
case model.TransportTypeStreamableHTTP, model.TransportTypeSSE:
|
|
// URL is required for streamable-http and sse
|
|
if obj.URL == "" {
|
|
issue := NewValidationIssue(
|
|
ValidationIssueTypeSemantic,
|
|
ctx.Field("url").String(),
|
|
fmt.Sprintf("url is required for %s transport type", obj.Type),
|
|
ValidationIssueSeverityError,
|
|
"remote-transport-url-required",
|
|
)
|
|
result.AddIssue(issue)
|
|
} else if !IsValidRemoteURL(obj.URL) {
|
|
// Validate URL format (no templates allowed for remotes, no localhost)
|
|
issue := NewValidationIssueFromError(
|
|
ValidationIssueTypeSemantic,
|
|
ctx.Field("url").String(),
|
|
fmt.Errorf("%w: %s", ErrInvalidRemoteURL, obj.URL),
|
|
"invalid-remote-url",
|
|
)
|
|
result.AddIssue(issue)
|
|
}
|
|
|
|
// Collect available variables from the transport's Variables field
|
|
availableVariables := collectRemoteTransportVariables(obj)
|
|
|
|
// Validate URL format with template variable support
|
|
if !IsValidTemplatedURL(obj.URL, availableVariables) {
|
|
// Check if it's a template variable issue or basic URL issue
|
|
templateVars := extractTemplateVariables(obj.URL)
|
|
var err error
|
|
if len(templateVars) > 0 {
|
|
err = fmt.Errorf("%w: template variables in URL %s reference undefined variables. Available variables: %v",
|
|
ErrInvalidRemoteURL, obj.URL, availableVariables)
|
|
} else {
|
|
err = fmt.Errorf("%w: %s", ErrInvalidRemoteURL, obj.URL)
|
|
}
|
|
issue := NewValidationIssueFromError(
|
|
ValidationIssueTypeSemantic,
|
|
ctx.Field("url").String(),
|
|
err,
|
|
"invalid-templated-url",
|
|
)
|
|
result.AddIssue(issue)
|
|
}
|
|
return result
|
|
default:
|
|
issue := NewValidationIssue(
|
|
ValidationIssueTypeSemantic,
|
|
ctx.Field("type").String(),
|
|
fmt.Sprintf("unsupported transport type for remotes: %s (only streamable-http and sse are supported)", obj.Type),
|
|
ValidationIssueSeverityError,
|
|
"unsupported-remote-transport-type",
|
|
)
|
|
result.AddIssue(issue)
|
|
}
|
|
|
|
return result
|
|
}
|
|
|
|
// ValidatePublishRequest validates a complete publish request including extensions
|
|
// Note: ValidateServerJSON should be called separately before this function
|
|
func ValidatePublishRequest(ctx context.Context, req apiv0.ServerJSON, cfg *config.Config) error {
|
|
// Validate publisher extensions in _meta
|
|
if err := validatePublisherExtensions(req); err != nil {
|
|
return err
|
|
}
|
|
|
|
// Validate registry ownership for all packages if validation is enabled
|
|
if cfg.EnableRegistryValidation {
|
|
if err := validateRegistryOwnership(ctx, req); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// ValidateUpdateRequest validates an update request including registry ownership
|
|
// Note: ValidateServerJSON should be called separately before this function
|
|
func ValidateUpdateRequest(ctx context.Context, req apiv0.ServerJSON, cfg *config.Config, skipRegistryValidation bool) error {
|
|
if cfg.EnableRegistryValidation && !skipRegistryValidation {
|
|
if err := validateRegistryOwnership(ctx, req); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func validateRegistryOwnership(ctx context.Context, req apiv0.ServerJSON) error {
|
|
for i, pkg := range req.Packages {
|
|
if err := ValidatePackage(ctx, pkg, req.Name); err != nil {
|
|
return fmt.Errorf("registry validation failed for package %d (%s): %w", i, pkg.Identifier, err)
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func validatePublisherExtensions(req apiv0.ServerJSON) error {
|
|
const maxExtensionSize = 4 * 1024 // 4KB limit
|
|
|
|
// Check size limit for _meta publisher-provided extension
|
|
if req.Meta != nil && req.Meta.PublisherProvided != nil {
|
|
extensionsJSON, err := json.Marshal(req.Meta.PublisherProvided)
|
|
if err != nil {
|
|
return fmt.Errorf("failed to marshal _meta.io.modelcontextprotocol.registry/publisher-provided extension: %w", err)
|
|
}
|
|
if len(extensionsJSON) > maxExtensionSize {
|
|
return fmt.Errorf("_meta.io.modelcontextprotocol.registry/publisher-provided extension exceeds 4KB limit (%d bytes)", len(extensionsJSON))
|
|
}
|
|
}
|
|
|
|
// Note: ServerJSON._meta only contains PublisherProvided data
|
|
// Official registry metadata is handled separately in the response structure
|
|
|
|
return nil
|
|
}
|
|
|
|
func parseServerName(serverJSON apiv0.ServerJSON) (string, error) {
|
|
name := serverJSON.Name
|
|
if name == "" {
|
|
return "", fmt.Errorf("server name is required and must be a string")
|
|
}
|
|
|
|
// Validate format: dns-namespace/name
|
|
if !strings.Contains(name, "/") {
|
|
return "", fmt.Errorf("server name must be in format 'dns-namespace/name' (e.g., 'com.example.api/server')")
|
|
}
|
|
|
|
// Check for multiple slashes - reject if found
|
|
slashCount := strings.Count(name, "/")
|
|
if slashCount > 1 {
|
|
return "", ErrMultipleSlashesInServerName
|
|
}
|
|
|
|
// Split and check for empty parts
|
|
parts := strings.SplitN(name, "/", 2)
|
|
if len(parts) != 2 || parts[0] == "" || parts[1] == "" {
|
|
return "", fmt.Errorf("server name must be in format 'dns-namespace/name' with non-empty namespace and name parts")
|
|
}
|
|
|
|
// Validate name format using regex
|
|
if !serverNameRegex.MatchString(name) {
|
|
namespace := parts[0]
|
|
serverName := parts[1]
|
|
|
|
// Check which part is invalid for a better error message
|
|
if !namespaceRegex.MatchString(namespace) {
|
|
return "", fmt.Errorf("%w: namespace '%s' is invalid. Namespace must start and end with alphanumeric characters, and may contain dots and hyphens in the middle", ErrInvalidServerNameFormat, namespace)
|
|
}
|
|
if !namePartRegex.MatchString(serverName) {
|
|
return "", fmt.Errorf("%w: name '%s' is invalid. Name must start and end with alphanumeric characters, and may contain dots, underscores, and hyphens in the middle", ErrInvalidServerNameFormat, serverName)
|
|
}
|
|
// Fallback in case both somehow pass individually but not together
|
|
return "", fmt.Errorf("%w: invalid format for '%s'", ErrInvalidServerNameFormat, name)
|
|
}
|
|
|
|
return name, nil
|
|
}
|