diff options
Diffstat (limited to 'lib/chef/client.rb')
-rw-r--r-- | lib/chef/client.rb | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/lib/chef/client.rb b/lib/chef/client.rb index a524a9cd54..42b7084787 100644 --- a/lib/chef/client.rb +++ b/lib/chef/client.rb @@ -97,6 +97,14 @@ class Chef attr_reader :rest # + # A rest object with validate_utf8 set to false. This will not throw exceptions + # on non-UTF8 strings in JSON but will sanitize them so that e.g. POSTs will + # never fail. Cannot be configured on a request-by-request basis, so we carry + # around another rest object for it. + # + attr_reader :rest_clean + + # # The runner used to converge. # # @return [Chef::Runner] @@ -385,13 +393,23 @@ class Chef end end + # Rest client for use by API reporters. This rest client will not fail with an exception if + # it is fed non-UTF8 data. + # + # @api private + def rest_clean(client_name=node_name, config=Chef::Config) + @rest_clean ||= + Chef::ServerAPI.new(config[:chef_server_url], client_name: client_name, + signing_key_filename: config[:client_key], validate_utf8: false) + end + # Resource reporters send event information back to the chef server for # processing. Can only be called after we have a @rest object # @api private def register_reporters [ - Chef::ResourceReporter.new(rest), - Chef::Audit::AuditReporter.new(rest), + Chef::ResourceReporter.new(rest_clean), + Chef::Audit::AuditReporter.new(rest_clean), ].each do |r| events.register(r) end @@ -603,6 +621,8 @@ class Chef # We now have the client key, and should use it from now on. @rest = Chef::ServerAPI.new(config[:chef_server_url], client_name: client_name, signing_key_filename: config[:client_key]) + # force initialization of ther rest_clean API object + rest_clean(client_name, config) register_reporters rescue Exception => e # TODO this should probably only ever fire if we *started* registration. |