From 48cfe6ff5f0ffbd588b8837446c191491fb3fde2 Mon Sep 17 00:00:00 2001 From: James Phillips Date: Wed, 10 Jan 2018 09:33:49 -0800 Subject: [PATCH 1/2] Fixes crash where body was optional for PQ endpoint (it is not). Fixes #3791 --- agent/prepared_query_endpoint.go | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/agent/prepared_query_endpoint.go b/agent/prepared_query_endpoint.go index 1d8ee7ba27ff..0be0ea3ed90c 100644 --- a/agent/prepared_query_endpoint.go +++ b/agent/prepared_query_endpoint.go @@ -22,12 +22,10 @@ func (s *HTTPServer) preparedQueryCreate(resp http.ResponseWriter, req *http.Req } s.parseDC(req, &args.Datacenter) s.parseToken(req, &args.Token) - if req.ContentLength > 0 { - if err := decodeBody(req, &args.Query, nil); err != nil { - resp.WriteHeader(http.StatusBadRequest) - fmt.Fprintf(resp, "Request decode failed: %v", err) - return nil, nil - } + if err := decodeBody(req, &args.Query, nil); err != nil { + resp.WriteHeader(http.StatusBadRequest) + fmt.Fprintf(resp, "Request decode failed: %v", err) + return nil, nil } var reply string From 10b4eaf4eab2c7b2eb9fe52eff35ba74d498a573 Mon Sep 17 00:00:00 2001 From: James Phillips Date: Wed, 10 Jan 2018 09:38:13 -0800 Subject: [PATCH 2/2] Updates the change log. --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f2568415e555..6d2249720312 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ IMPROVEMENTS: BUG FIXES: +* server: Fixed a crash when POST-ing an empty body to the /v1/query endpoint. [[GH-3791](https://github.com/hashicorp/consul/issues/3791)] * ui: Added a URI escape around key/value keys so that it's not possible to create unexpected partial key names when entering characters like `?` inside a key. [[GH-3760](https://github.com/hashicorp/consul/issues/3760)] ## 1.0.2 (December 15, 2017)