Skip to content

Handle OpenSSL v3 EOF errors #1107

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

Merged
merged 1 commit into from
Jul 1, 2022
Merged

Handle OpenSSL v3 EOF errors #1107

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion lib/redis/client.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ def io
e2 = TimeoutError.new("Connection timed out")
e2.set_backtrace(e1.backtrace)
raise e2
rescue Errno::ECONNRESET, Errno::EPIPE, Errno::ECONNABORTED, Errno::EBADF, Errno::EINVAL => e
rescue Errno::ECONNRESET, Errno::EPIPE, Errno::ECONNABORTED, Errno::EBADF, Errno::EINVAL, EOFError => e
raise ConnectionError, "Connection lost (%s)" % [e.class.name.split("::").last]
end

Expand Down
6 changes: 6 additions & 0 deletions lib/redis/connection/ruby.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,6 +384,12 @@ def read
format_reply(reply_type, line)
rescue Errno::EAGAIN
raise TimeoutError
rescue OpenSSL::SSL::SSLError => ssl_error
if ssl_error.message.match?(/SSL_read: unexpected eof while reading/i)
raise EOFError, ssl_error.message
else
raise
end
end

def format_reply(reply_type, line)
Expand Down