Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions cmd/mcpproxy-tray/internal/api/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -586,9 +586,9 @@ func (c *Client) GetServers() ([]Server, error) {
func (c *Client) EnableServer(serverName string, enabled bool) error {
var endpoint string
if enabled {
endpoint = fmt.Sprintf("/api/v1/servers/%s/enable", serverName)
endpoint = fmt.Sprintf("/api/v1/servers/%s/enable", url.PathEscape(serverName))
} else {
endpoint = fmt.Sprintf("/api/v1/servers/%s/disable", serverName)
endpoint = fmt.Sprintf("/api/v1/servers/%s/disable", url.PathEscape(serverName))
}

resp, err := c.makeRequest("POST", endpoint, nil)
Expand All @@ -605,7 +605,7 @@ func (c *Client) EnableServer(serverName string, enabled bool) error {

// RestartServer restarts a server
func (c *Client) RestartServer(serverName string) error {
endpoint := fmt.Sprintf("/api/v1/servers/%s/restart", serverName)
endpoint := fmt.Sprintf("/api/v1/servers/%s/restart", url.PathEscape(serverName))

resp, err := c.makeRequest("POST", endpoint, nil)
if err != nil {
Expand Down Expand Up @@ -640,7 +640,7 @@ func (c *Client) ForceReconnectAllServers(reason string) error {

// TriggerOAuthLogin triggers OAuth login for a server
func (c *Client) TriggerOAuthLogin(serverName string) error {
endpoint := fmt.Sprintf("/api/v1/servers/%s/login", serverName)
endpoint := fmt.Sprintf("/api/v1/servers/%s/login", url.PathEscape(serverName))

resp, err := c.makeRequest("POST", endpoint, nil)
if err != nil {
Expand Down Expand Up @@ -713,7 +713,7 @@ func (c *Client) SetActiveProfile(name string) error {

// GetServerTools gets tools for a specific server
func (c *Client) GetServerTools(serverName string) ([]Tool, error) {
endpoint := fmt.Sprintf("/api/v1/servers/%s/tools", serverName)
endpoint := fmt.Sprintf("/api/v1/servers/%s/tools", url.PathEscape(serverName))

resp, err := c.makeRequest("GET", endpoint, nil)
if err != nil {
Expand Down Expand Up @@ -754,7 +754,7 @@ func (c *Client) GetServerTools(serverName string) ([]Tool, error) {

// QuarantineServer places a server in quarantine
func (c *Client) QuarantineServer(serverName string) error {
endpoint := fmt.Sprintf("/api/v1/servers/%s/quarantine", serverName)
endpoint := fmt.Sprintf("/api/v1/servers/%s/quarantine", url.PathEscape(serverName))

resp, err := c.makeRequest("POST", endpoint, nil)
if err != nil {
Expand Down
48 changes: 48 additions & 0 deletions cmd/mcpproxy-tray/internal/api/server_path_escape_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
package api

import (
"net/http"
"net/http/httptest"
"testing"

"go.uber.org/zap"
)

// Official-registry server ids are namespace/name; the core decodes a
// %2F-encoded {id} on /api/v1/servers/{id}/* (MCP-1118), so the tray has to
// send one for the menu actions to reach the right server.
func TestClientServerActions_EscapeSlashServerName(t *testing.T) {
const (
name = "io.github.owner/repo"
enc = "/api/v1/servers/io.github.owner%2Frepo"
)

var got string
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
got = r.URL.EscapedPath()
w.Header().Set("Content-Type", "application/json")
_, _ = w.Write([]byte(`{"success":true,"data":{}}`))
}))
defer server.Close()

client := &Client{baseURL: server.URL, httpClient: server.Client(), logger: zap.NewNop().Sugar()}

for _, tc := range []struct {
name string
call func() error
want string
}{
{"enable", func() error { return client.EnableServer(name, true) }, enc + "/enable"},
{"disable", func() error { return client.EnableServer(name, false) }, enc + "/disable"},
{"restart", func() error { return client.RestartServer(name) }, enc + "/restart"},
{"login", func() error { return client.TriggerOAuthLogin(name) }, enc + "/login"},
{"tools", func() error { _, err := client.GetServerTools(name); return err }, enc + "/tools"},
{"quarantine", func() error { return client.QuarantineServer(name) }, enc + "/quarantine"},
} {
got = ""
_ = tc.call()
if got != tc.want {
t.Errorf("%s: request path = %q, want %q", tc.name, got, tc.want)
}
}
}
Loading