Skip to content

fix: add MaxHeaderBytes and body size limits to HTTP servers (PILOT-107) #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TeoSlayer merged 1 commit into from
May 28, 2026
Merged

fix: add MaxHeaderBytes and body size limits to HTTP servers (PILOT-107) #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions cmd/cosift/pebble_serve.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,6 +408,8 @@ func runPebbleServe(ctx context.Context, cfg *config.Config, args []string) erro
ReadHeaderTimeout: 10 * time.Second,
ReadTimeout: 30 * time.Second,
WriteTimeout: 60 * time.Second,
IdleTimeout: 120 * time.Second,
MaxHeaderBytes: 1 << 20, // 1 MB
}

log.Printf("pebble-serve: listening on %s (PebbleStore at %s)", *addr, *dir)
Expand Down Expand Up @@ -3006,7 +3008,7 @@ type searchRequest struct {

func (s *pebbleHTTP) handleSearchPOST(w http.ResponseWriter, r *http.Request) {
var req searchRequest
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
if err := json.NewDecoder(http.MaxBytesReader(w, r.Body, 1<<20)).Decode(&req); err != nil {
writeProblem(w, http.StatusBadRequest, "invalid JSON body: "+err.Error())
return
}
Expand Down Expand Up @@ -3069,7 +3071,7 @@ type findSimilarRequest struct {

func (s *pebbleHTTP) handleFindSimilarPOST(w http.ResponseWriter, r *http.Request) {
var req findSimilarRequest
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
if err := json.NewDecoder(http.MaxBytesReader(w, r.Body, 1<<20)).Decode(&req); err != nil {
writeProblem(w, http.StatusBadRequest, "invalid JSON body: "+err.Error())
return
}
Expand Down Expand Up @@ -3161,7 +3163,7 @@ func (req synthRequest) toValues() url.Values {

func (s *pebbleHTTP) handleAnswerPOST(w http.ResponseWriter, r *http.Request) {
var req synthRequest
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
if err := json.NewDecoder(http.MaxBytesReader(w, r.Body, 1<<20)).Decode(&req); err != nil {
writeProblem(w, http.StatusBadRequest, "invalid JSON body: "+err.Error())
return
}
Expand All @@ -3171,7 +3173,7 @@ func (s *pebbleHTTP) handleAnswerPOST(w http.ResponseWriter, r *http.Request) {

func (s *pebbleHTTP) handleResearchPOST(w http.ResponseWriter, r *http.Request) {
var req synthRequest
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
if err := json.NewDecoder(http.MaxBytesReader(w, r.Body, 1<<20)).Decode(&req); err != nil {
writeProblem(w, http.StatusBadRequest, "invalid JSON body: "+err.Error())
return
}
Expand Down Expand Up @@ -5810,7 +5812,7 @@ type contentsBatchItem struct {
func (s *pebbleHTTP) handleContentsBatch(w http.ResponseWriter, r *http.Request) {
start := time.Now()
var req contentsBatchReq
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
if err := json.NewDecoder(http.MaxBytesReader(w, r.Body, 1<<20)).Decode(&req); err != nil {
writeProblem(w, http.StatusBadRequest, "invalid JSON body: "+err.Error())
return
}
Expand Down
11 changes: 6 additions & 5 deletions internal/server/http.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,7 @@ func (s *Server) handleFeedback(w http.ResponseWriter, r *http.Request) {
return
}
var req FeedbackRequest
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
if err := json.NewDecoder(http.MaxBytesReader(w, r.Body, 1<<20)).Decode(&req); err != nil {
writeProblem(w, http.StatusBadRequest, "invalid JSON body")
return
}
Expand Down Expand Up @@ -683,7 +683,7 @@ type AdminRecrawlResponse struct {
// next pass. This split keeps the API endpoint stateless and quick.
func (s *Server) handleAdminRecrawl(w http.ResponseWriter, r *http.Request) {
var req AdminRecrawlRequest
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
if err := json.NewDecoder(http.MaxBytesReader(w, r.Body, 1<<20)).Decode(&req); err != nil {
writeProblem(w, http.StatusBadRequest, "invalid JSON body")
return
}
Expand Down Expand Up @@ -744,7 +744,7 @@ type AdminRecrawlByDomainResponse struct {
// batch-/contents cap pattern). Larger sweeps should be split.
func (s *Server) handleAdminRecrawlByDomain(w http.ResponseWriter, r *http.Request) {
var req AdminRecrawlByDomainRequest
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
if err := json.NewDecoder(http.MaxBytesReader(w, r.Body, 1<<20)).Decode(&req); err != nil {
writeProblem(w, http.StatusBadRequest, "invalid JSON body")
return
}
Expand Down Expand Up @@ -831,7 +831,7 @@ func (s *Server) handleAdminReembed(w http.ResponseWriter, r *http.Request) {
}
var req AdminReembedRequest
if r.ContentLength > 0 {
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
if err := json.NewDecoder(http.MaxBytesReader(w, r.Body, 1<<20)).Decode(&req); err != nil {
writeProblem(w, http.StatusBadRequest, "invalid JSON body")
return
}
Expand Down Expand Up @@ -2189,7 +2189,7 @@ type ContentsBatchItem struct {
func (s *Server) handleContentsBatch(w http.ResponseWriter, r *http.Request) {
start := time.Now()
var req ContentsBatchRequest
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
if err := json.NewDecoder(http.MaxBytesReader(w, r.Body, 1<<20)).Decode(&req); err != nil {
writeProblem(w, http.StatusBadRequest, fmt.Sprintf("invalid json body: %v", err))
return
}
Expand Down Expand Up @@ -3152,6 +3152,7 @@ func ListenAndServe(ctx context.Context, addr string, h http.Handler) error {
ReadTimeout: 30 * time.Second,
WriteTimeout: 60 * time.Second,
IdleTimeout: 120 * time.Second,
MaxHeaderBytes: 1 << 20, // 1 MB
}
errCh := make(chan error, 1)
go func() { errCh <- srv.ListenAndServe() }()
Expand Down
Loading