Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
82823aad1e | ||
|
|
64176fe6d7 |
@@ -22,8 +22,9 @@ type Issue struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type Label struct {
|
type Label struct {
|
||||||
ID int64 `json:"id"`
|
ID int64 `json:"id"`
|
||||||
Name string `json:"name"`
|
Name string `json:"name"`
|
||||||
|
Color string `json:"color,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type User struct {
|
type User struct {
|
||||||
|
|||||||
@@ -0,0 +1,48 @@
|
|||||||
|
package gitea
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
)
|
||||||
|
|
||||||
|
// ListLabels fetches all labels defined on a repo.
|
||||||
|
func (c *Client) ListLabels(ctx context.Context, owner, repo string) ([]Label, error) {
|
||||||
|
p := fmt.Sprintf("/api/v1/repos/%s/%s/labels", owner, repo)
|
||||||
|
body, status, err := c.GetJSON(ctx, p)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if err := MapStatus(status, body); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
var labels []Label
|
||||||
|
if err := json.Unmarshal(body, &labels); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return labels, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// AddIssueLabels adds labelIDs to an issue or pull request (PRs share index
|
||||||
|
// space with issues, per Gitea). This is additive per Gitea's own POST
|
||||||
|
// semantics — existing labels are left in place, no replace/delete needed.
|
||||||
|
// Returns the issue's full label set after the add.
|
||||||
|
func (c *Client) AddIssueLabels(ctx context.Context, owner, repo string, number int, labelIDs []int64) ([]Label, error) {
|
||||||
|
p := fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/labels", owner, repo, number)
|
||||||
|
payload, err := json.Marshal(map[string][]int64{"labels": labelIDs})
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
body, status, err := c.PostJSON(ctx, p, payload)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if err := MapStatus(status, body); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
var labels []Label
|
||||||
|
if err := json.Unmarshal(body, &labels); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return labels, nil
|
||||||
|
}
|
||||||
@@ -0,0 +1,107 @@
|
|||||||
|
package gitea_test
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"encoding/json"
|
||||||
|
"io"
|
||||||
|
"net/http"
|
||||||
|
"net/http/httptest"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"git.d-ma.be/mathias/gitea-mcp/internal/gitea"
|
||||||
|
"github.com/stretchr/testify/assert"
|
||||||
|
"github.com/stretchr/testify/require"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestListLabels(t *testing.T) {
|
||||||
|
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
assert.Equal(t, http.MethodGet, r.Method)
|
||||||
|
assert.Equal(t, "/api/v1/repos/o/r/labels", r.URL.Path)
|
||||||
|
w.Header().Set("Content-Type", "application/json")
|
||||||
|
_, _ = w.Write([]byte(`[
|
||||||
|
{"id":1,"name":"bug","color":"ee0701"},
|
||||||
|
{"id":2,"name":"enhancement","color":"84b6eb"}
|
||||||
|
]`))
|
||||||
|
}))
|
||||||
|
defer srv.Close()
|
||||||
|
|
||||||
|
c := gitea.NewClient(srv.URL, "tok")
|
||||||
|
labels, err := c.ListLabels(context.Background(), "o", "r")
|
||||||
|
require.NoError(t, err)
|
||||||
|
require.Len(t, labels, 2)
|
||||||
|
assert.Equal(t, int64(1), labels[0].ID)
|
||||||
|
assert.Equal(t, "bug", labels[0].Name)
|
||||||
|
assert.Equal(t, "ee0701", labels[0].Color)
|
||||||
|
assert.Equal(t, "enhancement", labels[1].Name)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestListLabels_Empty(t *testing.T) {
|
||||||
|
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
w.Header().Set("Content-Type", "application/json")
|
||||||
|
_, _ = w.Write([]byte(`[]`))
|
||||||
|
}))
|
||||||
|
defer srv.Close()
|
||||||
|
|
||||||
|
c := gitea.NewClient(srv.URL, "tok")
|
||||||
|
labels, err := c.ListLabels(context.Background(), "o", "r")
|
||||||
|
require.NoError(t, err)
|
||||||
|
assert.Empty(t, labels)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestListLabels_NotFound(t *testing.T) {
|
||||||
|
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
w.WriteHeader(http.StatusNotFound)
|
||||||
|
_, _ = w.Write([]byte(`{"message":"repo not found"}`))
|
||||||
|
}))
|
||||||
|
defer srv.Close()
|
||||||
|
|
||||||
|
c := gitea.NewClient(srv.URL, "tok")
|
||||||
|
_, err := c.ListLabels(context.Background(), "o", "r")
|
||||||
|
require.Error(t, err)
|
||||||
|
assert.ErrorIs(t, err, gitea.ErrNotFound)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestAddIssueLabels(t *testing.T) {
|
||||||
|
var captured []byte
|
||||||
|
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
assert.Equal(t, http.MethodPost, r.Method)
|
||||||
|
assert.Equal(t, "/api/v1/repos/o/r/issues/42/labels", r.URL.Path)
|
||||||
|
var err error
|
||||||
|
captured, err = io.ReadAll(r.Body)
|
||||||
|
require.NoError(t, err)
|
||||||
|
w.Header().Set("Content-Type", "application/json")
|
||||||
|
_, _ = w.Write([]byte(`[
|
||||||
|
{"id":1,"name":"bug","color":"ee0701"},
|
||||||
|
{"id":3,"name":"priority","color":"00ff00"}
|
||||||
|
]`))
|
||||||
|
}))
|
||||||
|
defer srv.Close()
|
||||||
|
|
||||||
|
c := gitea.NewClient(srv.URL, "tok")
|
||||||
|
labels, err := c.AddIssueLabels(context.Background(), "o", "r", 42, []int64{3})
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
var payload map[string]any
|
||||||
|
require.NoError(t, json.Unmarshal(captured, &payload))
|
||||||
|
ids, ok := payload["labels"].([]any)
|
||||||
|
require.True(t, ok)
|
||||||
|
require.Len(t, ids, 1)
|
||||||
|
assert.Equal(t, float64(3), ids[0])
|
||||||
|
|
||||||
|
require.Len(t, labels, 2)
|
||||||
|
assert.Equal(t, "bug", labels[0].Name)
|
||||||
|
assert.Equal(t, "priority", labels[1].Name)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestAddIssueLabels_NotFound(t *testing.T) {
|
||||||
|
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
w.WriteHeader(http.StatusNotFound)
|
||||||
|
_, _ = w.Write([]byte(`{"message":"issue not found"}`))
|
||||||
|
}))
|
||||||
|
defer srv.Close()
|
||||||
|
|
||||||
|
c := gitea.NewClient(srv.URL, "tok")
|
||||||
|
_, err := c.AddIssueLabels(context.Background(), "o", "r", 999, []int64{1})
|
||||||
|
require.Error(t, err)
|
||||||
|
assert.ErrorIs(t, err, gitea.ErrNotFound)
|
||||||
|
}
|
||||||
@@ -0,0 +1,87 @@
|
|||||||
|
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 IssueLabel struct {
|
||||||
|
c *gitea.Client
|
||||||
|
a *allowlist.Allowlist
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewIssueLabel(c *gitea.Client, a *allowlist.Allowlist) *IssueLabel {
|
||||||
|
return &IssueLabel{c: c, a: a}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (t *IssueLabel) Descriptor() registry.ToolDescriptor {
|
||||||
|
return registry.ToolDescriptor{
|
||||||
|
Name: "issue_label",
|
||||||
|
Description: "Add labels to an issue or pull request. Resolves label names to IDs via the repo's label list. Additive — existing labels are left in place.",
|
||||||
|
InputSchema: json.RawMessage(`{
|
||||||
|
"type":"object",
|
||||||
|
"properties":{
|
||||||
|
"owner":{"type":"string"},
|
||||||
|
"repo":{"type":"string"},
|
||||||
|
"number":{"type":"integer","minimum":1},
|
||||||
|
"labels":{"type":"array","items":{"type":"string"}},
|
||||||
|
"label_ids":{"type":"array","items":{"type":"integer"}}
|
||||||
|
},
|
||||||
|
"required":["owner","repo","number","labels"]
|
||||||
|
}`),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
type issueLabelArgs struct {
|
||||||
|
Owner string `json:"owner"`
|
||||||
|
Repo string `json:"repo"`
|
||||||
|
Number int `json:"number"`
|
||||||
|
Labels []string `json:"labels,omitempty"`
|
||||||
|
LabelIDs []int64 `json:"label_ids,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func (t *IssueLabel) Call(ctx context.Context, raw json.RawMessage) (json.RawMessage, error) {
|
||||||
|
var args issueLabelArgs
|
||||||
|
if err := parseArgs(raw, &args); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if err := t.a.Check(args.Owner); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if args.Number < 1 {
|
||||||
|
return nil, fmt.Errorf("number must be >= 1: %w", gitea.ErrValidation)
|
||||||
|
}
|
||||||
|
if len(args.Labels) == 0 && len(args.LabelIDs) == 0 {
|
||||||
|
return nil, fmt.Errorf("labels is required: %w", gitea.ErrValidation)
|
||||||
|
}
|
||||||
|
|
||||||
|
ids := append([]int64{}, args.LabelIDs...)
|
||||||
|
if len(args.Labels) > 0 {
|
||||||
|
existing, err := t.c.ListLabels(ctx, args.Owner, args.Repo)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
byName := make(map[string]int64, len(existing))
|
||||||
|
for _, l := range existing {
|
||||||
|
byName[l.Name] = l.ID
|
||||||
|
}
|
||||||
|
for _, name := range args.Labels {
|
||||||
|
id, ok := byName[name]
|
||||||
|
if !ok {
|
||||||
|
return nil, fmt.Errorf("label %q not found in %s/%s: %w", name, args.Owner, args.Repo, gitea.ErrValidation)
|
||||||
|
}
|
||||||
|
ids = append(ids, id)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
labels, err := t.c.AddIssueLabels(ctx, args.Owner, args.Repo, args.Number, ids)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return textOK(labels)
|
||||||
|
}
|
||||||
@@ -0,0 +1,82 @@
|
|||||||
|
package tools_test
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"encoding/json"
|
||||||
|
"io"
|
||||||
|
"net/http"
|
||||||
|
"net/http/httptest"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"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/tools"
|
||||||
|
"github.com/stretchr/testify/assert"
|
||||||
|
"github.com/stretchr/testify/require"
|
||||||
|
)
|
||||||
|
|
||||||
|
const labelListFixture = `[
|
||||||
|
{"id":1,"name":"bug","color":"ee0701"},
|
||||||
|
{"id":2,"name":"enhancement","color":"84b6eb"}
|
||||||
|
]`
|
||||||
|
|
||||||
|
func TestIssueLabelAppliesByName(t *testing.T) {
|
||||||
|
var captured []byte
|
||||||
|
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
switch {
|
||||||
|
case r.Method == http.MethodGet && r.URL.Path == "/api/v1/repos/o/r/labels":
|
||||||
|
w.Header().Set("Content-Type", "application/json")
|
||||||
|
_, _ = w.Write([]byte(labelListFixture))
|
||||||
|
case r.Method == http.MethodPost && r.URL.Path == "/api/v1/repos/o/r/issues/42/labels":
|
||||||
|
var err error
|
||||||
|
captured, err = io.ReadAll(r.Body)
|
||||||
|
require.NoError(t, err)
|
||||||
|
w.Header().Set("Content-Type", "application/json")
|
||||||
|
_, _ = w.Write([]byte(labelListFixture))
|
||||||
|
default:
|
||||||
|
t.Fatalf("unexpected request: %s %s", r.Method, r.URL.Path)
|
||||||
|
}
|
||||||
|
}))
|
||||||
|
defer srv.Close()
|
||||||
|
|
||||||
|
tool := tools.NewIssueLabel(gitea.NewClient(srv.URL, "tok"), allowlist.New([]string{"o"}))
|
||||||
|
out, err := tool.Call(context.Background(), json.RawMessage(`{"owner":"o","repo":"r","number":42,"labels":["bug","enhancement"]}`))
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
var payload map[string]any
|
||||||
|
require.NoError(t, json.Unmarshal(captured, &payload))
|
||||||
|
ids, ok := payload["labels"].([]any)
|
||||||
|
require.True(t, ok)
|
||||||
|
assert.ElementsMatch(t, []any{float64(1), float64(2)}, ids)
|
||||||
|
|
||||||
|
assert.Contains(t, string(out), `"name":"bug"`)
|
||||||
|
assert.Contains(t, string(out), `"name":"enhancement"`)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestIssueLabelUnknownNameNamesTheMissingLabel(t *testing.T) {
|
||||||
|
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
w.Header().Set("Content-Type", "application/json")
|
||||||
|
_, _ = w.Write([]byte(labelListFixture))
|
||||||
|
}))
|
||||||
|
defer srv.Close()
|
||||||
|
|
||||||
|
tool := tools.NewIssueLabel(gitea.NewClient(srv.URL, "tok"), allowlist.New([]string{"o"}))
|
||||||
|
_, err := tool.Call(context.Background(), json.RawMessage(`{"owner":"o","repo":"r","number":42,"labels":["bug","does-not-exist"]}`))
|
||||||
|
require.Error(t, err)
|
||||||
|
assert.ErrorIs(t, err, gitea.ErrValidation)
|
||||||
|
assert.Contains(t, err.Error(), `"does-not-exist"`)
|
||||||
|
assert.Contains(t, err.Error(), "o/r")
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestIssueLabelAllowlistRejects(t *testing.T) {
|
||||||
|
tool := tools.NewIssueLabel(gitea.NewClient("http://unused", ""), allowlist.New([]string{"allowed"}))
|
||||||
|
_, err := tool.Call(context.Background(), json.RawMessage(`{"owner":"evil","repo":"r","number":1,"labels":["bug"]}`))
|
||||||
|
require.Error(t, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestIssueLabelRequiresValidNumber(t *testing.T) {
|
||||||
|
tool := tools.NewIssueLabel(gitea.NewClient("http://unused", ""), allowlist.New([]string{"o"}))
|
||||||
|
_, err := tool.Call(context.Background(), json.RawMessage(`{"owner":"o","repo":"r","number":0,"labels":["bug"]}`))
|
||||||
|
require.Error(t, err)
|
||||||
|
assert.ErrorIs(t, err, gitea.ErrValidation)
|
||||||
|
}
|
||||||
@@ -0,0 +1,54 @@
|
|||||||
|
package tools
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"encoding/json"
|
||||||
|
|
||||||
|
"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 LabelList struct {
|
||||||
|
c *gitea.Client
|
||||||
|
a *allowlist.Allowlist
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewLabelList(c *gitea.Client, a *allowlist.Allowlist) *LabelList {
|
||||||
|
return &LabelList{c: c, a: a}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (t *LabelList) Descriptor() registry.ToolDescriptor {
|
||||||
|
return registry.ToolDescriptor{
|
||||||
|
Name: "label_list",
|
||||||
|
Description: "List all labels defined on a repo. Returns id, name, and color for each label.",
|
||||||
|
InputSchema: json.RawMessage(`{
|
||||||
|
"type":"object",
|
||||||
|
"properties":{
|
||||||
|
"owner":{"type":"string"},
|
||||||
|
"repo":{"type":"string"}
|
||||||
|
},
|
||||||
|
"required":["owner","repo"]
|
||||||
|
}`),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
type labelListArgs struct {
|
||||||
|
Owner string `json:"owner"`
|
||||||
|
Repo string `json:"repo"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func (t *LabelList) Call(ctx context.Context, raw json.RawMessage) (json.RawMessage, error) {
|
||||||
|
var args labelListArgs
|
||||||
|
if err := parseArgs(raw, &args); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if err := t.a.Check(args.Owner); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
labels, err := t.c.ListLabels(ctx, args.Owner, args.Repo)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return textOK(labels)
|
||||||
|
}
|
||||||
@@ -0,0 +1,42 @@
|
|||||||
|
package tools_test
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"encoding/json"
|
||||||
|
"net/http"
|
||||||
|
"net/http/httptest"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"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/tools"
|
||||||
|
"github.com/stretchr/testify/assert"
|
||||||
|
"github.com/stretchr/testify/require"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestLabelListTool(t *testing.T) {
|
||||||
|
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
assert.Equal(t, http.MethodGet, r.Method)
|
||||||
|
assert.Equal(t, "/api/v1/repos/mathias/infra/labels", r.URL.Path)
|
||||||
|
w.Header().Set("Content-Type", "application/json")
|
||||||
|
_, _ = w.Write([]byte(`[
|
||||||
|
{"id":1,"name":"bug","color":"ee0701"},
|
||||||
|
{"id":2,"name":"enhancement","color":"84b6eb"}
|
||||||
|
]`))
|
||||||
|
}))
|
||||||
|
defer srv.Close()
|
||||||
|
|
||||||
|
tool := tools.NewLabelList(gitea.NewClient(srv.URL, "tok"), allowlist.New([]string{"mathias"}))
|
||||||
|
out, err := tool.Call(context.Background(), json.RawMessage(`{"owner":"mathias","repo":"infra"}`))
|
||||||
|
require.NoError(t, err)
|
||||||
|
assert.Contains(t, string(out), `"id":1`)
|
||||||
|
assert.Contains(t, string(out), `"name":"bug"`)
|
||||||
|
assert.Contains(t, string(out), `"color":"ee0701"`)
|
||||||
|
assert.Contains(t, string(out), `"name":"enhancement"`)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestLabelListAllowlistRejects(t *testing.T) {
|
||||||
|
tool := tools.NewLabelList(gitea.NewClient("http://unused", ""), allowlist.New([]string{"mathias"}))
|
||||||
|
_, err := tool.Call(context.Background(), json.RawMessage(`{"owner":"evil","repo":"x"}`))
|
||||||
|
require.Error(t, err)
|
||||||
|
}
|
||||||
@@ -54,6 +54,8 @@ func RegisterAll(
|
|||||||
reg.Register(NewIssueListComments(c, a))
|
reg.Register(NewIssueListComments(c, a))
|
||||||
reg.Register(NewIssueClose(c, a))
|
reg.Register(NewIssueClose(c, a))
|
||||||
reg.Register(NewIssueReopen(c, a))
|
reg.Register(NewIssueReopen(c, a))
|
||||||
|
reg.Register(NewLabelList(c, a))
|
||||||
|
reg.Register(NewIssueLabel(c, a))
|
||||||
reg.Register(NewWorkflowRunList(c, a))
|
reg.Register(NewWorkflowRunList(c, a))
|
||||||
reg.Register(NewReleaseCreate(c, a))
|
reg.Register(NewReleaseCreate(c, a))
|
||||||
reg.Register(NewRepoDelete(c, a))
|
reg.Register(NewRepoDelete(c, a))
|
||||||
|
|||||||
@@ -54,5 +54,5 @@ func TestEveryRegisteredToolIsDispatchable(t *testing.T) {
|
|||||||
// Lock the tool count so an accidental drop of a registration in RegisterAll
|
// Lock the tool count so an accidental drop of a registration in RegisterAll
|
||||||
// (the single source main.go and this test share) fails loudly.
|
// (the single source main.go and this test share) fails loudly.
|
||||||
func TestRegisteredToolCount(t *testing.T) {
|
func TestRegisteredToolCount(t *testing.T) {
|
||||||
assert.Len(t, buildRegistry().Tools(), 39)
|
assert.Len(t, buildRegistry().Tools(), 41)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import (
|
|||||||
"context"
|
"context"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"os"
|
||||||
|
|
||||||
"git.d-ma.be/mathias/gitea-mcp/internal/allowlist"
|
"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/gitea"
|
||||||
@@ -22,7 +23,7 @@ func NewRepoMirrorPush(c *gitea.Client, a *allowlist.Allowlist) *RepoMirrorPush
|
|||||||
func (t *RepoMirrorPush) Descriptor() registry.ToolDescriptor {
|
func (t *RepoMirrorPush) Descriptor() registry.ToolDescriptor {
|
||||||
return registry.ToolDescriptor{
|
return registry.ToolDescriptor{
|
||||||
Name: "repo_mirror_push",
|
Name: "repo_mirror_push",
|
||||||
Description: "Manage push mirrors for a repository: add, list, or delete.",
|
Description: "Manage push mirrors for a repository: add, list, or delete. For the mirror credential, PREFER remote_password_env (the name of an env var the server reads) so the secret never rides the tool-call payload/transcript; remote_password (raw) is discouraged and will be persisted in logs.",
|
||||||
InputSchema: json.RawMessage(`{
|
InputSchema: json.RawMessage(`{
|
||||||
"type":"object",
|
"type":"object",
|
||||||
"properties":{
|
"properties":{
|
||||||
@@ -31,7 +32,8 @@ func (t *RepoMirrorPush) Descriptor() registry.ToolDescriptor {
|
|||||||
"action":{"type":"string","enum":["add","list","delete"]},
|
"action":{"type":"string","enum":["add","list","delete"]},
|
||||||
"remote_address":{"type":"string","description":"Mirror target URL (required for add)."},
|
"remote_address":{"type":"string","description":"Mirror target URL (required for add)."},
|
||||||
"remote_username":{"type":"string"},
|
"remote_username":{"type":"string"},
|
||||||
"remote_password":{"type":"string","description":"Never logged or returned."},
|
"remote_password_env":{"type":"string","description":"PREFERRED: name of a server-side env var holding the mirror credential; the server resolves it, so the secret is never in this call. Errors if the var is unset."},
|
||||||
|
"remote_password":{"type":"string","description":"DISCOURAGED: raw credential — lands in the tool-call transcript/logs. Use remote_password_env instead."},
|
||||||
"interval":{"type":"string","description":"Sync interval, e.g. '8h0m0s'."},
|
"interval":{"type":"string","description":"Sync interval, e.g. '8h0m0s'."},
|
||||||
"sync_on_commit":{"type":"boolean"},
|
"sync_on_commit":{"type":"boolean"},
|
||||||
"mirror_name":{"type":"string","description":"Remote name to delete (required for delete)."}
|
"mirror_name":{"type":"string","description":"Remote name to delete (required for delete)."}
|
||||||
@@ -42,15 +44,16 @@ func (t *RepoMirrorPush) Descriptor() registry.ToolDescriptor {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type repoMirrorPushArgs struct {
|
type repoMirrorPushArgs struct {
|
||||||
Owner string `json:"owner"`
|
Owner string `json:"owner"`
|
||||||
Repo string `json:"repo"`
|
Repo string `json:"repo"`
|
||||||
Action string `json:"action"`
|
Action string `json:"action"`
|
||||||
RemoteAddress string `json:"remote_address"`
|
RemoteAddress string `json:"remote_address"`
|
||||||
RemoteUsername string `json:"remote_username"`
|
RemoteUsername string `json:"remote_username"`
|
||||||
RemotePassword string `json:"remote_password"`
|
RemotePassword string `json:"remote_password"`
|
||||||
Interval string `json:"interval"`
|
RemotePasswordEnv string `json:"remote_password_env"`
|
||||||
SyncOnCommit bool `json:"sync_on_commit"`
|
Interval string `json:"interval"`
|
||||||
MirrorName string `json:"mirror_name"`
|
SyncOnCommit bool `json:"sync_on_commit"`
|
||||||
|
MirrorName string `json:"mirror_name"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// safeMirror omits remote_password so it is never returned to the caller.
|
// safeMirror omits remote_password so it is never returned to the caller.
|
||||||
@@ -72,6 +75,22 @@ func toSafeMirror(m *gitea.PushMirror) safeMirror {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// resolveMirrorPassword prefers remote_password_env — the name of a server-side
|
||||||
|
// env var — so the credential never appears in the tool-call payload (#49). It
|
||||||
|
// falls back to the raw (discouraged) remote_password. An env name that resolves
|
||||||
|
// to empty is a loud error, not a silent empty password.
|
||||||
|
func resolveMirrorPassword(args repoMirrorPushArgs) (string, error) {
|
||||||
|
if args.RemotePasswordEnv != "" {
|
||||||
|
pw := os.Getenv(args.RemotePasswordEnv)
|
||||||
|
if pw == "" {
|
||||||
|
return "", fmt.Errorf("remote_password_env %q is unset or empty in the server environment: %w",
|
||||||
|
args.RemotePasswordEnv, gitea.ErrValidation)
|
||||||
|
}
|
||||||
|
return pw, nil
|
||||||
|
}
|
||||||
|
return args.RemotePassword, nil
|
||||||
|
}
|
||||||
|
|
||||||
func (t *RepoMirrorPush) Call(ctx context.Context, raw json.RawMessage) (json.RawMessage, error) {
|
func (t *RepoMirrorPush) Call(ctx context.Context, raw json.RawMessage) (json.RawMessage, error) {
|
||||||
var args repoMirrorPushArgs
|
var args repoMirrorPushArgs
|
||||||
if err := parseArgs(raw, &args); err != nil {
|
if err := parseArgs(raw, &args); err != nil {
|
||||||
@@ -82,10 +101,14 @@ func (t *RepoMirrorPush) Call(ctx context.Context, raw json.RawMessage) (json.Ra
|
|||||||
}
|
}
|
||||||
switch args.Action {
|
switch args.Action {
|
||||||
case "add":
|
case "add":
|
||||||
|
password, err := resolveMirrorPassword(args)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
m, err := t.c.AddPushMirror(ctx, args.Owner, args.Repo, gitea.AddPushMirrorArgs{
|
m, err := t.c.AddPushMirror(ctx, args.Owner, args.Repo, gitea.AddPushMirrorArgs{
|
||||||
RemoteAddress: args.RemoteAddress,
|
RemoteAddress: args.RemoteAddress,
|
||||||
RemoteUsername: args.RemoteUsername,
|
RemoteUsername: args.RemoteUsername,
|
||||||
RemotePassword: args.RemotePassword,
|
RemotePassword: password,
|
||||||
Interval: args.Interval,
|
Interval: args.Interval,
|
||||||
SyncOnCommit: args.SyncOnCommit,
|
SyncOnCommit: args.SyncOnCommit,
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ package tools_test
|
|||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
|
"io"
|
||||||
"net/http"
|
"net/http"
|
||||||
"net/http/httptest"
|
"net/http/httptest"
|
||||||
"testing"
|
"testing"
|
||||||
@@ -14,6 +15,45 @@ import (
|
|||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// #49: remote_password_env names a server-side env var; the secret is resolved
|
||||||
|
// from the server environment and never rides the tool-call payload.
|
||||||
|
func TestRepoMirrorPushTool_PasswordFromEnv(t *testing.T) {
|
||||||
|
t.Setenv("TEST_MIRROR_PW", "env-secret")
|
||||||
|
var gotPw string
|
||||||
|
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
body, _ := io.ReadAll(r.Body)
|
||||||
|
var m map[string]any
|
||||||
|
_ = json.Unmarshal(body, &m)
|
||||||
|
gotPw, _ = m["remote_password"].(string)
|
||||||
|
w.WriteHeader(http.StatusCreated)
|
||||||
|
_, _ = w.Write([]byte(`{"id":1,"remote_name":"m","remote_address":"a"}`))
|
||||||
|
}))
|
||||||
|
defer srv.Close()
|
||||||
|
|
||||||
|
tool := tools.NewRepoMirrorPush(gitea.NewClient(srv.URL, "tok"), allowlist.New([]string{"mathias"}))
|
||||||
|
out, err := tool.Call(context.Background(), json.RawMessage(`{
|
||||||
|
"owner":"mathias","name":"infra","action":"add",
|
||||||
|
"remote_address":"https://github.com/mathias/infra.git",
|
||||||
|
"remote_username":"mathias","remote_password_env":"TEST_MIRROR_PW"
|
||||||
|
}`))
|
||||||
|
require.NoError(t, err)
|
||||||
|
assert.Equal(t, "env-secret", gotPw, "password must be resolved from the server env var")
|
||||||
|
assert.NotContains(t, string(out), "env-secret")
|
||||||
|
}
|
||||||
|
|
||||||
|
// remote_password_env pointing at an unset var must fail loudly, not silently
|
||||||
|
// send an empty password.
|
||||||
|
func TestRepoMirrorPushTool_EnvUnsetErrors(t *testing.T) {
|
||||||
|
tool := tools.NewRepoMirrorPush(gitea.NewClient("http://unused", ""), allowlist.New([]string{"mathias"}))
|
||||||
|
_, err := tool.Call(context.Background(), json.RawMessage(`{
|
||||||
|
"owner":"mathias","name":"infra","action":"add",
|
||||||
|
"remote_address":"https://github.com/x/y.git","remote_username":"u",
|
||||||
|
"remote_password_env":"DEFINITELY_UNSET_MIRROR_VAR_XYZ"
|
||||||
|
}`))
|
||||||
|
require.Error(t, err)
|
||||||
|
assert.ErrorIs(t, err, gitea.ErrValidation)
|
||||||
|
}
|
||||||
|
|
||||||
func TestRepoMirrorPushTool_Add(t *testing.T) {
|
func TestRepoMirrorPushTool_Add(t *testing.T) {
|
||||||
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
assert.Equal(t, http.MethodPost, r.Method)
|
assert.Equal(t, http.MethodPost, r.Method)
|
||||||
|
|||||||
Reference in New Issue
Block a user