jiazhizhong/higress
1
0
Fork 0
mirror of https://github.com/alibaba/higress.git synced 2026-03-08 02:30:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add security schema for nacos mcp (#2847)

Browse Source
This commit is contained in:
EricaLiu
2025-09-01 15:23:04 +08:00
committed by GitHub
parent 9a12f0b593
commit 020b5f3984
2 changed files with 73 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
registry/mcp_model.go
View File

@@ -47,17 +47,25 @@ type McpServerRule struct {
}
type ServerConfig struct {
Name string `json:"name,omitempty"`
Config map[string]interface{} `json:"config,omitempty"`
Name string `json:"name,omitempty"`
Config map[string]interface{} `json:"config,omitempty"`
SecuritySchemes []*SecuritySchemes `json:"securitySchemes,omitempty"`
}
type McpTool struct {
Name string `json:"name,omitempty"`
Description string `json:"description,omitempty"`
Args []*ToolArgs `json:"args,omitempty"`
RequestTemplate *RequestTemplate `json:"requestTemplate"`
ResponseTemplate *ResponseTemplate `json:"responseTemplate"`
ErrorResponseTemplate string `json:"errorResponseTemplate,omitempty"`
Name string `json:"name,omitempty"`
Description string `json:"description,omitempty"`
Args []*ToolArgs `json:"args,omitempty"`
RequestTemplate *RequestTemplate `json:"requestTemplate"`
ResponseTemplate *ResponseTemplate `json:"responseTemplate"`
ErrorResponseTemplate string `json:"errorResponseTemplate,omitempty"`
Security *ToolSecurity `json:"security"`
}
type ToolSecurity struct {
Id string `json:"type,omitempty"`
PassThrough bool `json:"passthrough,omitempty"`
Credential string `json:"credential"`
}
type ToolArgs struct {
@@ -80,6 +88,7 @@ type RequestTemplate struct {
ArgsToJsonBody bool `json:"argsToJsonBody,omitempty"`
ArgsToUrlParam bool `json:"argsToUrlParam,omitempty"`
ArgsToFormBody bool `json:"argsToFormBody,omitempty"`
Security *ToolSecurity `json:"security,omitempty"`
}
type RequestTemplateHeaders struct {
@@ -125,8 +134,18 @@ type ServiceRef struct {
// McpToolConfig Struct for mcp tool json unmarshal
type McpToolConfig struct {
Tools []*ToolDescription `json:"tools,omitempty"`
ToolsMeta map[string]*ToolsMeta `json:"toolsMeta,omitempty"`
Tools []*ToolDescription `json:"tools,omitempty"`
ToolsMeta map[string]*ToolsMeta `json:"toolsMeta,omitempty"`
SecuritySchemes []*SecuritySchemes `json:"securitySchemes,omitempty"`
}
type SecuritySchemes struct {
Id string `json:"id,omitempty"`
Type string `json:"type,omitempty"`
Scheme string `json:"scheme,omitempty"`
In string `json:"in,omitempty"`
Name string `json:"name,omitempty"`
DefaultCredential string `json:"defaultCredential,omitempty"`
}
type ToolDescription struct {
@@ -148,8 +167,9 @@ type ToolsMeta struct {
}
type JsonGoTemplate struct {
RequestTemplate RequestTemplate `json:"requestTemplate,omitempty"`
ResponseTemplate ResponseTemplate `json:"responseTemplate,omitempty"`
ArgsPosition map[string]string `json:"argsPosition,omitempty"`
ErrorResponseTemplate string `json:"errorResponseTemplate,omitempty"`
RequestTemplate RequestTemplate `json:"requestTemplate,omitempty"`
ResponseTemplate ResponseTemplate `json:"responseTemplate,omitempty"`
ArgsPosition map[string]string `json:"argsPosition,omitempty"`
ErrorResponseTemplate string `json:"errorResponseTemplate,omitempty"`
Security *ToolSecurity `json:"security,omitempty"`
}

41
registry/nacos/mcpserver/watcher.go
View File

@@ -129,8 +129,8 @@ func NewWatcher(cache memory.Cache, opts ...WatcherOption) (provider.Watcher, er
constant.WithCacheDir(DefaultNacosCacheDir),
constant.WithNotLoadCacheAtStart(DefaultNacosNotLoadCache),
constant.WithLogRollingConfig(&constant.ClientLogRollingConfig{
MaxAge: DefaultNacosLogMaxAge,
MaxSize: DefaultNacosLogMaxSize,
MaxAge: DefaultNacosLogMaxAge,
MaxSize: DefaultNacosLogMaxSize,
MaxBackups: DefaultNacosLogMaxBackups,
}),
constant.WithUpdateCacheWhenEmpty(w.updateCacheWhenEmpty),
@@ -429,6 +429,10 @@ func (w *watcher) processToolConfig(dataId, data string, credentials map[string]
},
}
rule.Server.Config["credentials"] = credentials
// process security schemas
if len(toolsDescription.SecuritySchemes) > 0 {
rule.Server.SecuritySchemes = toolsDescription.SecuritySchemes
}
var allowTools []string
for _, t := range toolsDescription.Tools {
@@ -479,6 +483,15 @@ func (w *watcher) processToolConfig(dataId, data string, credentials map[string]
convertTool.ResponseTemplate = responseTemplate
convertTool.ErrorResponseTemplate = errorResponseTemplate
}
security, err := getSecurityFromToolMeta(toolMeta)
if err != nil {
mcpServerLog.Errorf("get security from tool meta error:%v, tool name %v", err, t.Name)
continue
} else {
convertTool.Security = security
}
rule.Tools = append(rule.Tools, convertTool)
}
@@ -740,6 +753,30 @@ func getResponseTemplateFromToolMeta(toolMeta *provider.ToolsMeta) (*provider.Re
return nil, "", nil
}
func getSecurityFromToolMeta(toolMeta *provider.ToolsMeta) (*provider.ToolSecurity, error) {
if toolMeta == nil {
return nil, nil
}
toolTemplate := toolMeta.Templates
for kind, meta := range toolTemplate {
switch kind {
case provider.JsonGoTemplateType:
templateData, err := json.Marshal(meta)
if err != nil {
return nil, err
}
template := &provider.JsonGoTemplate{}
if err = json.Unmarshal(templateData, template); err != nil {
return nil, err
}
return template.Security, nil
default:
return nil, fmt.Errorf("unsupported tool meta type: %s", kind)
}
}
return nil, nil
}
func mergeMaps(maps ...map[string]string) map[string]string {
if len(maps) == 0 {
return nil