feat(gitea): support extra outbound HTTP headers via GITEA_EXTRA_HEADERS

Add a GITEA_EXTRA_HEADERS environment variable that accepts a JSON
object of header name/value pairs (e.g. Cloudflare Access
credentials) and applies them to every outbound request to Gitea,
both the raw pkg/gitea.DoJSON/DoBytes path and the SDK-backed
pkg/gitea.NewClient path, without overriding Authorization,
Content-Type, or Accept.

Co-Authored-By: Codet <codet@commitgo.dev> (GPT-5-Codex)

README.md

@@ -20,6 +20,14 @@ make install
 
 Pass the Gitea host and access token as command-line flags or environment variables, flags take precedence. Run `gitea-mcp --help` for the full list of flags and environment variables. Logs are written to `$HOME/.gitea-mcp/gitea-mcp.log`, add `-d` for debug logging.
 
+Set `GITEA_EXTRA_HEADERS` to a JSON object of header name/value pairs to send with every outbound request to Gitea, for example when Gitea sits behind Cloudflare Access:
+
+```bash
+export GITEA_EXTRA_HEADERS='{"CF-Access-Client-Id":"id","CF-Access-Client-Secret":"secret"}'
+```
+
+These headers never override `Authorization`, `Content-Type`, or `Accept` set by `gitea-mcp` itself.
+
 ### MCP protocol and HTTP transport
 
 The server supports MCP up to `2026-07-28` and negotiates down to the client's version, advertising only the `tools` capability. Tool and Gitea failures return a `tools/call` result with `result.isError: true`, while malformed requests and server faults stay JSON-RPC errors.

cmd/cmd.go

@@ -2,9 +2,11 @@ package cmd
 
 import (
 	"context"
+	"encoding/json"
 	"flag"
 	"fmt"
 	"io"
+	"net/http"
 	"os"
 	"strconv"
 	"strings"
@@ -86,6 +88,7 @@ func initFlagSet(fs *flag.FlagSet, args []string, getenv func(string) string, re
 		fmt.Fprintf(w, "  GITEA_ACCESS_TOKEN\tProvide access token\n")
 		fmt.Fprintf(w, "  GITEA_ACCESS_TOKEN_FILE\tPath to a file containing the access token (e.g. a Docker secret)\n")
 		fmt.Fprintf(w, "  GITEA_DEBUG\tSet to 'true' for debug mode\n")
+		fmt.Fprintf(w, "  GITEA_EXTRA_HEADERS\tJSON object of extra HTTP headers to send with Gitea API requests\n")
 		fmt.Fprintf(w, "  GITEA_HOST\tOverride Gitea host URL\n")
 		fmt.Fprintf(w, "  GITEA_INSECURE\tSet to 'true' to ignore TLS errors\n")
 		fmt.Fprintf(w, "  GITEA_MAX_INLINE_ATTACHMENT_BYTES\tOverride inline image attachment size limit in bytes\n")
@@ -164,6 +167,18 @@ func initFlagSet(fs *flag.FlagSet, args []string, getenv func(string) string, re
 			flagPkg.MaxInlineAttachmentBytes = parsed
 		}
 	}
+	if val := getenv("GITEA_EXTRA_HEADERS"); val != "" {
+		var headers map[string]string
+		if err := json.Unmarshal([]byte(val), &headers); err != nil {
+			fmt.Fprintf(stderr, "invalid GITEA_EXTRA_HEADERS: %v\n", err)
+			osExit(1)
+		}
+		extraHeaders := make(http.Header, len(headers))
+		for name, value := range headers {
+			extraHeaders.Set(name, value)
+		}
+		flagPkg.ExtraHeaders = extraHeaders
+	}
 }
 
 // normalizeScope trims whitespace, lowercases, and converts internal spaces

cmd/cmd_test.go

@@ -5,6 +5,7 @@ import (
 	"flag"
 	"maps"
 	"slices"
+	"strings"
 	"testing"
 
 	flagPkg "gitea.com/gitea/gitea-mcp/pkg/flag"
@@ -95,3 +96,54 @@ func TestInitFlagSetScopes(t *testing.T) {
 		})
 	}
 }
+
+func TestInitFlagSetExtraHeaders(t *testing.T) {
+	t.Cleanup(func() { flagPkg.ExtraHeaders = nil })
+
+	getenv := func(key string) string {
+		if key == "GITEA_EXTRA_HEADERS" {
+			return `{"CF-Access-Client-Id":"id","CF-Access-Client-Secret":"secret"}`
+		}
+		return ""
+	}
+	readFile := func(string) ([]byte, error) { return nil, nil }
+	fs := flag.NewFlagSet("test", flag.ContinueOnError)
+	var stderr bytes.Buffer
+
+	initFlagSet(fs, []string{}, getenv, readFile, &stderr)
+
+	if got := flagPkg.ExtraHeaders.Get("CF-Access-Client-Id"); got != "id" {
+		t.Errorf("ExtraHeaders[CF-Access-Client-Id] = %q, want %q", got, "id")
+	}
+	if got := flagPkg.ExtraHeaders.Get("CF-Access-Client-Secret"); got != "secret" {
+		t.Errorf("ExtraHeaders[CF-Access-Client-Secret] = %q, want %q", got, "secret")
+	}
+}
+
+func TestInitFlagSetExtraHeadersInvalidJSON(t *testing.T) {
+	t.Cleanup(func() { flagPkg.ExtraHeaders = nil })
+
+	origOsExit := osExit
+	var exitCode int
+	osExit = func(code int) { exitCode = code }
+	t.Cleanup(func() { osExit = origOsExit })
+
+	getenv := func(key string) string {
+		if key == "GITEA_EXTRA_HEADERS" {
+			return `not-json`
+		}
+		return ""
+	}
+	readFile := func(string) ([]byte, error) { return nil, nil }
+	fs := flag.NewFlagSet("test", flag.ContinueOnError)
+	var stderr bytes.Buffer
+
+	initFlagSet(fs, []string{}, getenv, readFile, &stderr)
+
+	if exitCode != 1 {
+		t.Errorf("exitCode = %d, want 1", exitCode)
+	}
+	if !strings.Contains(stderr.String(), "GITEA_EXTRA_HEADERS") {
+		t.Errorf("stderr = %q, want mention of GITEA_EXTRA_HEADERS", stderr.String())
+	}
+}

operation/label/label_test.go

@@ -1,193 +0,0 @@
-package label
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"net/http"
-	"net/http/httptest"
-	"reflect"
-	"sort"
-	"sync"
-	"testing"
-
-	"gitea.com/gitea/gitea-mcp/pkg/flag"
-	"gitea.com/gitea/gitea-mcp/pkg/tool"
-
-	"github.com/modelcontextprotocol/go-sdk/mcp"
-)
-
-func Test_Tool_Registration(t *testing.T) {
-	if got := Tool.Scope(); got != "label" {
-		t.Fatalf("Scope() = %q, want %q", got, "label")
-	}
-
-	readTools := Tool.ReadTools()
-	if len(readTools) != 1 || readTools[0].Tool.Name != LabelReadToolName {
-		t.Fatalf("ReadTools() = %v, want exactly [%s]", toolNames(readTools), LabelReadToolName)
-	}
-	if !readTools[0].Tool.Annotations.ReadOnlyHint {
-		t.Fatalf("%s must be marked read-only", LabelReadToolName)
-	}
-
-	writeTools := Tool.WriteTools()
-	if len(writeTools) != 1 || writeTools[0].Tool.Name != LabelWriteToolName {
-		t.Fatalf("WriteTools() = %v, want exactly [%s]", toolNames(writeTools), LabelWriteToolName)
-	}
-	if writeTools[0].Tool.Annotations.ReadOnlyHint {
-		t.Fatalf("%s must not be marked read-only", LabelWriteToolName)
-	}
-
-	assertMethodEnum(t, LabelReadTool, []string{"list_repo_labels", "get_repo_label", "list_org_labels"})
-	assertMethodEnum(t, LabelWriteTool, []string{
-		"create_repo_label", "edit_repo_label", "delete_repo_label",
-		"create_org_label", "edit_org_label", "delete_org_label",
-	})
-}
-
-func toolNames(tools []tool.ServerTool) []string {
-	names := make([]string, len(tools))
-	for i, serverTool := range tools {
-		names[i] = serverTool.Tool.Name
-	}
-	return names
-}
-
-func assertMethodEnum(t *testing.T, definition *mcp.Tool, want []string) {
-	t.Helper()
-
-	schema, ok := definition.InputSchema.(map[string]any)
-	if !ok {
-		t.Fatalf("%s: input schema = %T, want map[string]any", definition.Name, definition.InputSchema)
-	}
-	properties, ok := schema["properties"].(map[string]any)
-	if !ok {
-		t.Fatalf("%s: properties = %T, want map[string]any", definition.Name, schema["properties"])
-	}
-	method, ok := properties["method"].(map[string]any)
-	if !ok {
-		t.Fatalf("%s: method property = %T, want map[string]any", definition.Name, properties["method"])
-	}
-	enum, ok := method["enum"].([]string)
-	if !ok {
-		t.Fatalf("%s: method enum = %T, want []string", definition.Name, method["enum"])
-	}
-
-	got := append([]string{}, enum...)
-	sort.Strings(got)
-	wantSorted := append([]string{}, want...)
-	sort.Strings(wantSorted)
-	if !reflect.DeepEqual(got, wantSorted) {
-		t.Fatalf("%s: method enum = %v, want %v", definition.Name, enum, want)
-	}
-}
-
-func Test_labelReadFn_listRepoLabels(t *testing.T) {
-	const (
-		owner = "octo"
-		repo  = "demo"
-	)
-
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		switch r.URL.Path {
-		case "/api/v1/version":
-			_, _ = w.Write([]byte(`{"version":"1.12.0"}`))
-		case fmt.Sprintf("/api/v1/repos/%s/%s/labels", owner, repo):
-			_, _ = w.Write([]byte(`[{"id":1,"name":"bug","color":"ff0000","description":"a bug"}]`))
-		default:
-			http.NotFound(w, r)
-		}
-	}))
-	defer server.Close()
-
-	withTestFlags(t, server.URL)
-
-	result, err := labelReadFn(context.Background(), map[string]any{
-		"method": "list_repo_labels",
-		"owner":  owner,
-		"repo":   repo,
-	})
-	if err != nil || result.IsError {
-		t.Fatalf("list_repo_labels err=%v result=%v", err, result)
-	}
-
-	var labels []map[string]any
-	decodeResult(t, result, &labels)
-	if len(labels) != 1 || labels[0]["name"] != "bug" {
-		t.Fatalf("unexpected labels: %v", labels)
-	}
-}
-
-func Test_labelWriteFn_createRepoLabel(t *testing.T) {
-	const (
-		owner = "octo"
-		repo  = "demo"
-	)
-
-	var (
-		mu   sync.Mutex
-		body map[string]any
-	)
-
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		switch {
-		case r.URL.Path == "/api/v1/version":
-			_, _ = w.Write([]byte(`{"version":"1.12.0"}`))
-		case r.URL.Path == fmt.Sprintf("/api/v1/repos/%s/%s/labels", owner, repo) && r.Method == http.MethodPost:
-			mu.Lock()
-			_ = json.NewDecoder(r.Body).Decode(&body)
-			mu.Unlock()
-			_, _ = w.Write([]byte(`{"id":7,"name":"bug","color":"ff0000","description":"a bug"}`))
-		default:
-			http.NotFound(w, r)
-		}
-	}))
-	defer server.Close()
-
-	withTestFlags(t, server.URL)
-
-	result, err := labelWriteFn(context.Background(), map[string]any{
-		"method":      "create_repo_label",
-		"owner":       owner,
-		"repo":        repo,
-		"name":        "bug",
-		"color":       "ff0000",
-		"description": "a bug",
-	})
-	if err != nil || result.IsError {
-		t.Fatalf("create_repo_label err=%v result=%v", err, result)
-	}
-
-	mu.Lock()
-	defer mu.Unlock()
-	if body["name"] != "bug" || body["color"] != "ff0000" {
-		t.Fatalf("unexpected request body: %v", body)
-	}
-
-	var label map[string]any
-	decodeResult(t, result, &label)
-	if label["name"] != "bug" {
-		t.Fatalf("unexpected label: %v", label)
-	}
-}
-
-func withTestFlags(t *testing.T, host string) {
-	t.Helper()
-	origHost, origToken, origVersion := flag.Host, flag.Token, flag.Version
-	flag.Host, flag.Token, flag.Version = host, "", "test"
-	t.Cleanup(func() { flag.Host, flag.Token, flag.Version = origHost, origToken, origVersion })
-}
-
-func decodeResult(t *testing.T, result *mcp.CallToolResult, out any) {
-	t.Helper()
-	if len(result.Content) != 1 {
-		t.Fatalf("result content = %v, want exactly one item", result.Content)
-	}
-	text, ok := result.Content[0].(*mcp.TextContent)
-	if !ok {
-		t.Fatalf("result content = %T, want *mcp.TextContent", result.Content[0])
-	}
-	if err := json.Unmarshal([]byte(text.Text), out); err != nil {
-		t.Fatalf("decode result: %v", err)
-	}
-}

operation/milestone/milestone_test.go

@@ -7,122 +7,14 @@ import (
 	"maps"
 	"net/http"
 	"net/http/httptest"
-	"reflect"
-	"sort"
 	"sync"
 	"testing"
 
 	"gitea.com/gitea/gitea-mcp/pkg/flag"
-	"gitea.com/gitea/gitea-mcp/pkg/tool"
 
 	"github.com/modelcontextprotocol/go-sdk/mcp"
 )
 
-func Test_Tool_Registration(t *testing.T) {
-	if got := Tool.Scope(); got != "milestone" {
-		t.Fatalf("Scope() = %q, want %q", got, "milestone")
-	}
-
-	readTools := Tool.ReadTools()
-	if len(readTools) != 1 || readTools[0].Tool.Name != MilestoneReadToolName {
-		t.Fatalf("ReadTools() = %v, want exactly [%s]", toolNames(readTools), MilestoneReadToolName)
-	}
-	if !readTools[0].Tool.Annotations.ReadOnlyHint {
-		t.Fatalf("%s must be marked read-only", MilestoneReadToolName)
-	}
-
-	writeTools := Tool.WriteTools()
-	if len(writeTools) != 1 || writeTools[0].Tool.Name != MilestoneWriteToolName {
-		t.Fatalf("WriteTools() = %v, want exactly [%s]", toolNames(writeTools), MilestoneWriteToolName)
-	}
-	if writeTools[0].Tool.Annotations.ReadOnlyHint {
-		t.Fatalf("%s must not be marked read-only", MilestoneWriteToolName)
-	}
-
-	assertMethodEnum(t, MilestoneReadTool, []string{"get", "list"})
-	assertMethodEnum(t, MilestoneWriteTool, []string{"create", "update", "edit", "delete"})
-}
-
-func toolNames(tools []tool.ServerTool) []string {
-	names := make([]string, len(tools))
-	for i, serverTool := range tools {
-		names[i] = serverTool.Tool.Name
-	}
-	return names
-}
-
-func assertMethodEnum(t *testing.T, definition *mcp.Tool, want []string) {
-	t.Helper()
-
-	schema, ok := definition.InputSchema.(map[string]any)
-	if !ok {
-		t.Fatalf("%s: input schema = %T, want map[string]any", definition.Name, definition.InputSchema)
-	}
-	properties, ok := schema["properties"].(map[string]any)
-	if !ok {
-		t.Fatalf("%s: properties = %T, want map[string]any", definition.Name, schema["properties"])
-	}
-	method, ok := properties["method"].(map[string]any)
-	if !ok {
-		t.Fatalf("%s: method property = %T, want map[string]any", definition.Name, properties["method"])
-	}
-	enum, ok := method["enum"].([]string)
-	if !ok {
-		t.Fatalf("%s: method enum = %T, want []string", definition.Name, method["enum"])
-	}
-
-	got := append([]string{}, enum...)
-	sort.Strings(got)
-	wantSorted := append([]string{}, want...)
-	sort.Strings(wantSorted)
-	if !reflect.DeepEqual(got, wantSorted) {
-		t.Fatalf("%s: method enum = %v, want %v", definition.Name, enum, want)
-	}
-}
-
-func Test_listMilestonesFn(t *testing.T) {
-	const (
-		owner = "octo"
-		repo  = "demo"
-	)
-
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		switch r.URL.Path {
-		case "/api/v1/version":
-			_, _ = w.Write([]byte(`{"version":"1.12.0"}`))
-		case fmt.Sprintf("/api/v1/repos/%s/%s/milestones", owner, repo):
-			_, _ = w.Write([]byte(`[{"id":1,"title":"v1","state":"open"}]`))
-		default:
-			http.NotFound(w, r)
-		}
-	}))
-	defer server.Close()
-
-	origHost, origToken, origVersion := flag.Host, flag.Token, flag.Version
-	flag.Host, flag.Token, flag.Version = server.URL, "", "test"
-	defer func() { flag.Host, flag.Token, flag.Version = origHost, origToken, origVersion }()
-
-	result, err := listMilestonesFn(context.Background(), map[string]any{
-		"owner": owner,
-		"repo":  repo,
-	})
-	if err != nil || result.IsError {
-		t.Fatalf("list err=%v result=%v", err, result)
-	}
-
-	text, ok := result.Content[0].(*mcp.TextContent)
-	if !ok {
-		t.Fatalf("result content = %T, want *mcp.TextContent", result.Content[0])
-	}
-	var milestones []map[string]any
-	if err := json.Unmarshal([]byte(text.Text), &milestones); err != nil {
-		t.Fatalf("decode result: %v", err)
-	}
-	if len(milestones) != 1 || milestones[0]["title"] != "v1" {
-		t.Fatalf("unexpected milestones: %v", milestones)
-	}
-}
-
 func Test_milestoneWriteFn_dueOn(t *testing.T) {
 	const (
 		owner = "octo"

pkg/flag/flag.go

@@ -1,5 +1,7 @@
 package flag
 
+import "net/http"
+
 var (
 	Host    string
 	Bind    string
@@ -15,4 +17,5 @@ var (
 	Debug         bool
 	AllowedTools  map[string]struct{}
 	AllowedScopes map[string]struct{}
+	ExtraHeaders  http.Header
 )

pkg/gitea/gitea.go

@@ -30,6 +30,32 @@ func sharedTransport() *http.Transport {
 	return sharedTrans
 }
 
+// extraHeaderTransport injects flag.ExtraHeaders into every request, without
+// overriding headers the caller already set (e.g. Authorization, Content-Type,
+// Accept). It reads flag.ExtraHeaders on each round trip rather than caching
+// it, so tests can change it between requests.
+type extraHeaderTransport struct {
+	base http.RoundTripper
+}
+
+func (t *extraHeaderTransport) RoundTrip(req *http.Request) (*http.Response, error) {
+	headers := flag.ExtraHeaders
+	if len(headers) == 0 {
+		return t.base.RoundTrip(req)
+	}
+	cloned := req.Clone(req.Context())
+	for name, values := range headers {
+		if cloned.Header.Get(name) == "" {
+			cloned.Header[name] = values
+		}
+	}
+	return t.base.RoundTrip(cloned)
+}
+
+func giteaTransport() http.RoundTripper {
+	return &extraHeaderTransport{base: sharedTransport()}
+}
+
 // NewClient returns a cached *gitea.Client keyed by host+token. The SDK's per-client
 // version cache and the shared transport let us reuse keep-alive connections
 // and avoid the SDK's /api/v1/version preflight on every tool call.
@@ -40,7 +66,7 @@ func NewClient(token string) (*gitea.Client, error) {
 	}
 
 	httpClient := &http.Client{
-		Transport:     sharedTransport(),
+		Transport:     giteaTransport(),
 		CheckRedirect: checkRedirect,
 	}
 	opts := []gitea.ClientOption{

pkg/gitea/gitea_test.go

@@ -0,0 +1,49 @@
+package gitea
+
+import (
+	"context"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	"gitea.com/gitea/gitea-mcp/pkg/flag"
+)
+
+func TestNewClient_SendsExtraHeaders(t *testing.T) {
+	var gotClientID, gotAuthorization string
+	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		gotClientID = r.Header.Get("CF-Access-Client-Id")
+		gotAuthorization = r.Header.Get("Authorization")
+		w.Header().Set("Content-Type", "application/json")
+		w.WriteHeader(http.StatusOK)
+		_, _ = w.Write([]byte(`{"login":"octocat"}`))
+	}))
+	defer srv.Close()
+
+	origHost := flag.Host
+	origExtraHeaders := flag.ExtraHeaders
+	defer func() {
+		flag.Host = origHost
+		flag.ExtraHeaders = origExtraHeaders
+	}()
+	flag.Host = srv.URL
+	flag.ExtraHeaders = http.Header{
+		"Cf-Access-Client-Id": []string{"client-id"},
+		"Authorization":       []string{"should-not-override"},
+	}
+
+	client, err := NewClient("the-token")
+	if err != nil {
+		t.Fatalf("NewClient returned error: %v", err)
+	}
+	if _, _, err := client.Users.GetMyUserInfo(context.Background()); err != nil {
+		t.Fatalf("GetMyUserInfo returned error: %v", err)
+	}
+
+	if gotClientID != "client-id" {
+		t.Fatalf("CF-Access-Client-Id header = %q, want %q", gotClientID, "client-id")
+	}
+	if gotAuthorization != "token the-token" {
+		t.Fatalf("Authorization header = %q, want %q", gotAuthorization, "token the-token")
+	}
+}

pkg/gitea/rest.go

@@ -59,7 +59,7 @@ var (
 func restHTTPClient() *http.Client {
 	restClientOnce.Do(func() {
 		restClient = &http.Client{
-			Transport:     sharedTransport(),
+			Transport:     giteaTransport(),
 			Timeout:       httpClientTimeout,
 			CheckRedirect: checkRedirect,
 		}
@@ -180,7 +180,7 @@ func DoJSON(ctx context.Context, method, path string, query url.Values, body, re
 
 func attachmentHTTPClient(origin *url.URL) *http.Client {
 	return &http.Client{
-		Transport: sharedTransport(),
+		Transport: giteaTransport(),
 		CheckRedirect: func(req *http.Request, via []*http.Request) error {
 			if err := checkRedirect(req, via); err != nil {
 				return err

pkg/gitea/rest_test.go

@@ -62,3 +62,44 @@ func TestDoJSON_LimitsErrorResponseBody(t *testing.T) {
 		t.Fatalf("expected body length %d, got %d", errBodySnippetSize, len(httpErr.Body))
 	}
 }
+
+func TestDoJSON_SendsExtraHeaders(t *testing.T) {
+	var gotClientID, gotAuthorization string
+	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		gotClientID = r.Header.Get("CF-Access-Client-Id")
+		gotAuthorization = r.Header.Get("Authorization")
+		w.WriteHeader(http.StatusOK)
+		_, _ = io.WriteString(w, "{}")
+	}))
+	defer srv.Close()
+
+	origHost := flag.Host
+	origToken := flag.Token
+	origExtraHeaders := flag.ExtraHeaders
+	defer func() {
+		flag.Host = origHost
+		flag.Token = origToken
+		flag.ExtraHeaders = origExtraHeaders
+	}()
+	flag.Host = srv.URL
+	flag.Token = "the-token"
+	flag.ExtraHeaders = http.Header{
+		"Cf-Access-Client-Id": []string{"client-id"},
+		"Authorization":       []string{"should-not-override"},
+	}
+
+	var out map[string]any
+	status, err := DoJSON(context.Background(), http.MethodGet, "repos/owner/repo", nil, nil, &out)
+	if err != nil {
+		t.Fatalf("DoJSON returned error: %v", err)
+	}
+	if status != http.StatusOK {
+		t.Fatalf("expected status %d, got %d", http.StatusOK, status)
+	}
+	if gotClientID != "client-id" {
+		t.Fatalf("CF-Access-Client-Id header = %q, want %q", gotClientID, "client-id")
+	}
+	if gotAuthorization != "token the-token" {
+		t.Fatalf("Authorization header = %q, want %q", gotAuthorization, "token the-token")
+	}
+}