Skip to content

Use File.exist?, restoring TLS certificate verification #177

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nabramovitz wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Use File.exist?, restoring TLS certificate verification #177

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/connection/netio.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ def open_ssl_socket()
fl = @ssl.ts_files.split(",")
fl.each do |fn|
# Add next cert file listed
raise Stomp::Error::SSLNoTruststoreFileError if !File::exists?(fn)
raise Stomp::Error::SSLNoTruststoreFileError if !File::exist?(fn)
raise Stomp::Error::SSLUnreadableTruststoreFileError if !File::readable?(fn)
truststores.add_file(fn)
end
Expand All @@ -386,7 +386,7 @@ def open_ssl_socket()
raise Stomp::Error::SSLClientParamsError if !@ssl.cert_file.nil? &&
@ssl.key_file.nil? && @ssl.key_text.nil?
if @ssl.cert_file
raise Stomp::Error::SSLNoCertFileError if !File::exists?(@ssl.cert_file)
raise Stomp::Error::SSLNoCertFileError if !File::exist?(@ssl.cert_file)
raise Stomp::Error::SSLUnreadableCertFileError if !File::readable?(@ssl.cert_file)
p [ "OSSL51", "old code cert file read" ] if ossdbg
usecert = OpenSSL::X509::Certificate.new(File.read(@ssl.cert_file))
Expand All @@ -403,7 +403,7 @@ def open_ssl_socket()
raise Stomp::Error::SSLClientParamsError if !@ssl.key_text.nil? &&
!@ssl.key_file.nil?
if @ssl.key_file
raise Stomp::Error::SSLNoKeyFileError if !File::exists?(@ssl.key_file)
raise Stomp::Error::SSLNoKeyFileError if !File::exist?(@ssl.key_file)
raise Stomp::Error::SSLUnreadableKeyFileError if !File::readable?(@ssl.key_file)
p [ "OSSL53", "old code key file read" ] if ossdbg
usekey = OpenSSL::PKey::RSA.new(File.read(@ssl.key_file), @ssl.key_password)
Expand Down