mail 2.5.3 → 2.6.0

data/lib/mail/network/delivery_methods/exim.rb

@@ -1,5 +1,3 @@
-require 'mail/check_delivery_params'
-
 module Mail
 
   # A delivery method implementation which sends via exim.
@@ -38,16 +36,13 @@ module Mail
   #
   #   mail.deliver!
   class Exim < Sendmail
-    include Mail::CheckDeliveryParams
-
     def initialize(values)
       self.settings = { :location       => '/usr/sbin/exim',
                         :arguments      => '-i -t' }.merge(values)
     end
 
     def self.call(path, arguments, destinations, mail)
-      check_params(mail)
-      IO.popen("#{path} #{arguments}", "w+") do |io|
+      popen "#{path} #{arguments}" do |io|
         io.puts mail.encoded.to_lf
         io.flush
       end

data/lib/mail/network/delivery_methods/file_delivery.rb

@@ -28,7 +28,7 @@ module Mail
     attr_accessor :settings
     
     def deliver!(mail)
-      check_params(mail)
+      check_delivery_params(mail)
 
       if ::File.respond_to?(:makedirs)
         ::File.makedirs settings[:location]

data/lib/mail/network/delivery_methods/sendmail.rb

@@ -41,27 +41,49 @@ module Mail
 
     def initialize(values)
       self.settings = { :location       => '/usr/sbin/sendmail',
-                        :arguments      => '-i -t' }.merge(values)
+                        :arguments      => '-i' }.merge(values)
     end
 
     attr_accessor :settings
 
     def deliver!(mail)
-      check_params(mail)
+      smtp_from, smtp_to, message = check_delivery_params(mail)
 
-      envelope_from = mail.return_path || mail.sender || mail.from_addrs.first
-      return_path = "-f " + '"' + envelope_from.escape_for_shell + '"' if envelope_from
+      from = "-f #{self.class.shellquote(smtp_from)}"
+      to = smtp_to.map { |_to| self.class.shellquote(_to) }.join(' ')
 
-      arguments = [settings[:arguments], return_path].compact.join(" ")
-
-      self.class.call(settings[:location], arguments, mail.destinations.collect(&:escape_for_shell).join(" "), mail)
+      arguments = "#{settings[:arguments]} #{from} --"
+      self.class.call(settings[:location], arguments, to, message)
     end
 
-    def self.call(path, arguments, destinations, mail)
-      IO.popen("#{path} #{arguments} #{destinations}", "w+") do |io|
-        io.puts mail.encoded.to_lf
+    def self.call(path, arguments, destinations, encoded_message)
+      popen "#{path} #{arguments} #{destinations}" do |io|
+        io.puts encoded_message.to_lf
         io.flush
       end
     end
+
+    if RUBY_VERSION < '1.9.0'
+      def self.popen(command, &block)
+        IO.popen "#{command} 2>&1", 'w+', &block
+      end
+    else
+      def self.popen(command, &block)
+        IO.popen command, 'w+', :err => :out, &block
+      end
+    end
+
+    # The following is an adaptation of ruby 1.9.2's shellwords.rb file,
+    # it is modified to include '+' in the allowed list to allow for
+    # sendmail to accept email addresses as the sender with a + in them.
+    def self.shellquote(address)
+      # Process as a single byte sequence because not all shell
+      # implementations are multibyte aware.
+      #
+      # A LF cannot be escaped with a backslash because a backslash + LF
+      # combo is regarded as line continuation and simply ignored. Strip it.
+      escaped = address.gsub(/([^A-Za-z0-9_\s\+\-.,:\/@])/n, "\\\\\\1").gsub("\n", '')
+      %("#{escaped}")
+    end
   end
 end

data/lib/mail/network/delivery_methods/smtp.rb

@@ -89,57 +89,54 @@ module Mail
                         :tls                  => nil
                       }.merge!(values)
     end
-    
+
     attr_accessor :settings
-    
+
     # Send the message via SMTP.
     # The from and to attributes are optional. If not set, they are retrieve from the Message.
     def deliver!(mail)
-      envelope_from, destinations, message = check_params(mail)
+      smtp_from, smtp_to, message = check_delivery_params(mail)
 
       smtp = Net::SMTP.new(settings[:address], settings[:port])
       if settings[:tls] || settings[:ssl]
         if smtp.respond_to?(:enable_tls)
-          unless settings[:openssl_verify_mode]
-            smtp.enable_tls
-          else
-            openssl_verify_mode = settings[:openssl_verify_mode]
-            if openssl_verify_mode.kind_of?(String)
-              openssl_verify_mode = "OpenSSL::SSL::VERIFY_#{openssl_verify_mode.upcase}".constantize
-            end
-            context = Net::SMTP.default_ssl_context
-            context.verify_mode = openssl_verify_mode
-            smtp.enable_tls(context)
-          end        
+          smtp.enable_tls(ssl_context)
         end
       elsif settings[:enable_starttls_auto]
-        if smtp.respond_to?(:enable_starttls_auto) 
-          unless settings[:openssl_verify_mode]
-            smtp.enable_starttls_auto
-          else
-            openssl_verify_mode = settings[:openssl_verify_mode]
-            if openssl_verify_mode.kind_of?(String)
-              openssl_verify_mode = "OpenSSL::SSL::VERIFY_#{openssl_verify_mode.upcase}".constantize
-            end
-            if RUBY_VERSION >= '1.9.0'
-              context = Net::SMTP.default_ssl_context
-              context.verify_mode = openssl_verify_mode
-              smtp.enable_tls(context)
-            else
-              smtp.enable_tls(openssl_verify_mode)
-            end
-          end
+        if smtp.respond_to?(:enable_starttls_auto)
+          smtp.enable_starttls_auto(ssl_context)
         end
       end
-      
+
       response = nil
       smtp.start(settings[:domain], settings[:user_name], settings[:password], settings[:authentication]) do |smtp_obj|
-        response = smtp_obj.sendmail(message, envelope_from, destinations)
+        response = smtp_obj.sendmail(message, smtp_from, smtp_to)
       end
 
-      return settings[:return_response] ? response : self
+      if settings[:return_response]
+        response
+      else
+        self
+      end
     end
     
-    
+
+    private
+
+    # Allow SSL context to be configured via settings, for Ruby >= 1.9
+    # Just returns openssl verify mode for Ruby 1.8.x
+    def ssl_context
+      openssl_verify_mode = settings[:openssl_verify_mode]
+
+      if openssl_verify_mode.kind_of?(String)
+        openssl_verify_mode = "OpenSSL::SSL::VERIFY_#{openssl_verify_mode.upcase}".constantize
+      end
+
+      context = Net::SMTP.default_ssl_context
+      context.verify_mode = openssl_verify_mode
+      context.ca_path = settings[:ca_path] if settings[:ca_path]
+      context.ca_file = settings[:ca_file] if settings[:ca_file]
+      context
+    end
   end
 end

data/lib/mail/network/delivery_methods/smtp_connection.rb

@@ -44,18 +44,18 @@ module Mail
       self.smtp = values[:connection]
       self.settings = values
     end
-    
+
     attr_accessor :smtp
     attr_accessor :settings
-    
+
     # Send the message via SMTP.
     # The from and to attributes are optional. If not set, they are retrieve from the Message.
     def deliver!(mail)
-      envelope_from, destinations, message = check_params(mail)
-      response = smtp.sendmail(message, envelope_from, destinations)
+      smtp_from, smtp_to, message = check_delivery_params(mail)
+      response = smtp.sendmail(message, smtp_from, smtp_to)
 
-      settings[:return_response] ? response : self 
+      settings[:return_response] ? response : self
     end
-        
+
   end
 end

data/lib/mail/network/delivery_methods/test_mailer.rb

@@ -30,13 +30,13 @@ module Mail
     end
 
     def initialize(values)
-      @settings = {}
+      @settings = values.dup
     end
     
     attr_accessor :settings
 
     def deliver!(mail)
-      check_params(mail)
+      check_delivery_params(mail)
       Mail::TestMailer.deliveries << mail
     end
     

data/lib/mail/network/retriever_methods/imap.rb

@@ -73,31 +73,35 @@ module Mail
       start do |imap|
         options[:read_only] ? imap.examine(options[:mailbox]) : imap.select(options[:mailbox])
 
-        message_ids = imap.uid_search(options[:keys])
-        message_ids.reverse! if options[:what].to_sym == :last
-        message_ids = message_ids.first(options[:count]) if options[:count].is_a?(Integer)
-        message_ids.reverse! if (options[:what].to_sym == :last && options[:order].to_sym == :asc) ||
+        uids = imap.uid_search(options[:keys])
+        uids.reverse! if options[:what].to_sym == :last
+        uids = uids.first(options[:count]) if options[:count].is_a?(Integer)
+        uids.reverse! if (options[:what].to_sym == :last && options[:order].to_sym == :asc) ||
                                 (options[:what].to_sym != :last && options[:order].to_sym == :desc)
 
         if block_given?
-          message_ids.each do |message_id|
-            fetchdata = imap.uid_fetch(message_id, ['RFC822'])[0]
+          uids.each do |uid|
+            uid = options[:uid].to_i unless options[:uid].nil?
+            fetchdata = imap.uid_fetch(uid, ['RFC822'])[0]
             new_message = Mail.new(fetchdata.attr['RFC822'])
             new_message.mark_for_delete = true if options[:delete_after_find]
             if block.arity == 3
-              yield new_message, imap, message_id
+              yield new_message, imap, uid
             else
               yield new_message
             end
-            imap.uid_store(message_id, "+FLAGS", [Net::IMAP::DELETED]) if options[:delete_after_find] && new_message.is_marked_for_delete?
+            imap.uid_store(uid, "+FLAGS", [Net::IMAP::DELETED]) if options[:delete_after_find] && new_message.is_marked_for_delete?
+            break unless options[:uid].nil?
           end
           imap.expunge if options[:delete_after_find]
         else
           emails = []
-          message_ids.each do |message_id|
-            fetchdata = imap.uid_fetch(message_id, ['RFC822'])[0]
+          uids.each do |uid|
+            uid = options[:uid].to_i unless options[:uid].nil?
+            fetchdata = imap.uid_fetch(uid, ['RFC822'])[0]
             emails << Mail.new(fetchdata.attr['RFC822'])
-            imap.uid_store(message_id, "+FLAGS", [Net::IMAP::DELETED]) if options[:delete_after_find]
+            imap.uid_store(uid, "+FLAGS", [Net::IMAP::DELETED]) if options[:delete_after_find]
+            break unless options[:uid].nil?
           end
           imap.expunge if options[:delete_after_find]
           emails.size == 1 && options[:count] == 1 ? emails.first : emails
@@ -111,8 +115,8 @@ module Mail
       mailbox = Net::IMAP.encode_utf7(mailbox)
 
       start do |imap|
-        imap.uid_search(['ALL']).each do |message_id|
-          imap.uid_store(message_id, "+FLAGS", [Net::IMAP::DELETED])
+        imap.uid_search(['ALL']).each do |uid|
+          imap.uid_store(uid, "+FLAGS", [Net::IMAP::DELETED])
         end
         imap.expunge
       end
@@ -137,6 +141,7 @@ module Mail
         options[:order]   ||= :asc
         options[:what]    ||= :first
         options[:keys]    ||= 'ALL'
+        options[:uid]     ||= nil
         options[:delete_after_find] ||= false
         options[:mailbox] = Net::IMAP.encode_utf7(options[:mailbox])
         options[:read_only] ||= false

data/lib/mail/parsers/address_lists_parser.rb

@@ -0,0 +1,132 @@
+module Mail::Parsers
+  class AddressListsParser
+    include Mail::Utilities
+
+    def parse(s)
+      address_list = AddressListStruct.new([],[])
+
+      if s.blank?
+        return address_list
+      end
+
+      actions, error = Ragel.parse(:address_lists, s)
+      if error
+        raise Mail::Field::ParseError.new(Mail::AddressList, s, error)
+      end
+
+
+      phrase_s = phrase_e = qstr_s = qstr = comment_s = nil
+      group_name_s = domain_s = group_name = nil
+      local_dot_atom_s = local_dot_atom_e = nil
+      local_dot_atom_pre_comment_e = nil
+      obs_domain_list_s = nil
+
+      address_s = 0
+      address = AddressStruct.new(nil, nil, [], nil, nil, nil, nil)
+      actions.each_slice(2) do |action_id, p|
+        action = Mail::Parsers::Ragel::ACTIONS[action_id]
+        case action
+
+        # Phrase
+        when :phrase_s then phrase_s = p
+        when :phrase_e then phrase_e = p-1
+
+        # Quoted String.
+        when :qstr_s then qstr_s = p
+        when :qstr_e then qstr = s[qstr_s..(p-1)]
+
+        # Comment
+        when :comment_s
+          comment_s = p unless comment_s
+        when :comment_e
+          if address
+            address.comments << s[comment_s..(p-2)]
+          end
+          comment_s = nil
+
+        # Group Name
+        when :group_name_s then group_name_s = p
+        when :group_name_e
+          if qstr
+            group = qstr
+            qstr = nil
+          else
+            group = s[group_name_s..(p-1)]
+            group_name_s = nil
+          end
+          address_list.group_names << group
+          group_name = group
+
+          # Start next address
+          address = AddressStruct.new(nil, nil, [], nil, nil, nil, nil)
+          address_s = p
+          address.group = group_name
+
+        # Address
+        when :address_s
+          address_s = p
+        when :address_e
+          # Ignore address end events if they don't have
+          # a matching address start event.
+          next if address_s.nil?
+          if address.local.nil? && local_dot_atom_pre_comment_e && local_dot_atom_s && local_dot_atom_e
+            if address.domain
+              address.local = s[local_dot_atom_s..local_dot_atom_e] if address
+            else
+              address.local = s[local_dot_atom_s..local_dot_atom_pre_comment_e] if address
+            end
+          end
+          address.raw = s[address_s..(p-1)]
+          address_list.addresses << address if address
+
+          # Start next address
+          address = AddressStruct.new(nil, nil, [], nil, nil, nil, nil)
+          address.group = group_name
+          address_s = nil
+
+        # Don't set the display name until the
+        # address has actually started. This allows
+        # us to choose quoted_s version if it
+        # exists and always use the 'full' phrase
+        # version.
+        when :angle_addr_s
+          if qstr
+            address.display_name = qstr
+            qstr = nil
+          elsif phrase_e
+            address.display_name = s[phrase_s..phrase_e].strip
+            phrase_e = phrase_s = nil
+          end
+
+        # Domain
+        when :domain_s
+          domain_s = p
+        when :domain_e
+          address.domain = s[domain_s..(p-1)].rstrip if address
+
+        # Local
+        when :local_dot_atom_s then local_dot_atom_s = p
+        when :local_dot_atom_e then local_dot_atom_e = p-1
+        when :local_dot_atom_pre_comment_e
+          local_dot_atom_pre_comment_e = p-1
+        when :local_quoted_string_e
+          address.local = '"' + qstr + '"' if address
+
+        # obs_domain_list
+        when :obs_domain_list_s then obs_domain_list_s = p
+        when :obs_domain_list_e
+          address.obs_domain_list = s[obs_domain_list_s..(p-1)]
+
+        else
+          raise Mail::Field::ParseError.new(Mail::AddressList, s, "Failed to process unknown action: #{action}")
+        end
+      end
+
+      if address_list.addresses.empty? && address_list.group_names.empty?
+        raise Mail::Field::ParseError.new(Mail::AddressList, s, "Didn't find any addresses or groups")
+      end
+
+      address_list
+    end
+  end
+end

data/lib/mail/parsers/content_disposition_parser.rb

@@ -0,0 +1,67 @@
+module Mail::Parsers
+  class ContentDispositionParser
+    include Mail::Utilities
+
+    def parse(s)
+      content_disposition = ContentDispositionStruct.new("", nil)
+      if s.blank?
+        return content_disposition
+      end
+
+      actions, error = Ragel.parse(:content_disposition, s)
+      if error
+        raise Mail::Field::ParseError.new(Mail::ContentDispositionElement, s, error)
+      end
+
+      content_disposition.parameters = []
+
+      disp_type_s = param_attr_s = param_attr = qstr_s = qstr = param_val_s = nil
+      actions.each_slice(2) do |action_id, p|
+        action = Mail::Parsers::Ragel::ACTIONS[action_id]
+        case action
+
+        # Disposition Type
+        when :disp_type_s then disp_type_s = p
+        when :disp_type_e
+          content_disposition.disposition_type = s[disp_type_s..(p-1)].downcase
+
+        # Parameter Attribute
+        when :param_attr_s then param_attr_s = p
+        when :param_attr_e then param_attr = s[param_attr_s..(p-1)]
+
+        # Quoted String.
+        when :qstr_s then qstr_s = p
+        when :qstr_e then qstr = s[qstr_s..(p-1)]
+
+        # Parameter Value
+        when :param_val_s then param_val_s = p
+        when :param_val_e
+          if param_attr.nil?
+            raise Mail::Field::ParseError.new(Mail::ContentDispositionElement, s, "no attribute for value")
+          end
+
+          # Use quoted string value if one exists, otherwise use parameter value
+          if qstr
+            value = qstr
+          else
+            value = s[param_val_s..(p-1)]
+          end
+
+          content_disposition.parameters <<  { param_attr => value }
+          param_attr = nil
+          qstr = nil
+
+        else
+          raise Mail::Field::ParseError.new(Mail::ContentDispositionElement, s, "Failed to process unknown action: #{action}")
+        end
+      end
+
+      content_disposition
+    end
+
+    private
+    def cleaned(string)
+      string =~ /(.+);\s*$/ ? $1 : string
+    end
+  end
+end

data/lib/mail/parsers/content_location_parser.rb

@@ -0,0 +1,35 @@
+module Mail::Parsers
+  class ContentLocationParser
+    def parse(s)
+      content_location = ContentLocationStruct.new(nil)
+      if s.blank?
+        return content_location
+      end
+
+      actions, error = Ragel.parse(:content_location, s)
+      if error
+        raise Mail::Field::ParseError.new(Mail::ContentLocationElement, s, error)
+      end
+
+      qstr_s = token_string_s = nil
+      actions.each_slice(2) do |action_id, p|
+        action = Mail::Parsers::Ragel::ACTIONS[action_id]
+        case action
+
+        # Quoted String.
+        when :qstr_s then qstr_s = p
+        when :qstr_e then content_location.location = s[qstr_s..(p-1)]
+
+        # Token String
+        when :token_string_s then token_string_s = p
+        when :token_string_e
+          content_location.location = s[token_string_s..(p-1)]
+
+        else
+          raise Mail::Field::ParseError.new(Mail::ContentLocationElement, s, "Failed to process unknown action: #{action}")
+        end
+      end
+      content_location
+    end
+  end
+end

data/lib/mail/parsers/content_transfer_encoding_parser.rb

@@ -0,0 +1,33 @@
+module Mail::Parsers
+  class ContentTransferEncodingParser
+
+    def parse(s)
+      content_transfer_encoding = ContentTransferEncodingStruct.new("")
+      if s.blank?
+        return content_transfer_encoding
+      end
+
+      actions, error = Ragel.parse(:content_transfer_encoding, s)
+      if error
+        raise Mail::Field::ParseError.new(Mail::ContentTransferEncodingElement, s, error)
+      end
+
+      encoding_s = nil
+      actions.each_slice(2) do |action_id, p|
+        action = Mail::Parsers::Ragel::ACTIONS[action_id]
+        case action
+
+        # Encoding
+        when :encoding_s then encoding_s = p
+        when :encoding_e
+          content_transfer_encoding.encoding = s[encoding_s..(p-1)].downcase
+
+        else
+          raise Mail::Field::ParseError.new(Mail::ContentTransferEncodingElement, s, "Failed to process unknown action: #{action}")
+        end
+      end
+
+      content_transfer_encoding
+    end
+  end
+end

data/lib/mail/parsers/content_type_parser.rb

@@ -0,0 +1,64 @@
+module Mail::Parsers
+  class ContentTypeParser
+    include Mail::Utilities
+
+    def parse(s)
+      actions, error = Ragel.parse(:content_type, s)
+      if error
+        raise Mail::Field::ParseError.new(Mail::ContentTypeElement, s, error)
+      end
+
+      content_type = ContentTypeStruct.new(nil,nil,[])
+
+      content_type.parameters = []
+
+      main_type_s = sub_type_s = param_attr_s = param_attr = nil
+      qstr_s = qstr = param_val_s = nil
+      actions.each_slice(2) do |action_id, p|
+        action = Mail::Parsers::Ragel::ACTIONS[action_id]
+        case action
+
+        # Main Type
+        when :main_type_s then main_type_s = p
+        when :main_type_e then
+          content_type.main_type = s[main_type_s..(p-1)].downcase
+
+        # Sub Type
+        when :sub_type_s then sub_type_s = p
+        when :sub_type_e
+          content_type.sub_type = s[sub_type_s..(p-1)].downcase
+
+        # Parameter Attribute
+        when :param_attr_s then param_attr_s = p
+        when :param_attr_e then param_attr = s[param_attr_s..(p-1)]
+
+        # Quoted String.
+        when :qstr_s then qstr_s = p
+        when :qstr_e then qstr = s[qstr_s..(p-1)]
+
+        # Parameter Value
+        when :param_val_s then param_val_s = p
+        when :param_val_e
+          if param_attr.nil?
+            raise Mail::Field::ParseError.new(Mail::ContentTypeElement, s, "no attribute for value")
+          end
+
+          # Use quoted s value if one exists, otherwise use parameter value
+          if qstr
+            value = qstr
+          else
+            value = s[param_val_s..(p-1)]
+          end
+
+          content_type.parameters <<  { param_attr => value }
+          param_attr = nil
+          qstr = nil
+
+        else
+          raise Mail::Field::ParseError.new(Mail::ContentTypeElement, s, "Failed to process unknown action: #{action}")
+        end
+      end
+      content_type
+    end
+  end
+end

data/lib/mail/parsers/date_time_parser.rb

@@ -0,0 +1,36 @@
+module Mail::Parsers
+  class DateTimeParser
+    include Mail::Utilities
+
+    def parse(s)
+      date_time = DateTimeStruct.new([])
+
+      actions, error = Ragel.parse(:date_time, s)
+      if error
+        raise Mail::Field::ParseError.new(Mail::DateTimeElement, s, error)
+      end
+
+      date_s = time_s = nil
+      actions.each_slice(2) do |action_id, p|
+        action = Mail::Parsers::Ragel::ACTIONS[action_id]
+        case action
+
+        # Date
+        when :date_s then date_s = p
+        when :date_e
+          date_time.date_string = s[date_s..(p-1)]
+
+        # Time
+        when :time_s then time_s = p
+        when :time_e
+          date_time.time_string = s[time_s..(p-1)]
+
+        else
+          raise Mail::Field::ParseError.new(Mail::DateTimeElement, s, "Failed to process unknown action: #{action}")
+        end
+      end
+
+      date_time
+    end
+  end
+end