mail 2.5.3 → 2.5.4

data/lib/mail/parsers/content_type.treetop

@@ -5,7 +5,7 @@ module Mail
     include RFC2045
     
     rule content_type
-      main_type "/" sub_type param_hashes:(CFWS ";"? parameter CFWS)* {
+      main_type "/" sub_type param_hashes:(CFWS ";"* parameter CFWS)* {
         def parameters
           param_hashes.elements.map do |param|
             param.parameter.param_hash
@@ -65,4 +65,4 @@ module Mail
     end
 
   end
-end
+end

data/lib/mail/parsers/rfc2045.rb

@@ -216,64 +216,21 @@ module Mail
         return cached
       end
 
-      i0 = index
-      if has_terminal?("7bit", false, index)
-        r1 = instantiate_node(SyntaxNode,input, index...(index + 4))
-        @index += 4
-      else
-        terminal_parse_failure("7bit")
-        r1 = nil
-      end
-      if r1
-        r0 = r1
-      else
-        if has_terminal?("8bit", false, index)
-          r2 = instantiate_node(SyntaxNode,input, index...(index + 4))
-          @index += 4
-        else
-          terminal_parse_failure("8bit")
-          r2 = nil
-        end
-        if r2
-          r0 = r2
+      s0, i0 = [], index
+      loop do
+        r1 = _nt_token
+        if r1
+          s0 << r1
         else
-          if has_terminal?("binary", false, index)
-            r3 = instantiate_node(SyntaxNode,input, index...(index + 6))
-            @index += 6
-          else
-            terminal_parse_failure("binary")
-            r3 = nil
-          end
-          if r3
-            r0 = r3
-          else
-            if has_terminal?("quoted-printable", false, index)
-              r4 = instantiate_node(SyntaxNode,input, index...(index + 16))
-              @index += 16
-            else
-              terminal_parse_failure("quoted-printable")
-              r4 = nil
-            end
-            if r4
-              r0 = r4
-            else
-              if has_terminal?("base64", false, index)
-                r5 = instantiate_node(SyntaxNode,input, index...(index + 6))
-                @index += 6
-              else
-                terminal_parse_failure("base64")
-                r5 = nil
-              end
-              if r5
-                r0 = r5
-              else
-                @index = i0
-                r0 = nil
-              end
-            end
-          end
+          break
         end
       end
+      if s0.empty?
+        @index = i0
+        r0 = nil
+      else
+        r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+      end
 
       node_cache[:ietf_token][start_index] = r0
 

data/lib/mail/parsers/rfc2045.treetop

@@ -8,8 +8,7 @@ module Mail
     end
     
     rule ietf_token
-      "7bit" / "8bit" / "binary" /
-      "quoted-printable" / "base64"
+      token+
     end
     
     rule custom_x_token

data/lib/mail/parsers/rfc2822.rb

@@ -2389,12 +2389,7 @@ module Mail
               break
             end
           end
-          if s4.empty?
-            @index = i4
-            r4 = nil
-          else
-            r4 = instantiate_node(SyntaxNode,input, i4...index, s4)
-          end
+          r4 = instantiate_node(SyntaxNode,input, i4...index, s4)
           s0 << r4
           if r4
             r10 = _nt_FWS
@@ -2804,6 +2799,23 @@ module Mail
       r0
     end
 
+    module Mailbox0
+      def dig_comments(comments, elements)
+        elements.each { |elem|
+          if elem.respond_to?(:comment)
+            comments << elem.comment
+          end
+          dig_comments(comments, elem.elements) if elem.elements
+         }
+      end
+
+      def comments
+        comments = []
+        dig_comments(comments, elements)
+        comments
+      end
+    end
+
     def _nt_mailbox
       start_index = index
       if node_cache[:mailbox].has_key?(index)
@@ -2819,10 +2831,12 @@ module Mail
       r1 = _nt_name_addr
       if r1
         r0 = r1
+        r0.extend(Mailbox0)
       else
         r2 = _nt_addr_spec
         if r2
           r0 = r2
+          r0.extend(Mailbox0)
         else
           @index = i0
           r0 = nil
@@ -2852,24 +2866,6 @@ module Mail
       end
     end
 
-    module Address1
-
-      def dig_comments(comments, elements)
-        elements.each { |elem|
-          if elem.respond_to?(:comment)
-            comments << elem.comment
-          end
-          dig_comments(comments, elem.elements) if elem.elements
-         }
-      end
-
-      def comments
-        comments = []
-        dig_comments(comments, elements)
-        comments
-      end
-    end
-
     def _nt_address
       start_index = index
       if node_cache[:address].has_key?(index)
@@ -2888,7 +2884,6 @@ module Mail
         r0 = r1
       else
         r2 = _nt_mailbox
-        r2.extend(Address1)
         if r2
           r0 = r2
         else
@@ -4299,41 +4294,46 @@ module Mail
       end
       s0 << r1
       if r1
-        i3, s3 = index, []
-        r4 = _nt_name_val_pair
-        s3 << r4
-        if r4
-          s5, i5 = [], index
+        i4, s4 = index, []
+        r5 = _nt_name_val_pair
+        s4 << r5
+        if r5
+          s6, i6 = [], index
           loop do
-            i6, s6 = index, []
-            r7 = _nt_CFWS
-            s6 << r7
-            if r7
-              r8 = _nt_name_val_pair
-              s6 << r8
+            i7, s7 = index, []
+            r8 = _nt_CFWS
+            s7 << r8
+            if r8
+              r9 = _nt_name_val_pair
+              s7 << r9
             end
-            if s6.last
-              r6 = instantiate_node(SyntaxNode,input, i6...index, s6)
-              r6.extend(NameValList0)
+            if s7.last
+              r7 = instantiate_node(SyntaxNode,input, i7...index, s7)
+              r7.extend(NameValList0)
             else
-              @index = i6
-              r6 = nil
+              @index = i7
+              r7 = nil
             end
-            if r6
-              s5 << r6
+            if r7
+              s6 << r7
             else
               break
             end
           end
-          r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
-          s3 << r5
+          r6 = instantiate_node(SyntaxNode,input, i6...index, s6)
+          s4 << r6
         end
-        if s3.last
-          r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
-          r3.extend(NameValList1)
+        if s4.last
+          r4 = instantiate_node(SyntaxNode,input, i4...index, s4)
+          r4.extend(NameValList1)
         else
-          @index = i3
-          r3 = nil
+          @index = i4
+          r4 = nil
+        end
+        if r4
+          r3 = r4
+        else
+          r3 = instantiate_node(SyntaxNode,input, index...index)
         end
         s0 << r3
       end

data/lib/mail/parsers/rfc2822.treetop

@@ -184,7 +184,7 @@ module Mail
     end
 
     rule quoted_string
-      CFWS? DQUOTE quoted_content:(FWS? qcontent)+ FWS? DQUOTE CFWS?
+      CFWS? DQUOTE quoted_content:(FWS? qcontent)* FWS? DQUOTE CFWS?
     end
 
     rule qcontent
@@ -222,7 +222,22 @@ module Mail
     end
   
     rule mailbox
-      name_addr / addr_spec
+      (name_addr / addr_spec) {
+        def dig_comments(comments, elements)
+          elements.each { |elem|
+            if elem.respond_to?(:comment)
+              comments << elem.comment
+            end
+            dig_comments(comments, elem.elements) if elem.elements
+           }
+        end
+
+        def comments
+          comments = []
+          dig_comments(comments, elements)
+          comments
+        end
+      }
     end
 
     rule address
@@ -244,24 +259,7 @@ module Mail
         end
 
       } /
-      mailbox {
-
-      def dig_comments(comments, elements)
-        elements.each { |elem|
-          if elem.respond_to?(:comment)
-            comments << elem.comment
-          end
-          dig_comments(comments, elem.elements) if elem.elements
-         }
-      end
-
-      def comments
-        comments = []
-        dig_comments(comments, elements)
-        comments
-      end
-
-      }
+      mailbox
     end
   
     rule address_list
@@ -340,7 +338,7 @@ module Mail
     end
     
     rule name_val_list
-      (CFWS)? (name_val_pair (CFWS name_val_pair)*)
+      (CFWS)? (name_val_pair (CFWS name_val_pair)*)?
     end
     
     rule name_val_pair

data/lib/mail/part.rb

@@ -38,8 +38,12 @@ module Mail
     end
     
     def add_required_fields
-      add_content_id unless has_content_id?
       super
+      add_content_id if !has_content_id? && inline?
+    end
+
+    def add_required_message_fields
+      # Override so we don't add Date, MIME-Version, or Message-ID.
     end
     
     def delivery_status_report_part?
@@ -113,4 +117,4 @@ module Mail
 
   end
   
-end
+end

data/lib/mail/patterns.rb

@@ -22,6 +22,7 @@ module Mail
     FIELD_NAME    = /[#{field_name}]+/
     FIELD_BODY    = /.+/
     FIELD_LINE    = /^[#{field_name}]+:\s*.+$/
+    FIELD_SPLIT   = /^(#{FIELD_NAME})\s*:\s*(#{FIELD_BODY})?$/
     HEADER_LINE   = /^([#{field_name}]+:\s*.+)$/
 
     QP_UNSAFE     = /[^#{qp_safe}]/

data/lib/mail/utilities.rb

@@ -41,28 +41,36 @@ module Mail
       token_safe?( str ) ? str : dquote(str)
     end
 
-    # Wraps supplied string in double quotes unless it is already wrapped.
-    # 
-    # Additionally will escape any double quotation marks in the string with a single
-    # backslash in front of the '"' character.
+    # Wraps supplied string in double quotes and applies \-escaping as necessary,
+    # unless it is already wrapped.
+    #
+    # Example:
+    #
+    #  string = 'This is a string'
+    #  dquote(string) #=> '"This is a string"'
+    #
+    #  string = 'This is "a string"'
+    #  dquote(string #=> '"This is \"a string\"'
     def dquote( str )
-      match = str.match(/^"(.*)?"$/)
-      str = match[1] if match
-      # First remove all escaped double quotes:
-      str = str.gsub(/\\"/, '"')
-      # Then wrap and re-escape all double quotes
-      '"' + str.gsub(/["]/n) {|s| '\\' + s } + '"'
+      '"' + unquote(str).gsub(/[\\"]/n) {|s| '\\' + s } + '"'
     end
-    
-    # Unwraps supplied string from inside double quotes.
-    # 
+
+    # Unwraps supplied string from inside double quotes and
+    # removes any \-escaping.
+    #
     # Example:
-    # 
+    #
     #  string = '"This is a string"'
     #  unquote(string) #=> 'This is a string'
+    #
+    #  string = '"This is \"a string\""'
+    #  unqoute(string) #=> 'This is "a string"'
     def unquote( str )
-      match = str.match(/^"(.*?)"$/)
-      match ? match[1] : str
+      if str =~ /^"(.*?)"$/
+        $1.gsub(/\\(.)/, '\1')
+      else
+        str
+      end
     end
     
     # Wraps a string in parenthesis and escapes any that are in the string itself.
@@ -135,7 +143,7 @@ module Mail
     #  obj1 = :this_IS_an_object
     #  match_to_s( obj1, obj2 ) #=> true
     def match_to_s( obj1, obj2 )
-      obj1.to_s.downcase == obj2.to_s.downcase
+      obj1.to_s.casecmp(obj2.to_s) == 0
     end
     
     # Capitalizes a string that is joined by hyphens correctly.

data/lib/mail/version_specific/ruby_1_8.rb

@@ -58,7 +58,7 @@ module Mail
       # Ruby 1.8 requires an encoding to work
       raise ArgumentError, "Must supply an encoding" if encoding.nil?
       encoding = encoding.to_s.upcase.gsub('_', '-')
-      [Encodings::Base64.encode(str), encoding]
+      [Encodings::Base64.encode(str), fix_encoding(encoding)]
     end
 
     def Ruby18.b_value_decode(str)
@@ -107,6 +107,10 @@ module Mail
       case encoding.upcase
       when 'UTF8'
         'UTF-8'
+      when 'UTF16', 'UTF-16'
+        'UTF-16BE'
+      when 'UTF32', 'UTF-32'
+        'UTF-32BE'
       else
         encoding
       end

data/lib/mail/version_specific/ruby_1_9.rb

@@ -51,9 +51,9 @@ module Mail
     def Ruby19.b_value_decode(str)
       match = str.match(/\=\?(.+)?\?[Bb]\?(.+)?\?\=/m)
       if match
-        encoding = match[1]
+        charset = match[1]
         str = Ruby19.decode_base64(match[2])
-        str.force_encoding(fix_encoding(encoding))
+        str.force_encoding(pick_encoding(charset))
       end
       decoded = str.encode("utf-8", :invalid => :replace, :replace => "")
       decoded.valid_encoding? ? decoded : decoded.encode("utf-16le", :invalid => :replace, :replace => "").encode("utf-8")
@@ -67,12 +67,12 @@ module Mail
     def Ruby19.q_value_decode(str)
       match = str.match(/\=\?(.+)?\?[Qq]\?(.+)?\?\=/m)
       if match
-        encoding = match[1]
+        charset = match[1]
         string = match[2].gsub(/_/, '=20')
         # Remove trailing = if it exists in a Q encoding
         string = string.sub(/\=$/, '')
         str = Encodings::QuotedPrintable.decode(string)
-        str.force_encoding(fix_encoding(encoding))
+        str.force_encoding(pick_encoding(charset))
       end
       decoded = str.encode("utf-8", :invalid => :replace, :replace => "")
       decoded.valid_encoding? ? decoded : decoded.encode("utf-16le", :invalid => :replace, :replace => "").encode("utf-8")
@@ -96,23 +96,48 @@ module Mail
       @uri_parser ||= URI::Parser.new
     end
 
-     # mails somtimes includes invalid encodings like iso885915 or utf8 so we transform them to iso885915 or utf8
-     # TODO: add this as a test somewhere
-     # Encoding.list.map{|e| [e.to_s.upcase==fix_encoding(e.to_s.downcase.gsub("-", "")), e.to_s] }.select {|a,b| !b}
-     #  Encoding.list.map{|e| [e.to_s==fix_encoding(e.to_s), e.to_s] }.select {|a,b| !b}
-    def Ruby19.fix_encoding(encoding)
-      case encoding
-        # ISO-8859-15, ISO-2022-JP and alike
-        when /iso-?(\d{4})-?(\w{1,2})/i then return "ISO-#{$1}-#{$2}"
-        # "ISO-2022-JP-KDDI"  and alike
-        when /iso-?(\d{4})-?(\w{1,2})-?(\w*)/i then return "ISO-#{$1}-#{$2}-#{$3}"
-        # UTF-8, UTF-32BE and alike
-        when /utf-?(\d{1,2})?(\w{1,2})/i then return "UTF-#{$1}#{$2}".gsub(/\A(UTF-(?:16|32))\z/, '\\1BE')
-        # Windows-1252 and alike
-        when /Windows-?(.*)/i then return "Windows-#{$1}"
-        when /^8bit$/ then return "ASCII-8BIT"
-        #more aliases to be added if needed
-        else return encoding
+    # Pick a Ruby encoding corresponding to the message charset. Most
+    # charsets have a Ruby encoding, but some need manual aliasing here.
+    #
+    # TODO: add this as a test somewhere:
+    #   Encoding.list.map { |e| [e.to_s.upcase == pick_encoding(e.to_s.downcase.gsub("-", "")), e.to_s] }.select {|a,b| !b}
+    #   Encoding.list.map { |e| [e.to_s == pick_encoding(e.to_s), e.to_s] }.select {|a,b| !b}
+    def Ruby19.pick_encoding(charset)
+      case charset
+
+      # ISO-8859-15, ISO-2022-JP and alike
+      when /iso-?(\d{4})-?(\w{1,2})/i
+        "ISO-#{$1}-#{$2}"
+
+      # "ISO-2022-JP-KDDI"  and alike
+      when /iso-?(\d{4})-?(\w{1,2})-?(\w*)/i
+        "ISO-#{$1}-#{$2}-#{$3}"
+
+      # UTF-8, UTF-32BE and alike
+      when /utf-?(\d{1,2})?(\w{1,2})/i
+        "UTF-#{$1}#{$2}".gsub(/\A(UTF-(?:16|32))\z/, '\\1BE')
+
+      # Windows-1252 and alike
+      when /Windows-?(.*)/i
+        "Windows-#{$1}"
+
+      when /^8bit$/
+        Encoding::ASCII_8BIT
+
+      # Microsoft-specific alias for CP949 (Korean)
+      when 'ks_c_5601-1987'
+        Encoding::CP949
+
+      # Wrongly written Shift_JIS (Japanese)
+      when 'shift-jis'
+        Encoding::Shift_JIS
+
+      # GB2312 (Chinese charset) is a subset of GB18030 (its replacement)
+      when /gb2312/i
+        Encoding::GB18030
+
+      else
+        charset
       end
     end
   end