mathiasandClaude Sonnet 5
43714047be
Allowlist.Check now takes ctx: when the caller authenticated with their own Gitea PAT (pass-through, v0.12.0), it skips the static GITEA_MCP_ALLOWED_OWNERS check entirely — Gitea's own permission model already gates that caller's access more precisely than a coarse owner-name list can. The static list still applies unchanged for the shared static-token/JWT path, where it's the only defense against the service token's blast radius. Mechanical: every tool call site already had ctx in scope, so this is a signature-only change at 41 call sites, no other tool behavior changes. Closes the "Deferred" item from #59. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
77 lines
1.8 KiB
Go
77 lines
1.8 KiB
Go
package tools
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"fmt"
|
|
|
|
"git.d-ma.be/mathias/gitea-mcp/internal/allowlist"
|
|
"git.d-ma.be/mathias/gitea-mcp/internal/gitea"
|
|
"git.d-ma.be/mathias/gitea-mcp/internal/registry"
|
|
)
|
|
|
|
type PRMerge struct {
|
|
c *gitea.Client
|
|
a *allowlist.Allowlist
|
|
}
|
|
|
|
func NewPRMerge(c *gitea.Client, a *allowlist.Allowlist) *PRMerge {
|
|
return &PRMerge{c: c, a: a}
|
|
}
|
|
|
|
func (t *PRMerge) Descriptor() registry.ToolDescriptor {
|
|
return registry.ToolDescriptor{
|
|
Name: "pr_merge",
|
|
Description: "Merge a pull request. style: merge (default), squash, or rebase.",
|
|
InputSchema: json.RawMessage(`{
|
|
"type":"object",
|
|
"properties":{
|
|
"owner":{"type":"string"},
|
|
"repo":{"type":"string"},
|
|
"number":{"type":"integer","minimum":1},
|
|
"style":{"type":"string","enum":["merge","squash","rebase"]},
|
|
"merge_message_title":{"type":"string"},
|
|
"merge_message_field":{"type":"string"}
|
|
},
|
|
"required":["owner","repo","number"]
|
|
}`),
|
|
}
|
|
}
|
|
|
|
type prMergeArgs struct {
|
|
Owner string `json:"owner"`
|
|
Repo string `json:"repo"`
|
|
Number int `json:"number"`
|
|
Style string `json:"style"`
|
|
Title string `json:"merge_message_title"`
|
|
Body string `json:"merge_message_field"`
|
|
}
|
|
|
|
func (t *PRMerge) Call(ctx context.Context, raw json.RawMessage) (json.RawMessage, error) {
|
|
var args prMergeArgs
|
|
if err := parseArgs(raw, &args); err != nil {
|
|
return nil, err
|
|
}
|
|
if err := t.a.Check(ctx, args.Owner); err != nil {
|
|
return nil, err
|
|
}
|
|
if args.Number < 1 {
|
|
return nil, fmt.Errorf("number must be >= 1: %w", gitea.ErrValidation)
|
|
}
|
|
|
|
style := args.Style
|
|
if style == "" {
|
|
style = "merge"
|
|
}
|
|
|
|
if err := t.c.MergePullRequest(ctx, args.Owner, args.Repo, args.Number, gitea.MergePRArgs{
|
|
Do: style,
|
|
Title: args.Title,
|
|
Body: args.Body,
|
|
}); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return textOK(map[string]any{"merged": true})
|
|
}
|