mail 2.6.6 → 2.7.0

data/lib/mail/version_specific/ruby_1_8.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 # frozen_string_literal: true
+require 'net/imap' # for decode_utf7
 
 module Mail
   class Ruby18
@@ -56,7 +57,27 @@ module Mail
     end
 
     def Ruby18.transcode_charset(str, from_encoding, to_encoding = 'UTF-8')
-      Iconv.conv("#{normalize_iconv_charset_encoding(to_encoding)}//IGNORE", normalize_iconv_charset_encoding(from_encoding), str)
+      case from_encoding
+      when /utf-?7/i
+        decode_utf7(str)
+      else
+        retried = false
+        begin
+          Iconv.conv("#{normalize_iconv_charset_encoding(to_encoding)}//IGNORE", normalize_iconv_charset_encoding(from_encoding), str)
+        rescue Iconv::InvalidEncoding
+          if retried
+            raise
+          else
+            from_encoding = 'ASCII'
+            retried = true
+            retry
+          end
+        end
+      end
+    end
+
+    def Ruby18.decode_utf7(str)
+      Net::IMAP.decode_utf7(str)
     end
 
     def Ruby18.b_value_encode(str, encoding)
@@ -97,7 +118,12 @@ module Mail
     end
 
     def Ruby18.param_decode(str, encoding)
-      URI.unescape(str)
+      str = URI.unescape(str)
+      if encoding
+        transcode_charset(str, encoding)
+      else
+        str
+      end
     end
 
     def Ruby18.param_encode(str)
@@ -106,6 +132,10 @@ module Mail
       "#{encoding}'#{language}'#{URI.escape(str)}"
     end
 
+    def Ruby18.string_byteslice(str, *args)
+      str.slice(*args)
+    end
+
     private
 
     def Ruby18.normalize_iconv_charset_encoding(encoding)
@@ -119,7 +149,14 @@ module Mail
       when 'KS_C_5601-1987'
         'CP949'
       else
-        encoding
+        # Fall back to ASCII for charsets that Iconv doesn't recognize
+        begin
+          Iconv.new('UTF-8', encoding)
+        rescue Iconv::InvalidEncoding => e
+          'ASCII'
+        else
+          encoding
+        end
       end
     end
   end

data/lib/mail/version_specific/ruby_1_9.rb

@@ -5,13 +5,23 @@ module Mail
   class Ruby19
     class StrictCharsetEncoder
       def encode(string, charset)
-        string.force_encoding(Mail::Ruby19.pick_encoding(charset))
+        case charset
+        when /utf-?7/i
+          Mail::Ruby19.decode_utf7(string)
+        else
+          string.force_encoding(Mail::Ruby19.pick_encoding(charset))
+        end
       end
     end
 
     class BestEffortCharsetEncoder
       def encode(string, charset)
-        string.force_encoding(pick_encoding(charset))
+        case charset
+        when /utf-?7/i
+          Mail::Ruby19.decode_utf7(string)
+        else
+          string.force_encoding(pick_encoding(charset))
+        end
       end
 
       private
@@ -32,7 +42,7 @@ module Mail
     class << self
       attr_accessor :charset_encoder
     end
-    self.charset_encoder = StrictCharsetEncoder.new
+    self.charset_encoder = BestEffortCharsetEncoder.new
 
     # Escapes any parenthesis in a string that are unescaped this uses
     # a Ruby 1.9.1 regexp feature of negative look behind
@@ -78,7 +88,32 @@ module Mail
     end
 
     def Ruby19.transcode_charset(str, from_encoding, to_encoding = Encoding::UTF_8)
-      charset_encoder.encode(str.dup, from_encoding).encode(to_encoding, :undef => :replace, :invalid => :replace, :replace => '')
+      to_encoding = to_encoding.to_s if RUBY_VERSION < '1.9.3'
+      to_encoding = Encoding.find(to_encoding)
+      replacement_char = to_encoding == Encoding::UTF_8 ? '�' : '?'
+      charset_encoder.encode(str.dup, from_encoding).encode(to_encoding, :undef => :replace, :invalid => :replace, :replace => replacement_char)
+    end
+
+    # From Ruby stdlib Net::IMAP
+    def Ruby19.encode_utf7(string)
+      string.gsub(/(&)|[^\x20-\x7e]+/) do
+        if $1
+          "&-"
+        else
+          base64 = [$&.encode(Encoding::UTF_16BE)].pack("m0")
+          "&" + base64.delete("=").tr("/", ",") + "-"
+        end
+      end.force_encoding(Encoding::ASCII_8BIT)
+    end
+
+    def Ruby19.decode_utf7(utf7)
+      utf7.gsub(/&([^-]+)?-/n) do
+        if $1
+          ($1.tr(",", "/") + "===").unpack("m")[0].encode(Encoding::UTF_8, Encoding::UTF_16BE)
+        else
+          "&"
+        end
+      end
     end
 
     def Ruby19.b_value_encode(str, encoding = nil)
@@ -93,8 +128,7 @@ module Mail
         str = Ruby19.decode_base64(match[2])
         str = charset_encoder.encode(str, charset)
       end
-      decoded = str.encode(Encoding::UTF_8, :invalid => :replace, :replace => "")
-      decoded.valid_encoding? ? decoded : decoded.encode(Encoding::UTF_16LE, :invalid => :replace, :replace => "").encode(Encoding::UTF_8)
+      transcode_to_scrubbed_utf8(str)
     rescue Encoding::UndefinedConversionError, ArgumentError, Encoding::ConverterNotFoundError
       warn "Encoding conversion failed #{$!}"
       str.dup.force_encoding(Encoding::UTF_8)
@@ -118,8 +152,7 @@ module Mail
         # jruby/jruby#829 which subtly changes String#encode semantics.
         str.force_encoding(Encoding::UTF_8) if str.encoding == Encoding::ASCII_8BIT
       end
-      decoded = str.encode(Encoding::UTF_8, :invalid => :replace, :replace => "")
-      decoded.valid_encoding? ? decoded : decoded.encode(Encoding::UTF_16LE, :invalid => :replace, :replace => "").encode(Encoding::UTF_8)
+      transcode_to_scrubbed_utf8(str)
     rescue Encoding::UndefinedConversionError, ArgumentError, Encoding::ConverterNotFoundError
       warn "Encoding conversion failed #{$!}"
       str.dup.force_encoding(Encoding::UTF_8)
@@ -128,7 +161,10 @@ module Mail
     def Ruby19.param_decode(str, encoding)
       str = uri_parser.unescape(str)
       str = charset_encoder.encode(str, encoding) if encoding
-      str
+      transcode_to_scrubbed_utf8(str)
+    rescue Encoding::UndefinedConversionError, ArgumentError, Encoding::ConverterNotFoundError
+      warn "Encoding conversion failed #{$!}"
+      str.dup.force_encoding(Encoding::UTF_8)
     end
 
     def Ruby19.param_encode(str)
@@ -207,6 +243,16 @@ module Mail
       convert_to_encoding(encoding)
     end
 
+    if "string".respond_to?(:byteslice)
+      def Ruby19.string_byteslice(str, *args)
+        str.byteslice(*args)
+      end
+    else
+      def Ruby19.string_byteslice(str, *args)
+        str.unpack('C*').slice(*args).pack('C*').force_encoding(str.encoding)
+      end
+    end
+
     class << self
       private
 
@@ -214,6 +260,7 @@ module Mail
         if encoding.is_a?(Encoding)
           encoding
         else
+          # Fall back to ASCII for charsets that Ruby doesn't recognize
           begin
             Encoding.find(encoding)
           rescue ArgumentError
@@ -221,6 +268,11 @@ module Mail
           end
         end
       end
+
+      def transcode_to_scrubbed_utf8(str)
+        decoded = str.encode(Encoding::UTF_8, :undef => :replace, :invalid => :replace, :replace => "�")
+        decoded.valid_encoding? ? decoded : decoded.encode(Encoding::UTF_16LE, :invalid => :replace, :replace => "�").encode(Encoding::UTF_8)
+      end
     end
   end
 end

data/lib/mail.rb

@@ -7,13 +7,7 @@ module Mail # :doc:
 
   require 'uri'
   require 'net/smtp'
-
-  begin
-    # Use mime/types/columnar if available, for reduced memory usage
-    require 'mime/types/columnar'
-  rescue LoadError
-    require 'mime/types'
-  end
+  require 'mini_mime'
 
   if RUBY_VERSION <= '1.8.6'
     begin
@@ -34,17 +28,10 @@ module Mail # :doc:
   require 'mail/version'
 
   require 'mail/core_extensions/string'
-  require 'mail/core_extensions/smtp' if RUBY_VERSION < '1.9.3'
+  require 'mail/core_extensions/smtp'
   require 'mail/indifferent_hash'
 
-  # Only load our multibyte extensions if AS is not already loaded
-  if defined?(ActiveSupport)
-    require 'active_support/inflector'
-  else
-    require 'mail/core_extensions/string/access'
-    require 'mail/core_extensions/string/multibyte'
-    require 'mail/multibyte'
-  end
+  require 'mail/multibyte'
 
   require 'mail/constants'
   require 'mail/utilities'

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: mail
 version: !ruby/object:Gem::Version
-  version: 2.6.6
+  version: 2.7.0
 platform: ruby
 authors:
 - Mikel Lindsaar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-09 00:00:00.000000000 Z
+date: 2017-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: mime-types
+  name: mini_mime
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4'
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4'
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -92,18 +86,9 @@ executables: []
 extensions: []
 extra_rdoc_files:
 - README.md
-- CONTRIBUTING.md
-- CHANGELOG.rdoc
-- TODO.rdoc
 files:
-- CHANGELOG.rdoc
-- CONTRIBUTING.md
-- Dependencies.txt
-- Gemfile
 - MIT-LICENSE
 - README.md
-- Rakefile
-- TODO.rdoc
 - lib/mail.rb
 - lib/mail/attachments_list.rb
 - lib/mail/body.rb
@@ -112,8 +97,6 @@ files:
 - lib/mail/constants.rb
 - lib/mail/core_extensions/smtp.rb
 - lib/mail/core_extensions/string.rb
-- lib/mail/core_extensions/string/access.rb
-- lib/mail/core_extensions/string/multibyte.rb
 - lib/mail/elements.rb
 - lib/mail/elements/address.rb
 - lib/mail/elements/address_list.rb
@@ -132,6 +115,7 @@ files:
 - lib/mail/encodings/8bit.rb
 - lib/mail/encodings/base64.rb
 - lib/mail/encodings/binary.rb
+- lib/mail/encodings/identity.rb
 - lib/mail/encodings/quoted_printable.rb
 - lib/mail/encodings/transfer_encoding.rb
 - lib/mail/encodings/unix_to_unix.rb
@@ -185,12 +169,12 @@ files:
 - lib/mail/message.rb
 - lib/mail/multibyte.rb
 - lib/mail/multibyte/chars.rb
-- lib/mail/multibyte/exceptions.rb
 - lib/mail/multibyte/unicode.rb
 - lib/mail/multibyte/utils.rb
 - lib/mail/network.rb
 - lib/mail/network/delivery_methods/exim.rb
 - lib/mail/network/delivery_methods/file_delivery.rb
+- lib/mail/network/delivery_methods/logger_delivery.rb
 - lib/mail/network/delivery_methods/sendmail.rb
 - lib/mail/network/delivery_methods/smtp.rb
 - lib/mail/network/delivery_methods/smtp_connection.rb
@@ -199,47 +183,40 @@ files:
 - lib/mail/network/retriever_methods/imap.rb
 - lib/mail/network/retriever_methods/pop3.rb
 - lib/mail/network/retriever_methods/test_retriever.rb
+- lib/mail/parser_tools.rb
 - lib/mail/parsers.rb
 - lib/mail/parsers/address_lists_parser.rb
+- lib/mail/parsers/address_lists_parser.rl
 - lib/mail/parsers/content_disposition_parser.rb
+- lib/mail/parsers/content_disposition_parser.rl
 - lib/mail/parsers/content_location_parser.rb
+- lib/mail/parsers/content_location_parser.rl
 - lib/mail/parsers/content_transfer_encoding_parser.rb
+- lib/mail/parsers/content_transfer_encoding_parser.rl
 - lib/mail/parsers/content_type_parser.rb
+- lib/mail/parsers/content_type_parser.rl
 - lib/mail/parsers/date_time_parser.rb
+- lib/mail/parsers/date_time_parser.rl
 - lib/mail/parsers/envelope_from_parser.rb
+- lib/mail/parsers/envelope_from_parser.rl
 - lib/mail/parsers/message_ids_parser.rb
+- lib/mail/parsers/message_ids_parser.rl
 - lib/mail/parsers/mime_version_parser.rb
+- lib/mail/parsers/mime_version_parser.rl
 - lib/mail/parsers/phrase_lists_parser.rb
-- lib/mail/parsers/ragel.rb
-- lib/mail/parsers/ragel/common.rl
-- lib/mail/parsers/ragel/date_time.rl
-- lib/mail/parsers/ragel/parser_info.rb
-- lib/mail/parsers/ragel/ruby.rb
-- lib/mail/parsers/ragel/ruby/machines/address_lists_machine.rb
-- lib/mail/parsers/ragel/ruby/machines/address_lists_machine.rb.rl
-- lib/mail/parsers/ragel/ruby/machines/content_disposition_machine.rb
-- lib/mail/parsers/ragel/ruby/machines/content_disposition_machine.rb.rl
-- lib/mail/parsers/ragel/ruby/machines/content_location_machine.rb
-- lib/mail/parsers/ragel/ruby/machines/content_location_machine.rb.rl
-- lib/mail/parsers/ragel/ruby/machines/content_transfer_encoding_machine.rb
-- lib/mail/parsers/ragel/ruby/machines/content_transfer_encoding_machine.rb.rl
-- lib/mail/parsers/ragel/ruby/machines/content_type_machine.rb
-- lib/mail/parsers/ragel/ruby/machines/content_type_machine.rb.rl
-- lib/mail/parsers/ragel/ruby/machines/date_time_machine.rb
-- lib/mail/parsers/ragel/ruby/machines/date_time_machine.rb.rl
-- lib/mail/parsers/ragel/ruby/machines/envelope_from_machine.rb
-- lib/mail/parsers/ragel/ruby/machines/envelope_from_machine.rb.rl
-- lib/mail/parsers/ragel/ruby/machines/message_ids_machine.rb
-- lib/mail/parsers/ragel/ruby/machines/message_ids_machine.rb.rl
-- lib/mail/parsers/ragel/ruby/machines/mime_version_machine.rb
-- lib/mail/parsers/ragel/ruby/machines/mime_version_machine.rb.rl
-- lib/mail/parsers/ragel/ruby/machines/phrase_lists_machine.rb
-- lib/mail/parsers/ragel/ruby/machines/phrase_lists_machine.rb.rl
-- lib/mail/parsers/ragel/ruby/machines/rb_actions.rl
-- lib/mail/parsers/ragel/ruby/machines/received_machine.rb
-- lib/mail/parsers/ragel/ruby/machines/received_machine.rb.rl
-- lib/mail/parsers/ragel/ruby/parser.rb.rl.erb
+- lib/mail/parsers/phrase_lists_parser.rl
 - lib/mail/parsers/received_parser.rb
+- lib/mail/parsers/received_parser.rl
+- lib/mail/parsers/rfc2045_content_transfer_encoding.rl
+- lib/mail/parsers/rfc2045_content_type.rl
+- lib/mail/parsers/rfc2045_mime.rl
+- lib/mail/parsers/rfc2183_content_disposition.rl
+- lib/mail/parsers/rfc3629_utf8.rl
+- lib/mail/parsers/rfc5234_abnf_core_rules.rl
+- lib/mail/parsers/rfc5322.rl
+- lib/mail/parsers/rfc5322_address.rl
+- lib/mail/parsers/rfc5322_date_time.rl
+- lib/mail/parsers/rfc5322_lexical_tokens.rl
 - lib/mail/part.rb
 - lib/mail/parts_list.rb
 - lib/mail/utilities.rb