CI / Test (ubuntu-latest) (push) Canceled after 0s
CI / Test (windows-latest) (push) Canceled after 0s
CI / Storage tests on PostgreSQL (push) Canceled after 0s
CI / Complement (federation off) (push) Canceled after 0s
CI / golangci-lint (push) Canceled after 0s
CI / Smoke test the binary (push) Canceled after 0s
Implements PLAN.md Phase 1. A client can now register, log in, manage its devices and set its profile; an operator can create accounts and flip the runtime switches. There are still no rooms and no real /sync. userapi: accounts, argon2id passwords in PHC format, devices, access and refresh tokens stored as SHA-256 hashes, account data and the admin flag. Its storage interface is storage.UserStore, implemented once in sqlstore with `?` placeholders; the postgres driver supplies a rebind function and unique-violation recognition rather than keeping a second copy of thirty statements. Timestamps in these tables are int64 milliseconds, the unit the Client-Server API uses on the wire. Client-Server API: register (user-interactive auth with m.login.dummy and optional registration tokens), register/available, token validity, login with m.login.password, logout, logout/all, refresh, account/whoami, capabilities, devices/* with password-gated deletion, profile/*, global and per-room account data. GET /sync is a deliberate placeholder: it answers a valid token with an empty but well-formed response and refuses a revoked one. Phase 1 has no rooms, so that is the whole truth, and it is what makes session revocation observable. Phase 4 replaces it with the syncapi. Auth middleware resolves a bearer token (header or the legacy query parameter) to a device and user, answering an expired token with the soft logout the spec asks for. Rate limiting is a token bucket per endpoint class keyed on the client address, returning M_LIMIT_EXCEEDED with retry_after_ms. adminapi v1 under /_warp/admin/v1: admin-only auth via a normal Matrix token, GET/PUT /federation and /registration driving internal/settings and reporting a config-pinned switch as a 409, GET/POST /users, GET /stats. warp create-account [--admin] creates the first account straight in the database, so a new install with registration off has a way in. Complement is wired up for the federation=off profile: an image meeting its contract, an entrypoint that configures Warp entirely from WARP_* variables, and a runner that builds, clones and executes the target set (TestRegistration, TestLogin, TestDeviceManagement). It has not been run yet -- there is no container runtime on the development machine -- so the three tests' assertions were read from the Complement sources and pinned as httptest tests instead, and CI gained a job that runs the real thing. Also fixes a .gitignore bug from Phase 0: the unanchored `warp` pattern, meant for the built binary, also matched the directory server/cmd/warp and silently excluded the entire command package from the repository. The binary patterns are now anchored to the repository root, and cmd/warp is committed for the first time. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
124 lines
3.9 KiB
Go
124 lines
3.9 KiB
Go
package httputil
|
|
|
|
import (
|
|
"bytes"
|
|
"context"
|
|
"encoding/json"
|
|
"errors"
|
|
"io"
|
|
"log/slog"
|
|
"net/http"
|
|
)
|
|
|
|
// MaxRequestBody caps a request body at 1 MiB. Endpoints that accept larger
|
|
// payloads (media upload) override it explicitly.
|
|
const MaxRequestBody = 1 << 20
|
|
|
|
type loggerKey struct{}
|
|
|
|
// WithLogger attaches a request-scoped logger to the context.
|
|
func WithLogger(ctx context.Context, l *slog.Logger) context.Context {
|
|
return context.WithValue(ctx, loggerKey{}, l)
|
|
}
|
|
|
|
// LoggerFrom returns the request-scoped logger, or the default one.
|
|
func LoggerFrom(ctx context.Context) *slog.Logger {
|
|
if l, ok := ctx.Value(loggerKey{}).(*slog.Logger); ok && l != nil {
|
|
return l
|
|
}
|
|
return slog.Default()
|
|
}
|
|
|
|
// WriteJSON writes v as JSON with the given status. Matrix requires
|
|
// application/json on every response, including errors.
|
|
func WriteJSON(w http.ResponseWriter, status int, v any) {
|
|
body, err := json.Marshal(v)
|
|
if err != nil {
|
|
slog.Error("marshalling response failed", "error", err)
|
|
w.Header().Set("Content-Type", "application/json")
|
|
w.WriteHeader(http.StatusInternalServerError)
|
|
_, _ = w.Write([]byte(`{"errcode":"M_UNKNOWN","error":"Internal server error"}`))
|
|
return
|
|
}
|
|
w.Header().Set("Content-Type", "application/json")
|
|
w.WriteHeader(status)
|
|
if _, err := w.Write(body); err != nil {
|
|
slog.Debug("writing response failed", "error", err)
|
|
}
|
|
}
|
|
|
|
// WriteError sends err as a Matrix error envelope. Anything that is not a
|
|
// *MatrixError is logged in full and reported as M_UNKNOWN, so internal
|
|
// details never leak to the client.
|
|
func WriteError(w http.ResponseWriter, r *http.Request, err error) {
|
|
var merr *MatrixError
|
|
if !errors.As(err, &merr) {
|
|
LoggerFrom(r.Context()).Error("unhandled handler error",
|
|
"error", err, "method", r.Method, "path", r.URL.Path)
|
|
merr = InternalError()
|
|
}
|
|
if merr.status >= 500 {
|
|
LoggerFrom(r.Context()).Error("request failed",
|
|
"errcode", merr.Code, "error", merr.Message,
|
|
"method", r.Method, "path", r.URL.Path)
|
|
}
|
|
WriteJSON(w, merr.StatusCode(), merr)
|
|
}
|
|
|
|
// DecodeJSON reads a JSON request body into v, enforcing MaxRequestBody and
|
|
// mapping a missing, oversized or malformed body onto the right Matrix error.
|
|
func DecodeJSON(w http.ResponseWriter, r *http.Request, v any) error {
|
|
present, err := DecodeOptionalJSON(w, r, v)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if !present {
|
|
return NotJSON()
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// DecodeOptionalJSON is DecodeJSON for an endpoint whose body may legitimately
|
|
// be absent, reporting whether there was one. A malformed body is still an
|
|
// error: only a genuinely empty one is "not sent".
|
|
//
|
|
// DELETE /devices/{deviceId} is the case this exists for. A client sends it
|
|
// with no body at all, because it does not know until the 401 comes back that
|
|
// the endpoint is interactive.
|
|
func DecodeOptionalJSON(w http.ResponseWriter, r *http.Request, v any) (bool, error) {
|
|
body := http.MaxBytesReader(w, r.Body, MaxRequestBody)
|
|
data, err := io.ReadAll(body)
|
|
if err != nil {
|
|
var tooLarge *http.MaxBytesError
|
|
if errors.As(err, &tooLarge) {
|
|
return false, NewError(http.StatusRequestEntityTooLarge, ErrCodeTooLarge, "Request body too large")
|
|
}
|
|
return false, NotJSON()
|
|
}
|
|
if len(bytes.TrimSpace(data)) == 0 {
|
|
return false, nil
|
|
}
|
|
if err := json.Unmarshal(data, v); err != nil {
|
|
var typeErr *json.UnmarshalTypeError
|
|
if errors.As(err, &typeErr) {
|
|
return false, BadJSON("Invalid value for field %q", typeErr.Field)
|
|
}
|
|
return false, NotJSON()
|
|
}
|
|
return true, nil
|
|
}
|
|
|
|
// Handler is an http.Handler whose errors are turned into Matrix envelopes by
|
|
// Wrap, so handlers can `return httputil.Forbidden(...)` instead of writing
|
|
// the response themselves.
|
|
type Handler func(http.ResponseWriter, *http.Request) error
|
|
|
|
// Wrap adapts a Handler to http.Handler.
|
|
func Wrap(h Handler) http.Handler {
|
|
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
if err := h(w, r); err != nil {
|
|
WriteError(w, r, err)
|
|
}
|
|
})
|
|
}
|