registry/internal/validators/registries/cargo_test.go
Radoslav Dimitrov 04623ed925
fix(validators): harden mcp-name matching (PyPI/NuGet anchoring, comment-form safe) + cargo follow-ups (#1331)
Registry-wide hardening of the `mcp-name:` ownership-token match, plus
the cargo follow-up fixes from the #1330 review — consolidated here per
maintainer request. Rebased onto current `main` (the merged #1330 cargo
commit drops out), so the diff is just the net-new work.

### Changes
- **PyPI/NuGet: boundary-anchored token match.** Replace
`strings.Contains(readme, "mcp-name: "+name)` with the shared
`containsMCPNameToken`, so a README declaring a longer name
(`…/widget-pro`) no longer satisfies an ownership claim for a shorter
prefix (`…/widget`). (Cargo already got this in #1330; NPM is unaffected
— it compares an exact metadata field.)
- **Matcher: treat the HTML comment close as a boundary.** `<!--
mcp-name: NAME-->` / `<!--mcp-name: NAME-->` (any spacing) validate
again — the documented hidden-comment form for PyPI/NuGet — while a
genuine longer name (`…/widget--pro`) still does not.
- **Cargo hardening (review of #1330):** pin scheme+port (not just host)
on the README fetch and redirects; a rate-limited/failed crate-version
existence probe now reports *transient* instead of "not found"; a 403
with the crate present no longer flatly asserts "no README".
- **Docs:** note the token must be followed by a boundary.

### ⚠️ Behavior change for PyPI/NuGet — read before merging
The match is **strictly stricter** (verified by fuzz, 2.3M execs: it can
only flip pass→fail, never fail→pass). After the comment-close fix, the
**only** forms that newly fail are unusual *inline* ones: the token
ending a sentence (`…/my-mcp.`) or glued to a trailing `/`. The
documented forms (own line, in `<!-- … -->`) are unaffected.

**Correcting an earlier claim:** this re-validates on **edits too**, not
just new versions — `edit.go → UpdateServer → ValidateUpdateRequest →
validateRegistryOwnership` runs the token check on any edit of a live
server (only delete-transitions skip it). So an existing PyPI/NuGet
server whose README uses one of the breaking inline forms would fail on
its next publish *or* edit. Given the v0.1 API-freeze posture, this
should land as a deliberate, noted change.

### Testing
`go build`, `vet`, `gofmt`, `golangci-lint` (prod files),
`check-schema`, `validate-examples` all clean. Hermetic + **live**
PyPI/NuGet/cargo suite passes. New: `TestCargoURLAllowed`, a
combined-fixture probe-429→transient case, comment-form matcher cases,
and `FuzzContainsMCPNameToken` (the strictly-stricter property, 2.3M
execs).

🤖 Generated with [Claude Code](https://claude.com/claude-code)

---------

Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-05 02:28:41 -04:00

538 lines
19 KiB
Go

package registries_test
import (
"context"
"encoding/json"
"fmt"
"net/http"
"net/http/httptest"
"net/url"
"strings"
"sync/atomic"
"testing"
"github.com/modelcontextprotocol/registry/internal/validators/registries"
"github.com/modelcontextprotocol/registry/pkg/model"
"github.com/stretchr/testify/assert"
)
func TestValidateCargo_RealPackages(t *testing.T) {
ctx := context.Background()
tests := []struct {
name string
packageName string
version string
serverName string
expectError bool
errorMessage string
}{
{
name: "empty package identifier should fail",
packageName: "",
version: "0.1.0",
serverName: "io.github.example/test",
expectError: true,
errorMessage: "package identifier is required for Cargo packages",
},
{
name: "empty package version should fail",
packageName: "rust-faf-mcp",
version: "",
serverName: "io.github.example/test",
expectError: true,
errorMessage: "package version is required for Cargo packages",
},
{
name: "non-existent crate should fail",
packageName: generateRandomPackageName(),
version: "0.1.0",
serverName: "io.github.example/test",
expectError: true,
errorMessage: "not found",
},
{
name: "non-existent version of real crate should fail",
packageName: "serde",
version: "99.99.99-not-real",
serverName: "io.github.example/test",
expectError: true,
errorMessage: "not found",
},
{
name: "real crate without mcp-name token should fail",
packageName: "serde", // most-downloaded crate; no MCP server claim
version: "1.0.219",
serverName: "io.github.example/test",
expectError: true,
errorMessage: "ownership validation failed",
},
{
name: "real crate with mismatched mcp-name should fail",
packageName: "tokio",
version: "1.40.0",
serverName: "io.github.example/completely-different-name",
expectError: true,
errorMessage: "ownership validation failed",
},
{
name: "additional real crate without mcp-name (rand)",
packageName: "rand",
version: "0.9.0",
serverName: "io.github.example/test",
expectError: true,
errorMessage: "ownership validation failed",
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
pkg := model.Package{
RegistryType: model.RegistryTypeCargo,
Identifier: tt.packageName,
Version: tt.version,
}
err := registries.ValidateCargo(ctx, pkg, tt.serverName)
if tt.expectError {
assert.Error(t, err)
assert.Contains(t, err.Error(), tt.errorMessage)
} else {
assert.NoError(t, err)
}
})
}
}
func TestValidateCargo_RegistryBaseURLMismatch(t *testing.T) {
ctx := context.Background()
tests := []struct {
name string
baseURL string
}{
{name: "different host", baseURL: "https://example.com"},
{name: "trailing slash", baseURL: "https://crates.io/"},
{name: "http (not https)", baseURL: "http://crates.io"},
{name: "subdomain", baseURL: "https://www.crates.io"},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
pkg := model.Package{
RegistryType: model.RegistryTypeCargo,
RegistryBaseURL: tt.baseURL,
Identifier: "rust-faf-mcp",
Version: "0.2.2",
}
err := registries.ValidateCargo(ctx, pkg, "io.github.Wolfe-Jam/rust-faf-mcp")
assert.Error(t, err)
assert.Contains(t, err.Error(), "registry type and base URL do not match")
})
}
}
func TestValidateCargo_RejectsMCPBOnlyFields(t *testing.T) {
ctx := context.Background()
pkg := model.Package{
RegistryType: model.RegistryTypeCargo,
Identifier: "rust-faf-mcp",
Version: "0.2.2",
FileSHA256: "0000000000000000000000000000000000000000000000000000000000000000",
}
err := registries.ValidateCargo(ctx, pkg, "io.github.Wolfe-Jam/rust-faf-mcp")
assert.Error(t, err)
assert.Contains(t, err.Error(), "cargo packages must not have 'fileSha256' field")
}
// Server names follow io.github.OWNER/REPO and may contain dots, slashes,
// hyphens, underscores, and digits. None of these get HTML-escaped during
// README rendering, so a boundary-anchored match against the rendered HTML is
// reliable. This is a hermetic POSITIVE test: each format variation is placed in
// a mock README as the exact mcp-name token and must validate successfully, so
// it actually exercises the match (the earlier version used a token-less live
// crate, where every case failed and the assertion was satisfied trivially).
func TestValidateCargo_ServerNameFormats(t *testing.T) {
ctx := context.Background()
tests := []struct {
name string
serverName string
}{
{name: "canonical io.github format", serverName: "io.github.Wolfe-Jam/rust-faf-mcp"},
{name: "multiple hyphens", serverName: "io.github.example/multi-hyphen-test-name"},
{name: "underscore", serverName: "io.github.example/snake_case_name"},
{name: "numeric suffix", serverName: "io.github.example/server-v2"},
{name: "dotted name segment", serverName: "io.github.example/group.tool"},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
serverName := tt.serverName
var mock *httptest.Server
mock = httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
if strings.HasSuffix(r.URL.Path, "/readme") {
w.Header().Set("Content-Type", "application/json")
_ = json.NewEncoder(w).Encode(map[string]string{"url": mock.URL + "/static-readme"})
return
}
// Token on its own line; the trailing newline is the boundary.
fmt.Fprintf(w, "<html><body>\nmcp-name: %s\n</body></html>", serverName)
}))
defer mock.Close()
pkg := model.Package{
RegistryType: model.RegistryTypeCargo,
RegistryBaseURL: mock.URL,
Identifier: "fmt-crate",
Version: "0.1.0",
}
err := registries.ValidateCargoREADME(ctx, pkg, serverName)
assert.NoError(t, err, "server name %q should validate when present as an exact mcp-name token", serverName)
})
}
}
// TestValidateCargo_PositivePathMock exercises the success branch: a README
// that contains the exact mcp-name token must return no error. Uses httptest
// to stand in for crates.io, so the test is hermetic — it doesn't depend on
// any live crate publishing a specific mcp-name line or on network reachability.
// Calls the test-only ValidateCargoREADME shim so the mock URL can take the
// place of https://crates.io without tripping the exact-baseURL guard.
func TestValidateCargo_PositivePathMock(t *testing.T) {
ctx := context.Background()
const serverName = "io.github.test/positive-path"
var mock *httptest.Server
mock = httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
if strings.HasSuffix(r.URL.Path, "/readme") {
w.Header().Set("Content-Type", "application/json")
// Encode of a static map cannot fail; ignore the error rather than
// calling t.Fatalf from this (server) goroutine, which is not the test
// goroutine and would truncate the response instead of failing cleanly.
_ = json.NewEncoder(w).Encode(map[string]string{"url": mock.URL + "/static-readme"})
return
}
// Rendered README HTML containing the mcp-name token.
fmt.Fprintf(w, "<html><body><p>some content</p><p>mcp-name: %s</p></body></html>", serverName)
}))
defer mock.Close()
pkg := model.Package{
RegistryType: model.RegistryTypeCargo,
RegistryBaseURL: mock.URL,
Identifier: "test-crate",
Version: "0.1.0",
}
err := registries.ValidateCargoREADME(ctx, pkg, serverName)
assert.NoError(t, err, "validator should accept a README containing the exact mcp-name token")
}
// TestValidateCargo_LivePositivePath is the live anchor — it validates against
// rust-faf-mcp v0.3.1 on real crates.io, the first crate published with the
// mcp-name token as visible markdown (v0.3.0 used a hidden HTML comment, which
// crates.io strips during README rendering — see package-types.mdx for the
// cargo-specific gotcha). Complements TestValidateCargo_PositivePathMock:
// the mock proves the validator works in principle (hermetic, fast); the live
// anchor proves it works against the real crates.io API + static CDN pipeline.
//
// If this test ever starts failing, check (in order):
// 1. Has rust-faf-mcp v0.3.1 been yanked or replaced?
// 2. Did crates.io change its README rendering pipeline (e.g., start
// stripping markdown lines that look like email-like tokens)?
// 3. Is the test machine network-blocked from crates.io or static.crates.io?
func TestValidateCargo_LivePositivePath(t *testing.T) {
ctx := context.Background()
pkg := model.Package{
RegistryType: model.RegistryTypeCargo,
Identifier: "rust-faf-mcp",
Version: "0.3.1",
}
err := registries.ValidateCargo(ctx, pkg, "io.github.Wolfe-Jam/rust-faf-mcp")
assert.NoError(t, err, "validator should accept the live rust-faf-mcp v0.3.1 crate (the canonical live anchor for cargo positive-path)")
}
// TestValidateCargo_TransientUpstreamError exercises the 5xx-as-transient branch:
// a 502/503 from static.crates.io is upstream availability, not "crate missing",
// and the error message must signal a retryable failure rather than imply the
// crate doesn't exist (the previous behavior, flagged in PR #1207 review).
func TestValidateCargo_TransientUpstreamError(t *testing.T) {
ctx := context.Background()
var mock *httptest.Server
mock = httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
if strings.HasSuffix(r.URL.Path, "/readme") {
w.Header().Set("Content-Type", "application/json")
_ = json.NewEncoder(w).Encode(map[string]string{
"url": mock.URL + "/static-readme",
})
return
}
// Simulate static.crates.io 502 — upstream blip, not a missing crate.
http.Error(w, "bad gateway", http.StatusBadGateway)
}))
defer mock.Close()
pkg := model.Package{
RegistryType: model.RegistryTypeCargo,
RegistryBaseURL: mock.URL,
Identifier: "test-crate",
Version: "0.1.0",
}
err := registries.ValidateCargoREADME(ctx, pkg, "io.github.test/transient")
assert.Error(t, err)
assert.Contains(t, err.Error(), "transient")
assert.NotContains(t, err.Error(), "not found", "transient upstream errors should not be reported as 'not found'")
}
// TestValidateCargo_RejectsForeignReadmeHost is the SSRF guard: the README
// pointer returned by the metadata endpoint must be on an allowed host. Here the
// (mock) metadata endpoint points the README at an unrelated host; the validator
// must refuse to fetch it rather than follow the pointer anywhere crates.io names.
// The ".invalid" host never resolves, so a regression that dropped the host check
// would fail to connect rather than silently pass — but the assertion targets the
// explicit "unexpected host" refusal, which happens before any fetch.
func TestValidateCargo_RejectsForeignReadmeHost(t *testing.T) {
ctx := context.Background()
mock := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
w.Header().Set("Content-Type", "application/json")
_ = json.NewEncoder(w).Encode(map[string]string{"url": "http://internal.invalid/secret-readme"})
}))
defer mock.Close()
pkg := model.Package{
RegistryType: model.RegistryTypeCargo,
RegistryBaseURL: mock.URL,
Identifier: "evil-crate",
Version: "0.1.0",
}
err := registries.ValidateCargoREADME(ctx, pkg, "io.github.test/evil")
assert.Error(t, err)
assert.Contains(t, err.Error(), "unexpected host", "a README URL on a foreign host must be refused (SSRF guard)")
}
// TestValidateCargoCombinedFixture exercises path-encoding and the full status
// matrix in one httptest fixture — the same pattern praised by @P4ST4S on
// PR #1321 for Go modules. One server dispatches on the crate identifier
// embedded in the URL path; wrong encoding routes to the fallback 500, which
// breaks the appropriate assertion. The explicit path assertion (assert.Equal
// on lastMetaPath) also catches encoding regressions directly.
func TestValidateCargoCombinedFixture(t *testing.T) {
ctx := context.Background()
const serverName = "io.github.test/combined"
tests := []struct {
name string
crateName string
version string
metaStatus int
readmeStatus int
readmeBody string
versionExists bool // response for the /api/v1/crates/{n}/{v} existence probe (403 disambiguation)
versionProbe int // if non-zero, the existence probe returns this status (overrides versionExists)
wantErr bool
wantContains []string
wantNotContains []string
}{
{
name: "happy_path_visible_token",
crateName: "combined-happy",
version: "0.1.0",
metaStatus: http.StatusOK,
readmeStatus: http.StatusOK,
readmeBody: fmt.Sprintf("<html><body><p>mcp-name: %s</p></body></html>", serverName),
},
{
// Defensive branch: crates.io's metadata endpoint returns 200 (with a
// CDN url) even for missing crates, so it does NOT 404 in practice for a
// missing crate — the real missing-crate path is readme_403_missing below.
// This case only covers what we'd report if the API ever did 404.
name: "metadata_404_defensive",
crateName: "combined-meta404",
version: "0.1.0",
metaStatus: http.StatusNotFound,
wantErr: true,
wantContains: []string{"metadata fetch failed", "status: 404"},
},
{
// Real missing-crate/version path: CDN 403 + existence probe 404.
name: "readme_403_missing",
crateName: "combined-readme403-missing",
version: "0.1.0",
metaStatus: http.StatusOK,
readmeStatus: http.StatusForbidden,
versionExists: false,
wantErr: true,
wantContains: []string{"not found"},
wantNotContains: []string{"has no rendered README"},
},
{
// Crate/version exists but the README CDN 403s: existence probe 200.
// Must NOT be reported as "not found", and must not flatly assert the
// README is absent (a 403 isn't definitive proof of that).
name: "readme_403_no_readme",
crateName: "combined-readme403-noreadme",
version: "0.1.0",
metaStatus: http.StatusOK,
readmeStatus: http.StatusForbidden,
versionExists: true,
wantErr: true,
wantContains: []string{"exists on crates.io", "could not be retrieved"},
wantNotContains: []string{"not found"},
},
{
// CDN 403 + the existence probe itself is rate-limited (429): existence
// is undetermined, so report transient/retryable, NOT "not found".
name: "readme_403_probe_transient",
crateName: "combined-readme403-probe429",
version: "0.1.0",
metaStatus: http.StatusOK,
readmeStatus: http.StatusForbidden,
versionProbe: http.StatusTooManyRequests,
wantErr: true,
wantContains: []string{"transient"},
wantNotContains: []string{"not found"},
},
{
name: "readme_429_transient",
crateName: "combined-readme429",
version: "0.1.0",
metaStatus: http.StatusOK,
readmeStatus: http.StatusTooManyRequests,
wantErr: true,
wantContains: []string{"transient"},
wantNotContains: []string{"not found"},
},
{
name: "readme_502_transient",
crateName: "combined-readme502",
version: "0.1.0",
metaStatus: http.StatusOK,
readmeStatus: http.StatusBadGateway,
wantErr: true,
wantContains: []string{"transient"},
wantNotContains: []string{"not found"},
},
{
// Prefix confusion: README declares a LONGER name; a claim for the
// shorter serverName must be rejected by the boundary-anchored match.
name: "prefix_confusion_rejected",
crateName: "combined-prefix",
version: "0.1.0",
metaStatus: http.StatusOK,
readmeStatus: http.StatusOK,
readmeBody: fmt.Sprintf("<html><body><p>mcp-name: %s-extended</p></body></html>", serverName),
wantErr: true,
wantContains: []string{"ownership validation failed"},
},
{
// Token present but glued to a trailing period — the error must explain
// the boundary cause, not tell the publisher to add a token they can see.
name: "glued_trailing_period_explained",
crateName: "combined-glued",
version: "0.1.0",
metaStatus: http.StatusOK,
readmeStatus: http.StatusOK,
readmeBody: fmt.Sprintf("<html><body><p>mcp-name: %s.</p></body></html>", serverName),
wantErr: true,
wantContains: []string{"immediately followed by", `"."`},
},
}
// lastMetaPath captures the metadata request path seen by the handler so
// each sub-test can assert the exact url.PathEscape-encoded form.
var lastMetaPath atomic.Value
lastMetaPath.Store("")
var srv *httptest.Server
srv = httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
for i := range tests {
tt := &tests[i]
metaPath := fmt.Sprintf("/api/v1/crates/%s/%s/readme",
url.PathEscape(tt.crateName), url.PathEscape(tt.version))
versionPath := fmt.Sprintf("/api/v1/crates/%s/%s",
url.PathEscape(tt.crateName), url.PathEscape(tt.version))
staticPath := "/readme-static/" + url.PathEscape(tt.crateName)
if r.URL.Path == metaPath {
lastMetaPath.Store(r.URL.Path)
if tt.metaStatus != http.StatusOK {
http.Error(w, "simulated non-200", tt.metaStatus)
return
}
w.Header().Set("Content-Type", "application/json")
_ = json.NewEncoder(w).Encode(map[string]string{"url": srv.URL + staticPath})
return
}
// Existence probe used to disambiguate a README 403.
if r.URL.Path == versionPath {
switch {
case tt.versionProbe != 0:
http.Error(w, "simulated probe status", tt.versionProbe)
case tt.versionExists:
w.Header().Set("Content-Type", "application/json")
_ = json.NewEncoder(w).Encode(map[string]any{"version": map[string]string{"num": tt.version}})
default:
http.Error(w, "not found", http.StatusNotFound)
}
return
}
if r.URL.Path == staticPath {
if tt.readmeStatus != http.StatusOK {
http.Error(w, "simulated non-200", tt.readmeStatus)
return
}
fmt.Fprint(w, tt.readmeBody)
return
}
}
http.Error(w, "unexpected path: "+r.URL.Path, http.StatusInternalServerError)
}))
defer srv.Close()
for i := range tests {
tt := tests[i]
lastMetaPath.Store("")
t.Run(tt.name, func(t *testing.T) {
wantMetaPath := fmt.Sprintf("/api/v1/crates/%s/%s/readme",
url.PathEscape(tt.crateName), url.PathEscape(tt.version))
pkg := model.Package{
RegistryType: model.RegistryTypeCargo,
RegistryBaseURL: srv.URL,
Identifier: tt.crateName,
Version: tt.version,
}
err := registries.ValidateCargoREADME(ctx, pkg, serverName)
// Assert encode step: the validator must have requested exactly the
// url.PathEscape-encoded path; wrong encoding hits the fallback 500.
assert.Equal(t, wantMetaPath, lastMetaPath.Load().(string),
"meta request path must be exactly the url.PathEscape-encoded form")
if tt.wantErr {
assert.Error(t, err)
for _, want := range tt.wantContains {
assert.Contains(t, err.Error(), want)
}
for _, notWant := range tt.wantNotContains {
assert.NotContains(t, err.Error(), notWant)
}
} else {
assert.NoError(t, err)
}
})
}
}