sisimai 4.22.3 → 4.22.4

data/lib/sisimai.rb

@@ -29,25 +29,22 @@ module Sisimai
       require 'sisimai/data'
       require 'sisimai/message'
 
-      rtype = nil
       input = argv1[:input] || nil
       field = argv1[:field] || []
       raise ' ***error: "field" accepts an array reference only' unless field.is_a? Array
 
       unless input
         # "input" did not specified, try to detect automatically.
-        rtype = argv0.class.to_s
-        if rtype == 'String' || rtype == 'IO'
+        if argv0.is_a?(::String) || argv0.is_a?(IO)
           # The argument may be a path to email
           input = 'email'
 
-        elsif rtype =~ /\A(?:Array|Hash)\z/
+        elsif argv0.is_a?(Array) || argv0.is_a?(Hash)
           # The argument may be a decoded JSON object
           input = 'json'
         end
       end
 
-      methodargv = {}
       delivered1 = argv1[:delivered] || false
       hookmethod = argv1[:hook] || nil
       bouncedata = []
@@ -77,14 +74,14 @@ module Sisimai
 
         if type == 'Array'
           # [ {...}, {...}, ... ]
-          argv0.each do |e|
+          while e = argv0.shift do
             list << e
           end
         else
           list << argv0
         end
 
-        list.each do |e|
+        while e = list.shift do
           methodargv = { data: e, hook: hookmethod, input: 'json' }
           mesg = Sisimai::Message.new(methodargv)
           next if mesg.void
@@ -95,7 +92,6 @@ module Sisimai
           next unless data
           bouncedata.concat(data) if data.size > 0
         end
-
       else
         # The value of "input" neither "email" nor "json"
         raise ' ***error: invalid value of "input"'
@@ -118,7 +114,7 @@ module Sisimai
       return nil unless argv0
 
       nyaan = Sisimai.make(argv0, argv1) || []
-      if RUBY_PLATFORM =~ /java/
+      if RUBY_PLATFORM.include?('java')
         # java-based ruby environment like JRuby.
         require 'jrjackson'
         jsonstring = JrJackson::Json.dump(nyaan)
@@ -132,18 +128,17 @@ module Sisimai
     # Parser engine list (MTA modules)
     # @return   [Hash]     Parser engine table
     def engine
-      names = %w|Bite::Email Bite::JSON ARF RFC3464 RFC3834|
       table = {}
 
-      names.each do |e|
-        r = 'Sisimai::' + e
+      %w[Bite::Email Bite::JSON ARF RFC3464 RFC3834].each do |e|
+        r = 'Sisimai::' << e
         require r.gsub('::', '/').downcase
 
-        if e =~ /\ABite::(?:Email|JSON)\z/
+        if e.start_with?('Bite::Email', 'Bite::JSON')
           # Sisimai::Bite::Email or Sisimai::Bite::JSON
           Module.const_get(r).send(:index).each do |ee|
             # Load and get the value of "description" from each module
-            rr = sprintf('Sisimai::%s::%s', e, ee)
+            rr = 'Sisimai::' << e + '::' << ee
             require rr.gsub('::', '/').downcase
             table[rr.to_sym] = Module.const_get(rr).send(:description)
           end
@@ -164,11 +159,10 @@ module Sisimai
       names = Sisimai::Reason.index
 
       # These reasons are not included in the results of Sisimai::Reason.index
-      names.concat(%w|Delivered Feedback Undefined Vacation|)
-
+      names.concat(%w[Delivered Feedback Undefined Vacation])
       names.each do |e|
         # Call .description() method of Sisimai::Reason::*
-        r = 'Sisimai::Reason::' + e
+        r = 'Sisimai::Reason::' << e
         require r.gsub('::', '/').downcase
         table[e.to_sym] = Module.const_get(r).send(:description)
       end
@@ -182,7 +176,7 @@ module Sisimai
     def match(argvs = '')
       return nil if argvs.empty?
       require 'sisimai/reason'
-      return Sisimai::Reason.match(argvs)
+      return Sisimai::Reason.match(argvs.downcase)
     end
   end
 end

data/lib/sisimai/address.rb

@@ -3,6 +3,12 @@ module Sisimai
   class Address
     # Imported from p5-Sisimail/lib/Sisimai/Address.pm
     require 'sisimai/rfc5322'
+    Indicators = {
+      :'email-address' => (1 << 0),    # <neko@example.org>
+      :'quoted-string' => (1 << 1),    # "Neko, Nyaan"
+      :'comment-block' => (1 << 2),    # (neko)
+    }
+
     @@undisclosed = 'libsisimai.org.invalid'
 
     # Return pseudo recipient or sender address
@@ -11,7 +17,7 @@ module Sisimai
     #                           nil when the argv1 is neither :r nor :s
     def self.undisclosed(argv1)
       return nil unless argv1
-      return nil unless %w|r s|.index(argv1.to_s)
+      return nil unless %w[r s].index(argv1.to_s)
 
       local = argv1 == :r ? 'recipient' : 'sender'
       return sprintf('undisclosed-%s-in-headers@%s', local, @@undisclosed)
@@ -49,46 +55,30 @@ module Sisimai
       #   find('Neko <neko(nyaan)@example.org>')
       #   #=> [{ address: 'neko@example.org', name: 'Neko', comment: '(nyaan)'}]
       return nil unless argv1
-      argv1 = argv1.gsub(/[\r\n]/, '')
 
+      characters = argv1.gsub(/[\r\n]/, '').split('')
       emailtable = { address: '', name: '', comment: '' }
       addrtables = []
       readbuffer = []
       readcursor = 0
-      delimiters = ['<', '>', '(', ')', '"', ',']
-      validemail = %r{(?>
-        (?:([^\s]+|["].+?["]))          # local part
-        [@]
-        (?:([^@\s]+|[0-9A-Za-z:\.]+))   # domain part
-        )
-      }x
-      indicators = {
-        :'email-address' => (1 << 0),    # <neko@example.org>
-        :'quoted-string' => (1 << 1),    # "Neko, Nyaan"
-        :'comment-block' => (1 << 2),    # (neko)
-      }
 
       v = emailtable  # temporary buffer
       p = ''          # current position
 
-      argv1.split('').each do |e|
+      while e = characters.shift do
         # Check each characters
-
-        if delimiters.detect { |r| r == e }
+        if %w[< > ( ) " ,].detect { |r| r == e }
           # The character is a delimiter character
           if e == ','
             # Separator of email addresses or not
-            if v[:address] =~ /\A[<].+[@].+[>]\z/
+            if v[:address].start_with?('<') && v[:address].end_with?('>') && v[:address].include?('@')
               # An email address has already been picked
-
-              if readcursor & indicators[:'comment-block'] > 0
+              if readcursor & Indicators[:'comment-block'] > 0
                 # The cursor is in the comment block (Neko, Nyaan)
-                v[:comment] += e
-
-              elsif readcursor & indicators[:'quoted-string'] > 0
+                v[:comment] << e
+              elsif readcursor & Indicators[:'quoted-string'] > 0
                 # "Neko, Nyaan"
-                v[:name] += e
-
+                v[:name] << e
               else
                 # The cursor is not in neither the quoted-string nor the comment block
                 readcursor = 0  # reset cursor position
@@ -98,7 +88,7 @@ module Sisimai
               end
             else
               # "Neko, Nyaan" <neko@nyaan.example.org> OR <"neko,nyaan"@example.org>
-              p.size > 0 ? (v[p] += e) : (v[:name] += e)
+              p.size > 0 ? (v[p] << e) : (v[:name] << e)
             end
             next
           end # End of if(',')
@@ -106,12 +96,11 @@ module Sisimai
           if e == '<'
             # <: The beginning of an email address or not
             if v[:address].size > 0
-              p.size > 0 ? (v[p] += e) : (v[:name] += e)
-
+              p.size > 0 ? (v[p] << e) : (v[:name] << e)
             else
               # <neko@nyaan.example.org>
-              readcursor |= indicators[:'email-address']
-              v[:address] += e
+              readcursor |= Indicators[:'email-address']
+              v[:address] << e
               p = :address
             end
             next
@@ -120,47 +109,45 @@ module Sisimai
 
           if e == '>'
             # >: The end of an email address or not
-            if readcursor & indicators[:'email-address'] > 0
+            if readcursor & Indicators[:'email-address'] > 0
               # <neko@example.org>
-              readcursor &= ~indicators[:'email-address']
-              v[:address] += e
+              readcursor &= ~Indicators[:'email-address']
+              v[:address] << e
               p = ''
             else
               # a comment block or a display name
-              p.size > 0 ? (v[:comment] += e) : (v[:name] += e)
+              p.size > 0 ? (v[:comment] << e) : (v[:name] << e)
             end
             next
           end # End of if('>')
 
           if e == '('
             # The beginning of a comment block or not
-            if readcursor & indicators[:'email-address'] > 0
+            if readcursor & Indicators[:'email-address'] > 0
               # <"neko(nyaan)"@example.org> or <neko(nyaan)@example.org>
-              if v[:address] =~ /["]/
+              if v[:address].include?('"')
                 # Quoted local part: <"neko(nyaan)"@example.org>
-                v[:address] += e
-
+                v[:address] << e
               else
                 # Comment: <neko(nyaan)@example.org>
-                readcursor |= indicators[:'comment-block']
-                v[:comment] += ' ' if v[:comment] =~ /[)]\z/
-                v[:comment] += e
+                readcursor |= Indicators[:'comment-block']
+                v[:comment] << ' ' if v[:comment].end_with?(')')
+                v[:comment] << e
                 p = :comment
               end
-            elsif readcursor & indicators[:'comment-block'] > 0
+            elsif readcursor & Indicators[:'comment-block'] > 0
               # Comment at the outside of an email address (...(...)
-              v[:comment] += ' ' if v[:comment] =~ /[)]\z/
-              v[:comment] += e
+              v[:comment] << ' ' if v[:comment].end_with?(')')
+              v[:comment] << e
 
-            elsif readcursor & indicators[:'quoted-string'] > 0
+            elsif readcursor & Indicators[:'quoted-string'] > 0
               # "Neko, Nyaan(cat)", Deal as a display name
-              v[:name] += e
-
+              v[:name] << e
             else
               # The beginning of a comment block
-              readcursor |= indicators[:'comment-block']
-              v[:comment] += ' ' if v[:comment] =~ /[)]\z/
-              v[:comment] += e
+              readcursor |= Indicators[:'comment-block']
+              v[:comment] << ' ' if v[:comment].end_with?(')')
+              v[:comment] << e
               p = :comment
             end
             next
@@ -168,27 +155,25 @@ module Sisimai
 
           if e == ')'
             # The end of a comment block or not
-            if readcursor & indicators[:'email-address'] > 0
+            if readcursor & Indicators[:'email-address'] > 0
               # <"neko(nyaan)"@example.org> OR <neko(nyaan)@example.org>
-              if v[:address] =~ /["]/
+              if v[:address].include?('"')
                 # Quoted string in the local part: <"neko(nyaan)"@example.org>
-                v[:address] += e
-
+                v[:address] << e
               else
                 # Comment: <neko(nyaan)@example.org>
-                readcursor &= ~indicators[:'comment-block']
-                v[:comment] += e
+                readcursor &= ~Indicators[:'comment-block']
+                v[:comment] << e
                 p = :address
               end
-            elsif readcursor & indicators[:'comment-block'] > 0
+            elsif readcursor & Indicators[:'comment-block'] > 0
               # Comment at the outside of an email address (...(...)
-              readcursor &= ~indicators[:'comment-block']
-              v[:comment] += e
+              readcursor &= ~Indicators[:'comment-block']
+              v[:comment] << e
               p = ''
-
             else
               # Deal as a display name
-              readcursor &= ~indicators[:'comment-block']
+              readcursor &= ~Indicators[:'comment-block']
               v[:name] = e
               p = ''
             end
@@ -199,15 +184,15 @@ module Sisimai
             # The beginning or the end of a quoted-string
             if p.size > 0
               # email-address or comment-block
-              v[p] += e
+              v[p] << e
             else
               # Display name
-              v[:name] += e
-              if readcursor & indicators[:'quoted-string'] > 0
+              v[:name] << e
+              if readcursor & Indicators[:'quoted-string'] > 0
                 # "Neko, Nyaan"
-                unless v[:name] =~ /\x5c["]\z/
+                unless v[:name].end_with?(%Q|\x5c"|)
                   # "Neko, Nyaan \"...
-                  readcursor &= ~indicators[:'quoted-string']
+                  readcursor &= ~Indicators[:'quoted-string']
                   p = ''
                 end
               end
@@ -216,7 +201,7 @@ module Sisimai
           end # End of if('"')
         else
           # The character is not a delimiter
-          p.size > 0 ? (v[p] += e) : (v[:name] += e)
+          p.size > 0 ? (v[p] << e) : (v[:name] << e)
           next
         end
       end
@@ -226,9 +211,9 @@ module Sisimai
         readbuffer << v
       else
         # No email address like <neko@example.org> in the argument
-        if cv = v[:name].match(validemail)
+        if cv = v[:name].match(/(?>(?:([^\s]+|["].+?["]))[@](?:([^@\s]+|[0-9A-Za-z:\.]+)))/)
           # String like an email address will be set to the value of "address"
-          v[:address] = sprintf('%s@%s', cv[1], cv[2])
+          v[:address] = cv[1] + '@' + cv[2]
 
         elsif Sisimai::RFC5322.is_mailerdaemon(v[:name])
           # Allow if the argument is MAILER-DAEMON
@@ -240,14 +225,14 @@ module Sisimai
           if cv = v[:address].match(/(.*)([(].+[)])(.*)/)
             # (nyaan)nekochan@example.org, nekochan(nyaan)cat@example.org or
             # nekochan(nyaan)@example.org
-            v[:address] = cv[1] + cv[3]
+            v[:address] = cv[1] << cv[3]
             v[:comment] = cv[2]
           end
           readbuffer << v
         end
       end
 
-      readbuffer.each do |e|
+      while e = readbuffer.shift do
         # The element must not include any character except from 0x20 to 0x7e.
         next if e[:address] =~ /[^\x20-\x7e]/
 
@@ -260,12 +245,12 @@ module Sisimai
         # except a domain part is an IP address like neko@[192.0.2.222]
         e[:address] = e[:address].sub(/\A[\[<{('`]/, '')
         e[:address] = e[:address].sub(/['`>})]\z/, '')
-        e[:address] = e[:address].sub(/\]\z/, '') unless e[:address] =~ /[@]\[[0-9A-Z:\.]+\]\z/i
+        e[:address] = e[:address].chomp(']') unless e[:address] =~ /[@]\[[0-9A-Za-z:\.]+\]\z/
 
         unless e[:address] =~ /\A["].+["][@]/
           # Remove double-quotations
           e[:address] = e[:address].sub(/\A["]/, '')
-          e[:address] = e[:address].sub(/["]\z/, '')
+          e[:address] = e[:address].chomp('"')
         end
 
         if addrs
@@ -275,14 +260,13 @@ module Sisimai
         else
           # Remove double-quotations, trailing spaces.
           [:name, :comment].each do |f|
-            e[f] = e[f].sub(/\A\s*/, '')
-            e[f] = e[f].sub(/\s*\z/, '')
+            e[f] = e[f].strip
           end
           e[:comment] = '' unless e[:comment] =~ /\A[(].+[)]/
 
           e[:name] = e[:name].squeeze(' ')     unless e[:name] =~ /\A["].+["]\z/
           e[:name] = e[:name].sub(/\A["]/, '') unless e[:name] =~ /\A["].+["][@]/
-          e[:name] = e[:name].sub(/["]\z/, '')
+          e[:name] = e[:name].chomp('"')
         end
         addrtables << e
       end
@@ -311,10 +295,9 @@ module Sisimai
     #   expand_verp('bounce+neko=example.org@example.org') #=> 'neko@example.org'
     def self.expand_verp(email)
       local = email.split('@', 2).first
-      verp0 = ''
 
       if cv = local.match(/\A[-_\w]+?[+](\w[-._\w]+\w)[=](\w[-.\w]+\w)\z/)
-        verp0 = sprintf('%s@%s', cv[1], cv[2])
+        verp0 = cv[1] + '@' + cv[2]
         return verp0 if Sisimai::RFC5322.is_emailaddress(verp0)
       else
         return ''
@@ -332,7 +315,7 @@ module Sisimai
       local = email.split('@')
       value = ''
       if cv = local[0].match(/\A([-_\w]+?)[+].+\z/)
-        value = sprintf('%s@%s', cv[1], local[1])
+        value = cv[1] + '@' + local[1]
       end
       return value
     end
@@ -389,12 +372,11 @@ module Sisimai
         end
         @user    = lpart
         @host    = dpart
-        @address = sprintf('%s@%s', lpart, dpart)
-
+        @address = lpart + '@' + dpart
       else
         # The argument does not include "@"
         return nil unless Sisimai::RFC5322.is_mailerdaemon(thing[:address])
-        return nil if thing[:address] =~ /[ ]/
+        return nil if thing[:address].include?(' ')
 
         # The argument does not include " "
         @user    = thing[:address]

data/lib/sisimai/arf.rb

@@ -6,16 +6,6 @@ module Sisimai
       require 'sisimai/bite/email'
       require 'sisimai/rfc5322'
 
-      Re0 =  {
-        :'content-type' => %r|multipart/mixed|,
-        :'report-type'  => %r/report-type=["]?feedback-report["]?/,
-        :'from'         => %r{(?:
-           staff[@]hotmail[.]com\z
-          |complaints[@]email-abuse[.]amazonses[.]com\z
-          )
-        }x,
-        :'subject'      => %r/complaint[ ]about[ ]message[ ]from[ ]/,
-      }.freeze
       # http://tools.ietf.org/html/rfc5965
       # http://en.wikipedia.org/wiki/Feedback_loop_(email)
       # http://en.wikipedia.org/wiki/Abuse_Reporting_Format
@@ -23,8 +13,10 @@ module Sisimai
       # Netease DMARC uses:    This is a spf/dkim authentication-failure report for an email message received from IP
       # OpenDMARC 1.3.0 uses:  This is an authentication failure report for an email message received from IP
       # Abusix ARF uses        this is an autogenerated email abuse complaint regarding your network.
-      Re1 = {
-        :begin  => %r{\A(?>
+      Indicators = Sisimai::Bite::Email.INDICATORS
+      StartingOf = { rfc822: ['Content-Type: message/rfc822', 'Content-Type: text/rfc822-headers'] }.freeze
+      MarkingsOf = {
+        message: %r{\A(?>
            [Tt]his[ ]is[ ].+[ ]email[ ]abuse[ ]report
           |[Tt]his[ ]is[ ](?:
              an[ ]autogenerated[ ]email[ ]abuse[ ]complaint
@@ -33,17 +25,13 @@ module Sisimai
             )
           )
         }x,
-        :rfc822 => %r[\AContent-Type: (:?message/rfc822|text/rfc822-headers)],
-        :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
       }.freeze
-      Indicators = Sisimai::Bite::Email.INDICATORS
       LongFields = Sisimai::RFC5322.LONGFIELDS
       RFC822Head = Sisimai::RFC5322.HEADERFIELDS
 
       def description; return 'Abuse Feedback Reporting Format'; end
       def smtpagent;   return 'FeedBack-Loop'; end
       def headerlist;  return []; end
-      def pattern;     return Re0; end
 
       # Email is a Feedback-Loop message or not
       # @param    [Hash] heads    Email header including "Content-Type", "From",
@@ -54,14 +42,19 @@ module Sisimai
         return false unless heads
         match = false
 
-        if heads['content-type'] =~ Re0[:'report-type']
+        if heads['content-type'] =~ /report-type=["]?feedback-report["]?/
           # Content-Type: multipart/report; report-type=feedback-report; ...
           match = true
 
-        elsif heads['content-type'] =~ Re0[:'content-type']
+        elsif heads['content-type'].include?('multipart/mixed')
           # Microsoft (Hotmail, MSN, Live, Outlook) uses its own report format.
           # Amazon SES Complaints bounces
-          if heads['from'] =~ Re0[:'from'] && heads['subject'] =~ Re0[:'subject']
+          mfrom = %r{(?:
+             staff[@]hotmail[.]com\z
+            |complaints[@]email-abuse[.]amazonses[.]com\z
+            )
+          }x
+          if heads['from'] =~ mfrom && heads['subject'].include?('complaint about message from ')
             # From: staff@hotmail.com
             # From: complaints@email-abuse.amazonses.com
             # Subject: complaint about message from 192.0.2.1
@@ -127,10 +120,10 @@ module Sisimai
         #      generator is using to generate the report.  The version number in
         #      this specification is set to "1".
         #
-        hasdivided.each do |e|
+        while e = hasdivided.shift do
           if readcursor.zero?
             # Beginning of the bounce message or delivery status part
-            if e =~ Re1[:begin]
+            if e =~ MarkingsOf[:message]
               readcursor |= Indicators[:deliverystatus]
               next
             end
@@ -138,7 +131,7 @@ module Sisimai
 
           if (readcursor & Indicators[:'message-rfc822']).zero?
             # Beginning of the original message part
-            if e =~ Re1[:rfc822]
+            if e.start_with?(StartingOf[:rfc822][0], StartingOf[:rfc822][1])
               readcursor |= Indicators[:'message-rfc822']
               next
             end
@@ -159,9 +152,7 @@ module Sisimai
 
             elsif cv = e.match(/\AFrom:[ ]*(.+)\z/)
               # Microsoft ARF: original sender.
-              if commondata[:from].empty?
-                commondata[:from] = Sisimai::Address.s3s4(cv[1])
-              end
+              commondata[:from] = Sisimai::Address.s3s4(cv[1]) if commondata[:from].empty?
 
             elsif cv = e.match(/\A([-0-9A-Za-z]+?)[:][ ]*(.+)\z/)
               # Get required headers only
@@ -172,16 +163,15 @@ module Sisimai
               next unless RFC822Head.key?(lhs)
 
               previousfn  = lhs
-              rfc822part += e + "\n"
+              rfc822part << e + "\n"
               rcptintext  = rhs if lhs == 'to'
 
-            elsif e =~ /\A[ \t]+/
+            elsif e.start_with?(' ', "\t")
               # Continued line from the previous line
-              rfc822part += e + "\n" if LongFields.key?(previousfn)
+              rfc822part << e + "\n" if LongFields.key?(previousfn)
               next if e.size > 0
-              rcptintext += e if previousfn == 'to'
+              rcptintext << e if previousfn == 'to'
             end
-
           else
             # Before "message/rfc822"
             next unless readcursor & Indicators[:deliverystatus] > 0
@@ -248,11 +238,9 @@ module Sisimai
             elsif cv = e.match(/\AOriginal-Mail-From:[ ]*(.+)\z/)
               # the header is optional and MUST NOT appear more than once.
               # Original-Mail-From: <somespammer@example.net>
-              if commondata[:from].empty?
-                commondata[:from] = Sisimai::Address.s3s4(cv[1])
-              end
+              commondata[:from] = Sisimai::Address.s3s4(cv[1]) if commondata[:from].empty?
 
-            elsif e =~ Re1[:begin]
+            elsif e =~ MarkingsOf[:message]
               # This is an email abuse report for an email message with the
               #   message-id of 0000-000000000000000000000000000000000@mx
               #   received from IP address 192.0.2.1 on
@@ -264,7 +252,7 @@ module Sisimai
 
         if arfheaders[:feedbacktype] == 'auth-failure' && arfheaders[:authres]
           # Append the value of Authentication-Results header
-          commondata[:diagnosis] += ' ' + arfheaders[:authres]
+          commondata[:diagnosis] << ' ' << arfheaders[:authres]
         end
 
         if recipients.zero?
@@ -276,18 +264,15 @@ module Sisimai
 
         unless rfc822part =~ /\bFrom: [^ ]+[@][^ ]+\b/
           # There is no "From:" header in the original message
-          if commondata[:from].size > 0
-            # Append the value of "Original-Mail-From" value as a sender address.
-            rfc822part += sprintf("From: %s\n", commondata[:from])
-          end
+          # Append the value of "Original-Mail-From" value as a sender address.
+          rfc822part << 'From: ' << commondata[:from] + "\n" if commondata[:from].size > 0
         end
 
         if cv = mhead['subject'].match(/complaint about message from (\d{1,3}[.]\d{1,3}[.]\d{1,3}[.]\d{1,3})/)
           # Microsoft ARF: remote host address.
           arfheaders[:rhost] = cv[1]
-          commondata[:diagnosis] = sprintf(
-            'This is a Microsoft email abuse report for an email message received from IP %s on %s',
-            arfheaders[:rhost], mhead['date'])
+          commondata[:diagnosis] = 
+            'This is a Microsoft email abuse report for an email message received from IP' << arfheaders[:rhost] + ' on ' << mhead['date']
         end
 
         dscontents.map do |e|