Bound the key cache and ration lookups of unknown keys per client address

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
This commit is contained in:
Ilker ManapandClaude Opus 5.5 committed 2026-10-04 10:19:38 +02:00
1 parent ebf437a36a
commit d3fb217b31
5 files changed
+154 -4

No files matched your search

+14 -1
View File
@@ -4,6 +4,7 @@ import (
"encoding/json"
"errors"
"log/slog"
"net"
"net/http"
"strings"
)
@@ -24,7 +25,7 @@ func Middleware(a *Authenticator, log *slog.Logger, exempt ...string) func(http.
return
}
p, err := a.Authenticate(r.Context(), BearerToken(r))
p, err := a.AuthenticateFrom(r.Context(), BearerToken(r), clientAddr(r))
if err != nil {
writeAuthError(w, err)
// The key prefix, never the key: a rejected credential in a log
@@ -66,6 +67,9 @@ func writeAuthError(w http.ResponseWriter, err error) {
switch {
case errors.Is(err, ErrMissing):
msg = "no api key was provided"
case errors.Is(err, ErrThrottled):
w.Header().Set("Retry-After", "1")
status, kind, msg = http.StatusTooManyRequests, "rate_limit_exceeded", "too many unrecognised api keys; slow down"
case errors.Is(err, ErrExpired):
msg = "this api key has expired"
case errors.Is(err, ErrRevoked):
@@ -104,3 +108,12 @@ func WriteForbiddenModel(w http.ResponseWriter, model string) {
"type": "invalid_request_error", "code": nil,
}})
}
// clientAddr is the address a request came from, without its port.
func clientAddr(r *http.Request) string {
host, _, err := net.SplitHostPort(r.RemoteAddr)
if err != nil {
return r.RemoteAddr
}
return host
}