Skip to content

Respect subclass POP3 SSL defaults #34

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
OskarEichler wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Respect subclass POP3 SSL defaults #34

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
16 changes: 10 additions & 6 deletions lib/net/pop.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ def POP3.enable_ssl(*args)
# Constructs proper parameters from arguments
def POP3.create_ssl_params(verify_or_params = {}, certs = nil)
begin
params = verify_or_params.to_hash
params = verify_or_params.to_hash.dup
rescue NoMethodError
params = {}
params[:verify_mode] = verify_or_params
Expand All @@ -360,22 +360,26 @@ def POP3.disable_ssl
#
# see also POP3.enable_ssl
def POP3.ssl_params
return @ssl_params
if instance_variable_defined?(:@ssl_params)
@ssl_params
elsif superclass.respond_to?(:ssl_params)
superclass.ssl_params
end
end

# returns +true+ if POP3.ssl_params is set
def POP3.use_ssl?
return !@ssl_params.nil?
return !ssl_params.nil?
end

# returns whether verify_mode is enable from POP3.ssl_params
def POP3.verify
return @ssl_params[:verify_mode]
return ssl_params[:verify_mode]
end

# returns the :ca_file or :ca_path from POP3.ssl_params
def POP3.certs
return @ssl_params[:ca_file] || @ssl_params[:ca_path]
return ssl_params[:ca_file] || ssl_params[:ca_path]
end

#
Expand Down Expand Up @@ -416,7 +420,7 @@ def POP3.start(address, port = nil,
# This method does *not* open the TCP connection.
def initialize(addr, port = nil, isapop = false)
@address = addr
@ssl_params = POP3.ssl_params
@ssl_params = self.class.ssl_params&.dup
@port = port
@apop = isapop

Expand Down