sneak
adfb6ab50a
check / check (push) Canceled after 0s
magic.DetectFormat returns an imagerequest.Format. ValidateMagicBytes returns the format it checked against the upstream Content-Type. The cache stores that format in the source's row, so a variant made from a cached source uses it too. The proxy hands it to Process, which still refuses input libvips would load with another loader, such as an SVG passing as AVIF. Format.MIMEType declares each MIME string once, and the fetcher, the cache's variant read and the Accept matching use it. magic.MIMEType, magic.ImageFormat, MIMEToImageFormat, magic's SVG detection, detectFormat, formatFromString, FormatToMIME and Result.InputFormat are gone. Model: opus-5-5
52 lines
1.2 KiB
Go
52 lines
1.2 KiB
Go
package httpfetcher
|
|
|
|
import (
|
|
"context"
|
|
"io"
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"testing"
|
|
|
|
"github.com/go-chi/chi/v5/middleware"
|
|
"sneak.berlin/go/pixa/internal/imagerequest"
|
|
)
|
|
|
|
// TestFetchSendsRequestID verifies that a fetch sends the ID of the request
|
|
// it serves, which the RequestID middleware stores in the request context,
|
|
// to the upstream host as X-Request-Id, so the fetch can be found in that
|
|
// host's logs.
|
|
func TestFetchSendsRequestID(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
const requestID = "test-request-id"
|
|
|
|
received := make(chan string, 1)
|
|
|
|
srv := httptest.NewServer(http.HandlerFunc(
|
|
func(w http.ResponseWriter, r *http.Request) {
|
|
received <- r.Header.Get("X-Request-Id")
|
|
|
|
w.Header().Set("Content-Type", imagerequest.FormatJPEG.MIMEType())
|
|
_, _ = io.WriteString(w, imagePayload)
|
|
}))
|
|
t.Cleanup(srv.Close)
|
|
|
|
f, _ := newServerFetcher(t, srv, nil)
|
|
|
|
ctx := context.WithValue(testContext(t), middleware.RequestIDKey, requestID)
|
|
|
|
res, err := f.Fetch(ctx, upstreamSource("/image"))
|
|
if err != nil {
|
|
t.Fatalf("Fetch() error = %v", err)
|
|
}
|
|
|
|
_ = res.Content.Close()
|
|
|
|
got := <-received
|
|
t.Logf("upstream received X-Request-Id %q", got)
|
|
|
|
if got != requestID {
|
|
t.Errorf("upstream X-Request-Id = %q, want %q", got, requestID)
|
|
}
|
|
}
|