Address Gadfly review on #7: garden cap, dim validation, shared errors
Build image / build-and-push (push) Successful in 5s

Fixes from the PR #26 adversarial review (graded 18 real / 0 false positive).

Correctness / security
- maxGardenCM fixed to 10_000 (100 m), matching its comment — it was
  100_000 cm (1 km), 10x too lax (5 models flagged this).
- Dimension validation now rejects NaN/Inf (which slip past naive
  comparisons) and subnormal-tiny positives, via a finite [1cm, 100m]
  check. Name (200) and notes (10_000) are length-capped so untrusted
  input can't balloon storage.
- Update version binding is `required,min=1`, so a negative/zero version
  is a 400, not a 409.

Maintainability / performance
- One unified writeServiceError (new errors.go) maps every auth + resource
  sentinel; writeResourceError removed. writeVersionConflict and
  parseIDParam moved to errors.go (shared, not in the gardens feature file).
- Request structs share an embedded gardenFields (one toInput).
- CreateGarden uses INSERT ... RETURNING (one round-trip).
- ListGardensForOwner has a defensive LIMIT (pagination is post-v1).

Tests: name/notes length, NaN/Inf/subnormal dims, dimension-at-cap valid,
negative/zero version -> 400.

Co-Authored-By: Claude Opus 4.8 (1M context) <[email protected]>
Claude-Session: https://claude.ai/code/session_01JdQpdYYsTgtkJBxbcpAszi
This commit is contained in:
2026-07-18 18:39:27 -04:00
co-authored by Claude Opus 4.8
parent f39ed52868
commit 3fbefa4e05
7 changed files with 165 additions and 120 deletions
+21 -68
View File
@@ -2,9 +2,7 @@ package api
import (
"errors"
"log/slog"
"net/http"
"strconv"
"github.com/gin-gonic/gin"
@@ -12,11 +10,10 @@ import (
"gitea.stevedudenhoeffer.com/steve/pansy/internal/service"
)
// gardenCreateRequest / gardenUpdateRequest are the JSON bodies for the gardens
// endpoints. Dimensions are centimeters (the API is metric-only; imperial is a
// display concern). On create, omitted dimensions default server-side; on
// update, version is required and every field is replaced.
type gardenCreateRequest struct {
// gardenFields is the shared mutable field set for the gardens endpoints.
// Dimensions are centimeters (the API is metric-only; imperial is a display
// concern). On create, omitted dimensions default server-side.
type gardenFields struct {
Name string `json:"name" binding:"required"`
WidthCM float64 `json:"widthCm"`
HeightCM float64 `json:"heightCm"`
@@ -24,20 +21,19 @@ type gardenCreateRequest struct {
Notes string `json:"notes"`
}
func (f gardenFields) toInput() service.GardenInput {
return service.GardenInput{Name: f.Name, WidthCM: f.WidthCM, HeightCM: f.HeightCM, UnitPref: f.UnitPref, Notes: f.Notes}
}
// gardenCreateRequest / gardenUpdateRequest are the JSON bodies. Update adds a
// required current version (>= 1) for the optimistic-concurrency guard.
type gardenCreateRequest struct {
gardenFields
}
type gardenUpdateRequest struct {
Name string `json:"name" binding:"required"`
WidthCM float64 `json:"widthCm"`
HeightCM float64 `json:"heightCm"`
UnitPref string `json:"unitPref"`
Notes string `json:"notes"`
Version int64 `json:"version" binding:"required"`
}
func (r gardenCreateRequest) toInput() service.GardenInput {
return service.GardenInput{Name: r.Name, WidthCM: r.WidthCM, HeightCM: r.HeightCM, UnitPref: r.UnitPref, Notes: r.Notes}
}
func (r gardenUpdateRequest) toInput() service.GardenInput {
return service.GardenInput{Name: r.Name, WidthCM: r.WidthCM, HeightCM: r.HeightCM, UnitPref: r.UnitPref, Notes: r.Notes}
gardenFields
Version int64 `json:"version" binding:"required,min=1"`
}
// listGardens returns the actor's gardens as a JSON array (always an array,
@@ -45,7 +41,7 @@ func (r gardenUpdateRequest) toInput() service.GardenInput {
func (h *handlers) listGardens(c *gin.Context) {
gardens, err := h.svc.ListGardens(c.Request.Context(), mustActor(c).ID)
if err != nil {
writeResourceError(c, err)
writeServiceError(c, err)
return
}
c.JSON(http.StatusOK, gardens)
@@ -59,7 +55,7 @@ func (h *handlers) createGarden(c *gin.Context) {
}
g, err := h.svc.CreateGarden(c.Request.Context(), mustActor(c).ID, req.toInput())
if err != nil {
writeResourceError(c, err)
writeServiceError(c, err)
return
}
c.JSON(http.StatusCreated, g)
@@ -72,7 +68,7 @@ func (h *handlers) getGarden(c *gin.Context) {
}
g, err := h.svc.GetGarden(c.Request.Context(), mustActor(c).ID, id)
if err != nil {
writeResourceError(c, err)
writeServiceError(c, err)
return
}
c.JSON(http.StatusOK, g)
@@ -96,7 +92,7 @@ func (h *handlers) updateGarden(c *gin.Context) {
writeVersionConflict(c, g)
return
}
writeResourceError(c, err)
writeServiceError(c, err)
return
}
c.JSON(http.StatusOK, g)
@@ -108,51 +104,8 @@ func (h *handlers) deleteGarden(c *gin.Context) {
return
}
if err := h.svc.DeleteGarden(c.Request.Context(), mustActor(c).ID, id); err != nil {
writeResourceError(c, err)
writeServiceError(c, err)
return
}
c.Status(http.StatusNoContent)
}
// parseIDParam reads a positive int64 path parameter, writing a 400 and
// returning ok=false on a malformed value.
func parseIDParam(c *gin.Context, name string) (int64, bool) {
id, err := strconv.ParseInt(c.Param(name), 10, 64)
if err != nil || id < 1 {
writeAPIError(c, http.StatusBadRequest, "INVALID_INPUT", "invalid id")
return 0, false
}
return id, true
}
// writeVersionConflict writes the 409 envelope for an optimistic-concurrency
// failure: the standard error object plus the current server row under
// "current", so the client can rebase its edit onto the fresh version and retry.
// This shape is the contract for every version-guarded (mutable) resource.
func writeVersionConflict(c *gin.Context, current any) {
c.JSON(http.StatusConflict, gin.H{
"error": gin.H{"code": "VERSION_CONFLICT", "message": "the resource was modified; refetch and retry"},
"current": current,
})
}
// writeResourceError maps the service-layer sentinel errors shared by every
// resource to pansy's JSON error envelope. ErrNotFound is used both for a
// genuinely missing row and for one the actor may not see (existence is masked).
func writeResourceError(c *gin.Context, err error) {
switch {
case errors.Is(err, domain.ErrNotFound):
writeAPIError(c, http.StatusNotFound, "NOT_FOUND", "not found")
case errors.Is(err, domain.ErrForbidden):
writeAPIError(c, http.StatusForbidden, "FORBIDDEN", "you don't have access")
case errors.Is(err, domain.ErrInvalidInput):
writeAPIError(c, http.StatusBadRequest, "INVALID_INPUT", "invalid input")
case errors.Is(err, domain.ErrVersionConflict):
// Reached only if a caller forgot to special-case the conflict (which
// needs the current row); still return a coherent 409.
writeAPIError(c, http.StatusConflict, "VERSION_CONFLICT", "the resource was modified; refetch and retry")
default:
slog.Error("api: unhandled service error", "error", err)
writeAPIError(c, http.StatusInternalServerError, "INTERNAL", "internal error")
}
}