diff --git a/scripts/init_secrets.py b/scripts/init_secrets.py index c154be7..44efd53 100644 --- a/scripts/init_secrets.py +++ b/scripts/init_secrets.py @@ -12,7 +12,7 @@ def write(name, value): if path.exists(): print('keep secrets/' + name) return path.read_text().strip() - path.write_text(value + '\n', newline='\n') + path.write_bytes((value + '\n').encode('utf-8')) print('created secrets/' + name) return value diff --git a/src/internal/api/helpers.go b/src/internal/api/helpers.go index b28fab7..4ed2c6d 100644 --- a/src/internal/api/helpers.go +++ b/src/internal/api/helpers.go @@ -4,6 +4,7 @@ import ( "crypto/sha256" "encoding/json" "errors" + "io" "mime" "net/http" "regexp" @@ -60,8 +61,13 @@ func decodeJSON(w http.ResponseWriter, r *http.Request, dst any) *apperr.AppErro } return apperr.InvalidRequest("malformed JSON body") } - if dec.More() { - return apperr.InvalidRequest("multiple JSON documents in body") + var extra json.RawMessage + if err := dec.Decode(&extra); err != io.EOF { + var maxErr *http.MaxBytesError + if errors.As(err, &maxErr) { + return apperr.PayloadTooLarge("request body too large") + } + return apperr.InvalidRequest("malformed JSON body") } return nil }