mail-jdec 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40591766001e935ee0d7788949ffeb1bc1169f15648e12b2393c1e493d73fbb5
-  data.tar.gz: b2a30e1f237534e3f4ad48580d9696c7e51865230c0391282e83bcce2481b644
+  metadata.gz: 880f1f6ecdd0e34f0844fe398d29bfcb13587c5a93aef0b2bcd42e1a7dbb6319
+  data.tar.gz: 9a135d5433d8cb1af49178d9e0a80a2884a1955d59f5391c0beac9417d343715
 SHA512:
-  metadata.gz: f20fb45790b61b679be860b6460a1db9d4ae4a04485a58de95fd3f17a6790be351d5ba37a7095b55556032950f585135dd31194c66ce492134e037386c0ca697
-  data.tar.gz: dc3a1c3a3a5c77b4fa56f27ef20521bdf0559d1a58cceb8f425b1949a9a9aa523b75488a6dd772f0e11f39cd0cc131a5476b11df054ce9d5b5beb6bcddf0aaad
+  metadata.gz: 654dde35ada8044faf9cd06addb0876c27604a32cc7463055615a7684e6021e574a40686c24660979ec71ade8b7c8cffa316fffa1cadb8b54be95b319fbdcdce
+  data.tar.gz: ee99673c7b744c5a880e4e1a752d4afebc5784a6850f1e2dfbc31bdc3e88b7d082d4e985cb51bbdb38c23c12116e73d4c4f7a128730647811e25b3e105f944f4

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # CHANGELOG
 
+## 1.0.4
+
+* Sanitize some wrong parameters for content type and content disposition.
+* Sanitize unescaped characters for RFC2231 filename.
+* Strip null bytes from decoded string.
+* Decode unicode-1-1-utf-7.
+* Fallback parser errors for date and addresses.
+* Fallback unknown encoding errors for body.
+* Sort filename parameters by counter number.
+
 ## 1.0.3
 
 * Fix decoding of quoted printable with space.

data/lib/mail/jdec/body_patch.rb

@@ -0,0 +1,19 @@
+module Mail
+  module Jdec
+    module BodyPatch
+      def decoded
+        super
+      rescue Mail::UnknownEncodingType => e
+        if Jdec.enabled?
+          Jdec::Decoder.force_utf8(raw_source)
+        else
+          raise e
+        end
+      end
+    end
+  end
+end
+
+unless Mail::Body.included_modules.include?(Mail::Jdec::BodyPatch)
+  Mail::Body.prepend Mail::Jdec::BodyPatch
+end

data/lib/mail/jdec/decoder.rb

@@ -17,6 +17,16 @@ module Mail
         def force_utf8(str)
           str.dup.force_encoding('utf-8').encode('utf-8', invalid: :replace, undef: :replace)
         end
+
+        def decode_utf7(str)
+          str.gsub(/\+([^-]+)?-/n) do
+            if $1
+              ($1.tr(",", "/") + "===").unpack("m")[0].encode(Encoding::UTF_8, Encoding::UTF_16BE)
+            else
+              '+'
+            end
+          end
+        end
       end
     end
 

data/lib/mail/jdec/elements/content_disposition_element_patch.rb

@@ -2,21 +2,37 @@ module Mail
   module Jdec
     module ContentDispositionElementPatch
       def initialize(string)
+        if Jdec.enabled?
+          # Remove extra trailing semicolon
+          string = string.gsub(/;+$/, '')
+          # Handles filename=test
+          string = string.gsub(/filename\s*=\s*([^"]+?)\s*(;|$)/im) { %Q|filename="#{$1}"#{$2}| }
+          # Handles filename=""test""
+          string = string.gsub(/filename\s*=\s*"+([^"]+?)"+\s*(;|$)/im) { %Q|filename="#{$1}"#{$2}| }
+          # Escape tspecial chars in RFC2231 filename
+          string = string.gsub(/filename\*(\d*)(\*?)\s*=\s*(\S+?)'(\S*)'(\S+)(;|$)/i) { %Q|filename*#{$1}#{$2}=#{$3}'#{$4}'#{Escaper.escape($5)}#{$6}| }
+          string = string.gsub(/filename\*(\d*)(\*?)\s*=\s*(\S+)(;|$)/i) { %Q|filename*#{$1}#{$2}=#{Escaper.escape($3)}#{$4}| }
+        end
+
         super
       rescue Mail::Field::ParseError => e
         if Jdec.enabled?
-          value = Jdec::Decoder.force_utf8(string)
-          if (matched = value.match(/^\s*attachment\s*;\s*(.+)/im))
-            @disposition_type = 'attachment'
-            @parameters = [{ filename: matched[1].gsub(/(\r\n|\r|\n)\s/, '') }]
-          else
-            raise e
-          end
+          @disposition_type = 'attachment'
+          @parameters = ['filename' => Jdec::Decoder.force_utf8(string)]
         else
           raise e
         end
       end
     end
+
+    module Escaper
+      def self.escape(str)
+        require 'cgi'
+        str.gsub(/[#{Regexp.escape(%Q|()<>@,;:\\"/[]?=|)}]/) do |c|
+          CGI.escape(c)
+        end
+      end
+    end
   end
 end
 

data/lib/mail/jdec/elements/content_type_element_patch.rb

@@ -3,11 +3,29 @@ module Mail
     module ContentTypeElementPatch
       def initialize(string)
         if Jdec.enabled?
-          # Handles ; name=
-          string = string.gsub(/^\s*;?\s*name=(.+)$/im) { "application/octet-stream; name=#{$1}" }
+          # Remove extra trailing semicolon
+          string = string.gsub(/;+$/, '')
+          # Remove unnecessary space
+          string = string.gsub(/;\s*charset\s+=\s+/i, '; charset=')
+          # Handles name=test
+          string = string.gsub(/name\s*=\s*([^"]+?)\s*(;|$)/im) { %Q|name="#{$1}"#{$2}| }
+          # Handles name=""test""
+          string = string.gsub(/name\s*=\s*"+([^"]+?)"+\s*(;|$)/im) { %Q|name="#{$1}"#{$2}| }
+          # Handles text; name=test
+          string = string.gsub(/^\s*([^\/]+)\s*;\s*name\s*=\s*(.+)$/im) { "#{$1}/unknown; name=#{$2}" }
+          # Handles ; name=test
+          string = string.gsub(/^\s*;?\s*name\s*=\s*(.+)$/im) { "application/octet-stream; name=#{$1}" }
         end
 
         super
+      rescue Mail::Field::ParseError => e
+        if Jdec.enabled?
+          @main_type = 'application'
+          @sub_type = 'octet-stream'
+          @parameters = ['name' => Jdec::Decoder.force_utf8(string)]
+        else
+          raise e
+        end
       end
     end
   end

data/lib/mail/jdec/fields/address_field_patch.rb

@@ -0,0 +1,27 @@
+module Mail
+  module Jdec
+    module AddressFieldPatch
+      def parse(val = value)
+        super
+      rescue Mail::Field::ParseError => e
+        if Jdec.enabled?
+          @errors = [name, val, e]
+          @address_list = AddressList.new('')
+        else
+          raise e
+        end
+      end
+
+      def errors
+        @errors
+      end
+    end
+  end
+end
+
+klasses = ObjectSpace.each_object(Class).select { |klass| klass < Mail::CommonAddress }
+klasses.each do |klass|
+  unless klass.included_modules.include?(Mail::Jdec::AddressFieldPatch)
+    klass.prepend Mail::Jdec::AddressFieldPatch
+  end
+end

data/lib/mail/jdec/fields/date_field_patch.rb

@@ -0,0 +1,54 @@
+module Mail
+  module Jdec
+    module DateFieldPatch
+      def date_time
+        super
+      rescue ArgumentError, Mail::Field::ParseError => e
+        if Jdec.enabled?
+          begin
+            require 'time'
+            Time.parse(value).to_datetime
+          rescue ArgumentError => e
+            nil
+          end
+        else
+          raise e
+        end
+      end
+    end
+  end
+end
+
+module Mail
+  class DateField < StructuredField
+    def initialize(value = nil, charset = nil)
+      super(CAPITALIZED_FIELD, self.class.normalize_datetime(value), charset)
+    end
+
+    def self.normalize_datetime(string)
+      if Utilities.blank?(string)
+        datetime = ::DateTime.now
+      else
+        stripped = string.to_s.gsub(/\(.*?\)/, '').squeeze(' ')
+        begin
+          datetime = ::DateTime.parse(stripped)
+        rescue ArgumentError => e
+          raise unless 'invalid date' == e.message
+        end
+      end
+
+      if datetime
+        datetime.strftime('%a, %d %b %Y %H:%M:%S %z')
+      else
+        string
+      end
+    end
+  end
+end
+
+klasses = ObjectSpace.each_object(Class).select { |klass| klass < Mail::CommonDate }
+klasses.each do |klass|
+  unless klass.included_modules.include?(Mail::Jdec::DateFieldPatch)
+    klass.prepend Mail::Jdec::DateFieldPatch
+  end
+end

data/lib/mail/jdec/fields/parameter_hash_patch.rb

@@ -0,0 +1,59 @@
+# encoding: utf-8
+# frozen_string_literal: true
+module Mail
+
+  # ParameterHash is an intelligent Hash that allows you to add
+  # parameter values including the MIME extension paramaters that
+  # have the name*0="blah", name*1="bleh" keys, and will just return
+  # a single key called name="blahbleh" and do any required un-encoding
+  # to make that happen
+  # Parameters are defined in RFC2045, split keys are in RFC2231
+
+  class ParameterHash < IndifferentHash
+
+    include Mail::Utilities
+
+    def [](key_name)
+      key_pattern = Regexp.escape(key_name.to_s)
+      pairs = []
+      exact = nil
+      each do |k,v|
+        if k =~ /^#{key_pattern}(\*|$)/i
+          if $1 == ASTERISK
+            pairs << [k, v]
+          else
+            exact = k
+          end
+        end
+      end
+      if pairs.empty? # Just dealing with a single value pair
+        super(exact || key_name)
+      else # Dealing with a multiple value pair or a single encoded value pair
+        string = pairs.sort_by { |a| a.first.to_s =~ /^([^*]+)\*(\d+)/ ? [$1, $2.to_i] : [a.first.to_s, 0] }.map { |v| v.last }.join('')
+        if mt = string.match(/([\w\-]+)?'(\w\w)?'(.*)/)
+          string = mt[3]
+          encoding = mt[1]
+        else
+          encoding = nil
+        end
+        Mail::Encodings.param_decode(string, encoding)
+      end
+    end
+
+    def encoded
+      map.sort_by { |a| a.first.to_s =~ /^([^*]+)\*(\d+)/ ? [$1, $2.to_i] : [a.first.to_s, 0] }.map! do |key_name, value|
+        unless value.ascii_only?
+          value = Mail::Encodings.param_encode(value)
+          key_name = "#{key_name}*"
+        end
+        %Q{#{key_name}=#{quote_token(value)}}
+      end.join(";\r\n\s")
+    end
+
+    def decoded
+      map.sort_by { |a| a.first.to_s =~ /^([^*]+)\*(\d+)/ ? [$1, $2.to_i] : [a.first.to_s, 0] }.map! do |key_name, value|
+        %Q{#{key_name}=#{quote_token(value)}}
+      end.join("; ")
+    end
+  end
+end

data/lib/mail/jdec/ruby_1_9_patch.rb

@@ -11,6 +11,21 @@ module Mail
         end
         super
       end
+
+      def transcode_charset(str, from_encoding, to_encoding = Encoding::UTF_8)
+        if Jdec.enabled?
+          case from_encoding.to_s.downcase
+          when 'unicode-1-1-utf-7'
+            str = Decoder.decode_utf7(str).encode(to_encoding, undef: :replace, invalid: :replace)
+          else
+            str = super
+          end
+          str.strip! if to_encoding.to_s.downcase == 'utf-8'
+          str
+        else
+          super
+        end
+      end
     end
   end
 end

data/lib/mail/jdec/version.rb

@@ -1,5 +1,5 @@
 module Mail
   module Jdec
-    VERSION = '1.0.3'
+    VERSION = '1.0.4'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mail-jdec
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Yoshikazu Kaneta
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-06 00:00:00.000000000 Z
+date: 2019-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail
@@ -99,11 +99,15 @@ files:
 - bin/setup
 - gemfiles/mail27.gemfile
 - lib/mail/jdec.rb
+- lib/mail/jdec/body_patch.rb
 - lib/mail/jdec/decoder.rb
 - lib/mail/jdec/detector.rb
 - lib/mail/jdec/elements/content_disposition_element_patch.rb
 - lib/mail/jdec/elements/content_type_element_patch.rb
 - lib/mail/jdec/encodings_patch.rb
+- lib/mail/jdec/fields/address_field_patch.rb
+- lib/mail/jdec/fields/date_field_patch.rb
+- lib/mail/jdec/fields/parameter_hash_patch.rb
 - lib/mail/jdec/fields/references_field_patch.rb
 - lib/mail/jdec/fields/structured_field_patch.rb
 - lib/mail/jdec/fields/unstructured_field_patch.rb