diff options
author | Lamont Granquist <lamont@scriptkiddie.org> | 2017-02-08 10:25:14 -0800 |
---|---|---|
committer | Tom Duffield <tom@chef.io> | 2017-02-08 16:59:38 -0600 |
commit | 8278a357e3aeaf4b58bc88fcfbdd48e27c0ff944 (patch) | |
tree | f2c23a5ba5c2532b795b2dd9fcf2e96c2d1dae17 | |
parent | 76d435b6c2e4b8886da7c05121f54807b9e685bf (diff) | |
download | chef-8278a357e3aeaf4b58bc88fcfbdd48e27c0ff944.tar.gz |
sanitize utf8 data going to serverlcg/data-collector-utf8
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
Signed-off-by: Tom Duffield <tom@chef.io>
-rw-r--r-- | lib/chef/data_collector.rb | 4 | ||||
-rw-r--r-- | spec/support/shared/context/client.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/chef/data_collector.rb b/lib/chef/data_collector.rb index bcd15ea323..0a92b800a6 100644 --- a/lib/chef/data_collector.rb +++ b/lib/chef/data_collector.rb @@ -288,9 +288,9 @@ class Chef # raise an exception. def setup_http_client if data_collector_token.nil? - Chef::ServerAPI.new(data_collector_server_url) + Chef::ServerAPI.new(data_collector_server_url, validate_utf8: false) else - Chef::HTTP::SimpleJSON.new(data_collector_server_url) + Chef::HTTP::SimpleJSON.new(data_collector_server_url, validate_utf8: false) end end diff --git a/spec/support/shared/context/client.rb b/spec/support/shared/context/client.rb index 295bd6ce5f..c65650e6b1 100644 --- a/spec/support/shared/context/client.rb +++ b/spec/support/shared/context/client.rb @@ -95,7 +95,7 @@ shared_context "a client run" do def stub_for_data_collector_init expect(Chef::ServerAPI).to receive(:new). - with(Chef::Config[:data_collector][:server_url]). + with(Chef::Config[:data_collector][:server_url], validate_utf8: false). exactly(:once). and_return(http_data_collector) end |