Update for working PyPi, Nuget and Docker validation

🏠 Remote-Dev: homespace

Author: domdomegg

docs/publisher/guide.md

@@ -88,18 +88,15 @@ The official MCP registry currently only supports the NPM public registry (`http
 <summary><strong>🐍 PyPI Packages</strong></summary>
 
 ### Requirements
-Add an `MCP` project URL to your `pyproject.toml`:
+Include your server name in your package README file using this format:
 
-```toml
-[project.urls]
-Homepage = "https://github.com/you/your-project"
-MCP = "io.github.username/server-name"
-```
+**MCP name format**: `mcp-name: io.github.username/server-name`
+
+Add it to your README.md file (which becomes the package description on PyPI).
 
 ### How It Works
 - Registry fetches `https://pypi.org/pypi/your-package/json`
-- Checks that `project_urls["MCP"]` matches your server name
-- Fails if MCP URL is missing or doesn't match
+- Passes if `mcp-name: server-name` is in the README content
 
 ### Example server.json
 ```json
@@ -123,24 +120,15 @@ The official MCP registry currently only supports the official PyPI registry (`h
 <summary><strong>📋 NuGet Packages</strong></summary>
 
 ### Requirements
-Add an `<mcp-name>` element to your `.nuspec` file:
-
-```xml
-<package>
-  <metadata>
-    <id>Your.NuGet.Package</id>
-    <version>1.0.0</version>
-    <mcp-name>io.github.username/server-name</mcp-name>
-    <!-- other metadata -->
-  </metadata>
-</package>
-```
+Include your server name in your package's README using this format:
+
+**MCP name format**: `mcp-name: io.github.username/server-name`
+
+Add a README file to your NuGet package that includes the server name.
 
 ### How It Works
-- Registry fetches `.nuspec` file directly from NuGet API
-- Uses URL pattern: `https://api.nuget.org/v3-flatcontainer/{id}/{version}/{id}.nuspec`
-- Checks that `<mcp-name>` element matches your server name
-- Fails if element is missing or doesn't match
+- Registry fetches README from `https://api.nuget.org/v3-flatcontainer/{id}/{version}/readme`
+- Passes if `mcp-name: server-name` is found in the README content
 
 ### Example server.json
 ```json

internal/validators/registries/mcpb_test.go

@@ -19,6 +19,12 @@ func TestValidateMCPB(t *testing.T) {
 		expectError  bool
 		errorMessage string
 	}{
+		{
+			name:        "valid MCPB package should pass",
+			packageName: "https://github.com/domdomegg/airtable-mcp-server/releases/download/v1.7.2/airtable-mcp-server.mcpb",
+			serverName:  "io.github.domdomegg/airtable-mcp-server",
+			expectError: false,
+		},
 		{
 			name:        "valid MCPB package should pass",
 			packageName: "https://github.com/microsoft/playwright-mcp/releases/download/v0.0.36/playwright-mcp-extension-v0.0.36.zip",

internal/validators/registries/npm.go

@@ -23,13 +23,13 @@ func ValidateNPM(ctx context.Context, pkg model.Package, serverName string) erro
 	}
 
 	client := &http.Client{Timeout: 10 * time.Second}
-	
-	url := baseURL + "/" + pkg.Identifier
+
+	url := baseURL + "/" + pkg.Identifier + "/" + pkg.Version
 	req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, 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")
 
@@ -57,4 +57,4 @@ func ValidateNPM(ctx context.Context, pkg model.Package, serverName string) erro
 	}
 
 	return nil
-}
+}

internal/validators/registries/npm_test.go

@@ -37,12 +37,35 @@ func TestValidateNPM_RealPackages(t *testing.T) {
 			errorMessage: "missing required 'mcpName' field",
 		},
 		{
-			name:         "real package with different mcpName should fail",
+			name:         "real package without mcpName should fail",
 			packageName:  "lodash", // Another popular package
 			version:      "4.17.21",
 			serverName:   "com.example/completely-different-name",
 			expectError:  true,
-			errorMessage: "missing required 'mcpName' field", // Will fail because lodash doesn't have mcpName
+			errorMessage: "missing required 'mcpName' field",
+		},
+		{
+			name:         "real package without mcpName should fail",
+			packageName:  "airtable-mcp-server",
+			version:      "1.5.0",
+			serverName:   "io.github.domdomegg/airtable-mcp-server",
+			expectError:  true,
+			errorMessage: "missing required 'mcpName' field",
+		},
+		{
+			name:         "real package with incorrect mcpName should fail",
+			packageName:  "airtable-mcp-server",
+			version:      "1.7.2",
+			serverName:   "io.github.not-domdomegg/airtable-mcp-server",
+			expectError:  true,
+			errorMessage: "Expected mcpName 'io.github.not-domdomegg/airtable-mcp-server', got 'io.github.domdomegg/airtable-mcp-server'",
+		},
+		{
+			name:        "real package with correct mcpName should pass",
+			packageName: "airtable-mcp-server",
+			version:     "1.7.2",
+			serverName:  "io.github.domdomegg/airtable-mcp-server",
+			expectError: false,
 		},
 	}
 
@@ -64,4 +87,4 @@ func TestValidateNPM_RealPackages(t *testing.T) {
 			}
 		})
 	}
-}
+}

internal/validators/registries/nuget.go

@@ -2,27 +2,15 @@ package registries
 
 import (
 	"context"
-	"encoding/xml"
 	"fmt"
+	"io"
 	"net/http"
 	"strings"
 	"time"
 
 	"github.com/modelcontextprotocol/registry/pkg/model"
 )
 
-// NuSpecMetadata represents the metadata section of a .nuspec file
-type NuSpecMetadata struct {
-	XMLName xml.Name `xml:"metadata"`
-	MCPName string   `xml:"mcp-name"`
-}
-
-// NuSpecPackage represents the root element of a .nuspec file
-type NuSpecPackage struct {
-	XMLName  xml.Name       `xml:"package"`
-	Metadata NuSpecMetadata `xml:"metadata"`
-}
-
 // ValidateNuGet validates that a NuGet package contains the correct MCP server name
 func ValidateNuGet(ctx context.Context, pkg model.Package, serverName string) error {
 	baseURL := pkg.RegistryBaseURL
@@ -38,8 +26,9 @@ func ValidateNuGet(ctx context.Context, pkg model.Package, serverName string) er
 		return fmt.Errorf("NuGet package validation requires a specific version, but none was provided")
 	}
 
-	url := fmt.Sprintf("%s/v3-flatcontainer/%s/%s/%s.nuspec", baseURL, lowerID, lowerVersion, lowerID)
-	req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)
+	// Try to get README from the package
+	readmeURL := fmt.Sprintf("%s/v3-flatcontainer/%s/%s/readme", baseURL, lowerID, lowerVersion)
+	req, err := http.NewRequestWithContext(ctx, http.MethodGet, readmeURL, nil)
 	if err != nil {
 		return fmt.Errorf("failed to create request: %w", err)
 	}
@@ -48,26 +37,25 @@ func ValidateNuGet(ctx context.Context, pkg model.Package, serverName string) er
 
 	resp, err := client.Do(req)
 	if err != nil {
-		return fmt.Errorf("failed to fetch .nuspec from NuGet: %w", err)
+		return fmt.Errorf("failed to fetch README from NuGet: %w", err)
 	}
 	defer resp.Body.Close()
 
-	if resp.StatusCode != http.StatusOK {
-		return fmt.Errorf("NuGet package '%s' version '%s' not found (status: %d)", pkg.Identifier, pkg.Version, resp.StatusCode)
-	}
-
-	var nuspec NuSpecPackage
-	if err := xml.NewDecoder(resp.Body).Decode(&nuspec); err != nil {
-		return fmt.Errorf("failed to parse .nuspec metadata: %w", err)
-	}
+	if resp.StatusCode == http.StatusOK {
+		// Check README content
+		readmeBytes, err := io.ReadAll(resp.Body)
+		if err != nil {
+			return fmt.Errorf("failed to read README content: %w", err)
+		}
 
-	if nuspec.Metadata.MCPName == "" {
-		return fmt.Errorf("NuGet package '%s' is missing required '<mcp-name>' element. Add this to your .nuspec: <mcp-name>%s</mcp-name>", pkg.Identifier, serverName)
-	}
+		readmeContent := string(readmeBytes)
 
-	if nuspec.Metadata.MCPName != serverName {
-		return fmt.Errorf("NuGet package ownership validation failed. Expected mcp-name '%s', got '%s'", serverName, nuspec.Metadata.MCPName)
+		// Check for mcp-name: format (more specific)
+		mcpNamePattern := "mcp-name: " + serverName
+		if strings.Contains(readmeContent, mcpNamePattern) {
+			return nil // Found as mcp-name: format
+		}
 	}
 
-	return nil
+	return fmt.Errorf("NuGet package '%s' ownership validation failed. The server name '%s' must appear as 'mcp-name: %s' in the package README. Add it to your package README", pkg.Identifier, serverName, serverName)
 }

internal/validators/registries/nuget_test.go

@@ -26,7 +26,7 @@ func TestValidateNuGet_RealPackages(t *testing.T) {
 			version:      "1.0.0",
 			serverName:   "com.example/test",
 			expectError:  true,
-			errorMessage: "not found",
+			errorMessage: "ownership validation failed",
 		},
 		{
 			name:         "real package without version should fail",
@@ -42,15 +42,30 @@ func TestValidateNuGet_RealPackages(t *testing.T) {
 			version:      "999.999.999", // Version that doesn't exist
 			serverName:   "com.example/test",
 			expectError:  true,
-			errorMessage: "not found",
+			errorMessage: "ownership validation failed",
 		},
 		{
-			name:         "real package without mcp-name should fail",
+			name:         "real package without server name in README should fail",
 			packageName:  "Newtonsoft.Json",
 			version:      "13.0.3", // Popular version
 			serverName:   "com.example/test",
 			expectError:  true,
-			errorMessage: "missing required '<mcp-name>' element",
+			errorMessage: "ownership validation failed",
+		},
+		{
+			name:         "real package without server name in README should fail",
+			packageName:  "TimeMcpServer",
+			version:      "1.0.0",
+			serverName:   "io.github.domdomegg/time-mcp-server",
+			expectError:  true,
+			errorMessage: "ownership validation failed",
+		},
+		{
+			name:        "real package with server name in README should pass",
+			packageName: "TimeMcpServer",
+			version:     "1.0.2",
+			serverName:  "io.github.domdomegg/time-mcp-server",
+			expectError: false,
 		},
 	}
 
@@ -72,4 +87,4 @@ func TestValidateNuGet_RealPackages(t *testing.T) {
 			}
 		})
 	}
-}
+}