diff options
author | Pete Higgins <pete@peterhiggins.org> | 2020-12-16 14:43:00 -0800 |
---|---|---|
committer | Pete Higgins <pete@peterhiggins.org> | 2020-12-16 14:43:00 -0800 |
commit | 0e4abd29a2f10bbfe96929d79c432f36dfff2ead (patch) | |
tree | fed20ae64ac7e577f2fb243865560aad35c78ccf /lib/chef/http | |
parent | 8f2cbbdc7fb504cbf19b38321995870af32ef0b0 (diff) | |
download | chef-0e4abd29a2f10bbfe96929d79c432f36dfff2ead.tar.gz |
Add friendlier error messages for OpenSSL stuff.
Signed-off-by: Pete Higgins <pete@peterhiggins.org>
Diffstat (limited to 'lib/chef/http')
-rw-r--r-- | lib/chef/http/ssl_policies.rb | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/lib/chef/http/ssl_policies.rb b/lib/chef/http/ssl_policies.rb index 5b4ac347f6..f6fd7dc580 100644 --- a/lib/chef/http/ssl_policies.rb +++ b/lib/chef/http/ssl_policies.rb @@ -105,8 +105,17 @@ class Chef raise Chef::Exceptions::ConfigurationError, "The configured ssl_client_key #{config[:ssl_client_key]} does not exist" end - http_client.cert = OpenSSL::X509::Certificate.new(::File.binread(config[:ssl_client_cert])) - http_client.key = OpenSSL::PKey::RSA.new(::File.binread(config[:ssl_client_key])) + begin + http_client.cert = OpenSSL::X509::Certificate.new(::File.binread(config[:ssl_client_cert])) + rescue OpenSSL::X509::CertificateError => e + raise Chef::Exceptions::ConfigurationError, "Error reading cert file '#{config[:ssl_client_cert]}', original error '#{e.class}: #{e.message}'" + end + + begin + http_client.key = OpenSSL::PKey::RSA.new(::File.binread(config[:ssl_client_key])) + rescue OpenSSL::PKey::RSAError => e + raise Chef::Exceptions::ConfigurationError, "Error reading key file '#{config[:ssl_client_key]}', original error '#{e.class}: #{e.message}'" + end end end |