a100367461## Summary - Add URL encoding for package identifiers and versions in NPM registry requests - Fixes issue where scoped packages like @hellocoop/admin-mcp failed validation due to unencoded @ and / symbols - Add unit tests for scoped NPM packages to prevent regression Fixes #409 Co-authored-by: Radoslav Dimitrov <radoslav@stacklok.com>
79 lines
2.5 KiB
Go
79 lines
2.5 KiB
Go
package registries
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"fmt"
|
|
"net/http"
|
|
"net/url"
|
|
"time"
|
|
|
|
"github.com/modelcontextprotocol/registry/pkg/model"
|
|
)
|
|
|
|
// NPMPackageResponse represents the structure returned by the NPM registry API
|
|
type NPMPackageResponse struct {
|
|
MCPName string `json:"mcpName"`
|
|
}
|
|
|
|
// ValidateNPM validates that an NPM package contains the correct MCP server name
|
|
func ValidateNPM(ctx context.Context, pkg model.Package, serverName string) error {
|
|
// Set default registry base URL if empty
|
|
if pkg.RegistryBaseURL == "" {
|
|
pkg.RegistryBaseURL = model.RegistryURLNPM
|
|
}
|
|
|
|
if pkg.Identifier == "" {
|
|
return fmt.Errorf("package identifier is required for NPM packages")
|
|
}
|
|
|
|
// we need version to look up the package metadata
|
|
// not providing version will return all the versions
|
|
// and we won't be able to validate the mcpName field
|
|
// against the server name
|
|
if pkg.Version == "" {
|
|
return fmt.Errorf("package version is required for NPM packages")
|
|
}
|
|
|
|
// Validate that the registry base URL matches NPM exactly
|
|
if pkg.RegistryBaseURL != model.RegistryURLNPM {
|
|
return fmt.Errorf("registry type and base URL do not match: '%s' is not valid for registry type '%s'. Expected: %s",
|
|
pkg.RegistryBaseURL, model.RegistryTypeNPM, model.RegistryURLNPM)
|
|
}
|
|
|
|
client := &http.Client{Timeout: 10 * time.Second}
|
|
|
|
requestURL := pkg.RegistryBaseURL + "/" + url.PathEscape(pkg.Identifier) + "/" + url.PathEscape(pkg.Version)
|
|
req, err := http.NewRequestWithContext(ctx, http.MethodGet, requestURL, nil)
|
|
if err != nil {
|
|
return fmt.Errorf("failed to create request: %w", err)
|
|
}
|
|
|
|
req.Header.Set("User-Agent", "MCP-Registry-Validator/1.0")
|
|
req.Header.Set("Accept", "application/json")
|
|
|
|
resp, err := client.Do(req)
|
|
if err != nil {
|
|
return fmt.Errorf("failed to fetch package metadata from NPM: %w", err)
|
|
}
|
|
defer resp.Body.Close()
|
|
|
|
if resp.StatusCode != http.StatusOK {
|
|
return fmt.Errorf("NPM package '%s' not found (status: %d)", pkg.Identifier, resp.StatusCode)
|
|
}
|
|
|
|
var npmResp NPMPackageResponse
|
|
if err := json.NewDecoder(resp.Body).Decode(&npmResp); err != nil {
|
|
return fmt.Errorf("failed to parse NPM package metadata: %w", err)
|
|
}
|
|
|
|
if npmResp.MCPName == "" {
|
|
return fmt.Errorf("NPM package '%s' is missing required 'mcpName' field. Add this to your package.json: \"mcpName\": \"%s\"", pkg.Identifier, serverName)
|
|
}
|
|
|
|
if npmResp.MCPName != serverName {
|
|
return fmt.Errorf("NPM package ownership validation failed. Expected mcpName '%s', got '%s'", serverName, npmResp.MCPName)
|
|
}
|
|
|
|
return nil
|
|
}
|