c36b521bf1## Summary - add a publisher preflight that rejects non-UTF-8 `server.json` bytes before parsing - reject unpaired UTF-16 surrogate escapes inside JSON string fields before publish/validate requests are sent - keep valid non-ASCII descriptions, including em dashes, round-tripping through the publish path - make the publisher test token helper set `USERPROFILE` as well as `HOME` so Windows tests use the temp home directory Closes #1306. ## To verify - `go test ./cmd/publisher/commands -run "TestPublishCommand_(Success|PreservesNonASCIIDescription|RejectsInvalidUTF8ServerJSON|RejectsUnpairedSurrogateEscape)$" -count=1` - `go test ./cmd/publisher/commands -run TestPublishCommand -count=1` - `go test ./cmd/publisher/commands -run TestValidateCommand -count=1` - `git diff --check` Co-authored-by: Radoslav Dimitrov <radoslav@stacklok.com>
118 lines
3.1 KiB
Go
118 lines
3.1 KiB
Go
package commands_test
|
|
|
|
import (
|
|
"encoding/json"
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"os"
|
|
"path/filepath"
|
|
"testing"
|
|
|
|
"github.com/modelcontextprotocol/registry/internal/validators"
|
|
apiv0 "github.com/modelcontextprotocol/registry/pkg/api/v0"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
// SetupMockRegistryServer creates an httptest.Server that mocks the registry API
|
|
func SetupMockRegistryServer(t *testing.T, publishHandler func(w http.ResponseWriter, r *http.Request), validateHandler func(w http.ResponseWriter, r *http.Request)) *httptest.Server {
|
|
t.Helper()
|
|
|
|
mux := http.NewServeMux()
|
|
|
|
// Default handlers if not provided
|
|
if publishHandler == nil {
|
|
publishHandler = func(w http.ResponseWriter, _ *http.Request) {
|
|
w.WriteHeader(http.StatusCreated)
|
|
response := apiv0.ServerResponse{
|
|
Server: apiv0.ServerJSON{
|
|
Name: "com.example/test",
|
|
Version: "1.0.0",
|
|
},
|
|
}
|
|
_ = json.NewEncoder(w).Encode(response)
|
|
}
|
|
}
|
|
|
|
if validateHandler == nil {
|
|
validateHandler = func(w http.ResponseWriter, _ *http.Request) {
|
|
w.Header().Set("Content-Type", "application/json")
|
|
result := validators.ValidationResult{Valid: true}
|
|
_ = json.NewEncoder(w).Encode(result)
|
|
}
|
|
}
|
|
|
|
mux.HandleFunc("/v0/publish", func(w http.ResponseWriter, r *http.Request) {
|
|
if r.Method != http.MethodPost {
|
|
w.WriteHeader(http.StatusMethodNotAllowed)
|
|
return
|
|
}
|
|
publishHandler(w, r)
|
|
})
|
|
|
|
mux.HandleFunc("/v0/validate", func(w http.ResponseWriter, r *http.Request) {
|
|
if r.Method != http.MethodPost {
|
|
w.WriteHeader(http.StatusMethodNotAllowed)
|
|
return
|
|
}
|
|
validateHandler(w, r)
|
|
})
|
|
|
|
server := httptest.NewServer(mux)
|
|
t.Cleanup(server.Close)
|
|
|
|
return server
|
|
}
|
|
|
|
// SetupTestToken creates a token file pointing to the test server.
|
|
// It overrides $HOME to a temp directory so tests don't touch real credentials.
|
|
func SetupTestToken(t *testing.T, registryURL, token string) string {
|
|
t.Helper()
|
|
|
|
// Override the home directory so tokenFilePath() resolves to a temp directory.
|
|
tempHome := t.TempDir()
|
|
t.Setenv("HOME", tempHome)
|
|
t.Setenv("USERPROFILE", tempHome)
|
|
|
|
dir := filepath.Join(tempHome, ".config", "mcp-publisher")
|
|
require.NoError(t, os.MkdirAll(dir, 0700))
|
|
|
|
tokenPath := filepath.Join(dir, "token.json")
|
|
tokenData := map[string]string{
|
|
"token": token,
|
|
"registry": registryURL,
|
|
}
|
|
|
|
data, err := json.Marshal(tokenData)
|
|
require.NoError(t, err)
|
|
|
|
err = os.WriteFile(tokenPath, data, 0600)
|
|
require.NoError(t, err)
|
|
|
|
return tokenPath
|
|
}
|
|
|
|
// CreateTestServerJSON creates a server.json file in a temp directory and changes to it
|
|
func CreateTestServerJSON(t *testing.T, serverJSON apiv0.ServerJSON) (string, string) {
|
|
t.Helper()
|
|
|
|
tempDir, err := os.MkdirTemp("", "mcp-publisher-test")
|
|
require.NoError(t, err)
|
|
t.Cleanup(func() { os.RemoveAll(tempDir) })
|
|
|
|
jsonData, err := json.MarshalIndent(serverJSON, "", " ")
|
|
require.NoError(t, err)
|
|
|
|
serverFile := filepath.Join(tempDir, "server.json")
|
|
err = os.WriteFile(serverFile, jsonData, 0600)
|
|
require.NoError(t, err)
|
|
|
|
// Change to temp directory
|
|
originalDir, err := os.Getwd()
|
|
require.NoError(t, err)
|
|
t.Cleanup(func() { _ = os.Chdir(originalDir) })
|
|
|
|
err = os.Chdir(tempDir)
|
|
require.NoError(t, err)
|
|
|
|
return tempDir, serverFile
|
|
}
|