mail 2.6.6 → 2.7.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -5
- data/MIT-LICENSE +1 -1
- data/README.md +74 -90
- data/lib/mail/attachments_list.rb +8 -4
- data/lib/mail/body.rb +50 -38
- data/lib/mail/check_delivery_params.rb +8 -6
- data/lib/mail/configuration.rb +2 -0
- data/lib/mail/constants.rb +1 -1
- data/lib/mail/core_extensions/smtp.rb +19 -16
- data/lib/mail/core_extensions/string.rb +0 -4
- data/lib/mail/elements/address.rb +28 -22
- data/lib/mail/elements/address_list.rb +10 -18
- data/lib/mail/elements/content_disposition_element.rb +8 -15
- data/lib/mail/elements/content_location_element.rb +5 -10
- data/lib/mail/elements/content_transfer_encoding_element.rb +5 -10
- data/lib/mail/elements/content_type_element.rb +8 -19
- data/lib/mail/elements/date_time_element.rb +6 -14
- data/lib/mail/elements/envelope_from_element.rb +14 -21
- data/lib/mail/elements/message_ids_element.rb +8 -12
- data/lib/mail/elements/mime_version_element.rb +6 -14
- data/lib/mail/elements/phrase_list.rb +6 -9
- data/lib/mail/elements/received_element.rb +9 -15
- data/lib/mail/encodings/7bit.rb +5 -15
- data/lib/mail/encodings/8bit.rb +2 -21
- data/lib/mail/encodings/base64.rb +11 -12
- data/lib/mail/encodings/binary.rb +3 -22
- data/lib/mail/encodings/identity.rb +24 -0
- data/lib/mail/encodings/quoted_printable.rb +6 -6
- data/lib/mail/encodings/transfer_encoding.rb +38 -29
- data/lib/mail/encodings/unix_to_unix.rb +3 -1
- data/lib/mail/encodings.rb +99 -43
- data/lib/mail/envelope.rb +1 -1
- data/lib/mail/field.rb +96 -59
- data/lib/mail/fields/bcc_field.rb +2 -2
- data/lib/mail/fields/cc_field.rb +1 -1
- data/lib/mail/fields/comments_field.rb +1 -1
- data/lib/mail/fields/common/common_address.rb +32 -7
- data/lib/mail/fields/common/common_field.rb +1 -10
- data/lib/mail/fields/common/parameter_hash.rb +1 -1
- data/lib/mail/fields/content_description_field.rb +1 -1
- data/lib/mail/fields/content_disposition_field.rb +3 -3
- data/lib/mail/fields/content_id_field.rb +2 -2
- data/lib/mail/fields/content_location_field.rb +1 -1
- data/lib/mail/fields/content_transfer_encoding_field.rb +1 -1
- data/lib/mail/fields/content_type_field.rb +4 -9
- data/lib/mail/fields/date_field.rb +2 -3
- data/lib/mail/fields/from_field.rb +1 -1
- data/lib/mail/fields/in_reply_to_field.rb +1 -1
- data/lib/mail/fields/keywords_field.rb +1 -1
- data/lib/mail/fields/message_id_field.rb +1 -1
- data/lib/mail/fields/mime_version_field.rb +1 -1
- data/lib/mail/fields/optional_field.rb +4 -1
- data/lib/mail/fields/received_field.rb +1 -1
- data/lib/mail/fields/references_field.rb +1 -1
- data/lib/mail/fields/reply_to_field.rb +1 -1
- data/lib/mail/fields/resent_bcc_field.rb +1 -1
- data/lib/mail/fields/resent_cc_field.rb +1 -1
- data/lib/mail/fields/resent_date_field.rb +0 -1
- data/lib/mail/fields/resent_from_field.rb +1 -1
- data/lib/mail/fields/resent_message_id_field.rb +1 -1
- data/lib/mail/fields/resent_sender_field.rb +1 -1
- data/lib/mail/fields/resent_to_field.rb +1 -1
- data/lib/mail/fields/return_path_field.rb +1 -1
- data/lib/mail/fields/sender_field.rb +1 -1
- data/lib/mail/fields/subject_field.rb +1 -1
- data/lib/mail/fields/to_field.rb +1 -1
- data/lib/mail/fields/unstructured_field.rb +21 -4
- data/lib/mail/header.rb +10 -8
- data/lib/mail/mail.rb +2 -10
- data/lib/mail/matchers/has_sent_mail.rb +21 -1
- data/lib/mail/message.rb +78 -68
- data/lib/mail/multibyte/chars.rb +29 -28
- data/lib/mail/multibyte/unicode.rb +10 -10
- data/lib/mail/multibyte.rb +64 -15
- data/lib/mail/network/delivery_methods/logger_delivery.rb +37 -0
- data/lib/mail/network/delivery_methods/sendmail.rb +8 -5
- data/lib/mail/network/delivery_methods/smtp.rb +58 -49
- data/lib/mail/network/delivery_methods/smtp_connection.rb +9 -1
- data/lib/mail/network/retriever_methods/imap.rb +18 -5
- data/lib/mail/network/retriever_methods/pop3.rb +3 -1
- data/lib/mail/network.rb +1 -0
- data/lib/mail/parser_tools.rb +15 -0
- data/lib/mail/parsers/address_lists_parser.rb +33207 -104
- data/lib/mail/parsers/address_lists_parser.rl +172 -0
- data/lib/mail/parsers/content_disposition_parser.rb +876 -49
- data/lib/mail/parsers/content_disposition_parser.rl +82 -0
- data/lib/mail/parsers/content_location_parser.rb +803 -23
- data/lib/mail/parsers/content_location_parser.rl +71 -0
- data/lib/mail/parsers/content_transfer_encoding_parser.rb +501 -19
- data/lib/mail/parsers/content_transfer_encoding_parser.rl +64 -0
- data/lib/mail/parsers/content_type_parser.rb +1023 -48
- data/lib/mail/parsers/content_type_parser.rl +83 -0
- data/lib/mail/parsers/date_time_parser.rb +870 -24
- data/lib/mail/parsers/date_time_parser.rl +62 -0
- data/lib/mail/parsers/envelope_from_parser.rb +3569 -34
- data/lib/mail/parsers/envelope_from_parser.rl +82 -0
- data/lib/mail/parsers/message_ids_parser.rb +2839 -25
- data/lib/mail/parsers/message_ids_parser.rl +82 -0
- data/lib/mail/parsers/mime_version_parser.rb +491 -26
- data/lib/mail/parsers/mime_version_parser.rl +61 -0
- data/lib/mail/parsers/phrase_lists_parser.rb +860 -18
- data/lib/mail/parsers/phrase_lists_parser.rl +83 -0
- data/lib/mail/parsers/received_parser.rb +8764 -37
- data/lib/mail/parsers/received_parser.rl +84 -0
- data/lib/mail/parsers/rfc2045_content_transfer_encoding.rl +13 -0
- data/lib/mail/parsers/rfc2045_content_type.rl +25 -0
- data/lib/mail/parsers/rfc2045_mime.rl +16 -0
- data/lib/mail/parsers/rfc2183_content_disposition.rl +15 -0
- data/lib/mail/parsers/rfc3629_utf8.rl +19 -0
- data/lib/mail/parsers/rfc5234_abnf_core_rules.rl +22 -0
- data/lib/mail/parsers/rfc5322.rl +59 -0
- data/lib/mail/parsers/rfc5322_address.rl +72 -0
- data/lib/mail/parsers/{ragel/date_time.rl → rfc5322_date_time.rl} +8 -1
- data/lib/mail/parsers/rfc5322_lexical_tokens.rl +60 -0
- data/lib/mail/parsers.rb +16 -24
- data/lib/mail/part.rb +3 -3
- data/lib/mail/parts_list.rb +5 -6
- data/lib/mail/utilities.rb +59 -28
- data/lib/mail/version.rb +2 -2
- data/lib/mail/version_specific/ruby_1_8.rb +40 -3
- data/lib/mail/version_specific/ruby_1_9.rb +61 -9
- data/lib/mail.rb +3 -16
- metadata +44 -53
- data/CHANGELOG.rdoc +0 -803
- data/CONTRIBUTING.md +0 -60
- data/Dependencies.txt +0 -2
- data/Gemfile +0 -14
- data/Rakefile +0 -29
- data/TODO.rdoc +0 -9
- data/lib/mail/core_extensions/string/access.rb +0 -146
- data/lib/mail/core_extensions/string/multibyte.rb +0 -79
- data/lib/mail/multibyte/exceptions.rb +0 -9
- data/lib/mail/parsers/ragel/common.rl +0 -185
- data/lib/mail/parsers/ragel/parser_info.rb +0 -61
- data/lib/mail/parsers/ragel/ruby/machines/address_lists_machine.rb +0 -14864
- data/lib/mail/parsers/ragel/ruby/machines/address_lists_machine.rb.rl +0 -37
- data/lib/mail/parsers/ragel/ruby/machines/content_disposition_machine.rb +0 -751
- data/lib/mail/parsers/ragel/ruby/machines/content_disposition_machine.rb.rl +0 -37
- data/lib/mail/parsers/ragel/ruby/machines/content_location_machine.rb +0 -614
- data/lib/mail/parsers/ragel/ruby/machines/content_location_machine.rb.rl +0 -37
- data/lib/mail/parsers/ragel/ruby/machines/content_transfer_encoding_machine.rb +0 -447
- data/lib/mail/parsers/ragel/ruby/machines/content_transfer_encoding_machine.rb.rl +0 -37
- data/lib/mail/parsers/ragel/ruby/machines/content_type_machine.rb +0 -825
- data/lib/mail/parsers/ragel/ruby/machines/content_type_machine.rb.rl +0 -37
- data/lib/mail/parsers/ragel/ruby/machines/date_time_machine.rb +0 -817
- data/lib/mail/parsers/ragel/ruby/machines/date_time_machine.rb.rl +0 -37
- data/lib/mail/parsers/ragel/ruby/machines/envelope_from_machine.rb +0 -2149
- data/lib/mail/parsers/ragel/ruby/machines/envelope_from_machine.rb.rl +0 -37
- data/lib/mail/parsers/ragel/ruby/machines/message_ids_machine.rb +0 -1570
- data/lib/mail/parsers/ragel/ruby/machines/message_ids_machine.rb.rl +0 -37
- data/lib/mail/parsers/ragel/ruby/machines/mime_version_machine.rb +0 -440
- data/lib/mail/parsers/ragel/ruby/machines/mime_version_machine.rb.rl +0 -37
- data/lib/mail/parsers/ragel/ruby/machines/phrase_lists_machine.rb +0 -564
- data/lib/mail/parsers/ragel/ruby/machines/phrase_lists_machine.rb.rl +0 -37
- data/lib/mail/parsers/ragel/ruby/machines/rb_actions.rl +0 -51
- data/lib/mail/parsers/ragel/ruby/machines/received_machine.rb +0 -5144
- data/lib/mail/parsers/ragel/ruby/machines/received_machine.rb.rl +0 -37
- data/lib/mail/parsers/ragel/ruby/parser.rb.rl.erb +0 -37
- data/lib/mail/parsers/ragel/ruby.rb +0 -40
- data/lib/mail/parsers/ragel.rb +0 -18
@@ -0,0 +1,37 @@
|
|
1
|
+
require 'mail/check_delivery_params'
|
2
|
+
|
3
|
+
module Mail
|
4
|
+
class LoggerDelivery
|
5
|
+
include Mail::CheckDeliveryParams
|
6
|
+
|
7
|
+
attr_reader :logger, :severity, :settings
|
8
|
+
|
9
|
+
def initialize(settings)
|
10
|
+
@settings = settings
|
11
|
+
@logger = settings.fetch(:logger) { default_logger }
|
12
|
+
@severity = derive_severity(settings[:severity])
|
13
|
+
end
|
14
|
+
|
15
|
+
def deliver!(mail)
|
16
|
+
Mail::CheckDeliveryParams.check(mail)
|
17
|
+
logger.log(severity) { mail.encoded }
|
18
|
+
end
|
19
|
+
|
20
|
+
private
|
21
|
+
def default_logger
|
22
|
+
require 'logger'
|
23
|
+
::Logger.new($stdout)
|
24
|
+
end
|
25
|
+
|
26
|
+
def derive_severity(severity)
|
27
|
+
case severity
|
28
|
+
when nil
|
29
|
+
Logger::INFO
|
30
|
+
when Integer
|
31
|
+
severity
|
32
|
+
else
|
33
|
+
Logger.const_get(severity.to_s.upcase)
|
34
|
+
end
|
35
|
+
end
|
36
|
+
end
|
37
|
+
end
|
@@ -52,7 +52,7 @@ module Mail
|
|
52
52
|
def deliver!(mail)
|
53
53
|
smtp_from, smtp_to, message = Mail::CheckDeliveryParams.check(mail)
|
54
54
|
|
55
|
-
from = "-f #{self.class.shellquote(smtp_from)}"
|
55
|
+
from = "-f #{self.class.shellquote(smtp_from)}" if smtp_from
|
56
56
|
to = smtp_to.map { |_to| self.class.shellquote(_to) }.join(' ')
|
57
57
|
|
58
58
|
arguments = "#{settings[:arguments]} #{from} --"
|
@@ -61,7 +61,7 @@ module Mail
|
|
61
61
|
|
62
62
|
def self.call(path, arguments, destinations, encoded_message)
|
63
63
|
popen "#{path} #{arguments} #{destinations}" do |io|
|
64
|
-
io.puts ::Mail::Utilities.
|
64
|
+
io.puts ::Mail::Utilities.binary_unsafe_to_lf(encoded_message)
|
65
65
|
io.flush
|
66
66
|
end
|
67
67
|
end
|
@@ -77,15 +77,18 @@ module Mail
|
|
77
77
|
end
|
78
78
|
|
79
79
|
# The following is an adaptation of ruby 1.9.2's shellwords.rb file,
|
80
|
-
#
|
81
|
-
#
|
80
|
+
# with the following modifications:
|
81
|
+
#
|
82
|
+
# - Wraps in double quotes
|
83
|
+
# - Allows '+' to accept email addresses with them
|
84
|
+
# - Allows '~' as it is not unescaped in double quotes
|
82
85
|
def self.shellquote(address)
|
83
86
|
# Process as a single byte sequence because not all shell
|
84
87
|
# implementations are multibyte aware.
|
85
88
|
#
|
86
89
|
# A LF cannot be escaped with a backslash because a backslash + LF
|
87
90
|
# combo is regarded as line continuation and simply ignored. Strip it.
|
88
|
-
escaped = address.gsub(/([^A-Za-z0-9_\s
|
91
|
+
escaped = address.gsub(/([^A-Za-z0-9_\s\+\-.,:\/@~])/n, "\\\\\\1").gsub("\n", '')
|
89
92
|
%("#{escaped}")
|
90
93
|
end
|
91
94
|
end
|
@@ -45,9 +45,8 @@ module Mail
|
|
45
45
|
# hostname or update the certificate authorities trusted by your ruby. If
|
46
46
|
# that isn't possible, you can control this behavior with
|
47
47
|
# an :openssl_verify_mode setting. Its value may be either an OpenSSL
|
48
|
-
# verify mode constant (OpenSSL::SSL::VERIFY_NONE),
|
49
|
-
# the name of an OpenSSL verify mode (none, peer
|
50
|
-
# fail_if_no_peer_cert).
|
48
|
+
# verify mode constant (OpenSSL::SSL::VERIFY_NONE, OpenSSL::SSL::VERIFY_PEER),
|
49
|
+
# or a string containing the name of an OpenSSL verify mode (none, peer).
|
51
50
|
#
|
52
51
|
# === Others
|
53
52
|
#
|
@@ -77,64 +76,74 @@ module Mail
|
|
77
76
|
class SMTP
|
78
77
|
attr_accessor :settings
|
79
78
|
|
79
|
+
DEFAULTS = {
|
80
|
+
:address => 'localhost',
|
81
|
+
:port => 25,
|
82
|
+
:domain => 'localhost.localdomain',
|
83
|
+
:user_name => nil,
|
84
|
+
:password => nil,
|
85
|
+
:authentication => nil,
|
86
|
+
:enable_starttls => nil,
|
87
|
+
:enable_starttls_auto => true,
|
88
|
+
:openssl_verify_mode => nil,
|
89
|
+
:ssl => nil,
|
90
|
+
:tls => nil,
|
91
|
+
:open_timeout => nil,
|
92
|
+
:read_timeout => nil
|
93
|
+
}
|
94
|
+
|
80
95
|
def initialize(values)
|
81
|
-
self.settings =
|
82
|
-
:port => 25,
|
83
|
-
:domain => 'localhost.localdomain',
|
84
|
-
:user_name => nil,
|
85
|
-
:password => nil,
|
86
|
-
:authentication => nil,
|
87
|
-
:enable_starttls_auto => true,
|
88
|
-
:openssl_verify_mode => nil,
|
89
|
-
:ssl => nil,
|
90
|
-
:tls => nil
|
91
|
-
}.merge!(values)
|
96
|
+
self.settings = DEFAULTS.merge(values)
|
92
97
|
end
|
93
98
|
|
94
|
-
# Send the message via SMTP.
|
95
|
-
# The from and to attributes are optional. If not set, they are retrieve from the Message.
|
96
99
|
def deliver!(mail)
|
97
|
-
|
98
|
-
|
99
|
-
smtp = Net::SMTP.new(settings[:address], settings[:port])
|
100
|
-
if settings[:tls] || settings[:ssl]
|
101
|
-
if smtp.respond_to?(:enable_tls)
|
102
|
-
smtp.enable_tls(ssl_context)
|
103
|
-
end
|
104
|
-
elsif settings[:enable_starttls_auto]
|
105
|
-
if smtp.respond_to?(:enable_starttls_auto)
|
106
|
-
smtp.enable_starttls_auto(ssl_context)
|
107
|
-
end
|
100
|
+
response = start_smtp_session do |smtp|
|
101
|
+
Mail::SMTPConnection.new(:connection => smtp, :return_response => true).deliver!(mail)
|
108
102
|
end
|
109
103
|
|
110
|
-
response
|
111
|
-
smtp.start(settings[:domain], settings[:user_name], settings[:password], settings[:authentication]) do |smtp_obj|
|
112
|
-
response = smtp_obj.sendmail(message, smtp_from, smtp_to)
|
113
|
-
end
|
114
|
-
|
115
|
-
if settings[:return_response]
|
116
|
-
response
|
117
|
-
else
|
118
|
-
self
|
119
|
-
end
|
104
|
+
settings[:return_response] ? response : self
|
120
105
|
end
|
121
106
|
|
122
107
|
private
|
108
|
+
def start_smtp_session(&block)
|
109
|
+
build_smtp_session.start(settings[:domain], settings[:user_name], settings[:password], settings[:authentication], &block)
|
110
|
+
end
|
123
111
|
|
124
|
-
|
125
|
-
|
126
|
-
|
127
|
-
|
112
|
+
def build_smtp_session
|
113
|
+
Net::SMTP.new(settings[:address], settings[:port]).tap do |smtp|
|
114
|
+
if settings[:tls] || settings[:ssl]
|
115
|
+
if smtp.respond_to?(:enable_tls)
|
116
|
+
smtp.enable_tls(ssl_context)
|
117
|
+
end
|
118
|
+
elsif settings[:enable_starttls]
|
119
|
+
if smtp.respond_to?(:enable_starttls)
|
120
|
+
smtp.enable_starttls(ssl_context)
|
121
|
+
end
|
122
|
+
elsif settings[:enable_starttls_auto]
|
123
|
+
if smtp.respond_to?(:enable_starttls_auto)
|
124
|
+
smtp.enable_starttls_auto(ssl_context)
|
125
|
+
end
|
126
|
+
end
|
128
127
|
|
129
|
-
|
130
|
-
|
128
|
+
smtp.open_timeout = settings[:open_timeout] if settings[:open_timeout]
|
129
|
+
smtp.read_timeout = settings[:read_timeout] if settings[:read_timeout]
|
130
|
+
end
|
131
131
|
end
|
132
132
|
|
133
|
-
context
|
134
|
-
|
135
|
-
|
136
|
-
|
137
|
-
|
138
|
-
|
133
|
+
# Allow SSL context to be configured via settings, for Ruby >= 1.9
|
134
|
+
# Just returns openssl verify mode for Ruby 1.8.x
|
135
|
+
def ssl_context
|
136
|
+
openssl_verify_mode = settings[:openssl_verify_mode]
|
137
|
+
|
138
|
+
if openssl_verify_mode.kind_of?(String)
|
139
|
+
openssl_verify_mode = OpenSSL::SSL.const_get("VERIFY_#{openssl_verify_mode.upcase}")
|
140
|
+
end
|
141
|
+
|
142
|
+
context = Net::SMTP.default_ssl_context
|
143
|
+
context.verify_mode = openssl_verify_mode if openssl_verify_mode
|
144
|
+
context.ca_path = settings[:ca_path] if settings[:ca_path]
|
145
|
+
context.ca_file = settings[:ca_file] if settings[:ca_file]
|
146
|
+
context
|
147
|
+
end
|
139
148
|
end
|
140
149
|
end
|
@@ -50,9 +50,17 @@ module Mail
|
|
50
50
|
# The from and to attributes are optional. If not set, they are retrieve from the Message.
|
51
51
|
def deliver!(mail)
|
52
52
|
smtp_from, smtp_to, message = Mail::CheckDeliveryParams.check(mail)
|
53
|
-
|
53
|
+
|
54
|
+
response = smtp.sendmail(dot_stuff(message), smtp_from, smtp_to)
|
54
55
|
|
55
56
|
settings[:return_response] ? response : self
|
56
57
|
end
|
58
|
+
|
59
|
+
private
|
60
|
+
# This is Net::SMTP's job, but before Ruby 2.x it does not dot-stuff
|
61
|
+
# an unterminated last line: https://bugs.ruby-lang.org/issues/9627
|
62
|
+
def dot_stuff(message)
|
63
|
+
message.gsub(/(\r\n\.)(\r\n|$)/, '\1.\2')
|
64
|
+
end
|
57
65
|
end
|
58
66
|
end
|
@@ -45,7 +45,8 @@ module Mail
|
|
45
45
|
:user_name => nil,
|
46
46
|
:password => nil,
|
47
47
|
:authentication => nil,
|
48
|
-
:enable_ssl => false
|
48
|
+
:enable_ssl => false,
|
49
|
+
:enable_starttls => false }.merge!(values)
|
49
50
|
end
|
50
51
|
|
51
52
|
attr_accessor :settings
|
@@ -67,14 +68,14 @@ module Mail
|
|
67
68
|
# keys: are passed as criteria to the SEARCH command. They can either be a string holding the entire search string,
|
68
69
|
# or a single-dimension array of search keywords and arguments. Refer to [IMAP] section 6.4.4 for a full list
|
69
70
|
# The default is 'ALL'
|
71
|
+
# search_charset: charset to pass to IMAP server search. Omitted by default. Example: 'UTF-8' or 'ASCII'.
|
70
72
|
#
|
71
73
|
def find(options={}, &block)
|
72
74
|
options = validate_options(options)
|
73
75
|
|
74
76
|
start do |imap|
|
75
77
|
options[:read_only] ? imap.examine(options[:mailbox]) : imap.select(options[:mailbox])
|
76
|
-
|
77
|
-
uids = imap.uid_search(options[:keys])
|
78
|
+
uids = imap.uid_search(options[:keys], options[:search_charset])
|
78
79
|
uids.reverse! if options[:what].to_sym == :last
|
79
80
|
uids = uids.first(options[:count]) if options[:count].is_a?(Integer)
|
80
81
|
uids.reverse! if (options[:what].to_sym == :last && options[:order].to_sym == :asc) ||
|
@@ -83,14 +84,18 @@ module Mail
|
|
83
84
|
if block_given?
|
84
85
|
uids.each do |uid|
|
85
86
|
uid = options[:uid].to_i unless options[:uid].nil?
|
86
|
-
fetchdata = imap.uid_fetch(uid, ['RFC822'])[0]
|
87
|
+
fetchdata = imap.uid_fetch(uid, ['RFC822', 'FLAGS'])[0]
|
87
88
|
new_message = Mail.new(fetchdata.attr['RFC822'])
|
88
89
|
new_message.mark_for_delete = true if options[:delete_after_find]
|
89
|
-
|
90
|
+
|
91
|
+
if block.arity == 4
|
92
|
+
yield new_message, imap, uid, fetchdata.attr['FLAGS']
|
93
|
+
elsif block.arity == 3
|
90
94
|
yield new_message, imap, uid
|
91
95
|
else
|
92
96
|
yield new_message
|
93
97
|
end
|
98
|
+
|
94
99
|
imap.uid_store(uid, "+FLAGS", [Net::IMAP::DELETED]) if options[:delete_after_find] && new_message.is_marked_for_delete?
|
95
100
|
break unless options[:uid].nil?
|
96
101
|
end
|
@@ -116,6 +121,7 @@ module Mail
|
|
116
121
|
mailbox = Net::IMAP.encode_utf7(mailbox)
|
117
122
|
|
118
123
|
start do |imap|
|
124
|
+
imap.select(mailbox)
|
119
125
|
imap.uid_search(['ALL']).each do |uid|
|
120
126
|
imap.uid_store(uid, "+FLAGS", [Net::IMAP::DELETED])
|
121
127
|
end
|
@@ -154,7 +160,14 @@ module Mail
|
|
154
160
|
def start(config=Mail::Configuration.instance, &block)
|
155
161
|
raise ArgumentError.new("Mail::Retrievable#imap_start takes a block") unless block_given?
|
156
162
|
|
163
|
+
if settings[:enable_starttls] && settings[:enable_ssl]
|
164
|
+
raise ArgumentError, ":enable_starttls and :enable_ssl are mutually exclusive. Set :enable_ssl if you're on an IMAPS connection. Set :enable_starttls if you're on an IMAP connection and using STARTTLS for secure TLS upgrade."
|
165
|
+
end
|
166
|
+
|
157
167
|
imap = Net::IMAP.new(settings[:address], settings[:port], settings[:enable_ssl], nil, false)
|
168
|
+
|
169
|
+
imap.starttls if settings[:enable_starttls]
|
170
|
+
|
158
171
|
if settings[:authentication].nil?
|
159
172
|
imap.login(settings[:user_name], settings[:password])
|
160
173
|
else
|
@@ -41,7 +41,8 @@ module Mail
|
|
41
41
|
:user_name => nil,
|
42
42
|
:password => nil,
|
43
43
|
:authentication => nil,
|
44
|
-
:enable_ssl => false
|
44
|
+
:enable_ssl => false,
|
45
|
+
:read_timeout => nil }.merge!(values)
|
45
46
|
end
|
46
47
|
|
47
48
|
attr_accessor :settings
|
@@ -128,6 +129,7 @@ module Mail
|
|
128
129
|
|
129
130
|
pop3 = Net::POP3.new(settings[:address], settings[:port], false)
|
130
131
|
pop3.enable_ssl(OpenSSL::SSL::VERIFY_NONE) if settings[:enable_ssl]
|
132
|
+
pop3.read_timeout = settings[:read_timeout] if settings[:read_timeout]
|
131
133
|
pop3.start(settings[:user_name], settings[:password])
|
132
134
|
|
133
135
|
yield pop3
|
data/lib/mail/network.rb
CHANGED
@@ -4,6 +4,7 @@ require 'mail/network/retriever_methods/base'
|
|
4
4
|
module Mail
|
5
5
|
register_autoload :SMTP, 'mail/network/delivery_methods/smtp'
|
6
6
|
register_autoload :FileDelivery, 'mail/network/delivery_methods/file_delivery'
|
7
|
+
register_autoload :LoggerDelivery, 'mail/network/delivery_methods/logger_delivery'
|
7
8
|
register_autoload :Sendmail, 'mail/network/delivery_methods/sendmail'
|
8
9
|
register_autoload :Exim, 'mail/network/delivery_methods/exim'
|
9
10
|
register_autoload :SMTPConnection, 'mail/network/delivery_methods/smtp_connection'
|
@@ -0,0 +1,15 @@
|
|
1
|
+
module Mail
|
2
|
+
# Extends each field parser with utility methods.
|
3
|
+
module ParserTools #:nodoc:
|
4
|
+
# Slice bytes from ASCII-8BIT data and mark as UTF-8.
|
5
|
+
if 'string'.respond_to?(:force_encoding)
|
6
|
+
def chars(data, from_bytes, to_bytes)
|
7
|
+
data.slice(from_bytes..to_bytes).force_encoding(Encoding::UTF_8)
|
8
|
+
end
|
9
|
+
else
|
10
|
+
def chars(data, from_bytes, to_bytes)
|
11
|
+
data.slice(from_bytes..to_bytes)
|
12
|
+
end
|
13
|
+
end
|
14
|
+
end
|
15
|
+
end
|