Skip to content

jsonrpc: Separate error handling for MaxBytesError #2605

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
jrick merged 3 commits into from
Jan 28, 2026
Merged

jsonrpc: Separate error handling for MaxBytesError #2605

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6754fd4
jsonrpc: Remove punctuation from error messages.
jholdstock Jan 28, 2026
612ffc8
jsonrpc: Fix typo in log warning.
jholdstock Jan 8, 2026
7afa0af
jsonrpc: Separate error handling for MaxBytesError
jholdstock Jan 9, 2026
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
20 changes: 13 additions & 7 deletions internal/rpc/jsonrpc/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) 2013-2015 The btcsuite developers
// Copyright (c) 2017-2024 The Decred developers
// Copyright (c) 2017-2026 The Decred developers
// Use of this source code is governed by an ISC
// license that can be found in the LICENSE file.

Expand Down Expand Up @@ -86,7 +86,7 @@ type handler struct {
// jsonAuthFail sends a message back to the client if the http auth is rejected.
func jsonAuthFail(w http.ResponseWriter) {
w.Header().Add("WWW-Authenticate", `Basic realm="dcrwallet RPC"`)
http.Error(w, "401 Unauthorized.", http.StatusUnauthorized)
http.Error(w, "401 Unauthorized", http.StatusUnauthorized)
}

// NewServer creates a new server for serving JSON-RPC client connections,
Expand Down Expand Up @@ -538,10 +538,16 @@ func (s *Server) postClientRPC(w http.ResponseWriter, r *http.Request) {
body := http.MaxBytesReader(w, r.Body, maxRequestSize)
rpcRequest, err := io.ReadAll(body)
if err != nil {
// TODO: what if the underlying reader errored?
log.Warnf("Request from client %v exceeds maximum size", r.RemoteAddr)
http.Error(w, "413 Request Too Large.",
http.StatusRequestEntityTooLarge)
var maxBytesError *http.MaxBytesError
if errors.As(err, &maxBytesError) {
log.Warnf("Request from client %s exceeds maximum size", r.RemoteAddr)
http.Error(w, "413 Request Too Large",
http.StatusRequestEntityTooLarge)
return
}

log.Warnf("Failed to read request from client %s", r.RemoteAddr)
http.Error(w, "Request read failed", http.StatusInternalServerError)
return
}

Expand All @@ -562,7 +568,7 @@ func (s *Server) postClientRPC(w http.ResponseWriter, r *http.Request) {
}
_, err = w.Write(resp)
if err != nil {
log.Warnf("Cannot write invalid request request to "+
log.Warnf("Cannot write invalid request response to "+
"client %s: %v", r.RemoteAddr, err)
}
return
Expand Down
Loading