mail 2.7.1 → 2.9.1

data/lib/mail/parsers/received_parser.rl

@@ -2,6 +2,9 @@
 require 'mail/utilities'
 require 'mail/parser_tools'
 
+begin
+  original_verbose, $VERBOSE = $VERBOSE, nil
+
 %%{
   machine date_time;
   alphtype int;
@@ -74,6 +77,10 @@ module Mail::Parsers
       %%write init;
       %%write exec;
 
+      if false
+        testEof
+      end
+
       if p != eof || cs < %%{ write first_final; }%%
         raise Mail::Field::IncompleteParseError.new(Mail::ReceivedElement, data, p)
       end
@@ -82,3 +89,7 @@ module Mail::Parsers
     end
   end
 end
+
+ensure
+  $VERBOSE = original_verbose
+end

data/lib/mail/parsers/rfc5322.rl

@@ -30,19 +30,35 @@
 
   # 3.6.4. Identification Fields
   obs_id_left = local_part;
-  id_left = dot_atom_text | obs_id_left;
-  # id_right modifications to support multiple '@' in msg_id.
-  msg_id_atext = ALPHA | DIGIT | "!" | "#" | "$" | "%" | "&" | "'" | "*" |
-                 "+" | "-" | "/" | "=" | "?" | "^" | "_" | "`" | "{" | "|" |
-                 "}" | "~" | "@";
-  msg_id_dot_atom_text = (msg_id_atext+ "."?)+;
   obs_id_right = domain;
   no_fold_literal = "[" (dtext)* "]";
-  id_right = msg_id_dot_atom_text | no_fold_literal | obs_id_right;
-  msg_id = (CFWS)?
-           (("<" id_left "@" id_right ">") >msg_id_s %msg_id_e)
-           (CFWS)?;
-  message_ids = msg_id (CFWS? msg_id)*;
+
+  msg_id_atext = rfc5322_atext | ":" | "," | "." | " ";
+
+  id_left = msg_id_atext+ | obs_id_left;
+  id_left_ns = ( msg_id_atext - ( " " | "," ) )+;
+
+  # id_right modifications to support multiple '@' in msg_id.
+  id_right = ( msg_id_atext | "@" )+ | no_fold_literal | obs_id_right;
+  id_right_ns = ( msg_id_atext - ( " " | "," ) | "@" )+ | no_fold_literal;
+
+  # Handle various message-id formats:
+  #  <id_left@id_right>
+  #  <id_left@id_right...
+  #  <id_left@>
+  #  <id_left>
+  #  <id_left...
+  #  id_left@id_right
+  #  id_left
+  # Handle comma-separated message_ids.
+  msg_id = (CFWS)? (
+      (("<" id_left "@" id_right? ">") >msg_id_s %msg_id_e) |
+      (("<" id_left "@" id_right? :>> "...") >msg_id_s %msg_id_e) |
+      (("<" id_left ">") >msg_id_s %msg_id_e) |
+      (("<" id_left :>> "..." ) >msg_id_s %msg_id_e) |
+      ((id_left_ns ("@" id_right_ns)? ) >msg_id_s %msg_id_e)
+    ) (CFWS)? <: ","?;
+  message_ids = msg_id**;
 
 
   # 3.6.7 Trace Fields
@@ -54,6 +70,5 @@
   # Envelope From
   ctime_date = day_name " "+ month " "+ day " " time_of_day " " year;
   null_sender = ('<>' ' '{0,1});
-  envelope_from = (addr_spec_no_angle_brackets | null_sender) >address_s %address_e " "
-                  (ctime_date >ctime_date_s %ctime_date_e);
+  envelope_from = (addr_spec_no_angle_brackets | null_sender) >address_s %address_e (" " (ctime_date >ctime_date_s %ctime_date_e))?;
 }%%

data/lib/mail/parsers.rb

@@ -1,19 +1,13 @@
 # frozen_string_literal: true
-# Ragel-generated parsers are full of known warnings. Suppress them.
-begin
-  orig, $VERBOSE = $VERBOSE, nil
 
-  require 'mail/parsers/address_lists_parser'
-  require 'mail/parsers/content_disposition_parser'
-  require 'mail/parsers/content_location_parser'
-  require 'mail/parsers/content_transfer_encoding_parser'
-  require 'mail/parsers/content_type_parser'
-  require 'mail/parsers/date_time_parser'
-  require 'mail/parsers/envelope_from_parser'
-  require 'mail/parsers/message_ids_parser'
-  require 'mail/parsers/mime_version_parser'
-  require 'mail/parsers/phrase_lists_parser'
-  require 'mail/parsers/received_parser'
-ensure
-  $VERBOSE = orig
-end
+require 'mail/parsers/address_lists_parser'
+require 'mail/parsers/content_disposition_parser'
+require 'mail/parsers/content_location_parser'
+require 'mail/parsers/content_transfer_encoding_parser'
+require 'mail/parsers/content_type_parser'
+require 'mail/parsers/date_time_parser'
+require 'mail/parsers/envelope_from_parser'
+require 'mail/parsers/message_ids_parser'
+require 'mail/parsers/mime_version_parser'
+require 'mail/parsers/phrase_lists_parser'
+require 'mail/parsers/received_parser'

data/lib/mail/part.rb

@@ -1,43 +1,39 @@
 # encoding: utf-8
 # frozen_string_literal: true
+require 'mail/constants'
+require 'mail/utilities'
+
 module Mail
   class Part < Message
-    
     # Creates a new empty Content-ID field and inserts it in the correct order
     # into the Header.  The ContentIdField object will automatically generate
     # a unique content ID if you try and encode it or output it to_s without
     # specifying a content id.
-    # 
+    #
     # It will preserve the content ID you specify if you do.
     def add_content_id(content_id_val = '')
       header['content-id'] = content_id_val
     end
-    
+
     # Returns true if the part has a content ID field, the field may or may
     # not have a value, but the field exists or not.
     def has_content_id?
       header.has_content_id?
     end
-    
-    def inline_content_id
-      # TODO: Deprecated in 2.2.2 - Remove in 2.3
-      warn("Part#inline_content_id is deprecated, please call Part#cid instead")
-      cid
-    end
-    
+
     def cid
       add_content_id unless has_content_id?
-      uri_escape(unbracket(content_id))
+      Utilities.uri_escape(Utilities.unbracket(content_id))
     end
-    
+
     def url
       "cid:#{cid}"
     end
-    
+
     def inline?
       header[:content_disposition].disposition_type == 'inline' if header[:content_disposition].respond_to?(:disposition_type)
     end
-    
+
     def add_required_fields
       super
       add_content_id if !has_content_id? && inline?
@@ -46,15 +42,15 @@ module Mail
     def add_required_message_fields
       # Override so we don't add Date, MIME-Version, or Message-ID.
     end
-    
+
     def delivery_status_report_part?
       (main_type =~ /message/i && sub_type =~ /delivery-status/i) && body =~ /Status:/
     end
-    
+
     def delivery_status_data
       delivery_status_report_part? ? parse_delivery_status_report : {}
     end
-    
+
     def bounced?
       if action.is_a?(Array)
         !!(action.first =~ /failed/i)
@@ -62,18 +58,18 @@ module Mail
         !!(action =~ /failed/i)
       end
     end
-    
-    
+
+
     # Either returns the action if the message has just a single report, or an
     # array of all the actions, one for each report
     def action
       get_return_values('action')
     end
-    
+
     def final_recipient
       get_return_values('final-recipient')
     end
-    
+
     def error_status
       get_return_values('status')
     end
@@ -81,17 +77,17 @@ module Mail
     def diagnostic_code
       get_return_values('diagnostic-code')
     end
-    
+
     def remote_mta
       get_return_values('remote-mta')
     end
-    
+
     def retryable?
       !(error_status =~ /^5/)
     end
 
     private
-    
+
     def get_return_values(key)
       if delivery_status_data[key].is_a?(Array)
         delivery_status_data[key].map { |a| a.value }
@@ -101,10 +97,10 @@ module Mail
         nil
       end
     end
-    
+
     # A part may not have a header.... so, just init a body if no header
     def parse_message
-      header_part, body_part = raw_source.split(/#{Constants::CRLF}#{Constants::WSP}*#{Constants::CRLF}/m, 2)
+      header_part, body_part = raw_source.split(/#{Constants::LAX_CRLF}#{Constants::WSP}*#{Constants::LAX_CRLF}/m, 2)
       if header_part =~ Constants::HEADER_LINE
         self.header = header_part
         self.body   = body_part
@@ -113,11 +109,11 @@ module Mail
         self.body   = raw_source
       end
     end
-    
+
     def parse_delivery_status_report
       @delivery_status_data ||= Header.new(body.to_s.gsub("\r\n\r\n", "\r\n"))
     end
 
   end
-  
+
 end

data/lib/mail/parts_list.rb

@@ -44,6 +44,63 @@ module Mail
       raise NoMethodError, "#collect! is not defined, please call #collect and create a new PartsList"
     end
 
+    def inspect_structure(parent_id = '')
+      enum_for(:map).with_index { |part, i|
+        i = i + 1 # Use 1-based indexes since this is for humans to read
+        id = parent_id.empty? ? "#{i}" : "#{parent_id}.#{i}"
+        if part.content_type == "message/rfc822"
+          sub_list = Mail.new(part.body).parts
+        else
+          sub_list = part.parts
+        end
+        id + '. ' + part.inspect +
+          if sub_list.any?
+            "\n" + sub_list.inspect_structure(id)
+          end.to_s
+      }.join("\n")
+    end
+
+    def recursive_each(&block)
+      each do |part|
+        if part.content_type == "message/rfc822"
+          sub_list = Mail.new(part.body).parts
+        else
+          sub_list = part.parts
+        end
+
+        yield part
+
+        sub_list.recursive_each(&block)
+      end
+    end
+
+    def recursive_size
+      i = 0
+      recursive_each {|p| i += 1 }
+      i
+    end
+
+    def recursive_delete_if
+      delete_if { |part|
+        if part.content_type == "message/rfc822"
+          sub_list = Mail.new(part.body).parts
+        else
+          sub_list = part.parts
+        end
+        (yield part).tap {
+          if sub_list.any?
+            sub_list.recursive_delete_if {|part| yield part }
+          end
+        }
+      }
+    end
+
+    def delete_attachments
+      recursive_delete_if { |part|
+        part.attachment?
+      }
+    end
+
     def sort
       self.class.new(@parts.sort)
     end

data/lib/mail/smtp_envelope.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+module Mail
+  class SmtpEnvelope #:nodoc:
+    # Reasonable cap on address length to avoid SMTP line length
+    # overflow on old SMTP servers.
+    MAX_ADDRESS_BYTESIZE = 2000
+
+    attr_reader :from, :to, :message
+
+    def initialize(mail)
+      self.from = mail.smtp_envelope_from
+      self.to = mail.smtp_envelope_to
+      self.message = mail.encoded
+    end
+
+    def from=(addr)
+      if Utilities.blank? addr
+        raise ArgumentError, "SMTP From address may not be blank: #{addr.inspect}"
+      end
+
+      @from = validate_addr 'From', addr
+    end
+
+    def to=(addr)
+      if Utilities.blank?(addr)
+        raise ArgumentError, "SMTP To address may not be blank: #{addr.inspect}"
+      end
+
+      @to = Array(addr).map do |addr|
+        validate_addr 'To', addr
+      end
+    end
+
+    def message=(message)
+      if Utilities.blank?(message)
+        raise ArgumentError, 'SMTP message may not be blank'
+      end
+
+      @message = message
+    end
+
+
+    private
+      def validate_addr(addr_name, addr)
+        if addr.bytesize > MAX_ADDRESS_BYTESIZE
+          raise ArgumentError, "SMTP #{addr_name} address may not exceed #{MAX_ADDRESS_BYTESIZE} bytes: #{addr.inspect}"
+        end
+
+        if /[\r\n]/.match?(addr)
+          raise ArgumentError, "SMTP #{addr_name} address may not contain CR or LF line breaks: #{addr.inspect}"
+        end
+
+        addr
+      end
+  end
+end