mail 2.7.0.rc1 → 2.7.0.rc2

data/lib/mail/parsers/content_type_parser.rl

@@ -1,24 +1,26 @@
 # frozen_string_literal: true
 require 'mail/utilities'
+require 'mail/parser_tools'
 
 %%{
   machine content_type;
+  alphtype int;
 
   # Main Type
   action main_type_s { main_type_s = p }
-  action main_type_e { content_type.main_type = data[main_type_s..(p-1)].downcase }
+  action main_type_e { content_type.main_type = chars(data, main_type_s, p-1).downcase }
 
   # Sub Type
   action sub_type_s { sub_type_s = p }
-  action sub_type_e { content_type.sub_type = data[sub_type_s..(p-1)].downcase }
+  action sub_type_e { content_type.sub_type = chars(data, sub_type_s, p-1).downcase }
 
   # Parameter Attribute
   action param_attr_s { param_attr_s = p }
-  action param_attr_e { param_attr = data[param_attr_s..(p-1)] }
+  action param_attr_e { param_attr = chars(data, param_attr_s, p-1) }
 
   # Quoted String
   action qstr_s { qstr_s = p }
-  action qstr_e { qstr = data[qstr_s..(p-1)] }
+  action qstr_e { qstr = chars(data, qstr_s, p-1) }
 
   # Parameter Value
   action param_val_s { param_val_s = p }
@@ -28,7 +30,7 @@ require 'mail/utilities'
     end
 
     # Use quoted s value if one exists, otherwise use parameter value
-    value = qstr || data[param_val_s..(p-1)]
+    value = qstr || chars(data, param_val_s, p-1)
 
     content_type.parameters << { param_attr => value }
     param_attr = nil
@@ -47,11 +49,15 @@ require 'mail/utilities'
 
 module Mail::Parsers
   module ContentTypeParser
+    extend Mail::ParserTools
+
     ContentTypeStruct = Struct.new(:main_type, :sub_type, :parameters, :error)
 
     %%write data noprefix;
 
     def self.parse(data)
+      data = data.dup.force_encoding(Encoding::ASCII_8BIT) if data.respond_to?(:force_encoding)
+
       return ContentTypeStruct.new('text', 'plain', []) if Mail::Utilities.blank?(data)
       content_type = ContentTypeStruct.new(nil, nil, [])
 
@@ -68,7 +74,7 @@ module Mail::Parsers
       %%write exec;
 
       if p != eof || cs < %%{ write first_final; }%%
-        raise Mail::Field::ParseError.new(Mail::ContentTypeElement, data, "Only able to parse up to #{data[0..p]}")
+        raise Mail::Field::IncompleteParseError.new(Mail::ContentTypeElement, data, p)
       end
 
       content_type

data/lib/mail/parsers/date_time_parser.rb

@@ -1,12 +1,15 @@
 
 # frozen_string_literal: true
 require 'mail/utilities'
+require 'mail/parser_tools'
 
 
 
 
 module Mail::Parsers
   module DateTimeParser
+    extend Mail::ParserTools
+
     DateTimeStruct = Struct.new(:date_string, :time_string, :error)
 
     
@@ -49,11 +52,14 @@ self._trans_keys = [
 	110, 110, 97, 117, 116, 
 	116, 104, 117, 117, 117, 
 	101, 101, 101, 101, 100, 100, 
-	1, 127, 1, 127, 10, 
-	10, 9, 32, -128, -1, 
-	9, 40, 9, 40, 9, 40, 
-	9, 83, 9, 77, 9, 
-	84, 0, 0, 0
+	1, 244, 1, 244, 10, 
+	10, 9, 32, 0, 244, 
+	128, 191, 160, 191, 128, 191, 
+	128, 159, 144, 191, 128, 
+	191, 128, 143, 9, 40, 
+	9, 40, 9, 40, 9, 83, 
+	9, 77, 9, 84, 0, 
+	0, 0
 ]
 
 class << self
@@ -72,8 +78,9 @@ self._key_spans = [
 	8, 1, 1, 1, 1, 1, 1, 1, 
 	1, 36, 1, 24, 36, 49, 49, 1, 
 	24, 49, 1, 1, 21, 1, 14, 1, 
-	1, 1, 1, 127, 127, 1, 24, 128, 
-	32, 32, 32, 75, 69, 76, 0
+	1, 1, 1, 244, 244, 1, 24, 245, 
+	64, 32, 64, 32, 48, 64, 16, 32, 
+	32, 32, 75, 69, 76, 0
 ]
 
 class << self
@@ -92,8 +99,9 @@ self._index_offsets = [
 	1827, 1836, 1838, 1840, 1842, 1844, 1846, 1848, 
 	1850, 1852, 1889, 1891, 1916, 1953, 2003, 2053, 
 	2055, 2080, 2130, 2132, 2134, 2156, 2158, 2173, 
-	2175, 2177, 2179, 2181, 2309, 2437, 2439, 2464, 
-	2593, 2626, 2659, 2692, 2768, 2838, 2915
+	2175, 2177, 2179, 2181, 2426, 2671, 2673, 2698, 
+	2944, 3009, 3042, 3107, 3140, 3189, 3254, 3271, 
+	3304, 3337, 3370, 3446, 3516, 3593
 ]
 
 class << self
@@ -389,31 +397,7 @@ self._indicies = [
 	152, 152, 152, 152, 152, 152, 152, 152, 
 	152, 152, 152, 152, 152, 152, 152, 152, 
 	152, 152, 152, 152, 152, 152, 152, 152, 
-	152, 152, 152, 152, 1, 157, 157, 157, 
-	157, 157, 157, 157, 157, 157, 1, 157, 
-	157, 158, 157, 157, 157, 157, 157, 157, 
-	157, 157, 157, 157, 157, 157, 157, 157, 
-	157, 157, 157, 157, 157, 157, 157, 157, 
-	157, 157, 157, 157, 159, 160, 157, 157, 
-	157, 157, 157, 157, 157, 157, 157, 157, 
-	157, 157, 157, 157, 157, 157, 157, 157, 
-	157, 157, 157, 157, 157, 157, 157, 157, 
-	157, 157, 157, 157, 157, 157, 157, 157, 
-	157, 157, 157, 157, 157, 157, 157, 157, 
-	157, 157, 157, 157, 157, 157, 157, 157, 
-	161, 157, 157, 157, 157, 157, 157, 157, 
-	157, 157, 157, 157, 157, 157, 157, 157, 
-	157, 157, 157, 157, 157, 157, 157, 157, 
-	157, 157, 157, 157, 157, 157, 157, 157, 
-	157, 157, 157, 157, 1, 162, 1, 157, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 157, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
+	152, 152, 152, 152, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
@@ -421,51 +405,160 @@ self._indicies = [
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 157, 157, 
+	157, 157, 157, 157, 157, 157, 157, 157, 
+	157, 157, 157, 157, 157, 157, 157, 157, 
+	157, 157, 157, 157, 157, 157, 157, 157, 
+	157, 157, 157, 157, 158, 159, 159, 159, 
+	159, 159, 159, 159, 159, 159, 159, 159, 
+	159, 160, 159, 159, 161, 162, 162, 162, 
+	163, 1, 164, 164, 164, 164, 164, 164, 
+	164, 164, 164, 1, 164, 164, 165, 164, 
+	164, 164, 164, 164, 164, 164, 164, 164, 
+	164, 164, 164, 164, 164, 164, 164, 164, 
+	164, 164, 164, 164, 164, 164, 164, 164, 
+	164, 166, 167, 164, 164, 164, 164, 164, 
+	164, 164, 164, 164, 164, 164, 164, 164, 
+	164, 164, 164, 164, 164, 164, 164, 164, 
+	164, 164, 164, 164, 164, 164, 164, 164, 
+	164, 164, 164, 164, 164, 164, 164, 164, 
+	164, 164, 164, 164, 164, 164, 164, 164, 
+	164, 164, 164, 164, 164, 168, 164, 164, 
+	164, 164, 164, 164, 164, 164, 164, 164, 
+	164, 164, 164, 164, 164, 164, 164, 164, 
+	164, 164, 164, 164, 164, 164, 164, 164, 
+	164, 164, 164, 164, 164, 164, 164, 164, 
+	164, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	157, 163, 1, 1, 1, 164, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	163, 1, 1, 1, 1, 1, 1, 1, 
-	165, 1, 118, 1, 1, 1, 166, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 169, 169, 169, 169, 169, 
+	169, 169, 169, 169, 169, 169, 169, 169, 
+	169, 169, 169, 169, 169, 169, 169, 169, 
+	169, 169, 169, 169, 169, 169, 169, 169, 
+	169, 170, 171, 171, 171, 171, 171, 171, 
+	171, 171, 171, 171, 171, 171, 172, 171, 
+	171, 173, 174, 174, 174, 175, 1, 176, 
+	1, 164, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	164, 1, 164, 164, 164, 164, 164, 164, 
+	164, 164, 164, 164, 164, 164, 164, 164, 
+	164, 164, 164, 164, 164, 164, 164, 164, 
+	164, 164, 164, 164, 164, 164, 164, 164, 
+	164, 164, 164, 164, 164, 164, 164, 164, 
+	164, 164, 164, 164, 164, 164, 164, 164, 
+	164, 164, 164, 164, 164, 164, 164, 164, 
+	164, 164, 164, 164, 164, 164, 164, 164, 
+	164, 164, 164, 164, 164, 164, 164, 164, 
+	164, 164, 164, 164, 164, 164, 164, 164, 
+	164, 164, 164, 164, 164, 164, 164, 164, 
+	164, 164, 164, 164, 164, 164, 164, 164, 
+	164, 164, 164, 164, 164, 164, 164, 164, 
+	164, 164, 164, 164, 164, 164, 164, 164, 
+	164, 164, 164, 164, 164, 164, 164, 164, 
+	164, 164, 164, 164, 164, 164, 164, 164, 
+	164, 164, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 169, 169, 169, 169, 
+	169, 169, 169, 169, 169, 169, 169, 169, 
+	169, 169, 169, 169, 169, 169, 169, 169, 
+	169, 169, 169, 169, 169, 169, 169, 169, 
+	169, 169, 170, 171, 171, 171, 171, 171, 
+	171, 171, 171, 171, 171, 171, 171, 172, 
+	171, 171, 173, 174, 174, 174, 175, 1, 
+	164, 164, 164, 164, 164, 164, 164, 164, 
+	164, 164, 164, 164, 164, 164, 164, 164, 
+	164, 164, 164, 164, 164, 164, 164, 164, 
+	164, 164, 164, 164, 164, 164, 164, 164, 
+	164, 164, 164, 164, 164, 164, 164, 164, 
+	164, 164, 164, 164, 164, 164, 164, 164, 
+	164, 164, 164, 164, 164, 164, 164, 164, 
+	164, 164, 164, 164, 164, 164, 164, 164, 
+	1, 169, 169, 169, 169, 169, 169, 169, 
+	169, 169, 169, 169, 169, 169, 169, 169, 
+	169, 169, 169, 169, 169, 169, 169, 169, 
+	169, 169, 169, 169, 169, 169, 169, 169, 
+	169, 1, 169, 169, 169, 169, 169, 169, 
+	169, 169, 169, 169, 169, 169, 169, 169, 
+	169, 169, 169, 169, 169, 169, 169, 169, 
+	169, 169, 169, 169, 169, 169, 169, 169, 
+	169, 169, 169, 169, 169, 169, 169, 169, 
+	169, 169, 169, 169, 169, 169, 169, 169, 
+	169, 169, 169, 169, 169, 169, 169, 169, 
+	169, 169, 169, 169, 169, 169, 169, 169, 
+	169, 169, 1, 169, 169, 169, 169, 169, 
+	169, 169, 169, 169, 169, 169, 169, 169, 
+	169, 169, 169, 169, 169, 169, 169, 169, 
+	169, 169, 169, 169, 169, 169, 169, 169, 
+	169, 169, 169, 1, 171, 171, 171, 171, 
+	171, 171, 171, 171, 171, 171, 171, 171, 
+	171, 171, 171, 171, 171, 171, 171, 171, 
+	171, 171, 171, 171, 171, 171, 171, 171, 
+	171, 171, 171, 171, 171, 171, 171, 171, 
+	171, 171, 171, 171, 171, 171, 171, 171, 
+	171, 171, 171, 171, 1, 171, 171, 171, 
+	171, 171, 171, 171, 171, 171, 171, 171, 
+	171, 171, 171, 171, 171, 171, 171, 171, 
+	171, 171, 171, 171, 171, 171, 171, 171, 
+	171, 171, 171, 171, 171, 171, 171, 171, 
+	171, 171, 171, 171, 171, 171, 171, 171, 
+	171, 171, 171, 171, 171, 171, 171, 171, 
+	171, 171, 171, 171, 171, 171, 171, 171, 
+	171, 171, 171, 171, 171, 1, 171, 171, 
+	171, 171, 171, 171, 171, 171, 171, 171, 
+	171, 171, 171, 171, 171, 171, 1, 177, 
+	1, 1, 1, 178, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 177, 1, 
+	1, 1, 1, 1, 1, 1, 179, 1, 
+	118, 1, 1, 1, 180, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 118, 1, 1, 1, 1, 1, 1, 
-	1, 167, 1, 168, 1, 1, 1, 169, 
+	1, 1, 1, 1, 1, 1, 1, 118, 
+	1, 1, 1, 1, 1, 1, 1, 181, 
+	1, 182, 1, 1, 1, 183, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 168, 1, 1, 1, 1, 1, 
-	1, 1, 170, 1, 163, 1, 1, 1, 
-	164, 1, 1, 1, 1, 1, 1, 1, 
+	182, 1, 1, 1, 1, 1, 1, 1, 
+	184, 1, 177, 1, 1, 1, 178, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 163, 1, 1, 1, 1, 
-	1, 1, 1, 165, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 177, 1, 1, 1, 1, 1, 1, 
+	1, 179, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 171, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 171, 1, 
-	163, 1, 1, 1, 164, 1, 1, 1, 
+	1, 1, 1, 1, 1, 185, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 163, 
-	1, 1, 1, 1, 1, 1, 1, 165, 
+	1, 1, 1, 1, 185, 1, 177, 1, 
+	1, 1, 178, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 177, 1, 1, 
+	1, 1, 1, 1, 1, 179, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 171, 1, 163, 1, 
-	1, 1, 164, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 163, 1, 1, 
-	1, 1, 1, 1, 1, 165, 1, 1, 
+	1, 1, 185, 1, 177, 1, 1, 1, 
+	178, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 177, 1, 1, 1, 1, 
+	1, 1, 1, 179, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 90, 1, 1, 0
+	1, 1, 1, 1, 1, 1, 1, 90, 
+	1, 1, 0
 ]
 
 class << self
@@ -484,17 +577,19 @@ self._trans_targs = [
 	19, 20, 22, 23, 24, 25, 27, 28, 
 	26, 24, 25, 27, 28, 29, 31, 32, 
 	30, 29, 31, 32, 33, 34, 35, 37, 
-	38, 48, 96, 99, 100, 101, 36, 34, 
+	38, 48, 103, 106, 107, 108, 36, 34, 
 	35, 37, 38, 39, 41, 42, 40, 39, 
 	41, 42, 43, 44, 45, 47, 46, 44, 
-	45, 47, 49, 50, 51, 53, 97, 57, 
+	45, 47, 49, 50, 51, 53, 104, 57, 
 	59, 61, 62, 64, 66, 68, 70, 72, 
 	73, 74, 76, 77, 75, 73, 74, 76, 
 	77, 78, 79, 81, 78, 79, 81, 80, 
 	78, 79, 81, 83, 85, 87, 88, 90, 
-	92, 93, 92, 102, 95, 92, 93, 92, 
-	102, 95, 94, 97, 52, 98, 52, 98, 
-	97, 52, 98, 54
+	92, 93, 92, 109, 95, 96, 97, 98, 
+	99, 100, 101, 102, 92, 93, 92, 109, 
+	95, 96, 97, 98, 99, 100, 101, 102, 
+	94, 104, 52, 105, 52, 105, 104, 52, 
+	105, 54
 ]
 
 class << self
@@ -521,9 +616,11 @@ self._trans_actions = [
 	0, 0, 3, 0, 0, 4, 4, 5, 
 	4, 1, 1, 8, 0, 0, 3, 0, 
 	4, 4, 5, 0, 0, 0, 0, 0, 
-	9, 9, 10, 11, 9, 0, 0, 3, 
-	12, 0, 0, 13, 13, 14, 0, 3, 
-	4, 4, 5, 0
+	9, 9, 10, 11, 9, 9, 9, 9, 
+	9, 9, 9, 9, 0, 0, 3, 12, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 13, 13, 14, 0, 3, 4, 4, 
+	5, 0
 ]
 
 class << self
@@ -543,7 +640,8 @@ self._eof_actions = [
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	13, 0, 4, 13, 13, 13, 0
+	0, 0, 0, 0, 0, 0, 0, 13, 
+	0, 4, 13, 13, 13, 0
 ]
 
 class << self
@@ -553,7 +651,7 @@ self.start = 1;
 class << self
 	attr_accessor :first_final
 end
-self.first_final = 96;
+self.first_final = 103;
 class << self
 	attr_accessor :error
 end
@@ -571,7 +669,9 @@ self.en_main = 1;
 
 
     def self.parse(data)
-      raise Mail::Field::ParseError.new(Mail::DateTimeElement, data, "nil is an invalid DateTime") if data.nil?
+      data = data.dup.force_encoding(Encoding::ASCII_8BIT) if data.respond_to?(:force_encoding)
+
+      raise Mail::Field::NilParseError.new(Mail::DateTimeElement) if data.nil?
 
       date_time = DateTimeStruct.new([])
 
@@ -633,7 +733,7 @@ begin
  date_s = p 		end
 	when 13 then
 		begin
- date_time.time_string = data[time_s..(p-1)] 		end
+ date_time.time_string = chars(data, time_s, p-1) 		end
 	when 9 then
 		begin
 		end
@@ -673,12 +773,12 @@ begin
  		end
 	when 6 then
 		begin
- date_time.date_string = data[date_s..(p-1)] 		end
+ date_time.date_string = chars(data, date_s, p-1) 		end
 		begin
  time_s = p 		end
 	when 14 then
 		begin
- date_time.time_string = data[time_s..(p-1)] 		end
+ date_time.time_string = chars(data, time_s, p-1) 		end
 		begin
  	begin
 		stack[top] = cs
@@ -739,7 +839,7 @@ begin
 		begin
 		end
 		begin
- date_time.date_string = data[date_s..(p-1)] 		end
+ date_time.date_string = chars(data, date_s, p-1) 		end
 		begin
  time_s = p 		end
 	end
@@ -761,7 +861,7 @@ begin
 	  case _eof_actions[cs]
 	when 13 then
 		begin
- date_time.time_string = data[time_s..(p-1)] 		end
+ date_time.time_string = chars(data, time_s, p-1) 		end
 	when 4 then
 		begin
 		end
@@ -776,8 +876,8 @@ end
 	end
 
 
-      if p != eof || cs < 96
-        raise Mail::Field::ParseError.new(Mail::DateTimeElement, data, "Only able to parse up to #{data[0..p]}")
+      if p != eof || cs < 103
+        raise Mail::Field::IncompleteParseError.new(Mail::DateTimeElement, data, p)
       end
 
       date_time