* Make backend tests wait on conditions instead of durations The backend workflow has a long tail of runs that fail once and pass on a rerun. Every one of them comes down to a test assuming an operation finishes within some duration rather than waiting for the state it needs. Three were reproducible and each was reproduced against the old code before being changed: TestServerAuthHooks minted a token that lived one second and never tested expiry, so a slow runner turned the first POST into a 401; TestServerApp_AnonMode saw "connection refused" because waitForHTTPServerStart returned silently after three seconds and left a later assertion to fail with something unrelated; TestFsStore_Cleanup slept 200ms against a 300ms ttl that Cleanup widens to 400ms with its commit grace, so roughly 100ms of stall collected an image meant to survive. Fixed sleeps before asserting on asynchronous work are replaced with polls on the condition itself, using require.Eventually and require.EventuallyWithT, and require.Never where the assertion is that something did not happen. Polling closures assert on the CollectT they are handed rather than on t, since testify runs them on another goroutine, and polls that issue HTTP requests stay under the rate limit on the routes they poll through. Where a test needs time to have passed, the clock input is pinned instead: staging ages are stamped with os.Chtimes on both sides of the cleanup boundary right before each call, which also makes the 100ms commit grace an exact case rather than something no assertion reaches, and the RSS tests set store.Comment.Timestamp explicitly rather than racing the wall clock into the first 100ms of a second so pubDate matches. chooseUnusedPort takes a port from the kernel's ephemeral range. Picking at random out of a fixed 10000-port window let two package binaries, which go test ./... runs concurrently, land on the same number between the probe closing and the server binding. The start helpers fail naming the port they waited on, and the SSL tests wait on the redirect port as well as the TLS one. Arbitrary budgets that nothing tests are gone: ten HTTP clients with a one-second timeout against bolt-backed import and export, the "should take about 100msec" assertions, and a one-second bound on noticing an already cancelled context. Shutdown stays bounded at ten seconds so a hang is still caught. Two assertions get stronger. TestServerAuthHooks accepted 403 or 401 from a blocked user, an alternative that existed only because the short token could expire mid-test; it is deterministically 403 now. TestAdmin_BlockedList asserted two users blocked while one carried the same 150ms ttl the next step waits to lapse, so the halves raced each other. goleak stops reporting the regexp2 clock goroutine, which chroma pulls in for syntax highlighting and which lives for up to a second after the last match with a timeout; it ends on its own but a binary finishing inside that window was reported as leaking, and this suite now finishes sooner. The ignore for net/http.(*Server).Shutdown goes the other way: it no longer matches anything, with both packages run fifteen times each under CPU oversubscription to confirm. Two gaps the change would otherwise have opened are covered directly rather than left to the side effects that used to cover them. The one-second token was the only thing exercising the authenticator's ClaimsUpd hook on refresh, so TestServerApp_ClaimsUpd now calls the hook itself and checks admin, blocked, email and restricted-name impersonation, including the two pass-through cases. Lifting the open-route limit removed the last incidental exercise of the rate limiter, so TestRateLimiter drives a burst past the allowance and checks the refusals and that the limit is per client. Both run without a wall clock, and both were confirmed to fail when the behaviour they cover is removed. Production code is untouched. The two sleeps outside test code, the 429 backoff in cmd/cleanup.go and the submit poll in store/image/image.go, are left alone: no CI failure implicates them. Test sleeps drop from 67 to 21, all of them either inside a testing/synctest bubble or a poll interval. The suite runs in about 22 seconds instead of 46, mostly because TestPublic_FindCommentsCtrl_ConsistentCount no longer paces a hundred subtests with an 80ms sleep each to stay under the open route limit. The 300s per-package budget now matches across both workflows, the race_test target and the documented command, and CLAUDE.md records the convention. with '#' will be ignored, and an empty message aborts the commit. # # Date: Sat Aug 22 01:12:31 2026 +0100 # # interactive rebase in progress; onto7c312da1# Last command done (1 command done): # reword deb6cbf1 # Make backend tests wait on conditions instead of durations # Next command to do (1 remaining command): # reword 262e6dc2 # Apply go fix under Go 1.27 # You are currently editing a commit while rebasing branch 'fix/backend-test-flakiness' on '7c312da1'. # # Changes to be committed: .github/workflows/release.yml # modified: CLAUDE.md # modified: Makefile modified: backend/_example/memory_store/server/rpc_test.go # modified: backend/app/cmd/import_test.go # modified: backend/app/cmd/server_test.go # modified: backend/app/main_test.go # modified: backend/app/rest/api/admin_test.go # modified: backend/app/rest/api/middleware_test.go # modified: backend/app/rest/api/migrator_test.go # modified: backend/app/rest/api/rest_private_test.go # modified: backend/app/rest/api/rest_public_test.go # modified: backend/app/rest/api/rest_test.go # modified: backend/app/rest/api/rss_test.go # modified: backend/app/rest/proxy/image_test.go # modified: backend/app/store/image/fs_store_test.go # modified: backend/app/store/service/service_test.go # modified: docs/backlog/api-tests-deadlock-on-macos.md # * Apply go fix under Go 1.27 Go 1.27 extends go fix with the modernizers, so `go fix ./...` now rewrites patterns the language has since replaced. Running it across all three modules produces this: legacy sync/atomic calls on plain integers become the atomic types (notify.Service.closed, image.Service.term and submitCount, and several test counters), reverse index loops become slices.Backward, a Split-then-index becomes strings.Cut, counted loops become range over an int, and interface{} becomes any in the e2e suite. The example module needed no changes. The e2e module is behind a build tag, so it only matches with `go fix -tags e2e ./...`. One knock-on: prealloc can see the bound of a loop once it is written as range over an int, so the slice it feeds is now preallocated. with '#' will be ignored, and an empty message aborts the commit. # # Date: Sat Aug 22 01:32:09 2026 +0100 # # interactive rebase in progress; onto7c312da1# Last commands done (2 commands done): # reword deb6cbf1 262e6dc2 # Apply go fix under Go 1.27 # No commands remaining. # You are currently editing a commit while rebasing branch 'fix/backend-test-flakiness' on '7c312da1'. # # Changes to be committed: backend/app/migrator/native.go # modified: backend/app/notify/notify.go backend/app/rest/api/rest_private_test.go # modified: backend/app/store/comment.go # modified: backend/app/store/image/image.go # modified: backend/app/store/service/service_test.go # modified: backend/app/store/service/title_test.go # modified: e2e/e2e_test.go # modified: e2e/widgets_test.go #
428 lines
14 KiB
Go
428 lines
14 KiB
Go
// Package image handles storing, resizing and retrieval of images
|
|
// Provides Store with Save and Load implementations on top of local file system and bolt db.
|
|
// Service object encloses Store and add common methods, this is the one consumer should use.
|
|
package image
|
|
|
|
// NOTE: matryer/moq should be installed globally and works with `go generate ./...`
|
|
//go:generate moq --out image_mock.go . Store
|
|
|
|
import (
|
|
"bytes"
|
|
"context"
|
|
"crypto/sha1" //nolint:gosec // not used for cryptography
|
|
"encoding/base64"
|
|
"errors"
|
|
"fmt"
|
|
"image"
|
|
_ "image/gif" // register gif decoder
|
|
_ "image/jpeg" // register jpeg decoder
|
|
"image/png"
|
|
"io"
|
|
"net/http"
|
|
"net/url"
|
|
"path"
|
|
"strings"
|
|
"sync"
|
|
"sync/atomic"
|
|
"time"
|
|
|
|
"github.com/PuerkitoBio/goquery"
|
|
log "github.com/go-pkgz/lgr"
|
|
"github.com/rs/xid"
|
|
"golang.org/x/image/draw"
|
|
_ "golang.org/x/image/webp" // register webp decoder so DecodeConfig accepts what readAndValidateImage allows
|
|
)
|
|
|
|
// Service wraps Store with common functions needed for any store implementation
|
|
// It also provides async Submit with func param retrieving all submitting IDs.
|
|
// Submitted IDs committed (i.e. moved from staging to final) on ServiceParams.EditDuration expiration.
|
|
type Service struct {
|
|
ServiceParams
|
|
|
|
store Store
|
|
wg sync.WaitGroup
|
|
submitCh chan submitReq
|
|
once sync.Once
|
|
term atomic.Int32 // term value used atomically to detect emergency termination
|
|
submitCount atomic.Int32 // atomic increment for counting submitted images
|
|
}
|
|
|
|
// ServiceParams contains externally adjustable parameters of Service
|
|
type ServiceParams struct {
|
|
EditDuration time.Duration // edit period for comments
|
|
ImageAPI string // image api matching path
|
|
ProxyAPI string // proxy api matching path
|
|
MaxSize int
|
|
MaxHeight int
|
|
MaxWidth int
|
|
}
|
|
|
|
// StoreInfo contains image store meta information
|
|
type StoreInfo struct {
|
|
FirstStagingImageTS time.Time
|
|
}
|
|
|
|
// Store defines interface for saving and loading pictures.
|
|
// Declares two-stage save with Commit. Save stores to staging area and Commit moves to the final location.
|
|
// Two-stage commit scheme is used for not storing images which are uploaded but later never used in the comments,
|
|
// e.g. when somebody uploaded a picture but did not sent the comment.
|
|
type Store interface {
|
|
Info() (StoreInfo, error) // get meta information about storage
|
|
Save(id string, img []byte) error // store image with passed id to staging
|
|
Load(id string) ([]byte, error) // load image by ID
|
|
Delete(id string) error // delete image by ID
|
|
|
|
ResetCleanupTimer(id string) error // resets cleanup timer for the image, called on comment preview
|
|
Commit(id string) error // move image from staging to permanent
|
|
Cleanup(ctx context.Context, ttl time.Duration) error // run removal loop for old images on staging
|
|
}
|
|
|
|
const submitQueueSize = 5000
|
|
|
|
type submitReq struct {
|
|
idsFn func() (ids []string)
|
|
TS time.Time
|
|
}
|
|
|
|
// NewService returns new Service instance
|
|
func NewService(s Store, p ServiceParams) *Service {
|
|
return &Service{ServiceParams: p, store: s}
|
|
}
|
|
|
|
// Commit multiple ids immediately
|
|
func (s *Service) Commit(idsFn func() []string) error {
|
|
var errs []error
|
|
for _, id := range idsFn() {
|
|
err := s.store.Commit(id)
|
|
if err != nil {
|
|
errs = append(errs, fmt.Errorf("failed to commit image %s: %w", id, err))
|
|
}
|
|
}
|
|
return errors.Join(errs...)
|
|
}
|
|
|
|
// Submit multiple ids via function for delayed commit
|
|
func (s *Service) Submit(idsFn func() []string) {
|
|
if idsFn == nil || s == nil {
|
|
return
|
|
}
|
|
|
|
s.once.Do(func() {
|
|
log.Printf("[DEBUG] image submitter activated")
|
|
s.submitCh = make(chan submitReq, submitQueueSize)
|
|
s.wg.Go(func() {
|
|
for req := range s.submitCh {
|
|
// wait for EditDuration expiration with emergency pass on term
|
|
for s.term.Load() == 0 && time.Since(req.TS) <= s.EditDuration {
|
|
time.Sleep(time.Millisecond * 10) // small sleep to relive busy wait but keep reactive for term (close)
|
|
}
|
|
err := s.Commit(req.idsFn)
|
|
if err != nil {
|
|
log.Printf("[WARN] image commit error %v", err)
|
|
}
|
|
|
|
s.submitCount.Add(-1)
|
|
}
|
|
log.Printf("[INFO] image submitter terminated")
|
|
})
|
|
})
|
|
|
|
s.submitCount.Add(1)
|
|
|
|
// reset cleanup timer before submitting the images
|
|
// to prevent them from being cleaned up while waiting for EditDuration to expire
|
|
for _, imgID := range idsFn() {
|
|
_ = s.store.ResetCleanupTimer(imgID)
|
|
}
|
|
|
|
s.submitCh <- submitReq{idsFn: idsFn, TS: time.Now()}
|
|
}
|
|
|
|
// ExtractPictures gets list of images from the doc html and convert from urls to ids, i.e. user/pic.png
|
|
func (s *Service) ExtractPictures(commentHTML string) (ids []string) {
|
|
return s.extractImageIDs(commentHTML, true)
|
|
}
|
|
|
|
// ExtractNonProxiedPictures gets list of non-proxied images from the doc html and convert from urls to ids, i.e. user/pic.png
|
|
// This method is used in image check on post preview and load, as proxied images have lazy loading
|
|
// and wouldn't be present on disk but still valid as they will be loaded the first time someone requests them.
|
|
func (s *Service) ExtractNonProxiedPictures(commentHTML string) (ids []string) {
|
|
return s.extractImageIDs(commentHTML, false)
|
|
}
|
|
|
|
// Cleanup runs periodic cleanup with 1.5*ServiceParams.EditDuration. Blocking loop, should be called inside of goroutine by consumer
|
|
func (s *Service) Cleanup(ctx context.Context) {
|
|
if s.EditDuration <= 0 {
|
|
log.Printf("[INFO] pictures cleanup disabled, edit duration is %v", s.EditDuration)
|
|
<-ctx.Done()
|
|
return
|
|
}
|
|
|
|
cleanupTTL := s.EditDuration * 15 / 10 // cleanup images older than 1.5 * EditDuration
|
|
log.Printf("[INFO] start pictures cleanup, staging ttl=%v", cleanupTTL)
|
|
|
|
for {
|
|
select {
|
|
case <-ctx.Done():
|
|
log.Printf("[INFO] cleanup terminated, %v", ctx.Err())
|
|
return
|
|
case <-time.After(cleanupTTL):
|
|
if err := s.store.Cleanup(ctx, cleanupTTL); err != nil {
|
|
log.Printf("[WARN] failed to cleanup, %v", err)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
// ResetCleanupTimer resets cleanup timer for the image
|
|
func (s *Service) ResetCleanupTimer(id string) error {
|
|
return s.store.ResetCleanupTimer(id)
|
|
}
|
|
|
|
// Info returns meta information about storage
|
|
func (s *Service) Info() (StoreInfo, error) {
|
|
return s.store.Info()
|
|
}
|
|
|
|
// Close flushes all in-progress submits and enforces waiting commits
|
|
func (s *Service) Close(ctx context.Context) {
|
|
log.Printf("[INFO] close image service ")
|
|
|
|
waitForTerm := func(ctx context.Context) {
|
|
ticker := time.NewTicker(10 * time.Millisecond)
|
|
defer ticker.Stop()
|
|
for {
|
|
select {
|
|
case <-ctx.Done():
|
|
return
|
|
case <-ticker.C:
|
|
if s.submitCount.Load() == 0 {
|
|
return
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
s.term.Store(1) // enforce non-delayed commits for all ids left in submitCh
|
|
waitForTerm(ctx)
|
|
|
|
if s.submitCh != nil {
|
|
close(s.submitCh)
|
|
}
|
|
s.wg.Wait()
|
|
}
|
|
|
|
// Load wraps storage Load function.
|
|
func (s *Service) Load(id string) ([]byte, error) {
|
|
return s.store.Load(id)
|
|
}
|
|
|
|
// Delete wraps storage Delete function.
|
|
func (s *Service) Delete(id string) error {
|
|
return s.store.Delete(id)
|
|
}
|
|
|
|
// Save wraps storage Save function, validating and resizing the image before calling it.
|
|
func (s *Service) Save(userID string, r io.Reader) (id string, err error) {
|
|
id = path.Join(userID, guid())
|
|
return id, s.SaveWithID(id, r)
|
|
}
|
|
|
|
// SaveWithID wraps storage Save function, validating and resizing the image before calling it.
|
|
func (s *Service) SaveWithID(id string, r io.Reader) error {
|
|
img, err := s.prepareImage(r)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
return s.store.Save(id, img)
|
|
}
|
|
|
|
// returns list of image IDs from the comment html, including proxied images if includeProxied is true
|
|
func (s *Service) extractImageIDs(commentHTML string, includeProxied bool) (ids []string) {
|
|
doc, err := goquery.NewDocumentFromReader(strings.NewReader(commentHTML))
|
|
if err != nil {
|
|
log.Printf("[ERROR] can't parse commentHTML to parse images: %q, error: %v", commentHTML, err)
|
|
return nil
|
|
}
|
|
doc.Find("img").Each(func(_ int, sl *goquery.Selection) {
|
|
if im, ok := sl.Attr("src"); ok {
|
|
if strings.Contains(im, s.ImageAPI) {
|
|
elems := strings.Split(im, "/")
|
|
if len(elems) >= 2 {
|
|
id := elems[len(elems)-2] + "/" + elems[len(elems)-1]
|
|
ids = append(ids, id)
|
|
}
|
|
}
|
|
if includeProxied && strings.Contains(im, s.ProxyAPI) {
|
|
proxiedURL, err := url.Parse(im)
|
|
if err != nil {
|
|
return
|
|
}
|
|
imgURL, err := base64.URLEncoding.DecodeString(proxiedURL.Query().Get("src"))
|
|
if err != nil {
|
|
return
|
|
}
|
|
imgID, err := CachedImgID(string(imgURL))
|
|
if err != nil {
|
|
return
|
|
}
|
|
ids = append(ids, imgID)
|
|
}
|
|
}
|
|
})
|
|
|
|
return ids
|
|
}
|
|
|
|
// maxImagePixels caps the declared pixel count of an image before any raster decode
|
|
// is allowed. Without this, a tiny compressed "decompression bomb" image declaring
|
|
// e.g. 65535x65535 px would force image.Decode to allocate gigabytes of pixel memory
|
|
// and OOM the service on a single comment upload. 16 MP covers any realistic image
|
|
// (~4096x4096) while keeping peak allocation bounded.
|
|
const maxImagePixels = 16 * 1024 * 1024
|
|
|
|
// prepareImage calls readAndValidateImage and resize on provided image.
|
|
func (s *Service) prepareImage(r io.Reader) ([]byte, error) {
|
|
data, err := readAndValidateImage(r, s.MaxSize)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("can't load image: %w", err)
|
|
}
|
|
|
|
resized := resize(data, s.MaxWidth, s.MaxHeight)
|
|
if resized == nil {
|
|
return nil, fmt.Errorf("image rejected: malformed or exceeds %d-pixel safe limit", maxImagePixels)
|
|
}
|
|
return resized, nil
|
|
}
|
|
|
|
// resize validates an image and, if needed, re-encodes it to fit within the given
|
|
// pixel limits preserving aspect ratio. Returns nil for malformed input or for
|
|
// declared dimensions exceeding maxImagePixels so attacker payloads (decompression
|
|
// bombs) never reach the store. With limit <= 0 or when the image already fits, the
|
|
// original bytes are returned verbatim so animated GIFs and other multi-frame formats
|
|
// round-trip without being flattened to one frame.
|
|
//
|
|
// Validation uses image.DecodeConfig (cheap — declares dimensions, allocates nothing)
|
|
// before any full image.Decode, so a 100 KB compressed image declaring 65535x65535 px
|
|
// is rejected without ever materializing the raster.
|
|
func resize(data []byte, limitW, limitH int) []byte {
|
|
if len(data) == 0 {
|
|
return nil
|
|
}
|
|
|
|
// validate format and dimensions without allocating pixel memory.
|
|
cfg, _, err := image.DecodeConfig(bytes.NewReader(data))
|
|
if err != nil {
|
|
log.Printf("[WARN] can't decode image config, %s", err)
|
|
return nil
|
|
}
|
|
// multiply in int64 — on 32-bit builds (GOARCH=386, 32-bit arm) the int
|
|
// product of two 16-bit-or-larger dimensions can overflow and wrap below
|
|
// maxImagePixels, bypassing the cap.
|
|
if cfg.Width <= 0 || cfg.Height <= 0 || int64(cfg.Width)*int64(cfg.Height) > int64(maxImagePixels) {
|
|
log.Printf("[WARN] image dimensions %dx%d exceed safe limit", cfg.Width, cfg.Height)
|
|
return nil
|
|
}
|
|
|
|
// dimensions are bounded — full decode is now safe to allocate. Decode also
|
|
// validates the raster body: a header that DecodeConfig accepts but with a
|
|
// corrupt or truncated payload would slip through if we returned early on the
|
|
// no-resize path without ever touching the pixels. Decode unconditionally,
|
|
// then either return the original bytes (no resize needed, multi-frame intact)
|
|
// or the re-encoded result.
|
|
src, _, err := image.Decode(bytes.NewReader(data))
|
|
if err != nil {
|
|
log.Printf("[WARN] can't decode image after dim-check, %s", err)
|
|
return nil
|
|
}
|
|
|
|
if limitW <= 0 || limitH <= 0 || (cfg.Width <= limitW && cfg.Height <= limitH) {
|
|
return data
|
|
}
|
|
|
|
w, h := src.Bounds().Dx(), src.Bounds().Dy()
|
|
newW, newH := getProportionalSizes(w, h, limitW, limitH)
|
|
m := image.NewRGBA(image.Rect(0, 0, newW, newH))
|
|
draw.CatmullRom.Scale(m, m.Bounds(), src, src.Bounds(), draw.Src, nil)
|
|
|
|
var out bytes.Buffer
|
|
if err = png.Encode(&out, m); err != nil {
|
|
log.Printf("[WARN] can't encode resized image to png, %s", err)
|
|
return data // fall back to the validated original
|
|
}
|
|
return out.Bytes()
|
|
}
|
|
|
|
// getProportionalSizes returns width and height resized by both dimensions proportionally
|
|
func getProportionalSizes(srcW, srcH, limitW, limitH int) (resW, resH int) {
|
|
if srcW <= limitW && srcH <= limitH {
|
|
return srcW, srcH
|
|
}
|
|
|
|
ratioW := float64(srcW) / float64(limitW)
|
|
propH := float64(srcH) / ratioW
|
|
|
|
ratioH := float64(srcH) / float64(limitH)
|
|
propW := float64(srcW) / ratioH
|
|
|
|
if int(propH) > limitH {
|
|
return int(propW), limitH
|
|
}
|
|
|
|
return limitW, int(propH)
|
|
}
|
|
|
|
// check if file f is a valid image format, i.e. gif, png, jpeg or webp and reads up to maxSize.
|
|
func readAndValidateImage(r io.Reader, maxSize int) ([]byte, error) {
|
|
isValidImage := func(b []byte) bool {
|
|
ct := http.DetectContentType(b)
|
|
return ct == "image/gif" || ct == "image/png" || ct == "image/jpeg" || ct == "image/webp"
|
|
}
|
|
|
|
lr := io.LimitReader(r, int64(maxSize)+1)
|
|
data, err := io.ReadAll(lr)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
if len(data) > maxSize {
|
|
return nil, fmt.Errorf("file is too large (limit=%d)", maxSize)
|
|
}
|
|
|
|
// read header first to check the format. http.DetectContentType inspects up
|
|
// to the first 512 bytes, but a smaller body is fine — pass the whole slice
|
|
// rather than panicking on a fixed-size sub-slice.
|
|
header := data
|
|
if len(header) > 512 {
|
|
header = header[:512]
|
|
}
|
|
if !isValidImage(header) {
|
|
return nil, fmt.Errorf("file format not allowed")
|
|
}
|
|
|
|
return data, nil
|
|
}
|
|
|
|
// guid makes a globally unique id
|
|
func guid() string {
|
|
return xid.New().String()
|
|
}
|
|
|
|
// Sha1Str converts provided string to sha1
|
|
func Sha1Str(s string) string {
|
|
return fmt.Sprintf("%x", sha1.Sum([]byte(s))) //nolint:gosec // not used for cryptography
|
|
}
|
|
|
|
// CachedImgID generates ID for a cached image.
|
|
// ID would look like: "cached_images/<sha1-of-image-url-hostname>-<sha1-of-image-entire-url>"
|
|
// <sha1-of-image-url-hostname> - would allow us to identify all images from particular site if ever needed
|
|
// <sha1-of-image-entire-url> - would allow us to avoid storing duplicates of the same image
|
|
// (as accurate as deduplication based on potentially mutable url can be)
|
|
func CachedImgID(imgURL string) (string, error) {
|
|
parsedURL, err := url.Parse(imgURL)
|
|
if err != nil {
|
|
return "", fmt.Errorf("can parse url %s: %w", imgURL, err)
|
|
}
|
|
return fmt.Sprintf("cached_images/%s-%s", Sha1Str(parsedURL.Hostname()), Sha1Str(imgURL)), nil
|
|
}
|