sisimai 4.22.3-java → 4.22.4-java

data/lib/sisimai/reason/vacation.rb

@@ -6,9 +6,7 @@ module Sisimai
       # Imported from p5-Sisimail/lib/Sisimai/Reason/Vacation.pm
       class << self
         def text; return 'vacation'; end
-        def description
-          return 'Email replied automatically due to a recipient is out of office'
-        end
+        def description; return 'Email replied automatically due to a recipient is out of office'; end
 
         # Try to match that the given text and regular expressions
         # @param    [String] argv1  String to be matched with regular expressions
@@ -17,13 +15,13 @@ module Sisimai
         def match(argv1)
           return nil unless argv1
           regex = %r{(?>
-             I[ ]am[ ](?:
+             i[ ]am[ ](?:
                away[ ](?:on[ ]vacation|until)
               |out[ ]of[ ]the[ ]office
               )
-            |I[ ]will[ ]be[ ]traveling[ ]for[ ]work[ ]on
+            |i[ ]will[ ]be[ ]traveling[ ]for[ ]work[ ]on
           )
-          }ix
+          }x
 
           return true if argv1 =~ regex
           return false

data/lib/sisimai/reason/virusdetected.rb

@@ -17,9 +17,7 @@ module Sisimai
       # Imported from p5-Sisimail/lib/Sisimai/Reason/VirusDetected.pm
       class << self
         def text; return 'virusdetected'; end
-        def description
-          return 'Email rejected due to a virus scanner on a destination host'
-        end
+        def description; return 'Email rejected due to a virus scanner on a destination host'; end
 
         # Try to match that the given text and regular expressions
         # @param    [String] argv1  String to be matched with regular expressions
@@ -31,10 +29,10 @@ module Sisimai
           regex = %r{(?>
              it[ ]has[ ]a[ ]potentially[ ]executable[ ]attachment
             |the[ ]message[ ]was[ ]rejected[ ]because[ ]it[ ]contains[ ]prohibited[ ]virus[ ]or[ ]spam[ ]content
-            |This[ ]form[ ]of[ ]attachment[ ]has[ ]been[ ]used[ ]by[ ]recent[ ]viruses[ ]or[ ]other[ ]malware
-            |Your[ ]message[ ]was[ ]infected[ ]with[ ]a[ ]virus
+            |this[ ]form[ ]of[ ]attachment[ ]has[ ]been[ ]used[ ]by[ ]recent[ ]viruses[ ]or[ ]other[ ]malware
+            |your[ ]message[ ]was[ ]infected[ ]with[ ]a[ ]virus
             )
-          }ix
+          }x
 
           return true if argv1 =~ regex
           return false

data/lib/sisimai/rfc2606.rb

@@ -14,8 +14,7 @@ module Sisimai
         return false unless argv.is_a?(::String)
 
         return true  if argv =~ /[.](?:test|example|invalid|localhost)\z/
-        return true  if argv =~ /example[.](?:com|net|org)\z/
-        return true  if argv =~ /example[.]jp\z/
+        return true  if argv =~ /example[.](?:com|net|org|jp)\z/
         return true  if argv =~ /example[.](?:ac|ad|co|ed|go|gr|lg|ne|or)[.]jp\z/
         return false
       end

data/lib/sisimai/rfc3464.rb

@@ -6,46 +6,30 @@ module Sisimai
       require 'sisimai/bite/email'
 
       # http://tools.ietf.org/html/rfc3464
-      Re0 = {
-        :'from'        => %r/\b(?:postmaster|mailer-daemon|root)[@]/i,
-        :'return-path' => %r/(?:[<][>]|mailer-daemon)/i,
-        :'subject'     => %r{(?>
-           delivery[ ](?:failed|failure|report)
-          |failure[ ]notice
-          |mail[ ](?:delivery|error)
-          |non[-]delivery
-          |returned[ ]mail
-          |undeliverable[ ]mail
-          |Warning:[ ]
-          )
-        }xi,
-      }.freeze
-      Re1 = {
-        :begin   => %r{\A(?>
-           Content-Type:[ ]*(?:
+      Indicators = Sisimai::Bite::Email.INDICATORS
+      MarkingsOf = {
+        message: %r{\A(?>
+           content-type:[ ]*(?:
              message/delivery-status
             |message/disposition-notification
             |text/plain;[ ]charset=
             )
-          |The[ ]original[ ]message[ ]was[ ]received[ ]at[ ]
-          |This[ ]report[ ]relates[ ]to[ ]your[ ]message
-          |Your[ ]message[ ]was[ ]not[ ]delivered[ ]to[ ]the[ ]following[ ]recipients
+          |the[ ]original[ ]message[ ]was[ ]received[ ]at[ ]
+          |this[ ]report[ ]relates[ ]to[ ]your[ ]message
+          |your[ ]message[ ]was[ ]not[ ]delivered[ ]to[ ]the[ ]following[ ]recipients
           )
-        }xi,
-        :endof   => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
-        :rfc822  => %r{\A(?>
-           Content-Type:[ ]*(?:message/rfc822|text/rfc822-headers)
-          |Return-Path:[ ]*[<].+[>]\z
+        }x,
+        rfc822:  %r{\A(?>
+           content-type:[ ]*(?:message/rfc822|text/rfc822-headers)
+          |return-path:[ ]*[<].+[>]\z
           )\z
-        }xi,
-        :error   => %r/\A(?:[45]\d\d[ \t]+|[<][^@]+[@][^@]+[>]:?[ \t]+)/i,
-        :command => %r/[ ](RCPT|MAIL|DATA)[ ]+command\b/,
+        }x,
+        error:   %r/\A(?:[45]\d\d[ \t]+|[<][^@]+[@][^@]+[>]:?[ \t]+)/,
+        command: %r/[ ](RCPT|MAIL|DATA)[ ]+command\b/,
       }.freeze
-      Indicators = Sisimai::Bite::Email.INDICATORS
 
       def description; 'Fallback Module for MTAs'; end
       def smtpagent;   'RFC3464'; end
-      def pattern;     return Re0; end
       def headerlist;  return []; end
 
       # Detect an error for RFC3464
@@ -82,14 +66,15 @@ module Sisimai
         }
         v = nil
 
-        hasdivided.each do |e|
+        while e = hasdivided.shift do
           # Save the current line for the next loop
           havepassed << e
+          d = e.downcase
           p = havepassed[-2]
 
           if readcursor.zero?
             # Beginning of the bounce message or delivery status part
-            if e =~ Re1[:begin]
+            if d =~ MarkingsOf[:message]
               readcursor |= Indicators[:deliverystatus]
               next
             end
@@ -97,7 +82,7 @@ module Sisimai
 
           if (readcursor & Indicators[:'message-rfc822']).zero?
             # Beginning of the original message part
-            if e =~ Re1[:rfc822]
+            if d =~ MarkingsOf[:rfc822]
               readcursor |= Indicators[:'message-rfc822']
               next
             end
@@ -111,15 +96,14 @@ module Sisimai
               next
             end
             rfc822list << e
-
           else
             # Before "message/rfc822"
             next unless readcursor & Indicators[:deliverystatus] > 0
             next unless e.size > 0
 
             v = dscontents[-1]
-            if cv = e.match(/\A(?:[Ff]inal|[Oo]riginal)-[Rr]ecipient:[ ]*(?:RFC|rfc)822;[ ]*([^ ]+)\z/) ||
-                    e.match(/\A(?:[Ff]inal|[Oo]riginal)-[Rr]ecipient:[ ]*([^ ]+)\z/)
+            if cv = e.match(/\A(?:Final|Original)-Recipient:[ ]*(?:RFC|rfc)822;[ ]*([^ ]+)\z/) ||
+                    e.match(/\A(?:Final|Original)-Recipient:[ ]*([^ ]+)\z/)
               # 2.3.2 Final-Recipient field
               #   The Final-Recipient field indicates the recipient for which this set
               #   of per-recipient fields applies.  This field MUST be present in each
@@ -149,17 +133,15 @@ module Sisimai
               v['recipient'] = y
               recipients += 1
 
-            elsif cv = e.match(/\A[Xx]-[Aa]ctual-[Rr]ecipient:[ ]*(?:RFC|rfc)822;[ ]*([^ ]+)\z/)
+            elsif cv = e.match(/\AX-Actual-Recipient:[ ]*(?:RFC|rfc)822;[ ]*([^ ]+)\z/)
               # X-Actual-Recipient:
               if cv[1] =~ /[ \t]+/
                 # X-Actual-Recipient: RFC822; |IFS=' ' && exec procmail -f- || exit 75 ...
-
               else
                 # X-Actual-Recipient: rfc822; kijitora@neko.example.jp
                 v['alias'] = cv[1]
               end
-
-            elsif cv = e.match(/\A[Aa]ction:[ ]*(.+)\z/)
+            elsif cv = e.match(/\AAction:[ ]*(.+)\z/)
               # 2.3.3 Action field
               #   The Action field indicates the action performed by the Reporting-MTA
               #   as a result of its attempt to deliver the message to this recipient
@@ -179,8 +161,7 @@ module Sisimai
                 # failed (bad destination mailbox address)
                 v['action'] = cv[1]
               end
-
-            elsif cv = e.match(/\A[Ss]tatus:[ ]*(\d[.]\d+[.]\d+)/)
+            elsif cv = e.match(/\AStatus:[ ]*(\d[.]\d+[.]\d+)/)
               # 2.3.4 Status field
               #   The per-recipient Status field contains a transport-independent
               #   status code that indicates the delivery status of the message to that
@@ -193,11 +174,11 @@ module Sisimai
               #       status-code = DIGIT "." 1*3DIGIT "." 1*3DIGIT
               v['status'] = cv[1]
 
-            elsif cv = e.match(/\A[Ss]tatus:[ ]*(\d+[ ]+.+)\z/)
+            elsif cv = e.match(/\AStatus:[ ]*(\d+[ ]+.+)\z/)
               # Status: 553 Exceeded maximum inbound message size
               v['alterrors'] = cv[1]
 
-            elsif cv = e.match(/\A[Rr]emote-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
+            elsif cv = e.match(/\ARemote-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
               # 2.3.5 Remote-MTA field
               #   The value associated with the Remote-MTA DSN field is a printable
               #   ASCII representation of the name of the "remote" MTA that reported
@@ -213,7 +194,7 @@ module Sisimai
               #   involved in the attempted delivery of the message to that recipient.
               v['rhost'] = cv[1].downcase
 
-            elsif cv = e.match(/\A[Ll]ast-[Aa]ttempt-[Dd]ate:[ ]*(.+)\z/)
+            elsif cv = e.match(/\ALast-Attempt-Date:[ ]*(.+)\z/)
               # 2.3.7 Last-Attempt-Date field
               #   The Last-Attempt-Date field gives the date and time of the last
               #   attempt to relay, gateway, or deliver the message (whether successful
@@ -227,9 +208,8 @@ module Sisimai
               #
               #       last-attempt-date-field = "Last-Attempt-Date" ":" date-time
               v['date'] = cv[1]
-
             else
-              if cv = e.match(/\A[Dd]iagnostic-[Cc]ode:[ ]*(.+?);[ ]*(.+)\z/)
+              if cv = e.match(/\ADiagnostic-Code:[ ]*(.+?);[ ]*(.+)\z/)
                 # 2.3.6 Diagnostic-Code field
                 #   For a "failed" or "delayed" recipient, the Diagnostic-Code DSN field
                 #   contains the actual diagnostic code issued by the mail transport.
@@ -242,18 +222,17 @@ module Sisimai
                 v['spec'] = cv[1].upcase
                 v['diagnosis'] = cv[2]
 
-              elsif cv = e.match(/\A[Dd]iagnostic-[Cc]ode:[ ]*(.+)\z/)
+              elsif cv = e.match(/\ADiagnostic-Code:[ ]*(.+)\z/)
                 # No value of "diagnostic-type"
                 # Diagnostic-Code: 554 ...
                 v['diagnosis'] = cv[1]
 
-              elsif p =~ /\A[Dd]iagnostic-[Cc]ode:[ ]*/ && cv = e.match(/\A[ \t]+(.+)\z/)
+              elsif p.start_with?('Diagnostic-Code:') && cv = e.match(/\A[ \t]+(.+)\z/)
                 # Continued line of the value of Diagnostic-Code header
-                v['diagnosis'] += ' ' + cv[1]
-                e = 'Diagnostic-Code: ' + e
-
+                v['diagnosis'] << ' ' << cv[1]
+                e = 'Diagnostic-Code: ' << e
               else
-                if cv = e.match(/\A[Rr]eporting-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
+                if cv = e.match(/\AReporting-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
                   # 2.2.2 The Reporting-MTA DSN field
                   #
                   #       reporting-mta-field =
@@ -268,7 +247,7 @@ module Sisimai
                   #   operation described in the DSN.  This field is required.
                   connheader['rhost'] ||= cv[1].downcase
 
-                elsif cv = e.match(/\A[Rr]eceived-[Ff]rom-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
+                elsif cv = e.match(/\AReceived-From-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
                   # 2.2.4 The Received-From-MTA DSN field
                   #   The optional Received-From-MTA field indicates the name of the MTA
                   #   from which the message was received.
@@ -283,7 +262,7 @@ module Sisimai
                   #   parentheses.  (In this case, the MTA-name-type will be "dns".)
                   connheader['lhost'] = cv[1].downcase
 
-                elsif cv = e.match(/\A[Aa]rrival-[Dd]ate:[ ]*(.+)\z/)
+                elsif cv = e.match(/\AArrival-Date:[ ]*(.+)\z/)
                   # 2.2.5 The Arrival-Date DSN field
                   #   The optional Arrival-Date field indicates the date and time at which
                   #   the message arrived at the Reporting MTA.  If the Last-Attempt-Date
@@ -293,35 +272,44 @@ module Sisimai
                   #
                   #       arrival-date-field = "Arrival-Date" ":" date-time
                   connheader['date'] = cv[1]
-
                 else
                   # Get error message
-                  next if e =~ /\A[ -]+/
-                  next unless e =~ Re1[:error]
+                  next if e.start_with?(' ', '-')
+                  next unless e =~ MarkingsOf[:error]
 
                   # 500 User Unknown
                   # <kijitora@example.jp> Unknown
                   v['alterrors'] ||= ' '
-                  v['alterrors']  += ' ' + e
+                  v['alterrors']  << ' ' << e
                 end
               end
             end
           end # End of if: rfc822
-
         end
 
-        loop do
+        while true
           # Fallback, parse entire message body
           break if recipients > 0
           match = 0
+          mfrom = mhead['from'].downcase
 
           # Failed to get a recipient address at code above
-          match += 1 if mhead['from']    =~ Re0[:from]
-          match += 1 if mhead['subject'] =~ Re0[:subject]
+          match += 1 if mfrom.include?('postmaster@') || mfrom.include?('mailer-daemon@') || mfrom.include?('root@')
+          match += 1 if mhead['subject'].downcase =~ %r{(?>
+             delivery[ ](?:failed|failure|report)
+            |failure[ ]notice
+            |mail[ ](?:delivery|error)
+            |non[-]delivery
+            |returned[ ]mail
+            |undeliverable[ ]mail
+            |warning:[ ]
+            )
+          }x
 
           if mhead['return-path']
             # Check the value of Return-Path of the message
-            match += 1 if mhead['return-path'] =~ Re0[:'return-path']
+            rpath  = mhead['return-path'].downcase
+            match += 1 if rpath.include?('<>') || rpath.include?('mailer-daemon')
           end
           break unless match > 0
 
@@ -330,35 +318,35 @@ module Sisimai
             |\A\s+\z
             |\A\s*--
             |\A\s+[=]\d+
-            |\AHi[ ][!]
-            |Content-(?:Description|Disposition|Transfer-Encoding|Type):[ ]
+            |\Ahi[ ][!]
+            |content-(?:description|disposition|transfer-encoding|type):[ ]
             |(?:name|charset)=
             |--\z
             |:[ ]--------
             )
-          }xi
+          }x
           re_stop = %r{(?:
              \A[*][*][*][ ].+[ ].+[ ][*][*][*]
-            |\AContent-Type:[ ]message/delivery-status
-            |\AHere[ ]is[ ]a[ ]copy[ ]of[ ]the[ ]first[ ]part[ ]of[ ]the[ ]message
-            |\AThe[ ]non-delivered[ ]message[ ]is[ ]attached[ ]to[ ]this[ ]message.
-            |\AReceived:[ \t]*
-            |\AReceived-From-MTA:[ \t]*
-            |\AReporting-MTA:[ \t]*
-            |\AReturn-Path:[ \t]*
-            |\AA[ ]copy[ ]of[ ]the[ ]original[ ]message[ ]below[ ]this[ ]line:
-            |Attachment[ ]is[ ]a[ ]copy[ ]of[ ]the[ ]message
-            |Below[ ]is[ ]a[ ]copy[ ]of[ ]the[ ]original[ ]message:
-            |Below[ ]this[ ]line[ ]is[ ]a[ ]copy[ ]of[ ]the[ ]message
-            |Message[ ]contains[ ].+[ ]file[ ]attachments
-            |Message[ ]text[ ]follows:[ ]
-            |Original[ ]message[ ]follows
-            |The[ ]attachment[ ]contains[ ]the[ ]original[ ]mail[ ]headers
-            |The[ ]first[ ]\d+[ ]lines[ ]
-            |Unsent[ ]Message[ ]below
-            |Your[ ]message[ ]reads[ ][(]in[ ]part[)]:
+            |\Acontent-type:[ ]message/delivery-status
+            |\Ahere[ ]is[ ]a[ ]copy[ ]of[ ]the[ ]first[ ]part[ ]of[ ]the[ ]message
+            |\Athe[ ]non-delivered[ ]message[ ]is[ ]attached[ ]to[ ]this[ ]message.
+            |\Areceived:[ \t]*
+            |\Areceived-from-mta:[ \t]*
+            |\Areporting-mta:[ \t]*
+            |\Areturn-path:[ \t]*
+            |\Aa[ ]copy[ ]of[ ]the[ ]original[ ]message[ ]below[ ]this[ ]line:
+            |attachment[ ]is[ ]a[ ]copy[ ]of[ ]the[ ]message
+            |below[ ]is[ ]a[ ]copy[ ]of[ ]the[ ]original[ ]message:
+            |below[ ]this[ ]line[ ]is[ ]a[ ]copy[ ]of[ ]the[ ]message
+            |message[ ]contains[ ].+[ ]file[ ]attachments
+            |message[ ]text[ ]follows:[ ]
+            |original[ ]message[ ]follows
+            |the[ ]attachment[ ]contains[ ]the[ ]original[ ]mail[ ]headers
+            |the[ ]first[ ]\d+[ ]lines[ ]
+            |unsent[ ]Message[ ]below
+            |your[ ]message[ ]reads[ ][(]in[ ]part[)]:
             )
-          }xi
+          }x
           re_addr = %r{(?:
              \A\s*
             |\A["].+["]\s*
@@ -388,15 +376,17 @@ module Sisimai
           }xi
 
           b = dscontents[-1]
-          mbody.split("\n").each do |e|
+          hasdivided = mbody.split("\n")
+          while e = hasdivided.shift do
             # Get the recipient's email address and error messages.
-            break if e =~ Re1[:endof]
-            break if e =~ Re1[:rfc822]
-            break if e =~ re_stop
+            break if e.start_with?('__END_OF_EMAIL_MESSAGE__')
+            d = e.downcase
+            break if d =~ MarkingsOf[:rfc822]
+            break if d =~ re_stop
 
             next if e.size.zero?
-            next if e =~ re_skip
-            next if e =~ /\A[*]/
+            next if d =~ re_skip
+            next if e.start_with?('*')
 
             if cv = e.match(re_addr)
               # May be an email address
@@ -418,7 +408,7 @@ module Sisimai
               b['alias'] = Sisimai::Address.s3s4(cv[1])
             end
             b['diagnosis'] ||= ''
-            b['diagnosis']  += ' ' + e
+            b['diagnosis']  << ' ' << e
           end
 
           break
@@ -431,21 +421,18 @@ module Sisimai
             next unless cv = e.match(/\ATo:\s*(.+)\z/)
             r = Sisimai::Address.find(cv[1], true) || []
             next if r.empty?
+            dscontents << Sisimai::Bite::Email.DELIVERYSTATUS if dscontents.size == recipients
 
-            if dscontents.size == recipients
-              dscontents << Sisimai::Bite::Email.DELIVERYSTATUS
-            end
             b = dscontents[-1]
             b['recipient'] = r[0][:address]
             b['agent'] = Sisimai::RFC3464.smtpagent + '::Fallback'
             recipients += 1
           end
         end
+        return nil if recipients.zero?
 
-        return nil unless recipients > 0
         require 'sisimai/string'
         require 'sisimai/smtp/status'
-
         dscontents.map do |e|
           # Set default values if each value is empty.
           connheader.each_key { |a| e[a] ||= connheader[a] || '' }
@@ -453,7 +440,7 @@ module Sisimai
           if e.key?('alterrors') && e['alterrors'].size > 0
             # Copy alternative error message
             e['diagnosis'] ||= e['alterrors']
-            if e['diagnosis'] =~ /\A[-]+/ || e['diagnosis'].end_with?('__')
+            if e['diagnosis'].start_with?('-') || e['diagnosis'].end_with?('__')
               # Override the value of diagnostic code message
               e['diagnosis'] = e['alterrors'] if e['alterrors'].size > 0
             end
@@ -467,14 +454,13 @@ module Sisimai
             e['reason']    = scannedset['reason'] || 'undefined'
             e['diagnosis'] = scannedset['message'] if scannedset['message'].size > 0
             e['command']   = ''
-
           else
             # Set the value of smtpagent
             e['agent'] = self.smtpagent
           end
 
           e['status'] ||= Sisimai::SMTP::Status.find(e['diagnosis'])
-          if cv = e['diagnosis'].match(Re1[:command])
+          if cv = e['diagnosis'].match(MarkingsOf[:command])
             e['command'] = cv[1]
           end
           e['date'] ||= mhead['date']