Compare commits

...
5 Commits
Author SHA1 Message Date
mathiasandClaude Opus 5 e1e9a2e30e feat(auth): every accepted request names the path that granted it
CD / Deploy via GitOps (push) Successful in 5s
CD / Lint / Test / Vet (push) Successful in 16s
CD / Build & Import (push) Successful in 16s
Closes #60. Closes #58 (fixed in mcp-chassis v0.7.0, consumed here).

Three auth paths reach this server and none of them said so on success.

PassthroughMiddleware logged nothing at all, success or failure. While verifying
#59 end to end there was no way to confirm from the logs whether calls were
using the new PAT pass-through — the caller's own Gitea PAT, the caller's own
identity — or falling through to the shared JWT/static path. The only available
reasoning was inference from which failures were absent.

    INFO mcp auth accepted auth_path=passthrough caller=alice token_fp=...
    INFO mcp auth accepted auth_path=jwt        caller=mathiasbq token_fp=...
    INFO mcp auth accepted auth_path=static     token_fp=...

The first line matters more than the other two. Pass-through is the path where a
request acts as a SPECIFIC Gitea user; an audit trail that cannot say which
identity performed a write is not an audit trail.

chassisauth.Fingerprint, not a local equivalent. The chassis emits token_fp on
its own accepted and rejected lines, and two different fingerprints for the same
token cannot be correlated — which is the only reason the field exists. Exported
from the chassis in v0.7.1 for exactly this.

A token that is not a valid PAT still falls through SILENTLY. The chassis owns
the verdict, and logging here as well would double-count every static-token
request, since all of them reach this middleware first. Asserted, because "logs
nothing on the failure path" is indistinguishable from "was never called".

Also lands #58 by consuming mcp-chassis v0.7.0: a JWT presented to a server with
no JWT auth configured now reports jwt_auth_not_configured rather than
static_token_mismatch. That log line is what sent a debugging session into
re-running the OAuth flow while the credentials were valid the whole time.

Verified: task check EXIT=0.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
2026-09-14 20:59:04 +02:00
mathiasandClaude Opus 5 09bde6df8a fix(health): /healthz answers now, and /readyz takes a degraded pod out
CD / Deploy via GitOps (push) Successful in 5s
CD / Lint / Test / Vet (push) Successful in 30s
CD / Build & Import (push) Successful in 15s
Closes #57. Consumes mcp-chassis v0.6.0 (mcp-chassis#4).

Two halves of one six-day outage. The chassis fix alone would not have fixed
this one.

/HEALTHZ WAS A CONSTANT

newHealthzHandler marshalled its body ONCE at startup and served those bytes for
the process lifetime. On 2026-09-14 it reported jwt.status=degraded for six days
after Authentik had recovered, because the answer was computed before Authentik
was up and could never change. A health endpoint that cannot change its answer
is not a health endpoint.

It now evaluates readiness per request. That is also what drives recovery: the
chassis resolves a pending issuer on demand, so every probe is a retry.

/READYZ IS NEW, AND IT IS THE ACTUAL CONTROL

Through all three occurrences the pod was 1/1 Running and readiness-green while
401ing every OAuth caller. k8s had no signal and kept routing to it. /readyz
answers 503 while JWT auth is degraded, so the pod leaves the Service instead of
serving guaranteed failures, and the kubelet's probe cadence becomes the retry
loop — no background goroutine, no context to own.

/healthz deliberately stays 200. The process is alive; a liveness probe must not
restart it, because restarting does not make the IdP come back sooner.

A server with no issuer configured is always ready. Making readiness depend on an
issuer it was never given would pull every static-token-only MCP out of its
Service — asserted, not assumed.

THE RETRY-WITHOUT-THE-K8S-ISSUER FALLBACK IS GONE

It existed because one unreachable issuer used to fail the whole constructor and
take Authentik auth down with it. Since v0.6.0 each issuer resolves lazily and
independently, so a down issuer degrades only itself. The warning it logged —
"multi-issuer init failed; retrying without the k8s issuer" — was the first line
of today's incident; it no longer has a reason to exist.

A constructor error now means a config error, which exits non-zero rather than
warning and continuing.

TESTS

healthz_live_test.go, written first and red (newReadyzHandler undefined, and
newHealthzHandler's signature could not express a state that changes). The
sharpest assertion is that readiness is evaluated TWICE for two requests — a
handler that caches cannot pass it.

The existing table test is ported, not weakened: same three cases, same expected
statuses, only the mechanism by which state reaches the handler changed.

Verified: task check EXIT=0 (lint, vet, race). The lint failure it surfaced was
pre-existing and is fixed in the preceding commit.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
2026-09-14 20:06:15 +02:00
mathiasandClaude Opus 5 aaaa4b4d64 fix(lint): reflect.Ptr -> reflect.Pointer, unblocking task check
`task check` has been red at HEAD since 2bb1fef adopted the canonical
.golangci.yml from infra/ci-templates, which enables govet's `inline` analyzer.
Nothing to do with the change it blocks; reproduced against a clean HEAD before
touching it.

reflect.Ptr is the pre-Go-1.18 spelling of reflect.Pointer and is a deprecated
alias for it. Identical constant, no behaviour change.

Separate commit because it is unrelated to the auth work that found it.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
2026-09-14 20:06:00 +02:00
mathias 2bb1fef543 chore(lint): adopt the canonical .golangci.yml from infra/ci-templates
CD / Lint / Test / Vet (push) Successful in 10s
CD / Build & Import (push) Successful in 5s
CD / Deploy via GitOps (push) Successful in 4s
Canonical lives at infra ci-templates/golangci.yml, distributed by the
infra#309 pattern: byte-identical copies, checksum drift gate in infra. Do
not edit this file here -- edit the canonical and run `task ci:sync`.

Verified locally before pushing, not pushed-and-hoped: golangci-lint v2.11.4
against a Go 1.26.1 toolchain (matching CI) reports 0 issues here.

Also applies gofumpt, which this config enables and the golangci-lint v2
default set does not check at all. That gap is why the drift was invisible:
earlier passes ran gofmt, which is weaker. Mechanical, deterministic,
build+vet verified.
2026-09-05 14:42:59 +02:00
mathias ee9ac99c40 style: apply gofmt
CD / Lint / Test / Vet (push) Successful in 10s
CD / Build & Import (push) Successful in 4s
CD / Deploy via GitOps (push) Successful in 4s
Estate-wide consolidation pass. golangci-lint v2 default set enables NO
formatter, so gofmt drift accumulated silently across the estate -- 8 repos
were carrying it, this one included. Same hole that let two files rot in
dma-cli until they were found by hand (dma-cli#12).

Mechanical and deterministic: `gofmt -w`, nothing hand-edited. Verified
before commit -- gofmt -l now reports 0, go build and go vet both pass.

Clears this repo to adopt the canonical .golangci.yml (infra
ci-templates/golangci.yml, infra#309 pattern) in a later wave.
2026-09-05 12:40:34 +02:00
19 changed files with 385 additions and 47 deletions
+9 -4
View File
@@ -2,21 +2,26 @@
"mcpServers": {
"brain": {
"type": "http",
"url": "https://brain-mcp.d-ma.be/mcp",
"url": "https://koala.tail30472e.ts.net:8443/mcp",
"headers": {
"Authorization": "Bearer ${BRAIN_MCP_TOKEN}"
}
},
"gitea": {
"_comment": "gitea-mcp authenticates by PASS-THROUGH: the bearer is a Gitea PAT it validates against Gitea and then acts as. GITEA_MCP_TOKEN -- which this entry used until 2026-09-08 -- 401s against it, so every harness synced from this file had a dead gitea server and no signal saying so. Probed 2026-09-08: GITEA_MCP_TOKEN 401, DMABE_GITEA_API_TOKEN 200, on both the public and the Serve URL.",
"type": "http",
"url": "https://git-mcp.d-ma.be/mcp",
"url": "https://koala.tail30472e.ts.net:8446/mcp",
"headers": {
"Authorization": "Bearer ${GITEA_MCP_TOKEN}"
"Authorization": "Bearer ${DMABE_GITEA_API_TOKEN}"
}
},
"infra": {
"_comment": "The bearer is belt-and-braces: this endpoint answers 200 with or without it, since Serve already limits reach to the tailnet. Sending it anyway means the day the server starts enforcing is not the day every harness breaks.",
"type": "http",
"url": "https://infra-mcp.d-ma.be/mcp"
"url": "https://koala.tail30472e.ts.net:8444/mcp",
"headers": {
"Authorization": "Bearer ${INFRA_MCP_TOKEN}"
}
}
}
}
+52
View File
@@ -0,0 +1,52 @@
# Canonical golangci-lint configuration for the estate's Go repos (infra#309
# pattern: one canonical file here, a byte-identical copy in each adopter,
# and the drift gate in THIS repo comparing sha256).
#
# Why this exists: 26 Go repos, 3 had a lint config, and all three were
# different. The 23 without one ran golangci-lint's v2 default set, which
# does NOT include a formatter -- so gofmt/gofumpt drift went uncaught until
# it was found by hand (dma-cli#12: two files drifted, nothing flagged them).
#
# The two configs this replaces (cobalt-dingo, coo-agent) were near-identical
# copies of each other AND both invalid under v2: they carried v1-style
# `linters-settings` and `issues.exclude-rules` keys, which `golangci-lint
# config verify` rejects outright. Their revive settings and test exclusions
# were therefore not in effect. Consolidating fixes that too.
#
# Per-repo variation does NOT belong here -- this file must stay byte-identical
# across adopters so the gate is a checksum, not a diff a human has to judge.
# A repo with a genuine exception (agentsquad excludes its seeded-bug fixture
# tree, which exists precisely to contain broken code) keeps its own config and
# is not listed as an adopter.
version: "2"
linters:
default: none
enable:
- errcheck # unchecked errors
- govet # suspicious constructs
- staticcheck # broad static analysis
- unused # unused code
- misspell # spelling
- revive # idiomatic Go
- exhaustive # exhaustive switch on enums
settings:
revive:
rules:
- name: var-naming
severity: warning
exclusions:
rules:
# Test files: table-driven cases legitimately carry unused struct fields
# and long functions.
- path: _test\.go
linters:
- revive
- unused
formatters:
enable:
- gofumpt
+61 -8
View File
@@ -1,6 +1,7 @@
package main
import (
"context"
"encoding/json"
"net/http"
)
@@ -22,15 +23,67 @@ type jwtStatus struct {
LastError string `json:"last_error,omitempty"`
}
func newHealthzHandler(dexConfigured, validatorReady bool, initErr error) http.HandlerFunc {
status := healthStatus{OK: true, JWT: jwtStatus{Status: jwtStatusFor(dexConfigured, validatorReady)}}
if initErr != nil {
status.JWT.LastError = initErr.Error()
}
body, _ := json.Marshal(status)
return func(w http.ResponseWriter, _ *http.Request) {
// readinessFn reports whether JWT validation is currently possible, and why
// not. chassisauth.JWTValidator.Ready satisfies it.
type readinessFn func(context.Context) (bool, error)
// newHealthzHandler reports the CURRENT state, evaluated per request.
//
// It used to marshal one body at startup and serve those bytes forever. That is
// how gitea-mcp reported jwt.status=degraded for six days after Authentik had
// recovered (mcp-chassis#4): the answer was computed before the IdP was up and
// could never change. Fixing the validator alone would not have fixed this —
// the validator would recover and /healthz would keep saying degraded.
//
// Calling ready() per request is also what drives recovery: the chassis resolves
// a pending issuer on demand, so every probe is a retry.
func newHealthzHandler(dexConfigured bool, ready readinessFn) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
status := healthStatus{OK: true, JWT: jwtStatus{Status: "disabled"}}
if dexConfigured {
ok, err := ready(r.Context())
status.JWT.Status = jwtStatusFor(true, ok)
if err != nil {
status.JWT.LastError = err.Error()
}
}
w.Header().Set("Content-Type", "application/json")
_, _ = w.Write(body)
_ = json.NewEncoder(w).Encode(status)
}
}
// newReadyzHandler is the kubelet's probe: 503 while JWT auth is degraded.
//
// /healthz stays 200 deliberately — the process is alive and a liveness probe
// must not restart it, because restarting does not make the IdP come back any
// sooner. Readiness is the right lever: k8s stops routing OAuth callers to a pod
// that would 401 them, and the probe's own cadence becomes the retry loop with
// no background goroutine to own.
//
// A server with no issuer configured is always ready. Making readiness depend on
// an issuer it was never given would pull every static-token-only MCP out of its
// Service.
func newReadyzHandler(dexConfigured bool, ready readinessFn) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
if !dexConfigured {
w.WriteHeader(http.StatusOK)
return
}
ok, err := ready(r.Context())
if !ok {
w.Header().Set("Content-Type", "application/json")
w.WriteHeader(http.StatusServiceUnavailable)
msg := ""
if err != nil {
msg = err.Error()
}
_ = json.NewEncoder(w).Encode(healthStatus{
OK: false,
JWT: jwtStatus{Status: "degraded", LastError: msg},
})
return
}
w.WriteHeader(http.StatusOK)
}
}
+106
View File
@@ -0,0 +1,106 @@
package main
import (
"context"
"encoding/json"
"net/http"
"net/http/httptest"
"testing"
"github.com/stretchr/testify/require"
)
// readinessFunc is what the handler asks. Named here so the test can drive it.
type fakeReadiness struct{ calls int }
// ready reports not-ready on the first call and ready afterwards — the shape of
// an IdP that was down when the process booted and came back a minute later.
func (f *fakeReadiness) ready(context.Context) (bool, error) {
f.calls++
if f.calls == 1 {
return false, errBoot
}
return true, nil
}
var errBoot = &bootErr{}
type bootErr struct{}
func (*bootErr) Error() string { return "oidc discovery: status 503" }
// A health endpoint that answers from a value captured at startup is not a
// health endpoint.
//
// newHealthzHandler marshalled its body ONCE and served the same bytes for the
// process lifetime. On 2026-09-14 gitea-mcp reported jwt.status=degraded for six
// days after Authentik recovered, because the answer had been computed before
// Authentik was up and could never change. The pod was 1/1 Running and
// readiness-green throughout.
//
// Fixing mcp-chassis#4 alone does not fix this: the validator would recover and
// /healthz would keep saying degraded.
func TestHealthz_ReflectsCurrentState_NotBootState(t *testing.T) {
f := &fakeReadiness{}
h := newHealthzHandler(true, f.ready)
first := decodeHealth(t, h)
require.Equal(t, "degraded", first.JWT.Status, "first call: issuer still down")
require.NotEmpty(t, first.JWT.LastError, "degraded must say why")
second := decodeHealth(t, h)
require.Equal(t, "enabled", second.JWT.Status,
"the issuer recovered; /healthz must notice without a restart")
require.Empty(t, second.JWT.LastError)
require.Equal(t, 2, f.calls, "readiness must be evaluated per request, not cached at startup")
}
// With no issuer configured, JWT auth is disabled by choice and readiness is
// never consulted — a static-token-only server must not be reported degraded.
func TestHealthz_NoIssuer_IsDisabledNotDegraded(t *testing.T) {
f := &fakeReadiness{}
h := newHealthzHandler(false, f.ready)
got := decodeHealth(t, h)
require.Equal(t, "disabled", got.JWT.Status)
require.Zero(t, f.calls, "no issuer configured means nothing to probe")
}
// readyz is what the kubelet probes. It must FAIL while JWT auth is degraded, so
// k8s stops routing to a pod that will 401 every OAuth caller — and so the
// probe's own cadence becomes the retry loop.
func TestReadyz_FailsWhileDegraded_ThenPasses(t *testing.T) {
f := &fakeReadiness{}
h := newReadyzHandler(true, f.ready)
rec := httptest.NewRecorder()
h(rec, httptest.NewRequest(http.MethodGet, "/readyz", nil))
require.Equal(t, http.StatusServiceUnavailable, rec.Code,
"a pod that cannot validate any JWT must not be in the Service")
rec = httptest.NewRecorder()
h(rec, httptest.NewRequest(http.MethodGet, "/readyz", nil))
require.Equal(t, http.StatusOK, rec.Code, "recovered without a restart")
}
// A static-token-only server is always ready. Making readyz depend on an issuer
// it was never given would take every static-only MCP out of its Service.
func TestReadyz_NoIssuer_AlwaysReady(t *testing.T) {
f := &fakeReadiness{}
h := newReadyzHandler(false, f.ready)
rec := httptest.NewRecorder()
h(rec, httptest.NewRequest(http.MethodGet, "/readyz", nil))
require.Equal(t, http.StatusOK, rec.Code)
require.Zero(t, f.calls)
}
func decodeHealth(t *testing.T, h http.HandlerFunc) healthStatus {
t.Helper()
rec := httptest.NewRecorder()
h(rec, httptest.NewRequest(http.MethodGet, "/healthz", nil))
var got healthStatus
require.NoError(t, json.Unmarshal(rec.Body.Bytes(), &got))
return got
}
+6 -1
View File
@@ -1,6 +1,7 @@
package main
import (
"context"
"encoding/json"
"errors"
"net/http"
@@ -43,7 +44,11 @@ func TestHealthzHandler(t *testing.T) {
for _, tc := range tests {
t.Run(tc.name, func(t *testing.T) {
h := newHealthzHandler(tc.dexConfigured, tc.validatorReady, tc.initErr)
// Readiness is now a function the handler calls per request rather
// than two values captured at startup (mcp-chassis#4). The cases
// below are unchanged; only how the state reaches the handler is.
ready := func(context.Context) (bool, error) { return tc.validatorReady, tc.initErr }
h := newHealthzHandler(tc.dexConfigured, ready)
rec := httptest.NewRecorder()
h.ServeHTTP(rec, httptest.NewRequest(http.MethodGet, "/healthz", nil))
+16 -16
View File
@@ -54,21 +54,17 @@ func main() {
}
}
jwtValidator, jwtInitErr := chassisauth.NewMultiJWTValidator(ctx, issuers)
if jwtInitErr != nil && cfg.K8sIssuerURL != "" && len(issuers) > 1 {
// A configured issuer (likely the in-cluster k8s OIDC) was unreachable at
// startup. Don't let it take down Authentik JWT auth — retry without it.
logger.Warn("multi-issuer init failed; retrying without the k8s issuer", "err", jwtInitErr)
pub := make([]chassisauth.IssuerConfig, 0, len(issuers))
for _, ic := range issuers {
if ic.IssuerURL != cfg.K8sIssuerURL {
pub = append(pub, ic)
}
}
jwtValidator, jwtInitErr = chassisauth.NewMultiJWTValidator(ctx, pub)
}
if jwtInitErr != nil {
logger.Warn("jwt validator init failed; JWT auth degraded", "err", jwtInitErr)
// No retry-without-the-k8s-issuer dance any more, and no "JWT auth degraded"
// warning to act on. Since mcp-chassis v0.6.0 an unreachable issuer does not
// fail construction: each issuer resolves independently and lazily, so one
// down issuer degrades only itself and recovers on its own. The fallback this
// replaced existed precisely because a single unreachable issuer used to take
// the whole validator with it.
jwtValidator, err := chassisauth.NewMultiJWTValidator(ctx, issuers)
if err != nil {
// Only a configuration error can reach here now.
logger.Error("jwt validator config invalid", "err", err)
os.Exit(1)
}
giteaClient := gitea.NewClient(cfg.GiteaBaseURL, cfg.DefaultToken)
@@ -98,7 +94,11 @@ func main() {
),
),
))
mux.Handle("/healthz", newHealthzHandler(cfg.DexIssuerURL != "", jwtValidator != nil, jwtInitErr))
// Readiness is evaluated per request, and evaluating it is what retries a
// pending issuer — so the kubelet's probe cadence is the recovery loop.
dexConfigured := cfg.DexIssuerURL != ""
mux.Handle("/healthz", newHealthzHandler(dexConfigured, jwtValidator.Ready))
mux.Handle("/readyz", newReadyzHandler(dexConfigured, jwtValidator.Ready))
if cfg.DexIssuerURL != "" {
mux.HandleFunc("GET /.well-known/oauth-protected-resource",
chassisauth.ProtectedResourceHandler(cfg.MCPResourceURL, cfg.DexIssuerURL))
+1 -1
View File
@@ -3,7 +3,7 @@ module git.d-ma.be/mathias/gitea-mcp
go 1.26.2
require (
git.d-ma.be/mathias/mcp-chassis v0.5.0
git.d-ma.be/mathias/mcp-chassis v0.7.1
github.com/hashicorp/golang-lru/v2 v2.0.7
github.com/stretchr/testify v1.11.1
)
+6
View File
@@ -1,5 +1,11 @@
git.d-ma.be/mathias/mcp-chassis v0.5.0 h1:0w3dt4t4r8OtZBHIOoZkR6p6L3L6YDiqhMh9bTI/w/8=
git.d-ma.be/mathias/mcp-chassis v0.5.0/go.mod h1:Ks7EK2UnGAN0H3rJjKUxUagX8/ZBdtLrOlcUbv0RwH8=
git.d-ma.be/mathias/mcp-chassis v0.6.0 h1:/MuxT9IyzZbN26+COlI2FK0moTyXMLG/qXc/cm0i0Vg=
git.d-ma.be/mathias/mcp-chassis v0.6.0/go.mod h1:Ks7EK2UnGAN0H3rJjKUxUagX8/ZBdtLrOlcUbv0RwH8=
git.d-ma.be/mathias/mcp-chassis v0.7.0 h1:ct31v1F1PMhMCva/V0ErEbgMzwnT+27lYKbug2A/quE=
git.d-ma.be/mathias/mcp-chassis v0.7.0/go.mod h1:Ks7EK2UnGAN0H3rJjKUxUagX8/ZBdtLrOlcUbv0RwH8=
git.d-ma.be/mathias/mcp-chassis v0.7.1 h1:4h8TOBHTA0L/no4IPcr4tLcQtmKUlhE2/cXyPdNFGmM=
git.d-ma.be/mathias/mcp-chassis v0.7.1/go.mod h1:Ks7EK2UnGAN0H3rJjKUxUagX8/ZBdtLrOlcUbv0RwH8=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+26
View File
@@ -2,9 +2,12 @@ package auth
import (
"context"
"log/slog"
"net/http"
"strings"
chassisauth "git.d-ma.be/mathias/mcp-chassis/auth"
"git.d-ma.be/mathias/gitea-mcp/internal/gitea"
)
@@ -25,11 +28,34 @@ func PassthroughMiddleware(validator TokenValidator, onValid, fallback http.Hand
token, hasBearer := strings.CutPrefix(authz, "Bearer ")
if hasBearer && token != "" {
if login, ok := validator.ValidateToken(r.Context(), token); ok {
// gitea-mcp#60. This middleware logged nothing at all, so there
// was no way to tell a PAT pass-through request from one that
// fell through to the shared JWT/static path — only inference
// from which failures were absent.
//
// It matters more here than on the other two paths: this is
// where a request acts as a SPECIFIC Gitea user. An audit trail
// that cannot say which identity performed a write is not an
// audit trail.
//
// chassisauth.Fingerprint, not a local equivalent: the chassis
// emits the same field on its own accepted/rejected lines, and
// two different fingerprints for one token cannot be correlated.
slog.Info("mcp auth accepted",
"auth_path", "passthrough",
"caller", login,
"token_fp", chassisauth.Fingerprint(token),
"path", r.URL.Path,
)
ctx := withCaller(r.Context(), login)
ctx = gitea.WithToken(ctx, token)
onValid.ServeHTTP(w, r.WithContext(ctx))
return
}
// A token that is not a valid PAT falls through SILENTLY. The
// chassis owns the verdict; logging here too would double-count
// every static-token request, since all of them reach this
// middleware first.
}
fallback.ServeHTTP(w, r)
})
+83
View File
@@ -0,0 +1,83 @@
package auth
import (
"bytes"
"context"
"encoding/json"
"log/slog"
"net/http"
"net/http/httptest"
"strings"
"testing"
"github.com/stretchr/testify/require"
)
type stubValidator struct{ login string }
func (s stubValidator) ValidateToken(context.Context, string) (string, bool) {
return s.login, s.login != ""
}
// gitea-mcp#60: PassthroughMiddleware logged nothing at all, success or failure.
//
// While verifying #59 end to end there was no way to confirm from the server
// logs whether calls were using the new PAT pass-through (caller's own Gitea
// PAT, own identity) or falling through to the shared JWT/static path. The only
// way to reason about it was inference. The chassis names its two paths as of
// v0.7.0; this is the third.
//
// This matters more than the other two: pass-through is the path where the
// request acts as a SPECIFIC Gitea user. An audit trail that cannot say which
// identity performed a write is not an audit trail.
func TestPassthroughMiddleware_LogsTheAcceptedPath(t *testing.T) {
var buf bytes.Buffer
prev := slog.Default()
slog.SetDefault(slog.New(slog.NewJSONHandler(&buf, &slog.HandlerOptions{Level: slog.LevelInfo})))
t.Cleanup(func() { slog.SetDefault(prev) })
reached := false
h := PassthroughMiddleware(stubValidator{login: "alice"},
http.HandlerFunc(func(http.ResponseWriter, *http.Request) { reached = true }),
http.HandlerFunc(func(http.ResponseWriter, *http.Request) { t.Fatal("must not fall back") }))
req := httptest.NewRequest(http.MethodGet, "/mcp", nil)
req.Header.Set("Authorization", "Bearer a-real-gitea-pat")
h.ServeHTTP(httptest.NewRecorder(), req)
require.True(t, reached)
var line map[string]any
require.NoError(t, json.Unmarshal([]byte(strings.TrimSpace(buf.String())), &line))
require.Equal(t, "mcp auth accepted", line["msg"])
require.Equal(t, "passthrough", line["auth_path"])
require.Equal(t, "alice", line["caller"])
require.NotEmpty(t, line["token_fp"], "correlatable without being a credential")
for k, v := range line {
require.NotContains(t, []any{v}, "a-real-gitea-pat",
"the PAT must never appear in any field, including %q", k)
}
}
// A token that is not a valid PAT must fall through silently to the chassis,
// which owns the rejection log. Logging here as well would double-count every
// static-token request — every one of them reaches this middleware first.
func TestPassthroughMiddleware_FallsThroughWithoutLogging(t *testing.T) {
var buf bytes.Buffer
prev := slog.Default()
slog.SetDefault(slog.New(slog.NewJSONHandler(&buf, &slog.HandlerOptions{Level: slog.LevelInfo})))
t.Cleanup(func() { slog.SetDefault(prev) })
fellBack := false
h := PassthroughMiddleware(stubValidator{},
http.HandlerFunc(func(http.ResponseWriter, *http.Request) { t.Fatal("must not accept") }),
http.HandlerFunc(func(http.ResponseWriter, *http.Request) { fellBack = true }))
req := httptest.NewRequest(http.MethodGet, "/mcp", nil)
req.Header.Set("Authorization", "Bearer not-a-pat")
h.ServeHTTP(httptest.NewRecorder(), req)
require.True(t, fellBack)
require.Empty(t, strings.TrimSpace(buf.String()),
"the chassis owns the verdict; logging here too would double-count every static-token call")
}
+2 -2
View File
@@ -27,8 +27,8 @@ func TestEmptyPathSegmentRejectedBeforeNetwork(t *testing.T) {
c := gitea.NewClient(srv.URL, "tok")
paths := []string{
"/api/v1/repos/mathias//issues", // empty repo
"/api/v1/repos//gitea-mcp/contents/", // empty owner
"/api/v1/repos/mathias//issues", // empty repo
"/api/v1/repos//gitea-mcp/contents/", // empty owner
"/api/v1/repos/mathias//issues?state=open", // empty repo before query
}
for _, p := range paths {
-1
View File
@@ -255,4 +255,3 @@ func (c *Client) GetRepo(ctx context.Context, owner, name string) (*Repo, error)
}
return &r, nil
}
+2 -2
View File
@@ -79,8 +79,8 @@ func TestCreateRepo_Org(t *testing.T) {
c := gitea.NewClient(srv.URL, "tok")
r, err := c.CreateRepo(context.Background(), gitea.CreateRepoArgs{
Name: "infra",
Org: "hyperguild",
Name: "infra",
Org: "hyperguild",
})
require.NoError(t, err)
assert.Equal(t, "hyperguild/infra", r.FullName)
+1 -1
View File
@@ -9,7 +9,7 @@ import (
)
const (
ProtocolVersion = "2025-03-26"
ProtocolVersion = "2025-03-26"
maxRequestBodyBytes = 1 << 20 // 1 MiB
)
+1
View File
@@ -25,6 +25,7 @@ type echoTool struct{}
func (echoTool) Descriptor() registry.ToolDescriptor {
return registry.ToolDescriptor{Name: "echo", Description: "echoes its input"}
}
func (echoTool) Call(_ context.Context, args json.RawMessage) (json.RawMessage, error) {
return args, nil
}
+6 -4
View File
@@ -16,10 +16,12 @@ import (
"github.com/stretchr/testify/require"
)
const branchCheckExistsResp = `{"name":"feat/x","commit":{"id":"abc","url":"http://example.com"}}`
const createBranchResp = `{"name":"feat/new","commit":{"id":"abc","url":"http://example.com"}}`
const upsertFileResp = `{"content":{"path":"doc.md","sha":"filsha","html_url":"http://example.com/doc.md"},"commit":{"sha":"cmt1","html_url":"http://example.com/commit/cmt1"}}`
const getRepoResp = `{"name":"myrepo","full_name":"owner/myrepo","default_branch":"main"}`
const (
branchCheckExistsResp = `{"name":"feat/x","commit":{"id":"abc","url":"http://example.com"}}`
createBranchResp = `{"name":"feat/new","commit":{"id":"abc","url":"http://example.com"}}`
upsertFileResp = `{"content":{"path":"doc.md","sha":"filsha","html_url":"http://example.com/doc.md"},"commit":{"sha":"cmt1","html_url":"http://example.com/commit/cmt1"}}`
getRepoResp = `{"name":"myrepo","full_name":"owner/myrepo","default_branch":"main"}`
)
func TestFileWriteBranchCreatesBranchAndFile(t *testing.T) {
mux := http.NewServeMux()
+1 -1
View File
@@ -36,7 +36,7 @@ const (
func (t *TBDShip) Descriptor() registry.ToolDescriptor {
return registry.ToolDescriptor{
Name: "tbd_ship",
Name: "tbd_ship",
Description: "Trunk-based ship of a single-file change: branch from base, write the file, open a PR, and auto-merge (squash) to base ONLY when the head commit's CI is fully green. Fails closed to PR-only (never merges) when CI is pending, red, or absent, when the base branch requires reviews, or when the merge isn't clean — returning the PR for manual handling with a reason. Set ci_timeout_seconds to poll CI to completion (default 0 = snapshot, which returns pending right after opening the PR). Returns {merged, pr_url, pr_number, ci_status, reason, branch}.",
InputSchema: json.RawMessage(`{
"type":"object",
+1 -1
View File
@@ -36,7 +36,7 @@ func parseArgs(raw json.RawMessage, dst any) error {
// allowlist check. Returns a typed ErrValidation naming the missing field.
func validateRequiredIdentifiers(dst any) error {
v := reflect.ValueOf(dst)
if v.Kind() != reflect.Ptr || v.IsNil() {
if v.Kind() != reflect.Pointer || v.IsNil() {
return nil
}
v = v.Elem()
+5 -5
View File
@@ -52,11 +52,11 @@ func TestWorkflowRunListTool(t *testing.T) {
},
},
{
name: "status=all is no-op",
input: `{"owner":"mathias","name":"gitea-mcp","status":"all"}`,
notQuery: []string{"status"},
respBody: `{"total_count":0,"workflow_runs":[]}`,
assert: func(t *testing.T, out string) {},
name: "status=all is no-op",
input: `{"owner":"mathias","name":"gitea-mcp","status":"all"}`,
notQuery: []string{"status"},
respBody: `{"total_count":0,"workflow_runs":[]}`,
assert: func(t *testing.T, out string) {},
},
{
name: "branch filter",