diff options
author | Lamont Granquist <lamont@scriptkiddie.org> | 2017-03-02 17:05:13 -0800 |
---|---|---|
committer | Lamont Granquist <lamont@scriptkiddie.org> | 2017-03-02 17:05:13 -0800 |
commit | e6484445fb873b2ccc5448cd4e6fc2b00ecbaf5b (patch) | |
tree | 619dc966659b7b208e30c84b5720e7c9f9226866 | |
parent | d4caa2d16f7a448a83947ac975bf900f55e4c261 (diff) | |
download | chef-e6484445fb873b2ccc5448cd4e6fc2b00ecbaf5b.tar.gz |
protect against nil response bodylcg/debug-log-bad-json-payload
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
-rw-r--r-- | lib/chef/http/json_output.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/chef/http/json_output.rb b/lib/chef/http/json_output.rb index 179f1de4ef..dc363cdc54 100644 --- a/lib/chef/http/json_output.rb +++ b/lib/chef/http/json_output.rb @@ -61,7 +61,9 @@ class Chef [http_response, rest_request, return_value] else Chef::Log.debug("Expected JSON response, but got content-type '#{http_response['content-type']}'") - Chef::Log.debug("Response body contains:\n#{http_response.body.length < 256 ? http_response.body : http_response.body[0..256] + " [...truncated...]"}") + if http_response.body + Chef::Log.debug("Response body contains:\n#{http_response.body.length < 256 ? http_response.body : http_response.body[0..256] + " [...truncated...]"}") + end return [http_response, rest_request, http_response.body.to_s] end end |