mail-sanitizer 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 658fd411823dcad053eede5f1c678558c216e60a3719c6e027051594734031f4
-  data.tar.gz: ed9a14a70b8d9453f5c0ba23959d0c85926d369f1daf67e0db8025074bcfd164
+  metadata.gz: 5db6a4447245ea29e1e3926f92f7d8f6b0a12859077c5ce3a5a1f835a60de426
+  data.tar.gz: 7c63c81f47f55c08c369261ae5ca23e09d073b8e5b22d7b0f72187b782f8d76a
 SHA512:
-  metadata.gz: acfa6e0931da027d2c016735f650f809f1e90c89596c41cc03be9c1052d2b58818482e75450b4cd2f81a84453e6e0fd629bd33ef49576853aede72b699ff5f51
-  data.tar.gz: 6254de9db9f514f511fa9b2df7947a819409faea88a1ac2228a308cb8407479f4d5c4d438604a24e2554c7058b15abf2d75c7db6f84898c822a45e432d758f3a
+  metadata.gz: 46b1d1bf9e1095c29229b17d43394ed60f1087004e6892b0a35828fb517de2ca4e4374afec404cbadcc993df73d511604e304b1504196da163588576434b45bc
+  data.tar.gz: 3ce2b4ab7c2714fe91468eb1d5b6f121318e801e6017a19e922eadd2b4e5455e709211372c369903b7d3ee3ec89627ce3b825f01929ddcdcf4fcc7b6db9a2e71

data/lib/mail/sanitizer/constant.rb

@@ -2,7 +2,7 @@ module Mail
   module Sanitizer
     class Constant
       QUOT_SYMBOL_PATTERN = /^>/
-      QUOT_PATTERN = /wrote:|-originalmessage-|-forwardedmessage-|forwardedby/
+      QUOT_PATTERN = /wrote:|-originalmessage-|-forwardedmessage-|forwardedby|beginforwardedmessage/
       QUOT_DATETIME_PATTERN = /^(on|at)/
       QUOT_KEYWORD_SET = [
         ['from:', 'sent:', 'to:', 'subject:'],

data/lib/mail/sanitizer/sanitizer.rb

@@ -7,6 +7,7 @@ module Mail
 
       def initialize(body)
         @src = body.dup
+        @src = @src.encode('utf-8', invalid: :replace, undef: :replace) unless @src.nil?
         @sanitized_body = nil
         @quot = nil
         @sign = nil
@@ -48,14 +49,18 @@ module Mail
         numrow = lines.size
 
         line_types = Array.new(numrow, :normal)
-        sign = false
+        sign_index = nil
         look_sign_symbol = false
         lines.each_with_index.reverse_each do |line, i|
           if line =~ Mail::Sanitizer::Constant::QUOT_SYMBOL_PATTERN
             line_types[i] = :quot
           elsif line =~ Mail::Sanitizer::Constant::SIGN_PATTERN
-            line_types[i] = :sign
-            sign = !sign
+            if sign_index.nil?
+              sign_index = i
+            else
+              line_types[i, sign_index - i + 1] = Array.new(sign_index - i + 1, :sign)
+              sign_index = nil
+            end
           elsif line =~ Mail::Sanitizer::Constant::SIGN_SYMBOL_PATTERN
             next if look_sign_symbol
             if line_types[i..-1].include?(:quot)
@@ -67,8 +72,6 @@ module Mail
             look_sign_symbol = true
           elsif line =~ /^[[:space:]]*$/
             line_types[i] = nil
-          elsif sign
-            line_types[i] = :sign
           end
         end
 
@@ -93,10 +96,9 @@ module Mail
             break if keywords.values.all?
           end
 
-          downcased_line = Mail::Sanitizer::String.downcase(line)
-          if keywords.values.all? || downcased_line =~ Mail::Sanitizer::Constant::QUOT_PATTERN ||
-             (downcased_line =~ Mail::Sanitizer::Constant::QUOT_DATETIME_PATTERN && Mail::Sanitizer::String.include_datetime?(line)) ||
-             (Mail::Sanitizer::String.include_datetime?(line) && Mail::Sanitizer::String.include_email_address?(line))
+          if keywords.values.all? ||
+             Mail::Sanitizer::String.quot_pattern?(line) ||
+             Mail::Sanitizer::String.include_datetime_and_email_address?(line)
             line_types[i, numrow - i] = Array.new(numrow - i, :quot) unless line_types[i] == :quot
             break
           end

data/lib/mail/sanitizer/string.rb

@@ -1,7 +1,7 @@
 module Mail
   module Sanitizer
     class String
-      ADDRESS_REGEXP = /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i
+      ADDRESS_REGEXP = /([a-zA-Z0-9_!#$%&`'"*+\-{|}~^\/=?\.]+@[a-zA-Z0-9][a-zA-Z0-9\.\-]+)/
       SP    = "[[:space:]]"
       DIGIT = "[0-9０-９]"
       YEAR  = "(#{DIGIT}{4})#{SP}*年"
@@ -17,13 +17,24 @@ module Mail
 
       class << self
         def split_line(str)
-          str.split(/[\r\n]/)
+          str.split(/\r\n|\r|\n/)
         end
 
         def downcase(str)
           str.downcase.gsub(/[[:space:]]/, '')
         end
 
+        def quot_pattern?(str)
+          s = downcase(str)
+          (s =~ Mail::Sanitizer::Constant::QUOT_PATTERN) ||
+          (s =~ Mail::Sanitizer::Constant::QUOT_DATETIME_PATTERN && Mail::Sanitizer::String.include_datetime?(str))
+        end
+
+        def include_datetime_and_email_address?(str)
+          s = Mail::Sanitizer::String.remove_email_address(str)
+          Mail::Sanitizer::String.include_email_address?(str) && Mail::Sanitizer::String.include_datetime?(s)
+        end
+
         def include_datetime?(str)
           str = replace_jp_datetime(str)
           DateTime.parse(str)
@@ -33,13 +44,11 @@ module Mail
         end
 
         def include_email_address?(str)
-          texts = str.split(/#{SP}/)
-          texts.each do |text|
-            text.strip!
-            text.gsub!(/^\(|^<|[^[:alpha:]]*$/, '')
-            return true if ADDRESS_REGEXP === text
-          end
-          return false
+          ADDRESS_REGEXP.match?(str)
+        end
+
+        def remove_email_address(str)
+          str.gsub(ADDRESS_REGEXP, '')
         end
 
         def replace_jp_datetime(str)

data/lib/mail/sanitizer/version.rb

@@ -1,5 +1,5 @@
 module Mail
   module Sanitizer
-    VERSION = "0.3.0"
+    VERSION = "0.4.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mail-sanitizer
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - MasatoMiyoshi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-05 00:00:00.000000000 Z
+date: 2022-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.3.3
 signing_key: 
 specification_version: 4
 summary: A simple sanitizer for mail bodies