Refuse a q outside 1-100 on /v1/image/ with 400 (closes #134)
check / check (push) Successful in 2m44s
check / check (push) Successful in 2m44s
The route ignored a q that was not a number or was outside 1-100 and used 85, so q=banana or q=500 was served as if q were absent and verified against a signature made for 85. It now reads q with the check the URL generator uses for its quality field (parseFormInt with minQuality and maxQuality, default encurl.DefaultQuality) and answers anything else with a 400 naming q and the value. An absent or empty q is still 85. README.md states the range. Model: opus-5-5
This commit is contained in:
@@ -125,8 +125,9 @@ Where:
|
|||||||
- `height` — requested height in pixels, `0` for original
|
- `height` — requested height in pixels, `0` for original
|
||||||
- `format` — output format (jpeg, png, webp, avif, gif, orig)
|
- `format` — output format (jpeg, png, webp, avif, gif, orig)
|
||||||
- `expiration` — Unix timestamp when signature expires
|
- `expiration` — Unix timestamp when signature expires
|
||||||
- `quality` — the URL's `q` query parameter (1-100), or `85` when the URL
|
- `quality` — the URL's `q` query parameter, a whole number from 1 to 100,
|
||||||
has no `q`
|
or `85` when the URL has no `q`; a request whose `q` is anything else is
|
||||||
|
refused with 400
|
||||||
- `fit` — the URL's `fit` query parameter (cover, contain, fill, inside,
|
- `fit` — the URL's `fit` query parameter (cover, contain, fill, inside,
|
||||||
outside), or `cover` when the URL has no `fit`
|
outside), or `cover` when the URL has no `fit`
|
||||||
|
|
||||||
|
|||||||
@@ -30,6 +30,12 @@ exhaustion
|
|||||||
|
|
||||||
# Completed Steps
|
# Completed Steps
|
||||||
|
|
||||||
|
- 2026-09-28 refuse an invalid `q` on `/v1/image/` (closes #134): a `q`
|
||||||
|
that is not a whole number from 1 to 100 is a 400 naming `q` and the
|
||||||
|
value, instead of being served at the default 85; the route reads `q`
|
||||||
|
with the generator's quality check (`parseFormInt` with `minQuality`
|
||||||
|
and `maxQuality`); an absent or empty `q` is still 85; `README.md`
|
||||||
|
states the range.
|
||||||
- 2026-09-28 unknown `PIXA_` environment variables abort startup (closes
|
- 2026-09-28 unknown `PIXA_` environment variables abort startup (closes
|
||||||
#133): a variable whose name starts with `PIXA_` but is neither a
|
#133): a variable whose name starts with `PIXA_` but is neither a
|
||||||
setting's variable nor `PIXA_CONFIG_PATH` aborts startup naming it, as
|
setting's variable nor `PIXA_CONFIG_PATH` aborts startup naming it, as
|
||||||
|
|||||||
@@ -23,8 +23,9 @@ import (
|
|||||||
// response can name it.
|
// response can name it.
|
||||||
var errInvalidFormField = errors.New("invalid")
|
var errInvalidFormField = errors.New("invalid")
|
||||||
|
|
||||||
// Bounds for the generator's quality and ttl fields. maxTTL is in seconds:
|
// Bounds for the generator's quality and ttl fields; the quality bounds also
|
||||||
// the expiry calculation time.Duration(ttl) * time.Second overflows above it.
|
// apply to the q parameter of /v1/image/. maxTTL is in seconds: the expiry
|
||||||
|
// calculation time.Duration(ttl) * time.Second overflows above it.
|
||||||
const (
|
const (
|
||||||
minQuality = 1
|
minQuality = 1
|
||||||
maxQuality = 100
|
maxQuality = 100
|
||||||
@@ -248,9 +249,9 @@ func parseFormDimension(form url.Values, field string) (int, error) {
|
|||||||
return value, nil
|
return value, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// parseFormInt reads an optional integer form field, returning def when the
|
// parseFormInt reads an optional integer form field or URL query parameter,
|
||||||
// field is empty and an error naming the field when the value is non-numeric
|
// returning def when the field is empty and an error naming the field when the
|
||||||
// or outside minValue to maxValue.
|
// value is non-numeric or outside minValue to maxValue.
|
||||||
func parseFormInt(
|
func parseFormInt(
|
||||||
form url.Values, field string, def, minValue, maxValue int,
|
form url.Values, field string, def, minValue, maxValue int,
|
||||||
) (int, error) {
|
) (int, error) {
|
||||||
|
|||||||
+12
-11
@@ -2,12 +2,14 @@ package handlers
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"errors"
|
"errors"
|
||||||
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
"net/http"
|
"net/http"
|
||||||
"strconv"
|
"strconv"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/go-chi/chi/v5"
|
"github.com/go-chi/chi/v5"
|
||||||
|
"sneak.berlin/go/pixa/internal/encurl"
|
||||||
"sneak.berlin/go/pixa/internal/httpfetcher"
|
"sneak.berlin/go/pixa/internal/httpfetcher"
|
||||||
"sneak.berlin/go/pixa/internal/imgcache"
|
"sneak.berlin/go/pixa/internal/imgcache"
|
||||||
)
|
)
|
||||||
@@ -100,23 +102,22 @@ func (s *Handlers) parseImageRequest(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Parse optional quality and fit params
|
// Parse optional quality and fit params. An absent q is 85; a q that is
|
||||||
if qStr := query.Get("q"); qStr != "" {
|
// not a whole number from 1 to 100 is refused, checked as the generator
|
||||||
q, parseErr := strconv.Atoi(qStr)
|
// checks its quality field.
|
||||||
if parseErr == nil && q > 0 && q <= 100 {
|
req.Quality, err = parseFormInt(query, "q",
|
||||||
req.Quality = q
|
encurl.DefaultQuality, minQuality, maxQuality)
|
||||||
}
|
if err != nil {
|
||||||
|
s.respondError(w, fmt.Sprintf("%v, got %q", err, query.Get("q")),
|
||||||
|
http.StatusBadRequest)
|
||||||
|
|
||||||
|
return nil, false
|
||||||
}
|
}
|
||||||
|
|
||||||
if fit := query.Get("fit"); fit != "" {
|
if fit := query.Get("fit"); fit != "" {
|
||||||
req.FitMode = imgcache.FitMode(fit)
|
req.FitMode = imgcache.FitMode(fit)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Default quality if not set
|
|
||||||
if req.Quality == 0 {
|
|
||||||
req.Quality = 85
|
|
||||||
}
|
|
||||||
|
|
||||||
// Default fit mode if not set
|
// Default fit mode if not set
|
||||||
if req.FitMode == "" {
|
if req.FitMode == "" {
|
||||||
req.FitMode = imgcache.FitCover
|
req.FitMode = imgcache.FitCover
|
||||||
|
|||||||
Reference in New Issue
Block a user