Merge pull request #305 from Protonmatter/protonmatter/json-body-cap

Cap JSON request bodies
This commit is contained in:
BaaRai
2026-11-17 22:29:08 +01:00
committed by GitHub
18 changed files with 215 additions and 60 deletions
+5
View File
@@ -110,10 +110,15 @@ func run() int {
log.Printf("[config] trusted proxies: %v", trusted)
}
srv := server.New(ctx, mgr, skillDir, *dataDir, keyDir, server.WithSecretScrub(), server.WithTrustedProxies(trusted))
// ReadTimeout bounds how long the request headers and body may take to arrive.
// It does not limit how long a handler runs, so an event stream stays open.
// WriteTimeout is left unset: a write deadline would cut that stream.
httpSrv := &http.Server{
Addr: *addr,
Handler: srv.Handler(),
ReadHeaderTimeout: 10 * time.Second,
ReadTimeout: 30 * time.Minute,
IdleTimeout: 2 * time.Minute,
}
go func() {
+3 -3
View File
@@ -36,7 +36,7 @@ func (s *Server) assetInterceptCreateRule(w http.ResponseWriter, r *http.Request
return
}
var req assetInterceptRuleReq
if err := decode(r, &req); err != nil {
if err := decode(w, r, &req); err != nil {
writeErr(w, 400, err.Error())
return
}
@@ -63,7 +63,7 @@ func (s *Server) assetInterceptUpdateRule(w http.ResponseWriter, r *http.Request
return
}
var req assetInterceptRuleReq
if err := decode(r, &req); err != nil {
if err := decode(w, r, &req); err != nil {
writeErr(w, 400, err.Error())
return
}
@@ -109,7 +109,7 @@ func (s *Server) assetInterceptToggleRule(w http.ResponseWriter, r *http.Request
var req struct {
Enabled bool `json:"enabled"`
}
if err := decode(r, &req); err != nil {
if err := decode(w, r, &req); err != nil {
writeErr(w, 400, err.Error())
return
}
+3 -3
View File
@@ -297,7 +297,7 @@ func (s *Server) authInit(w http.ResponseWriter, r *http.Request) {
Password string `json:"password"`
SetupToken string `json:"setup_token"`
}
if err := decode(r, &req); err != nil || req.Password == "" {
if err := decode(w, r, &req); err != nil || req.Password == "" {
writeErr(w, 400, "Password cannot be empty")
return
}
@@ -354,7 +354,7 @@ func (s *Server) authChangePassword(w http.ResponseWriter, r *http.Request) {
OldPassword string `json:"old_password"`
NewPassword string `json:"new_password"`
}
if err := decode(r, &req); err != nil {
if err := decode(w, r, &req); err != nil {
writeErr(w, 400, "Invalid request format")
return
}
@@ -416,7 +416,7 @@ func (s *Server) login(w http.ResponseWriter, r *http.Request, getSetting func(s
Username string `json:"username"`
Password string `json:"password"`
}
if err := decode(r, &req); err != nil {
if err := decode(w, r, &req); err != nil {
writeErr(w, 400, "Invalid request format")
return
}
+2 -2
View File
@@ -27,7 +27,7 @@ const (
func decodeConversationRequest(w http.ResponseWriter, r *http.Request, value any) bool {
r.Body = http.MaxBytesReader(w, r.Body, maxConversationRequestBytes)
if err := decode(r, value); err != nil {
if err := decode(w, r, value); err != nil {
var tooLarge *http.MaxBytesError
if errors.As(err, &tooLarge) {
writeErr(w, http.StatusRequestEntityTooLarge, "Request body too large")
@@ -396,7 +396,7 @@ func (s *Server) pgSendConversationMessage(w http.ResponseWriter, r *http.Reques
Message string `json:"message"`
Attachments []chatAttachment `json:"attachments,omitempty"` // files uploaded via method 1 (paths relative to the conversation working dir)
}
if err := decode(r, &req); err != nil {
if err := decode(w, r, &req); err != nil {
writeErr(w, 400, err.Error())
return
}
+2 -2
View File
@@ -52,7 +52,7 @@ func (s *Server) pgCreateCustomTool(w http.ResponseWriter, r *http.Request) {
return
}
var req customToolReq
if err := decode(r, &req); err != nil {
if err := decode(w, r, &req); err != nil {
writeErr(w, 400, err.Error())
return
}
@@ -104,7 +104,7 @@ func (s *Server) pgUpdateCustomTool(w http.ResponseWriter, r *http.Request) {
return
}
var req customToolReq
if err := decode(r, &req); err != nil {
if err := decode(w, r, &req); err != nil {
writeErr(w, 400, err.Error())
return
}
+69
View File
@@ -0,0 +1,69 @@
package server
import (
"encoding/json"
"errors"
"net/http"
"net/http/httptest"
"strings"
"testing"
)
func TestDecodeAcceptsSmallBody(t *testing.T) {
w := httptest.NewRecorder()
r := httptest.NewRequest(http.MethodPost, "/", strings.NewReader(`{"x":"ok"}`))
var v map[string]string
if err := decode(w, r, &v); err != nil || v["x"] != "ok" {
t.Fatalf("decode: %v %+v", err, v)
}
}
func TestDecodeCapsBody(t *testing.T) {
w := httptest.NewRecorder()
body := strings.NewReader(`{"x":"` + strings.Repeat("a", decodeMaxBytes) + `"}`)
r := httptest.NewRequest(http.MethodPost, "/", body)
var v map[string]string
err := decode(w, r, &v)
var tooLarge *http.MaxBytesError
if !errors.As(err, &tooLarge) {
t.Fatalf("err=%v, want the body cap", err)
}
}
func TestRawJSONBodyOverTheCapIs413(t *testing.T) {
h := limitRequestBody(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
var v map[string]string
if err := json.NewDecoder(r.Body).Decode(&v); err != nil {
writeErr(w, 400, err.Error())
return
}
writeJSON(w, 200, v)
}))
small := httptest.NewRecorder()
h.ServeHTTP(small, httptest.NewRequest(http.MethodPost, "/", strings.NewReader(`{"x":"ok"}`)))
if small.Code != 200 {
t.Fatalf("small body status=%d", small.Code)
}
large := httptest.NewRecorder()
req := httptest.NewRequest(http.MethodPost, "/", strings.NewReader(`{"x":"`+strings.Repeat("a", decodeMaxBytes)+`"}`))
h.ServeHTTP(large, req)
if large.Code != http.StatusRequestEntityTooLarge {
t.Fatalf("status=%d body=%s, want 413", large.Code, large.Body.String())
}
}
func TestMultipartBodyIsNotGivenTheJSONCap(t *testing.T) {
h := limitRequestBody(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
if _, ok := r.Body.(*limitedBody); ok {
t.Errorf("multipart body was given the JSON cap")
}
w.WriteHeader(http.StatusNoContent)
}))
r := httptest.NewRequest(http.MethodPost, "/", strings.NewReader("not-read"))
r.Header.Set("Content-Type", "multipart/form-data; boundary=abc")
w := httptest.NewRecorder()
h.ServeHTTP(w, r)
if w.Code != http.StatusNoContent {
t.Fatalf("status=%d", w.Code)
}
}
+8 -8
View File
@@ -141,7 +141,7 @@ func (s *Server) interceptCreateRule(w http.ResponseWriter, r *http.Request) {
return
}
var req interceptRuleReq
if err := decode(r, &req); err != nil {
if err := decode(w, r, &req); err != nil {
writeErr(w, 400, err.Error())
return
}
@@ -169,7 +169,7 @@ func (s *Server) interceptUpdateRule(w http.ResponseWriter, r *http.Request) {
return
}
var req interceptRuleReq
if err := decode(r, &req); err != nil {
if err := decode(w, r, &req); err != nil {
writeErr(w, 400, err.Error())
return
}
@@ -217,7 +217,7 @@ func (s *Server) interceptToggleRule(w http.ResponseWriter, r *http.Request) {
var req struct {
Enabled bool `json:"enabled"`
}
if err := decode(r, &req); err != nil {
if err := decode(w, r, &req); err != nil {
writeErr(w, 400, err.Error())
return
}
@@ -400,7 +400,7 @@ func (s *Server) interceptDecide(w http.ResponseWriter, r *http.Request) {
var req struct {
Decision string `json:"decision"` // "allowed" | "denied"
}
if err := decode(r, &req); err != nil {
if err := decode(w, r, &req); err != nil {
writeErr(w, 400, err.Error())
return
}
@@ -445,7 +445,7 @@ func (s *Server) interceptBatchDecide(w http.ResponseWriter, r *http.Request) {
IDs []int64 `json:"ids"`
Decision string `json:"decision"` // "allowed" | "denied"
}
if err := decode(r, &req); err != nil {
if err := decode(w, r, &req); err != nil {
writeErr(w, 400, err.Error())
return
}
@@ -647,7 +647,7 @@ func (s *Server) targetGateSetExemptions(w http.ResponseWriter, r *http.Request)
var req struct {
Exemptions []db.TargetExemption `json:"exemptions"`
}
if err := decode(r, &req); err != nil {
if err := decode(w, r, &req); err != nil {
writeErr(w, 400, err.Error())
return
}
@@ -697,7 +697,7 @@ func (s *Server) interceptSetToolConfig(w http.ResponseWriter, r *http.Request)
var req struct {
EnabledTools []string `json:"enabled_tools"`
}
if err := decode(r, &req); err != nil {
if err := decode(w, r, &req); err != nil {
writeErr(w, 400, err.Error())
return
}
@@ -722,7 +722,7 @@ func (s *Server) interceptGetJudgeConfig(w http.ResponseWriter, r *http.Request)
// interceptSetJudgeConfig persists the judge configuration.
func (s *Server) interceptSetJudgeConfig(w http.ResponseWriter, r *http.Request) {
var req intercept.JudgeConfig
if err := decode(r, &req); err != nil {
if err := decode(w, r, &req); err != nil {
writeErr(w, 400, err.Error())
return
}
+1 -1
View File
@@ -1024,7 +1024,7 @@ func (s *Server) Handler() http.Handler {
root := http.NewServeMux()
root.Handle("/api/", api)
root.Handle("/", s.webuiHandler())
return root
return limitRequestBody(root)
}
// --- handlers ---
+103 -22
View File
@@ -9,6 +9,7 @@ import (
"fmt"
"io"
"log"
"mime"
"net/http"
"net/url"
"os"
@@ -79,7 +80,87 @@ func pathInt(r *http.Request, name string) (int64, bool) {
return n, err == nil
}
func decode(r *http.Request, v any) error { return json.NewDecoder(r.Body).Decode(v) }
// decodeMaxBytes is the default JSON body cap. Multipart uploads are not capped
// here; those handlers set their own limit. A smaller MaxBytesReader installed
// by a handler still wins, because it sits inside this one.
const decodeMaxBytes = 32 << 20
// limitedBody records a MaxBytesError so a later 400 can be answered as 413.
type limitedBody struct {
io.ReadCloser
tooLarge bool
}
func (b *limitedBody) Read(p []byte) (int, error) {
n, err := b.ReadCloser.Read(p)
var tooLarge *http.MaxBytesError
if errors.As(err, &tooLarge) {
b.tooLarge = true
}
return n, err
}
type bodyLimitWriter struct {
http.ResponseWriter
tooLarge func() bool
}
func (b *bodyLimitWriter) WriteHeader(code int) {
if code == http.StatusBadRequest && b.tooLarge != nil && b.tooLarge() {
code = http.StatusRequestEntityTooLarge
}
b.ResponseWriter.WriteHeader(code)
}
func (b *bodyLimitWriter) Flush() {
if f, ok := b.ResponseWriter.(http.Flusher); ok {
f.Flush()
}
}
func (b *bodyLimitWriter) Unwrap() http.ResponseWriter { return b.ResponseWriter }
// limitRequestBody caps a non-multipart body at decodeMaxBytes and passes the
// real ResponseWriter into MaxBytesReader. A handler that then answers 400 for
// that read is rewritten to 413.
func limitRequestBody(next http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
if r.Body == nil || r.Body == http.NoBody || isMultipart(r) {
next.ServeHTTP(w, r)
return
}
body := &limitedBody{ReadCloser: http.MaxBytesReader(w, r.Body, decodeMaxBytes)}
r.Body = body
next.ServeHTTP(&bodyLimitWriter{ResponseWriter: w, tooLarge: func() bool { return body.tooLarge }}, r)
})
}
func isMultipart(r *http.Request) bool {
media, _, err := mime.ParseMediaType(r.Header.Get("Content-Type"))
if err != nil {
return false
}
return strings.HasPrefix(media, "multipart/")
}
func decode(w http.ResponseWriter, r *http.Request, v any) error {
if r.Body != nil {
if _, already := r.Body.(*limitedBody); !already {
r.Body = &limitedBody{ReadCloser: http.MaxBytesReader(w, r.Body, decodeMaxBytes)}
}
}
err := json.NewDecoder(r.Body).Decode(v)
var tooLarge *http.MaxBytesError
if errors.As(err, &tooLarge) {
if lb, ok := r.Body.(*limitedBody); ok {
lb.tooLarge = true
}
// Return the original error: a caller that maps 413 itself keeps working,
// and the middleware still rewrites a 400 for callers that do not.
return tooLarge
}
return err
}
// ---------- tasks (delete) ----------
@@ -138,7 +219,7 @@ func (s *Server) pgDeleteTask(w http.ResponseWriter, r *http.Request) {
return
}
var opts DeleteTaskOptions
if err := decode(r, &opts); err != nil && err != io.EOF {
if err := decode(w, r, &opts); err != nil && err != io.EOF {
writeErr(w, 400, "invalid JSON: "+err.Error())
return
}
@@ -250,7 +331,7 @@ func (s *Server) pgCreateAgent(w http.ResponseWriter, r *http.Request) {
return
}
var req struct{ Key, Name, Description string }
if err := decode(r, &req); err != nil {
if err := decode(w, r, &req); err != nil {
writeErr(w, 400, err.Error())
return
}
@@ -290,7 +371,7 @@ func (s *Server) pgUpdateAgent(w http.ResponseWriter, r *http.Request) {
return
}
var req struct{ Name, Description string }
if err := decode(r, &req); err != nil {
if err := decode(w, r, &req); err != nil {
writeErr(w, 400, err.Error())
return
}
@@ -516,7 +597,7 @@ func (s *Server) pgSavePrompt(w http.ResponseWriter, r *http.Request) {
return
}
var body struct{ Template, Note string }
if err := decode(r, &body); err != nil {
if err := decode(w, r, &body); err != nil {
writeErr(w, 400, err.Error())
return
}
@@ -565,7 +646,7 @@ func (s *Server) pgSaveWrapup(w http.ResponseWriter, r *http.Request) {
Prompt string `json:"prompt"`
MaxTurns *int `json:"max_turns"`
}
if err := decode(r, &body); err != nil {
if err := decode(w, r, &body); err != nil {
writeErr(w, 400, err.Error())
return
}
@@ -619,7 +700,7 @@ func (s *Server) pgSaveTaskTimeoutWrapup(w http.ResponseWriter, r *http.Request)
Prompt string `json:"prompt"`
MaxTurns *int `json:"max_turns"`
}
if err := decode(r, &body); err != nil {
if err := decode(w, r, &body); err != nil {
writeErr(w, 400, err.Error())
return
}
@@ -689,7 +770,7 @@ func (s *Server) pgPreviewPrompt(w http.ResponseWriter, r *http.Request) {
Template string `json:"template"`
Sample map[string]string `json:"sample"`
}
_ = decode(r, &body)
_ = decode(w, r, &body)
vars, _ := pg.PromptVars(a.ID)
if body.Template == "" {
body.Template, _ = pg.CurrentPrompt(a.ID)
@@ -724,7 +805,7 @@ func (s *Server) pgSetAgentVisibility(w http.ResponseWriter, r *http.Request) {
MCP []int64 `json:"mcp"`
Skill []string `json:"skill"`
}
if err := decode(r, &body); err != nil {
if err := decode(w, r, &body); err != nil {
writeErr(w, 400, err.Error())
return
}
@@ -797,7 +878,7 @@ func (s *Server) pgUpdateTool(w http.ResponseWriter, r *http.Request) {
Agents []string `json:"agents"`
Enabled bool `json:"enabled"`
}
if err := decode(r, &body); err != nil {
if err := decode(w, r, &body); err != nil {
writeErr(w, 400, err.Error())
return
}
@@ -963,7 +1044,7 @@ func (s *Server) pgSaveMCP(w http.ResponseWriter, r *http.Request) {
return
}
var m db.MCPServer
if err := decode(r, &m); err != nil {
if err := decode(w, r, &m); err != nil {
writeErr(w, 400, err.Error())
return
}
@@ -1182,7 +1263,7 @@ func (s *Server) fsCreateSkill(w http.ResponseWriter, r *http.Request) {
MCPs []string `json:"mcps"` // optional; MCP servers this skill unlocks
Instructions string `json:"instructions"` // optional; scaffolded if empty
}
if err := decode(r, &body); err != nil {
if err := decode(w, r, &body); err != nil {
writeErr(w, 400, err.Error())
return
}
@@ -1267,7 +1348,7 @@ func (s *Server) fsUpdateSkillMeta(w http.ResponseWriter, r *http.Request) {
License *string `json:"license"`
Compatibility *string `json:"compatibility"`
}
if err := decode(r, &body); err != nil {
if err := decode(w, r, &body); err != nil {
writeErr(w, 400, err.Error())
return
}
@@ -1788,7 +1869,7 @@ func (s *Server) fsWriteFile(w http.ResponseWriter, r *http.Request) {
var body struct {
Content string `json:"content"`
}
if err := decode(r, &body); err != nil {
if err := decode(w, r, &body); err != nil {
writeErr(w, 400, err.Error())
return
}
@@ -1819,7 +1900,7 @@ func (s *Server) fsCreateDir(w http.ResponseWriter, r *http.Request) {
var body struct {
Path string `json:"path"`
}
if err := decode(r, &body); err != nil {
if err := decode(w, r, &body); err != nil {
writeErr(w, 400, err.Error())
return
}
@@ -1888,7 +1969,7 @@ func (s *Server) pgToggleSkillVisibility(w http.ResponseWriter, r *http.Request)
SkillName string `json:"skill_name"`
Visible bool `json:"visible"`
}
if err := decode(r, &body); err != nil {
if err := decode(w, r, &body); err != nil {
writeErr(w, 400, err.Error())
return
}
@@ -1926,7 +2007,7 @@ func (s *Server) pgToggleVisibility(w http.ResponseWriter, r *http.Request) {
ResourceID int64 `json:"resource_id"`
Visible bool `json:"visible"`
}
if err := decode(r, &body); err != nil {
if err := decode(w, r, &body); err != nil {
writeErr(w, 400, err.Error())
return
}
@@ -1967,7 +2048,7 @@ func (s *Server) pgSaveProfile(w http.ResponseWriter, r *http.Request) {
APIKey string `json:"api_key"`
Streaming *bool `json:"streaming"`
}
if err := decode(r, &body); err != nil {
if err := decode(w, r, &body); err != nil {
writeErr(w, 400, err.Error())
return
}
@@ -2036,7 +2117,7 @@ func (s *Server) pgSaveLLMRetryPolicy(w http.ResponseWriter, r *http.Request) {
return
}
var pol db.LLMRetryPolicy
if err := decode(r, &pol); err != nil {
if err := decode(w, r, &pol); err != nil {
writeErr(w, 400, err.Error())
return
}
@@ -2108,7 +2189,7 @@ func (s *Server) pgActivateProfile(w http.ResponseWriter, r *http.Request) {
var body struct {
ID int64 `json:"id"`
}
if err := decode(r, &body); err != nil {
if err := decode(w, r, &body); err != nil {
writeErr(w, 400, err.Error())
return
}
@@ -2141,7 +2222,7 @@ func (s *Server) pgLLMPoolReset(w http.ResponseWriter, r *http.Request) {
var body struct {
ID int64 `json:"id"` // 0 / omitted = all
}
if err := decode(r, &body); err != nil {
if err := decode(w, r, &body); err != nil {
writeErr(w, 400, err.Error())
return
}
@@ -2168,7 +2249,7 @@ func (s *Server) pgListModels(w http.ResponseWriter, r *http.Request) {
Proxy string `json:"proxy"`
ProfileID *int64 `json:"profile_id"` // fallback: use stored key from this profile
}
if err := decode(r, &req); err != nil {
if err := decode(w, r, &req); err != nil {
writeErr(w, 400, err.Error())
return
}
+2 -2
View File
@@ -124,7 +124,7 @@ func (s *Server) syncSSDatasource(w http.ResponseWriter, r *http.Request) {
URL string `json:"url"`
APIKey string `json:"api_key"`
}
_ = decode(r, &body) // empty body = just create the placeholder
_ = decode(w, r, &body) // empty body = just create the placeholder
body.URL = strings.TrimSpace(body.URL)
body.APIKey = strings.TrimSpace(body.APIKey)
@@ -266,7 +266,7 @@ func (s *Server) syncSSRun(w http.ResponseWriter, r *http.Request) {
return
}
var req ssSyncReq
if err := decode(r, &req); err != nil {
if err := decode(w, r, &req); err != nil {
writeErr(w, 400, "invalid JSON: "+err.Error())
return
}
+2 -2
View File
@@ -512,7 +512,7 @@ func (s *Server) queueTaskArchiveDelete(w http.ResponseWriter, r *http.Request)
func (s *Server) queueTaskArchivesBatch(w http.ResponseWriter, r *http.Request) {
var request archiveBatchRequest
if err := decode(r, &request); err != nil {
if err := decode(w, r, &request); err != nil {
writeErr(w, 400, err.Error())
return
}
@@ -552,7 +552,7 @@ func (s *Server) queueTaskArchivesBatch(w http.ResponseWriter, r *http.Request)
func (s *Server) queueTaskArchiveActionBatch(w http.ResponseWriter, r *http.Request, action string) {
var request archiveBatchRequest
if err := decode(r, &request); err != nil {
if err := decode(w, r, &request); err != nil {
writeErr(w, 400, err.Error())
return
}
+1 -1
View File
@@ -33,7 +33,7 @@ func (s *Server) attachTaskAssets(w http.ResponseWriter, r *http.Request) {
SourceSummary string `json:"source_summary"`
Scope companyScopeInputs `json:"scope"`
}
if err := decode(r, &request); err != nil {
if err := decode(w, r, &request); err != nil {
var tooLarge *http.MaxBytesError
if errors.As(err, &tooLarge) {
writeErr(w, http.StatusRequestEntityTooLarge, "request body too large")
+3 -3
View File
@@ -21,7 +21,7 @@ type taskCategoryRequest struct {
func decodeTaskCategoryRequest(w http.ResponseWriter, r *http.Request) (*taskCategoryRequest, bool) {
r.Body = http.MaxBytesReader(w, r.Body, maxTaskCategoryRequestBytes)
var request taskCategoryRequest
if err := decode(r, &request); err != nil {
if err := decode(w, r, &request); err != nil {
var tooLarge *http.MaxBytesError
if errors.As(err, &tooLarge) {
writeErr(w, http.StatusRequestEntityTooLarge, "request body too large")
@@ -150,7 +150,7 @@ func (s *Server) updateTaskCategory(w http.ResponseWriter, r *http.Request) {
var request struct {
CategoryID json.RawMessage `json:"category_id"`
}
if err := decode(r, &request); err != nil {
if err := decode(w, r, &request); err != nil {
writeErr(w, http.StatusBadRequest, err.Error())
return
}
@@ -184,7 +184,7 @@ func (s *Server) updateTasksCategoryBatch(w http.ResponseWriter, r *http.Request
TaskIDs []string `json:"task_ids"`
CategoryID json.RawMessage `json:"category_id"`
}
if err := decode(r, &request); err != nil {
if err := decode(w, r, &request); err != nil {
var tooLarge *http.MaxBytesError
if errors.As(err, &tooLarge) {
writeErr(w, http.StatusRequestEntityTooLarge, "request body too large")
+3 -3
View File
@@ -91,7 +91,7 @@ func (s *Server) taskInterceptCreateRule(w http.ResponseWriter, r *http.Request)
return
}
var req taskInterceptRuleReq
if err := decode(r, &req); err != nil {
if err := decode(w, r, &req); err != nil {
writeErr(w, 400, err.Error())
return
}
@@ -123,7 +123,7 @@ func (s *Server) taskInterceptUpdateRule(w http.ResponseWriter, r *http.Request)
return
}
var req taskInterceptRuleReq
if err := decode(r, &req); err != nil {
if err := decode(w, r, &req); err != nil {
writeErr(w, 400, err.Error())
return
}
@@ -180,7 +180,7 @@ func (s *Server) taskInterceptToggleRule(w http.ResponseWriter, r *http.Request)
var req struct {
Enabled bool `json:"enabled"`
}
if err := decode(r, &req); err != nil {
if err := decode(w, r, &req); err != nil {
writeErr(w, 400, err.Error())
return
}
+1 -1
View File
@@ -30,7 +30,7 @@ func (s *Server) updateTaskMetadata(w http.ResponseWriter, r *http.Request) {
PlanQuietMode *bool `json:"plan_quiet_mode"`
TargetGate *bool `json:"target_gate"`
}
if err := decode(r, &request); err != nil {
if err := decode(w, r, &request); err != nil {
var tooLarge *http.MaxBytesError
if errors.As(err, &tooLarge) {
writeErr(w, http.StatusRequestEntityTooLarge, "request body too large")
+3 -3
View File
@@ -216,7 +216,7 @@ func (s *Server) rewriteCreateRule(w http.ResponseWriter, r *http.Request) {
return
}
var req rewriteRuleReq
if err := decode(r, &req); err != nil {
if err := decode(w, r, &req); err != nil {
writeErr(w, 400, err.Error())
return
}
@@ -249,7 +249,7 @@ func (s *Server) rewriteUpdateRule(w http.ResponseWriter, r *http.Request) {
return
}
var req rewriteRuleReq
if err := decode(r, &req); err != nil {
if err := decode(w, r, &req); err != nil {
writeErr(w, 400, err.Error())
return
}
@@ -308,7 +308,7 @@ func (s *Server) rewriteToggleRule(w http.ResponseWriter, r *http.Request) {
var req struct {
Enabled bool `json:"enabled"`
}
if err := decode(r, &req); err != nil {
if err := decode(w, r, &req); err != nil {
writeErr(w, 400, err.Error())
return
}
+2 -2
View File
@@ -60,7 +60,7 @@ func (s *Server) pgCreateTrigger(w http.ResponseWriter, r *http.Request) {
return
}
var req triggerReq
if err := decode(r, &req); err != nil {
if err := decode(w, r, &req); err != nil {
writeErr(w, 400, err.Error())
return
}
@@ -96,7 +96,7 @@ func (s *Server) pgUpdateTrigger(w http.ResponseWriter, r *http.Request) {
return
}
var req triggerReq
if err := decode(r, &req); err != nil {
if err := decode(w, r, &req); err != nil {
writeErr(w, 400, err.Error())
return
}
+2 -2
View File
@@ -139,7 +139,7 @@ func (s *Server) wsWrite(w http.ResponseWriter, r *http.Request) {
Path string `json:"path"`
Content string `json:"content"`
}
if err := decode(r, &req); err != nil {
if err := decode(w, r, &req); err != nil {
writeErr(w, 400, err.Error())
return
}
@@ -168,7 +168,7 @@ func (s *Server) wsMkdir(w http.ResponseWriter, r *http.Request) {
var req struct {
Path string `json:"path"`
}
if err := decode(r, &req); err != nil {
if err := decode(w, r, &req); err != nil {
writeErr(w, 400, err.Error())
return
}