diff options
author | Pete Higgins <pete@peterhiggins.org> | 2020-12-16 17:25:35 -0800 |
---|---|---|
committer | Pete Higgins <pete@peterhiggins.org> | 2020-12-16 17:25:35 -0800 |
commit | ca500b211a287e07d2de6253c9bc99dd7b9926f4 (patch) | |
tree | 15d47cbbe88f872e186e8613ddcfd45b36c9661b | |
parent | 897fa89f1da11bc7e8250908c87c899b90bb382b (diff) | |
download | chef-ca500b211a287e07d2de6253c9bc99dd7b9926f4.tar.gz |
Return early to remove a level of nesting.
Signed-off-by: Pete Higgins <pete@peterhiggins.org>
-rw-r--r-- | lib/chef/http/ssl_policies.rb | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/lib/chef/http/ssl_policies.rb b/lib/chef/http/ssl_policies.rb index 152ff4128a..03d9ff5ef1 100644 --- a/lib/chef/http/ssl_policies.rb +++ b/lib/chef/http/ssl_policies.rb @@ -98,28 +98,28 @@ class Chef end def set_client_credentials - if config[:ssl_client_cert] || config[:ssl_client_key] - unless config[:ssl_client_cert] && config[:ssl_client_key] - raise Chef::Exceptions::ConfigurationError, "You must configure ssl_client_cert and ssl_client_key together" - end - unless ::File.exists?(config[:ssl_client_cert]) - raise Chef::Exceptions::ConfigurationError, "The configured ssl_client_cert #{config[:ssl_client_cert]} does not exist" - end - unless ::File.exists?(config[:ssl_client_key]) - raise Chef::Exceptions::ConfigurationError, "The configured ssl_client_key #{config[:ssl_client_key]} does not exist" - end + return unless config[:ssl_client_cert] || 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 + unless config[:ssl_client_cert] && config[:ssl_client_key] + raise Chef::Exceptions::ConfigurationError, "You must configure ssl_client_cert and ssl_client_key together" + end + unless ::File.exists?(config[:ssl_client_cert]) + raise Chef::Exceptions::ConfigurationError, "The configured ssl_client_cert #{config[:ssl_client_cert]} does not exist" + end + unless ::File.exists?(config[:ssl_client_key]) + raise Chef::Exceptions::ConfigurationError, "The configured ssl_client_key #{config[:ssl_client_key]} does not exist" + 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 + 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 |