mirror of
https://gitea.com/gitea/gitea-mcp.git
synced 2026-08-03 07:39:22 +02:00
21aa4684d9
`-O` / `--tools` can already narrow the exposed tool set, but it needs every tool spelled out by name. `-S` / `--scope` (`GITEA_SCOPES`) complements it by selecting whole scopes, using the same names the `Scope` column of the tool tables documents. ```bash gitea-mcp -S issue,pull_request # only those scopes gitea-mcp --scope repository,branch --tools get_me # those scopes plus one extra tool ``` ## What changed - Each scope is one `tool.Tool` registry carrying a canonical name, so `operation/repo` is split into the six scopes its files already imply: `repository` (`repo.go` + `tree.go`), `file`, `branch`, `tag`, `commit`, `release`. The other twelve packages map 1:1, giving 18 scopes. - The two allowlists combine as a **union**: with neither set every tool loads; with only `--tools` set behaviour is unchanged; with both set, the selected scopes' tools plus the individually named tools load. `-r` / `GITEA_READONLY` still hides write tools on top. - Scope names are normalized on input (case, spaces, hyphens), so `Pull Request`, `pull-request` and `PULL_REQUEST` all resolve to `pull_request`. Unknown names only warn and list the valid scopes, mirroring how `--tools` treats unknown tool names. - The `Scope` column of all three READMEs now uses the canonical names verbatim, so it doubles as the reference for `--scope`, and `TestReadmeToolTables` compares that column against the registry in both directions — no translation table needed. - Flag parsing moves from `cmd.init()` into `Execute()`. `main()` only ever calls `Execute()`, so this is behaviourally equivalent, and it makes the `cmd` package testable at all: previously the `init()` parse of `os.Args` hit `flag.CommandLine`'s `ExitOnError` on `go test`'s own `-test.*` flags. ## Verification `make fmt`, `make lint-go` (0 issues) and `go test ./...` all pass. New tests cover the filter matrix (no filters / scope-only / tools-only regression / union / read-only interaction / unknown scope), scope-name uniqueness across `domainTools`, and the flag+env parsing and normalization. Smoke-tested `tools/list` over stdio against the built binary: | flags | tools exposed | | :-- | :-- | | _none_ | 54 (identical to `main`) | | `-S branch` | `create_branch`, `delete_branch`, `list_branches` | | `--scope 'Pull Request,TAG'` | the 4 `pull_request` + 4 `tag` tools | | `-O get_me` | `get_me` (unchanged) | | `-S commit -O get_me` | `get_commit`, `list_commits`, `get_me` | | `-S file -r` | `get_dir_contents`, `get_file_contents` | | `-S bogus,issue` | the 4 `issue` tools, plus a warning naming the valid scopes | Reviewed-on: https://gitea.com/gitea/gitea-mcp/pulls/219 Reviewed-by: Lunny Xiao <xiaolunwen@gmail.com> Co-authored-by: yp05327 <576951401@qq.com>
132 lines
3.8 KiB
Go
132 lines
3.8 KiB
Go
package tool
|
|
|
|
import (
|
|
"slices"
|
|
"strings"
|
|
|
|
"gitea.com/gitea/gitea-mcp/pkg/flag"
|
|
"gitea.com/gitea/gitea-mcp/pkg/log"
|
|
|
|
"github.com/mark3labs/mcp-go/server"
|
|
)
|
|
|
|
type Tool struct {
|
|
scope string
|
|
write []server.ServerTool
|
|
read []server.ServerTool
|
|
}
|
|
|
|
func New(scope string) *Tool {
|
|
return &Tool{
|
|
scope: scope,
|
|
write: make([]server.ServerTool, 0, 100),
|
|
read: make([]server.ServerTool, 0, 100),
|
|
}
|
|
}
|
|
|
|
// Scope returns the canonical scope name this domain of tools was registered under.
|
|
func (t *Tool) Scope() string {
|
|
return t.scope
|
|
}
|
|
|
|
func (t *Tool) RegisterWrite(s server.ServerTool) {
|
|
t.write = append(t.write, s)
|
|
}
|
|
|
|
func (t *Tool) RegisterRead(s server.ServerTool) {
|
|
t.read = append(t.read, s)
|
|
}
|
|
|
|
// ReadTools returns the read-only tools registered on this domain, ignoring
|
|
// the read-only and allowlist flags that Tools applies.
|
|
func (t *Tool) ReadTools() []server.ServerTool {
|
|
return t.read
|
|
}
|
|
|
|
// WriteTools returns the write tools registered on this domain, ignoring the
|
|
// read-only and allowlist flags that Tools applies.
|
|
func (t *Tool) WriteTools() []server.ServerTool {
|
|
return t.write
|
|
}
|
|
|
|
// Tools returns the tools registered on this domain after applying the
|
|
// read-only filter and the scope/tool allowlists (union semantics: a tool is
|
|
// kept if its domain's scope is in AllowedScopes OR its name is in
|
|
// AllowedTools). With no allowlists set, all tools pass through unchanged.
|
|
func (t *Tool) Tools() []server.ServerTool {
|
|
all := make([]server.ServerTool, 0, len(t.write)+len(t.read))
|
|
if !flag.ReadOnly {
|
|
all = append(all, t.write...)
|
|
}
|
|
all = append(all, t.read...)
|
|
if len(flag.AllowedScopes) == 0 && len(flag.AllowedTools) == 0 {
|
|
return all
|
|
}
|
|
_, scopeAllowed := flag.AllowedScopes[t.scope]
|
|
filtered := make([]server.ServerTool, 0, len(all))
|
|
for _, st := range all {
|
|
_, toolAllowed := flag.AllowedTools[st.Tool.Name]
|
|
if scopeAllowed || toolAllowed {
|
|
filtered = append(filtered, st)
|
|
}
|
|
}
|
|
return filtered
|
|
}
|
|
|
|
// warnUnmatched logs the names present in allowlist but absent from known,
|
|
// via logUnmatched, so WarnUnmatchedAllowedTools and WarnUnmatchedAllowedScopes
|
|
// share the same "collect, sort, no-op when empty" logic and can't drift.
|
|
// No-op if allowlist is empty or every name in it is known.
|
|
func warnUnmatched(allowlist, known map[string]struct{}, logUnmatched func(unmatched []string)) {
|
|
if len(allowlist) == 0 {
|
|
return
|
|
}
|
|
var unmatched []string
|
|
for name := range allowlist {
|
|
if _, ok := known[name]; !ok {
|
|
unmatched = append(unmatched, name)
|
|
}
|
|
}
|
|
if len(unmatched) == 0 {
|
|
return
|
|
}
|
|
slices.Sort(unmatched)
|
|
logUnmatched(unmatched)
|
|
}
|
|
|
|
// WarnUnmatchedAllowedTools logs any names in flag.AllowedTools that don't
|
|
// match a tool registered on any of the given domains. No-op if the allowlist
|
|
// is empty.
|
|
func WarnUnmatchedAllowedTools(domains ...*Tool) {
|
|
known := map[string]struct{}{}
|
|
for _, d := range domains {
|
|
for _, st := range d.read {
|
|
known[st.Tool.Name] = struct{}{}
|
|
}
|
|
for _, st := range d.write {
|
|
known[st.Tool.Name] = struct{}{}
|
|
}
|
|
}
|
|
warnUnmatched(flag.AllowedTools, known, func(unmatched []string) {
|
|
log.Warnf("Unknown tools in --tools allowlist (ignored): %s", strings.Join(unmatched, ", "))
|
|
})
|
|
}
|
|
|
|
// WarnUnmatchedAllowedScopes logs any names in flag.AllowedScopes that don't
|
|
// match the scope of any of the given domains. No-op if the allowlist is
|
|
// empty.
|
|
func WarnUnmatchedAllowedScopes(domains ...*Tool) {
|
|
knownSet := map[string]struct{}{}
|
|
known := make([]string, 0, len(domains))
|
|
for _, d := range domains {
|
|
if _, ok := knownSet[d.scope]; !ok {
|
|
knownSet[d.scope] = struct{}{}
|
|
known = append(known, d.scope)
|
|
}
|
|
}
|
|
warnUnmatched(flag.AllowedScopes, knownSet, func(unmatched []string) {
|
|
slices.Sort(known)
|
|
log.Warnf("Unknown scopes in --scope allowlist (ignored): %s. Valid scopes: %s", strings.Join(unmatched, ", "), strings.Join(known, ", "))
|
|
})
|
|
}
|