mail 2.7.0.rc1 → 2.7.0

data/lib/mail/parsers/message_ids_parser.rl

@@ -1,14 +1,16 @@
 # frozen_string_literal: true
 require 'mail/utilities'
+require 'mail/parser_tools'
 
 %%{
   # RFC 5322 Section 3.6.4: Identification Fields
   # https://tools.ietf.org/html/rfc5322#section-3.6.4
   machine message_ids;
+  alphtype int;
 
   # Message Ids
   action msg_id_s { msg_id_s = p }
-  action msg_id_e { message_ids.message_ids << data[msg_id_s..(p-1)].rstrip }
+  action msg_id_e { message_ids.message_ids << chars(data, msg_id_s, p-1).rstrip }
 
   # No-op actions
   action angle_addr_s {}
@@ -47,12 +49,16 @@ require 'mail/utilities'
 
 module Mail::Parsers
   module MessageIdsParser
+    extend Mail::ParserTools
+
     MessageIdsStruct = Struct.new(:message_ids, :error)
 
     %%write data noprefix;
 
     def self.parse(data)
-      raise Mail::Field::ParseError.new(Mail::MessageIdsElement, data, 'nil is invalid') if data.nil?
+      data = data.dup.force_encoding(Encoding::ASCII_8BIT) if data.respond_to?(:force_encoding)
+
+      raise Mail::Field::NilParseError.new(Mail::MessageIdsElement) if data.nil?
 
       # Parser state
       message_ids = MessageIdsStruct.new([])
@@ -67,7 +73,7 @@ module Mail::Parsers
       %%write exec;
 
       if p != eof || cs < %%{ write first_final; }%%
-        raise Mail::Field::ParseError.new(Mail::MessageIdsElement, data, "Only able to parse up to #{data[0..p]}")
+        raise Mail::Field::IncompleteParseError.new(Mail::MessageIdsElement, data, p)
       end
 
       message_ids

data/lib/mail/parsers/mime_version_parser.rb

@@ -1,12 +1,15 @@
 
 # frozen_string_literal: true
 require 'mail/utilities'
+require 'mail/parser_tools'
 
 
 
 
 module Mail::Parsers
   module MimeVersionParser
+    extend Mail::ParserTools
+
     MimeVersionStruct = Struct.new(:major, :minor, :error)
 
     
@@ -19,10 +22,13 @@ self._trans_keys = [
 	9, 32, 9, 57, 40, 
 	57, 46, 46, 40, 57, 
 	48, 57, 10, 10, 9, 32, 
-	1, 127, 1, 127, 10, 
-	10, 9, 32, 0, 127, 
-	9, 57, 9, 40, 9, 40, 
-	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, 57, 
+	9, 40, 9, 40, 0, 0, 
+	0
 ]
 
 class << self
@@ -31,8 +37,9 @@ class << self
 end
 self._key_spans = [
 	0, 49, 1, 24, 49, 18, 1, 18, 
-	10, 1, 24, 127, 127, 1, 24, 128, 
-	49, 32, 32, 0
+	10, 1, 24, 244, 244, 1, 24, 245, 
+	64, 32, 64, 32, 48, 64, 16, 49, 
+	32, 32, 0
 ]
 
 class << self
@@ -41,8 +48,9 @@ class << self
 end
 self._index_offsets = [
 	0, 0, 50, 52, 77, 127, 146, 148, 
-	167, 178, 180, 205, 333, 461, 463, 488, 
-	617, 667, 700, 733
+	167, 178, 180, 205, 450, 695, 697, 722, 
+	968, 1033, 1066, 1131, 1164, 1213, 1278, 1295, 
+	1345, 1378, 1411
 ]
 
 class << self
@@ -91,57 +99,142 @@ self._indicies = [
 	19, 19, 19, 19, 19, 19, 19, 19, 
 	19, 19, 19, 19, 19, 19, 19, 19, 
 	19, 19, 19, 19, 19, 19, 19, 19, 
-	19, 19, 19, 19, 1, 24, 24, 24, 
-	24, 24, 24, 24, 24, 24, 1, 24, 
-	24, 25, 24, 24, 24, 24, 24, 24, 
-	24, 24, 24, 24, 24, 24, 24, 24, 
-	24, 24, 24, 24, 24, 24, 24, 24, 
-	24, 24, 24, 24, 26, 27, 24, 24, 
-	24, 24, 24, 24, 24, 24, 24, 24, 
-	24, 24, 24, 24, 24, 24, 24, 24, 
-	24, 24, 24, 24, 24, 24, 24, 24, 
-	24, 24, 24, 24, 24, 24, 24, 24, 
-	24, 24, 24, 24, 24, 24, 24, 24, 
-	24, 24, 24, 24, 24, 24, 24, 24, 
-	28, 24, 24, 24, 24, 24, 24, 24, 
-	24, 24, 24, 24, 24, 24, 24, 24, 
-	24, 24, 24, 24, 24, 24, 24, 24, 
-	24, 24, 24, 24, 24, 24, 24, 24, 
-	24, 24, 24, 24, 1, 29, 1, 24, 
+	19, 19, 19, 19, 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, 24, 1, 
-	24, 24, 24, 24, 24, 24, 24, 24, 
-	24, 24, 24, 24, 24, 24, 24, 24, 
-	24, 24, 24, 24, 24, 24, 24, 24, 
-	24, 24, 24, 24, 24, 24, 24, 24, 
-	24, 24, 24, 24, 24, 24, 24, 24, 
-	24, 24, 24, 24, 24, 24, 24, 24, 
-	24, 24, 24, 24, 24, 24, 24, 24, 
-	24, 24, 24, 24, 24, 24, 24, 24, 
-	24, 24, 24, 24, 24, 24, 24, 24, 
-	24, 24, 24, 24, 24, 24, 24, 24, 
-	24, 24, 24, 24, 24, 24, 24, 24, 
-	24, 24, 24, 24, 24, 24, 24, 24, 
-	24, 24, 24, 24, 24, 24, 24, 24, 
+	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, 24, 24, 
 	24, 24, 24, 24, 24, 24, 24, 24, 
 	24, 24, 24, 24, 24, 24, 24, 24, 
 	24, 24, 24, 24, 24, 24, 24, 24, 
-	1, 30, 1, 1, 1, 31, 1, 1, 
+	24, 24, 24, 24, 25, 26, 26, 26, 
+	26, 26, 26, 26, 26, 26, 26, 26, 
+	26, 27, 26, 26, 28, 29, 29, 29, 
+	30, 1, 31, 31, 31, 31, 31, 31, 
+	31, 31, 31, 1, 31, 31, 32, 31, 
+	31, 31, 31, 31, 31, 31, 31, 31, 
+	31, 31, 31, 31, 31, 31, 31, 31, 
+	31, 31, 31, 31, 31, 31, 31, 31, 
+	31, 33, 34, 31, 31, 31, 31, 31, 
+	31, 31, 31, 31, 31, 31, 31, 31, 
+	31, 31, 31, 31, 31, 31, 31, 31, 
+	31, 31, 31, 31, 31, 31, 31, 31, 
+	31, 31, 31, 31, 31, 31, 31, 31, 
+	31, 31, 31, 31, 31, 31, 31, 31, 
+	31, 31, 31, 31, 31, 35, 31, 31, 
+	31, 31, 31, 31, 31, 31, 31, 31, 
+	31, 31, 31, 31, 31, 31, 31, 31, 
+	31, 31, 31, 31, 31, 31, 31, 31, 
+	31, 31, 31, 31, 31, 31, 31, 31, 
+	31, 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, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 37, 38, 38, 38, 38, 38, 38, 
+	38, 38, 38, 38, 38, 38, 39, 38, 
+	38, 40, 41, 41, 41, 42, 1, 43, 
+	1, 31, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	30, 1, 1, 1, 1, 1, 1, 1, 
-	32, 1, 1, 1, 1, 1, 1, 1, 
-	33, 33, 33, 33, 33, 33, 33, 33, 
-	33, 33, 1, 18, 1, 1, 1, 34, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
+	31, 1, 31, 31, 31, 31, 31, 31, 
+	31, 31, 31, 31, 31, 31, 31, 31, 
+	31, 31, 31, 31, 31, 31, 31, 31, 
+	31, 31, 31, 31, 31, 31, 31, 31, 
+	31, 31, 31, 31, 31, 31, 31, 31, 
+	31, 31, 31, 31, 31, 31, 31, 31, 
+	31, 31, 31, 31, 31, 31, 31, 31, 
+	31, 31, 31, 31, 31, 31, 31, 31, 
+	31, 31, 31, 31, 31, 31, 31, 31, 
+	31, 31, 31, 31, 31, 31, 31, 31, 
+	31, 31, 31, 31, 31, 31, 31, 31, 
+	31, 31, 31, 31, 31, 31, 31, 31, 
+	31, 31, 31, 31, 31, 31, 31, 31, 
+	31, 31, 31, 31, 31, 31, 31, 31, 
+	31, 31, 31, 31, 31, 31, 31, 31, 
+	31, 31, 31, 31, 31, 31, 31, 31, 
+	31, 31, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 18, 1, 1, 1, 1, 1, 
-	1, 1, 35, 1, 36, 1, 1, 1, 
-	37, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 36, 1, 1, 1, 1, 
-	1, 1, 1, 38, 1, 1, 0
+	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, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 37, 38, 38, 38, 38, 38, 
+	38, 38, 38, 38, 38, 38, 38, 39, 
+	38, 38, 40, 41, 41, 41, 42, 1, 
+	31, 31, 31, 31, 31, 31, 31, 31, 
+	31, 31, 31, 31, 31, 31, 31, 31, 
+	31, 31, 31, 31, 31, 31, 31, 31, 
+	31, 31, 31, 31, 31, 31, 31, 31, 
+	31, 31, 31, 31, 31, 31, 31, 31, 
+	31, 31, 31, 31, 31, 31, 31, 31, 
+	31, 31, 31, 31, 31, 31, 31, 31, 
+	31, 31, 31, 31, 31, 31, 31, 31, 
+	1, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 1, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 1, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 1, 38, 38, 38, 38, 
+	38, 38, 38, 38, 38, 38, 38, 38, 
+	38, 38, 38, 38, 38, 38, 38, 38, 
+	38, 38, 38, 38, 38, 38, 38, 38, 
+	38, 38, 38, 38, 38, 38, 38, 38, 
+	38, 38, 38, 38, 38, 38, 38, 38, 
+	38, 38, 38, 38, 1, 38, 38, 38, 
+	38, 38, 38, 38, 38, 38, 38, 38, 
+	38, 38, 38, 38, 38, 38, 38, 38, 
+	38, 38, 38, 38, 38, 38, 38, 38, 
+	38, 38, 38, 38, 38, 38, 38, 38, 
+	38, 38, 38, 38, 38, 38, 38, 38, 
+	38, 38, 38, 38, 38, 38, 38, 38, 
+	38, 38, 38, 38, 38, 38, 38, 38, 
+	38, 38, 38, 38, 38, 1, 38, 38, 
+	38, 38, 38, 38, 38, 38, 38, 38, 
+	38, 38, 38, 38, 38, 38, 1, 44, 
+	1, 1, 1, 45, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 44, 1, 
+	1, 1, 1, 1, 1, 1, 46, 1, 
+	1, 1, 1, 1, 1, 1, 47, 47, 
+	47, 47, 47, 47, 47, 47, 47, 47, 
+	1, 18, 1, 1, 1, 48, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	18, 1, 1, 1, 1, 1, 1, 1, 
+	49, 1, 50, 1, 1, 1, 51, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 50, 1, 1, 1, 1, 1, 1, 
+	1, 52, 1, 1, 0
 ]
 
 class << self
@@ -150,10 +243,12 @@ class << self
 end
 self._trans_targs = [
 	1, 0, 2, 4, 5, 3, 1, 2, 
-	4, 5, 6, 7, 5, 7, 8, 16, 
-	16, 10, 17, 12, 13, 12, 19, 15, 
-	12, 13, 12, 19, 15, 14, 17, 9, 
-	18, 16, 9, 18, 17, 9, 18
+	4, 5, 6, 7, 5, 7, 8, 23, 
+	23, 10, 24, 12, 13, 12, 26, 15, 
+	16, 17, 18, 19, 20, 21, 22, 12, 
+	13, 12, 26, 15, 16, 17, 18, 19, 
+	20, 21, 22, 14, 24, 9, 25, 23, 
+	9, 25, 24, 9, 25
 ]
 
 class << self
@@ -164,8 +259,10 @@ self._trans_actions = [
 	0, 0, 0, 1, 2, 0, 3, 3, 
 	4, 5, 6, 7, 0, 3, 1, 8, 
 	9, 0, 0, 10, 10, 11, 12, 10, 
-	0, 0, 1, 13, 0, 0, 14, 14, 
-	15, 0, 0, 1, 3, 3, 4
+	10, 10, 10, 10, 10, 10, 10, 0, 
+	0, 1, 13, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 14, 14, 15, 0, 
+	0, 1, 3, 3, 4
 ]
 
 class << self
@@ -175,7 +272,8 @@ end
 self._eof_actions = [
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	14, 0, 3, 0
+	0, 0, 0, 0, 0, 0, 0, 14, 
+	0, 3, 0
 ]
 
 class << self
@@ -185,7 +283,7 @@ self.start = 1;
 class << self
 	attr_accessor :first_final
 end
-self.first_final = 16;
+self.first_final = 23;
 class << self
 	attr_accessor :error
 end
@@ -203,6 +301,8 @@ self.en_main = 1;
 
 
     def self.parse(data)
+      data = data.dup.force_encoding(Encoding::ASCII_8BIT) if data.respond_to?(:force_encoding)
+
       return MimeVersionStruct.new('', nil) if Mail::Utilities.blank?(data)
 
       # Parser state
@@ -264,13 +364,13 @@ begin
  major_digits_s = p 		end
 	when 7 then
 		begin
- mime_version.major = data[major_digits_s..(p-1)] 		end
+ mime_version.major = chars(data, major_digits_s, p-1) 		end
 	when 8 then
 		begin
  minor_digits_s = p 		end
 	when 14 then
 		begin
- mime_version.minor = data[minor_digits_s..(p-1)] 		end
+ mime_version.minor = chars(data, minor_digits_s, p-1) 		end
 	when 10 then
 		begin
 		end
@@ -298,7 +398,7 @@ begin
  		end
 	when 6 then
 		begin
- mime_version.major = data[major_digits_s..(p-1)] 		end
+ mime_version.major = chars(data, major_digits_s, p-1) 		end
 		begin
  	begin
 		stack[top] = cs
@@ -310,7 +410,7 @@ begin
  		end
 	when 15 then
 		begin
- mime_version.minor = data[minor_digits_s..(p-1)] 		end
+ mime_version.minor = chars(data, minor_digits_s, p-1) 		end
 		begin
  	begin
 		stack[top] = cs
@@ -384,7 +484,7 @@ begin
 	  case _eof_actions[cs]
 	when 14 then
 		begin
- mime_version.minor = data[minor_digits_s..(p-1)] 		end
+ mime_version.minor = chars(data, minor_digits_s, p-1) 		end
 	when 3 then
 		begin
 		end
@@ -399,8 +499,8 @@ end
 	end
 
 
-      if p != eof || cs < 16
-        raise Mail::Field::ParseError.new(Mail::MimeVersionElement, data, "Only able to parse up to #{data[0..p]}")
+      if p != eof || cs < 23
+        raise Mail::Field::IncompleteParseError.new(Mail::MimeVersionElement, data, p)
       end
 
       mime_version

data/lib/mail/parsers/mime_version_parser.rl

@@ -1,16 +1,18 @@
 # frozen_string_literal: true
 require 'mail/utilities'
+require 'mail/parser_tools'
 
 %%{
   machine mime_version;
+  alphtype int;
 
   # Major Digits
   action major_digits_s { major_digits_s = p }
-  action major_digits_e { mime_version.major = data[major_digits_s..(p-1)] }
+  action major_digits_e { mime_version.major = chars(data, major_digits_s, p-1) }
 
   # Minor Digits
   action minor_digits_s { minor_digits_s = p }
-  action minor_digits_e { mime_version.minor = data[minor_digits_s..(p-1)] }
+  action minor_digits_e { mime_version.minor = chars(data, minor_digits_s, p-1) }
 
   # No-op actions
   action comment_s {}
@@ -26,11 +28,15 @@ require 'mail/utilities'
 
 module Mail::Parsers
   module MimeVersionParser
+    extend Mail::ParserTools
+
     MimeVersionStruct = Struct.new(:major, :minor, :error)
 
     %%write data noprefix;
 
     def self.parse(data)
+      data = data.dup.force_encoding(Encoding::ASCII_8BIT) if data.respond_to?(:force_encoding)
+
       return MimeVersionStruct.new('', nil) if Mail::Utilities.blank?(data)
 
       # Parser state
@@ -46,7 +52,7 @@ module Mail::Parsers
       %%write exec;
 
       if p != eof || cs < %%{ write first_final; }%%
-        raise Mail::Field::ParseError.new(Mail::MimeVersionElement, data, "Only able to parse up to #{data[0..p]}")
+        raise Mail::Field::IncompleteParseError.new(Mail::MimeVersionElement, data, p)
       end
 
       mime_version