Artifact 9ea8b646b7a15f1edb424f9a373d24c4fdc28973a93baec0be497a20f5ba3937:
- File
internal/sync/serve_http.go
— part of check-in
[b3139353e1]
at
2026-07-23 14:33:43
on branch trunk
— sync: send explicit Content-Length on xfer replies so fossil <=2.23 can clone (#134)
The xfer HTTP server let net/http frame large clone/sync replies as Transfer-Encoding: chunked with no Content-Length. Release-tagged fossil <=2.23 reads the reply length only from Content-Length (src/http.c leaves iLength negative otherwise) and aborts with "server did not reply" on any chunked reply above ~256KB, so those clients could not clone a repository larger than that from a libfossil server.
writeXferResponse already materialises the whole response via Encode before the first write, so the exact body length is known for free. Set Content-Length explicitly; net/http then never falls back to chunked.
The fix is unconditional rather than negotiated. The triage proposed sniffing a client capability and keeping chunked for capable clients to avoid the buffering cost of Content-Length. That premise does not hold here: the server never streams -- Encode always returns a complete slice -- so chunked saves no memory over Content-Length, and #88's per-clone bound (DefaultCloneBatchBytes) still caps each reply either way. Content-Length is exactly what canonical fossil's own server emits, so it is strictly the more compatible framing for every client, including builds whose version banner cannot be trusted (#86).
Tests: a reconstructed <=2.23 client that requires a non-negative Content-Length and rejects chunked framing on a >256KB clone response (the discriminating test, since real fossil 2.28 tolerates chunked and cannot reproduce the failure), plus a modern-client no-regression clone of the same corpus. The existing real-fossil multi-batch clone interop test continues to pass unchanged.
Fixes #101 (user: [email protected], size: 5006) [annotate] [blame] [check-ins using]
package sync import ( "context" "fmt" "io" "log/slog" "net" "net/http" "strconv" "github.com/danmestas/go-libfossil/internal/repo" "github.com/danmestas/go-libfossil/internal/xfer" ) // maxRequestBodyBytes caps the size of incoming xfer request bodies. // Fossil sync payloads are typically under 1MB; 50MB is generous headroom. const maxRequestBodyBytes = 50 * 1024 * 1024 // ServeHTTP starts an HTTP server that accepts Fossil xfer requests. // Blocks until ctx is cancelled. Stock fossil clone/sync can connect. func ServeHTTP(ctx context.Context, addr string, r *repo.Repo, h HandleFunc) error { if addr == "" { panic("sync.ServeHTTP: addr must not be empty") } if r == nil { panic("sync.ServeHTTP: r must not be nil") } if h == nil { panic("sync.ServeHTTP: h must not be nil") } mux := http.NewServeMux() mux.HandleFunc("/", xferHandler(r, h)) srv := &http.Server{ Handler: mux, } ln, err := net.Listen("tcp", addr) if err != nil { return fmt.Errorf("sync.ServeHTTP: listen: %w", err) } go func() { <-ctx.Done() srv.Close() }() err = srv.Serve(ln) if err == http.ErrServerClosed { return nil } return err } // XferHandler returns an http.HandlerFunc that decodes Fossil xfer requests, // dispatches to the HandleFunc, and encodes the response. Use this to compose // a custom mux when you need additional routes (e.g. /healthz) alongside xfer. func XferHandler(r *repo.Repo, h HandleFunc) http.HandlerFunc { if r == nil { panic("sync.XferHandler: r must not be nil") } if h == nil { panic("sync.XferHandler: h must not be nil") } return xferHandler(r, h) } // xferHandler is the unexported implementation. func xferHandler(r *repo.Repo, h HandleFunc) http.HandlerFunc { return func(w http.ResponseWriter, req *http.Request) { // Fossil sends GET as a server probe — respond with a basic page. if req.Method != http.MethodPost { w.Header().Set("Content-Type", "text/html") fmt.Fprint(w, "<html><body><h1>Fossil Sync Server</h1></body></html>") return } // Bound request body size to prevent resource exhaustion. req.Body = http.MaxBytesReader(w, req.Body, maxRequestBodyBytes) body, err := io.ReadAll(req.Body) if err != nil { http.Error(w, "read body: "+err.Error(), http.StatusBadRequest) return } if len(body) == 0 { // Empty POST — respond with empty xfer message. writeXferResponse(w, &xfer.Message{}) return } // §4: select framing from the request's Content-Type rather than by // trial. A canonical or libfossil client sends the compressed container // as application/x-fossil. A type we do not recognise carries no framing // signal at all, so decoding it either way is a guess -- reject it rather // than feed possibly-compressed bytes to the card parser (issue #104). ct := req.Header.Get("Content-Type") if !xfer.KnownContentType(ct) { slog.Error("serve-http: unsupported content type", "content-type", ct) http.Error(w, fmt.Sprintf("unsupported content type %q: expected %s or %s", ct, xfer.ContentTypeCompressed, xfer.ContentTypeUncompressed), http.StatusUnsupportedMediaType) return } msg, err := xfer.Decode(body, ct) if err != nil { slog.Error("serve-http: decode failed", "bytes", len(body), "err", err) http.Error(w, fmt.Sprintf("decode xfer (%d bytes): %v", len(body), err), http.StatusBadRequest) return } resp, err := h(req.Context(), r, msg) if err != nil { http.Error(w, "handler: "+err.Error(), http.StatusInternalServerError) return } writeXferResponse(w, resp) } } // writeXferResponse encodes an xfer message and writes it as the HTTP response. // // The full response is already materialised by Encode before any write, so the // exact body length is known for free. Setting Content-Length explicitly keeps // net/http from falling back to Transfer-Encoding: chunked once the buffered // body exceeds its internal ~2KB flush threshold. Release-tagged fossil <=2.23 // reads the reply length only from Content-Length (src/http.c) and aborts with // "server did not reply" on a chunked reply above ~256KB (issue #101). // Buffering is not introduced here -- Encode already holds the whole slice, so // #88's per-clone bound (DefaultCloneBatchBytes) still caps the response. func writeXferResponse(w http.ResponseWriter, msg *xfer.Message) { if w == nil { panic("writeXferResponse: w must not be nil") } if msg == nil { panic("writeXferResponse: msg must not be nil") } respBytes, err := msg.Encode() if err != nil { http.Error(w, "encode response: "+err.Error(), http.StatusInternalServerError) return } w.Header().Set("Content-Type", xfer.ContentTypeCompressed) w.Header().Set("Content-Length", strconv.Itoa(len(respBytes))) n, err := w.Write(respBytes) if err != nil { slog.Error("serve-http: write response failed", "err", err) return } if n != len(respBytes) { panic(fmt.Sprintf("writeXferResponse: short write %d of %d bytes", n, len(respBytes))) } }