{mcp} Add MCP Proxy Server with OAuth Authentication

.github/workflows/go.yml

@@ -11,7 +11,7 @@ jobs:
   build:
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-13, windows-latest]
+        os: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     environment: CI
     steps:

main/main.go

@@ -26,6 +26,7 @@ import (
 	"github.com/aliyun/aliyun-cli/v3/config"
 	go_migrate "github.com/aliyun/aliyun-cli/v3/go-migrate"
 	"github.com/aliyun/aliyun-cli/v3/i18n"
+	"github.com/aliyun/aliyun-cli/v3/mcpproxy"
 	"github.com/aliyun/aliyun-cli/v3/openapi"
 	"github.com/aliyun/aliyun-cli/v3/oss/lib"
 	"github.com/aliyun/aliyun-cli/v3/ossutil"
@@ -76,6 +77,8 @@ func Main(args []string) {
 	rootCmd.AddSubCommand(lib.NewOssCommand())
 	rootCmd.AddSubCommand(cli.NewVersionCommand())
 	rootCmd.AddSubCommand(cli.NewAutoCompleteCommand())
+	// mcp proxy command
+	rootCmd.AddSubCommand(mcpproxy.NewMCPProxyCommand())
 	// go v1 to v2 migrate command
 	rootCmd.AddSubCommand(go_migrate.NewGoMigrateCommand())
 	// new oss command

mcpproxy/command.go

@@ -0,0 +1,260 @@
+// Copyright (c) 2009-present, Alibaba Cloud All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package mcpproxy
+
+import (
+	"encoding/json"
+	"fmt"
+	"net/url"
+	"os"
+	"os/signal"
+	"strconv"
+	"syscall"
+
+	"github.com/aliyun/aliyun-cli/v3/cli"
+	"github.com/aliyun/aliyun-cli/v3/i18n"
+)
+
+func NewMCPProxyCommand() *cli.Command {
+	cmd := &cli.Command{
+		Name:  "mcp-proxy",
+		Short: i18n.T("Start MCP server proxy", "启动 MCP 服务器代理"),
+		Long: i18n.T(
+			"Start a local proxy server for Aliyun API MCP Servers. "+
+				"The proxy handles OAuth authentication automatically, "+
+				"allowing MCP clients to connect without managing credentials.",
+			"启动阿里云 API MCP Server 的本地代理服务。"+
+				"代理自动处理 OAuth 认证，"+
+				"允许 MCP 客户端无需管理凭证即可连接。",
+		),
+		Usage:  "aliyun mcp-proxy [--port PORT] [--host HOST] [--region-type REGION_TYPE] [--upstream-url URL] [--oauth-app-name NAME]",
+		Sample: "aliyun mcp-proxy --region-type CN --port 8088",
+		Run: func(ctx *cli.Context, args []string) error {
+			return runMCPProxy(ctx)
+		},
+	}
+
+	cmd.Flags().Add(&cli.Flag{
+		Name:         "port",
+		DefaultValue: "8088",
+		Short: i18n.T(
+			"Proxy server port",
+			"代理服务器端口",
+		),
+	})
+
+	cmd.Flags().Add(&cli.Flag{
+		Name:         "host",
+		DefaultValue: "127.0.0.1",
+		Short: i18n.T(
+			"Proxy server host (use 0.0.0.0 to listen on all interfaces)",
+			"代理服务器地址 (使用 0.0.0.0 监听所有网络接口)",
+		),
+	})
+
+	cmd.Flags().Add(&cli.Flag{
+		Name:         "region-type",
+		DefaultValue: "CN",
+		Short: i18n.T(
+			"Region type: CN or INTL",
+			"地域类型: CN 或 INTL",
+		),
+	})
+
+	cmd.Flags().Add(&cli.Flag{
+		Name: "no-browser",
+		Short: i18n.T(
+			"Disable automatic browser opening. Use manual code input mode instead",
+			"使用手动输入授权码模式，不自动打开浏览器",
+		),
+	})
+
+	cmd.Flags().Add(&cli.Flag{
+		Name:         "scope",
+		DefaultValue: "/acs/mcp-server",
+		Short: i18n.T(
+			"OAuth predefined scope (default: /acs/mcp-server)",
+			"OAuth 预定义权限范围（默认: /acs/mcp-server）",
+		),
+	})
+
+	cmd.Flags().Add(&cli.Flag{
+		Name: "upstream-url",
+		Short: i18n.T(
+			"Custom upstream MCP server URL (overrides EndpointMap configuration)",
+			"自定义上游 MCP 服务器地址（覆盖 EndpointMap 配置）",
+		),
+	})
+
+	cmd.Flags().Add(&cli.Flag{
+		Name: "oauth-app-name",
+		Short: i18n.T(
+			"Use existing OAuth application by name (for users without create permission)",
+			"使用已存在的 OAuth 应用名称（适用于没有创建权限的用户）",
+		),
+	})
+
+	return cmd
+}
+
+// ProxyConfig 封装了启动 MCP Proxy 所需的所有配置参数
+type StartProxyConfig struct {
+	McpProfile  *McpProfile
+	RegionType  RegionType
+	Host        string
+	Port        int
+	NoBrowser   bool
+	Scope       string
+	UpstreamURL string
+}
+
+func runMCPProxy(ctx *cli.Context) error {
+	portStr := ctx.Flags().Get("port").GetStringOrDefault("8088")
+	host := ctx.Flags().Get("host").GetStringOrDefault("127.0.0.1")
+	regionStr := ctx.Flags().Get("region-type").GetStringOrDefault("CN")
+	port, err := strconv.Atoi(portStr)
+	if err != nil {
+		return fmt.Errorf("invalid port: %s", portStr)
+	}
+	var regionType RegionType
+	switch regionStr {
+	case "CN":
+		regionType = RegionCN
+	case "INTL":
+		regionType = RegionINTL
+	default:
+		return fmt.Errorf("invalid region type: %s, must be CN or INTL", regionStr)
+	}
+
+	noBrowser := ctx.Flags().Get("no-browser").IsAssigned()
+	scope := ctx.Flags().Get("scope").GetStringOrDefault("/acs/mcp-server")
+	upstreamURL := ctx.Flags().Get("upstream-url").GetStringOrDefault("")
+	oauthAppName := ctx.Flags().Get("oauth-app-name").GetStringOrDefault("")
+
+	proxyConfig := ProxyConfig{
+		Host:            host,
+		Port:            port,
+		RegionType:      regionType,
+		Scope:           scope,
+		AutoOpenBrowser: !noBrowser,
+		UpstreamBaseURL: upstreamURL,
+		OAuthAppName:    oauthAppName,
+	}
+
+	mcpProfile, err := getOrCreateMCPProfile(ctx, proxyConfig)
+	if err != nil {
+		return err
+	}
+	proxyConfig.McpProfile = mcpProfile
+	return startMCPProxy(ctx, proxyConfig)
+}
+
+func startMCPProxy(ctx *cli.Context, config ProxyConfig) error {
+	servers, err := ListMCPServers(ctx, config.RegionType)
+	if err != nil {
+		return fmt.Errorf("failed to list MCP servers: %w", err)
+	}
+
+	if len(servers) == 0 {
+		return fmt.Errorf("no MCP servers found")
+	}
+
+	config.CallbackManager = NewOAuthCallbackManager()
+	config.ExistMcpServers = servers
+
+	proxy := NewMCPProxy(config)
+	go proxy.TokenRefresher.Start()
+
+	printProxyInfo(ctx, proxy)
+
+	// 设置信号处理，捕获 Ctrl+C (SIGINT) 和 SIGTERM
+	sigChan := make(chan os.Signal, 1)
+	signal.Notify(sigChan, os.Interrupt, syscall.SIGTERM)
+
+	// 在 goroutine 中启动服务器
+	serverErrChan := make(chan error, 1)
+	go func() {
+		if err := proxy.Start(); err != nil {
+			serverErrChan <- err
+		}
+	}()
+
+	// 等待信号、服务器错误或致命错误
+	select {
+	case sig := <-sigChan:
+		cli.Printf(ctx.Stdout(), "\nReceived signal: %v, shutting down gracefully...\n", sig)
+		if proxy.TokenRefresher != nil {
+			proxy.TokenRefresher.Stop()
+		}
+		if err := proxy.Stop(); err != nil {
+			// 如果是超时错误，记录日志但不返回错误，因为服务器已经关闭
+			cli.Printf(ctx.Stderr(), "Warning: %v\n", err)
+		}
+		cli.Println(ctx.Stdout(), "MCP Proxy stopped successfully")
+		return nil
+	case err := <-serverErrChan:
+		return err
+	case fatalErr := <-proxy.TokenRefresher.fatalErrCh:
+		cli.Printf(ctx.Stderr(), "\nFatal error: %v\n", fatalErr)
+		cli.Printf(ctx.Stdout(), "Shutting down gracefully...\n")
+		if proxy.TokenRefresher != nil {
+			proxy.TokenRefresher.Stop()
+		}
+		if err := proxy.Stop(); err != nil {
+			cli.Printf(ctx.Stderr(), "Warning: %v\n", err)
+		}
+		return fatalErr
+	}
+}
+
+func printProxyInfo(ctx *cli.Context, proxy *MCPProxy) {
+	cli.Printf(ctx.Stdout(), "\nMCP Proxy Server Started\nListen: %s:%d\nRegion: %s\n",
+		proxy.Host, proxy.Port, proxy.RegionType)
+
+	cli.Println(ctx.Stdout(), "\nAvailable Servers:")
+	for _, server := range proxy.ExistMcpServers {
+		cli.Printf(ctx.Stdout(), "  - %s\n", server.Name)
+		if server.Urls.MCP != "" {
+			if upstreamURL, err := url.Parse(server.Urls.MCP); err == nil {
+				cli.Printf(ctx.Stdout(), "    MCP: http://%s:%d%s\n", proxy.Host, proxy.Port, upstreamURL.Path)
+			}
+		}
+		if server.Urls.SSE != "" {
+			if upstreamURL, err := url.Parse(server.Urls.SSE); err == nil {
+				cli.Printf(ctx.Stdout(), "    SSE: http://%s:%d%s\n", proxy.Host, proxy.Port, upstreamURL.Path)
+			}
+		}
+	}
+
+	cli.Println(ctx.Stdout(), "\nPress Ctrl+C to stop")
+}
+
+func GetContentFromApiResponse(response map[string]any) ([]byte, error) {
+	responseBody := response["body"]
+	if responseBody == nil {
+		return nil, fmt.Errorf("response body is nil")
+	}
+	switch v := responseBody.(type) {
+	case string:
+		return []byte(v), nil
+	case map[string]any, []any:
+		jsonData, _ := json.Marshal(v)
+		return jsonData, nil
+	case []byte:
+		return v, nil
+	default:
+		return []byte(fmt.Sprintf("%v", v)), nil
+	}
+}