sisimai 4.25.17 → 5.0.0

data/lib/sisimai/lhost/yandex.rb

@@ -1,13 +1,12 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::Yandex parses a bounce email which created by Yandex.Mail.
-  # Methods in the module are called from only Sisimai::Message.
+  # Sisimai::Lhost::Yandex parses a bounce email which created by Yandex.Mail. Methods in the module
+  # are called from only Sisimai::Message.
   module Yandex
     class << self
-      # Imported from p5-Sisimail/lib/Sisimai/Lhost/Yandex.pm
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      ReBackbone = %r|^Content-Type:[ ]message/rfc822|.freeze
+      Boundaries = ['Content-Type: message/rfc822'].freeze
       StartingOf = { message: ['This is the mail system at host yandex.ru.'] }.freeze
 
       # Parse bounce messages from Yandex.Mail
@@ -15,7 +14,7 @@ module Sisimai::Lhost
       # @param  [String] mbody  Message body of a bounce email
       # @return [Hash]          Bounce data list and message/rfc822 part
       # @return [Nil]           it failed to parse or the arguments are missing
-      def make(mhead, mbody)
+      def inquire(mhead, mbody)
         # X-Yandex-Front: mxback1h.mail.yandex.net
         # X-Yandex-TimeMark: 1417885948
         # X-Yandex-Uniq: 92309766-f1c8-4bd4-92bc-657c75766587
@@ -26,13 +25,12 @@ module Sisimai::Lhost
         return nil unless mhead['x-yandex-uniq']
         return nil unless mhead['from'] == 'mailer-daemon@yandex.ru'
 
-        require 'sisimai/rfc1894'
         fieldtable = Sisimai::RFC1894.FIELDTABLE
         permessage = {}     # (Hash) Store values of each Per-Message field
 
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
-        emailsteak = Sisimai::RFC5322.fillet(mbody, ReBackbone)
-        bodyslices = emailsteak[0].split("\n")
+        emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
+        bodyslices = emailparts[0].split("\n")
         readslices = ['']
         readcursor = 0      # (Integer) Points the current cursor position
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
@@ -40,8 +38,8 @@ module Sisimai::Lhost
         v = nil
 
         while e = bodyslices.shift do
-          # Read error messages and delivery status lines from the head of the email
-          # to the previous line of the beginning of the original message.
+          # Read error messages and delivery status lines from the head of the email to the previous
+          # line of the beginning of the original message.
           readslices << e # Save the current line for the next loop
 
           if readcursor == 0
@@ -82,23 +80,21 @@ module Sisimai::Lhost
               next unless fieldtable[o[0]]
               v[fieldtable[o[0]]] = o[2]
 
-              next unless f == 1
+              next unless f
               permessage[fieldtable[o[0]]] = o[2]
             end
           else
             # The line does not begin with a DSN field defined in RFC3464
-            if cv = e.match(/[ \t][(]in reply to .*([A-Z]{4}).*/)
+            if e.include?(' (in reply to ') || e.include?('command)')
               # 5.1.1 <userunknown@example.co.jp>... User Unknown (in reply to RCPT TO
-              commandset << cv[1]
+              cv = Sisimai::SMTP::Command.find(e)
+              commandset << cv if cv
 
-            elsif cv = e.match(/([A-Z]{4})[ \t]*.*command[)]\z/)
-              # to MAIL command)
-              commandset << cv[1]
             else
               # Continued line of the value of Diagnostic-Code field
               next unless readslices[-2].start_with?('Diagnostic-Code:')
-              next unless cv = e.match(/\A[ \t]+(.+)\z/)
-              v['diagnosis'] << ' ' << cv[1]
+              next unless e.start_with?(' ')
+              v['diagnosis'] << ' ' << Sisimai::String.sweep(e)
               readslices[-1] = 'Diagnostic-Code: ' << e
             end
           end
@@ -110,11 +106,11 @@ module Sisimai::Lhost
           e['lhost'] ||= permessage['rhost']
           permessage.each_key { |a| e[a] ||= permessage[a] || '' }
 
-          e['command']   = commandset.shift || ''
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'].tr("\n", ' '))
+          e['command'] ||= commandset.shift || Sisimai::SMTP::Command.find(e['diagnosis']) || ''
         end
 
-        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
       end
       def description; return 'Yandex.Mail: https://www.yandex.ru'; end
     end

data/lib/sisimai/lhost/zoho.rb

@@ -1,13 +1,12 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::Zoho parses a bounce email which created by Zoho Mail.
-  # Methods in the module are called from only Sisimai::Message.
+  # Sisimai::Lhost::Zoho parses a bounce email which created by Zoho Mail. Methods in the module are
+  # called from only Sisimai::Message.
   module Zoho
     class << self
-      # Imported from p5-Sisimail/lib/Sisimai/Lhost/Zoho.pm
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      ReBackbone = %r|^Received:[ ]*from[ ]mail[.]zoho[.]com[ ]by[ ]mx[.]zohomail[.]com|.freeze
+      Boundaries = ['Received: from mail.zoho.com by mx.zohomail.com'].freeze
       StartingOf = { message: ['This message was created automatically by mail delivery'] }.freeze
       MessagesOf = { 'expired' => ['Host not reachable'] }.freeze
 
@@ -16,23 +15,23 @@ module Sisimai::Lhost
       # @param  [String] mbody  Message body of a bounce email
       # @return [Hash]          Bounce data list and message/rfc822 part
       # @return [Nil]           it failed to parse or the arguments are missing
-      def make(mhead, mbody)
+      def inquire(mhead, mbody)
         # X-ZohoMail: Si CHF_MF_NL SS_10 UW48 UB48 FMWL UW48 UB48 SGR3_1_09124_42
         # X-Zoho-Virus-Status: 2
         # X-Mailer: Zoho Mail
         return nil unless mhead['x-zohomail']
 
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
-        emailsteak = Sisimai::RFC5322.fillet(mbody, ReBackbone)
-        bodyslices = emailsteak[0].split("\n")
+        emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
+        bodyslices = emailparts[0].split("\n")
         readcursor = 0      # (Integer) Points the current cursor position
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
         qprintable = false
         v = nil
 
         while e = bodyslices.shift do
-          # Read error messages and delivery status lines from the head of the email
-          # to the previous line of the beginning of the original message.
+          # Read error messages and delivery status lines from the head of the email to the previous
+          # line of the beginning of the original message.
           if readcursor == 0
             # Beginning of the bounce message or delivery status part
             readcursor |= Indicators[:deliverystatus] if e.start_with?(StartingOf[:message][0])
@@ -54,15 +53,15 @@ module Sisimai::Lhost
           # shironeko@example.org Invalid Address, ERROR_CODE :550, ERROR_CODE :Requested action not taken: mailbox unavailable
           v = dscontents[-1]
 
-          if cv = e.match(/\A([^ ]+[@][^ ]+)[ \t]+(.+)\z/)
+          if Sisimai::String.aligned(e, ['@', ' ', 'ERROR_CODE :'])
             # kijitora@example.co.jp Invalid Address, ERROR_CODE :550, ERROR_CODE :5.1.=
             if v['recipient']
               # There are multiple recipient addresses in the message body.
               dscontents << Sisimai::Lhost.DELIVERYSTATUS
               v = dscontents[-1]
             end
-            v['recipient'] = cv[1]
-            v['diagnosis'] = cv[2]
+            v['recipient'] = e[0, e.index(' ')]
+            v['diagnosis'] = e[e.index(' ') + 1, e.size]
 
             if v['diagnosis'].end_with?('=')
               # Quoted printable
@@ -71,7 +70,7 @@ module Sisimai::Lhost
             end
             recipients += 1
 
-          elsif cv = e.match(/\A\[Status: .+[<]([^ ]+[@][^ ]+)[>],/)
+          elsif e.start_with?('[Status: ')
             # Expired
             # [Status: Error, Address: <kijitora@6kaku.example.co.jp>, ResponseCode 421, , Host not reachable.]
             if v['recipient']
@@ -79,7 +78,9 @@ module Sisimai::Lhost
               dscontents << Sisimai::Lhost.DELIVERYSTATUS
               v = dscontents[-1]
             end
-            v['recipient'] = cv[1]
+            p1 = e.index('<')
+            p2 = e.index('>', p1 + 2)
+            v['recipient'] = Sisimai::Address.s3s4(e[p1, p2 - p1])
             v['diagnosis'] = e
             recipients += 1
           else
@@ -100,7 +101,7 @@ module Sisimai::Lhost
           end
         end
 
-        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
       end
       def description; return 'Zoho Mail: https://www.zoho.com'; end
     end

data/lib/sisimai/lhost.rb

@@ -2,7 +2,6 @@ module Sisimai
   # Sisimai::Lhost - Base class for Sisimai::Lhost::*
   module Lhost
     class << self
-      # Imported from p5-Sisimail/lib/Sisimai/Lhost.pm
       require 'sisimai/rfc5322'
 
       # Data structure for parsed bounce messages
@@ -23,7 +22,7 @@ module Sisimai
           'replycode'    => nil,  # SMTP Reply code
           'diagnosis'    => nil,  # The value of Diagnostic-Code header
           'recipient'    => nil,  # The value of Final-Recipient header
-          'softbounce'   => nil,  # Soft bounce or not
+          'hardbounce'   => nil,  # Hard bounce or not
           'feedbacktype' => nil,  # Feedback Type
         }
       end
@@ -42,13 +41,12 @@ module Sisimai
       # @return   [Array] MTA list with order
       def index
         return %w[
-          Activehunter Amavis AmazonSES AmazonWorkMail Aol ApacheJames Barracuda Bigfoot
-          Biglobe Courier Domino EZweb EinsUndEins Exchange2003 Exchange2007 Exim FML
-          Facebook GMX GSuite GoogleGroups Gmail IMailServer InterScanMSS KDDI MXLogic
-          MailFoundry MailMarshalSMTP MailRu McAfee MessageLabs MessagingServer Notes
-          Office365 OpenSMTPD Outlook Postfix PowerMTA ReceivingSES SendGrid Sendmail
-          SurfControl V5sendmail Verizon X1 X2 X3 X4 X5 X6 Yahoo Yandex Zoho MFILTER
-          Qmail
+          Activehunter Amavis AmazonSES AmazonWorkMail Aol ApacheJames Barracuda Bigfoot Biglobe
+          Courier Domino EZweb EinsUndEins Exchange2003 Exchange2007 Exim FML Facebook GMX GSuite
+          GoogleGroups Gmail IMailServer InterScanMSS KDDI MXLogic MailFoundry MailMarshalSMTP
+          MailRu McAfee MessageLabs MessagingServer Notes Office365 OpenSMTPD Outlook Postfix
+          PowerMTA ReceivingSES SendGrid Sendmail SurfControl V5sendmail Verizon X1 X2 X3 X4 X5 X6
+          Yahoo Yandex Zoho MFILTER Qmail
         ]
       end
 
@@ -71,7 +69,7 @@ module Sisimai
       # @param  [String] mbody  Message body of a bounce email
       # @return [Hash]          Bounce data list and message/rfc822 part
       # @return [Nil]           it failed to parse or the arguments are missing
-      def make; return nil; end
+      def inquire; return nil; end
       def description; return ''; end
     end
   end

data/lib/sisimai/mail/maildir.rb

@@ -1,9 +1,7 @@
 module Sisimai
   class Mail
-    # Sisimai::Mail::Maildir is a reader for getting contents of each email in
-    # the Maildir/ directory.
+    # Sisimai::Mail::Maildir is a reader for getting contents of each email in the Maildir/ directory.
     class Maildir
-      # Imported from p5-Sisimail/lib/Sisimai/Mail/Maildir.pm
       # :dir    [String] Path to Maildir/
       # :size   [Integer] The number of files/directories in the Maildir/
       # :path   [String] Path to each file

data/lib/sisimai/mail/mbox.rb

@@ -2,7 +2,6 @@ module Sisimai
   class Mail
     # Sisimai::Mail::Mbox is a mailbox file (UNIX mbox) reader.
     class Mbox
-      # Imported from p5-Sisimail/lib/Sisimai/Mail/Mbox.pm
       # :dir    [String]  Directory name of the mbox
       # :file   [String]  File name of the mbox
       # :path   [String]  Path to mbox
@@ -13,9 +12,9 @@ module Sisimai
       attr_accessor :offset, :handle
 
       # Constructor of Sisimai::Mail::Mbox
-      # @param    [String] argv1            Path to mbox
-      # @return   [Sisimai::Mail::Mbox,Nil] Object or nil if the argument is not
-      #                                     specified or does not exist
+      # @param    [String] argv1          Path to mbox
+      # @return   [Sisimai::Mail::Mbox]   Object
+      #           [Nil]                   is not specified or does not exist
       def initialize(argv1)
         raise Errno::ENOENT   unless File.exist?(argv1)
         raise 'is not a file' unless File.ftype(argv1) == 'file'

data/lib/sisimai/mail/memory.rb

@@ -2,7 +2,6 @@ module Sisimai
   class Mail
     # Sisimai::Mail::Memory is a class for reading an email string
     class Memory
-      # Imported from p5-Sisimail/lib/Sisimai/Mail/Memory.pm
       # :path    [String]  Fixed string "<MEMORY>"
       # :size    [Integer] data size of the email text
       # :payload [Array]   Entire bounce mail message

data/lib/sisimai/mail/stdin.rb

@@ -1,9 +1,7 @@
 module Sisimai
   class Mail
-    # Sisimai::Mail::STDIN is a reader for getting contents of each email from
-    # STDIN
+    # Sisimai::Mail::STDIN is a reader for getting contents of each email from STDIN
     class STDIN
-      # Imported from p5-Sisimail/lib/Sisimai/Mail/STDIN.pm
       # :path   [String]  Fixed string "<STDIN>"
       # :size   [Integer] Data size which has been read
       # :offset [Integer]  The number of emails which have neen read

data/lib/sisimai/mail.rb

@@ -1,10 +1,7 @@
 module Sisimai
-  # Sisimai::Mail is a handler of UNIX mbox or Maildir for reading each mail.
-  # It is a wrapper class of Sisimai::Mail::Mbox, Sisimai::Mail::Maildir, and
-  # Sisimai::Mail::Memory classes.
+  # Sisimai::Mail is a handler of UNIX mbox or Maildir for reading each mail. It is a wrapper class
+  # of Sisimai::Mail::Mbox, Sisimai::Mail::Maildir, and Sisimai::Mail::Memory classes.
   class Mail
-    # Imported from p5-Sisimail/lib/Sisimai/Mail.pm
-
     # :path [String] path to mbox or Maildir/
     # :kind [String] Data type: mailbox, maildir, or stdin
     # :data [Sisimai::Mail::[Mbox,Maildir,Memory,STDIN]] Object
@@ -47,8 +44,7 @@ module Sisimai
           end
         end
       elsif argv1.is_a?(IO)
-        # Read from STDIN
-        # The argument neither a mailbox nor a Maildir/.
+        # Read from STDIN, The argument neither a mailbox nor a Maildir/.
         classname = self.class.to_s << '::STDIN'
         parameter['kind'] = 'stdin'
         parameter['path'] = '<STDIN>'

data/lib/sisimai/mda.rb

@@ -1,25 +1,17 @@
 module Sisimai
   # Sisimai::MDA - Error message parser for MDA
   module MDA
-    # Imported from p5-Sisimail/lib/Sisimai/MDA.pm
     class << self
       AgentNames = {
         # dovecot/src/deliver/deliver.c
         # 11: #define DEFAULT_MAIL_REJECTION_HUMAN_REASON \
         # 12: "Your message to <%t> was automatically rejected:%n%r"
-        'dovecot'    => %r/\AYour message to [^ ]+ was automatically rejected:\z/,
-        'mail.local' => %r/\Amail[.]local: /,
-        'procmail'   => %r/\Aprocmail: /,
-        'maildrop'   => %r/\Amaildrop: /,
-        'vpopmail'   => %r/\Avdelivermail: /,
-        'vmailmgr'   => %r/\Avdeliver: /,
-      }.freeze
-      MarkingsOf = {
-        message: %r{\A(?>
-           Your[ ]message[ ]to[ ][^ ]+[ ]was[ ]automatically[ ]rejected:\z
-          |(?:mail[.]local|procmail|maildrop|vdelivermail|vdeliver):[ ]
-          )
-        }x
+        'dovecot'    => ['Your message to ', ' was automatically rejected:'],
+        'mail.local' => ['mail.local: '],
+        'procmail'   => ['procmail: '],
+        'maildrop'   => ['maildrop: '],
+        'vpopmail'   => ['vdelivermail: '],
+        'vmailmgr'   => ['vdeliver: '],
       }.freeze
 
       # dovecot/src/deliver/mail-send.c:94
@@ -79,43 +71,37 @@ module Sisimai
       # @param  [String] mbody  Message body of a bounce email
       # @return [Hash]          Bounce data list and message/rfc822 part
       # @return [Nil]           it failed to parse or the arguments are missing
-      def make(mhead, mbody)
+      def inquire(mhead, mbody)
+        return nil unless mhead
+        return nil unless mbody.size > 0
         return nil unless mhead['from'].downcase.start_with?('mail delivery subsystem','mailer-daemon', 'postmaster')
 
-        agentname0 = ''   # [String] MDA name
+        deliversby = ''   # [String] Mail Delivery Agent name
         reasonname = ''   # [String] Error reason
         bouncemesg = ''   # [String] Error message
-        bodyslices = mbody.split("\n")
-        linebuffer = []
+        linebuffer = mbody.split("\n")
 
-        while e = bodyslices.shift do
-          # Check each line with each MDA's symbol regular expression.
-          if agentname0 == ''
-            # Try to match with each regular expression
-            next if e.empty?
-            next unless e =~ MarkingsOf[:message]
+        AgentNames.each_key do |e|
+          # Find a mail delivery agent name from the entire message body
+          p = mbody.index(AgentNames[e][0])
+          next unless p
 
-            AgentNames.each_key do |f|
-              # Detect the agent name from the line
-              next unless e =~ AgentNames[f]
-              agentname0 = f
-              break
-            end
+          if AgentNames[e].size > 1
+            # Try to find the 2nd argument
+            q = mbody.index(AgentNames[e][1])
+            next unless q
+            next if p > q
           end
-
-          # Append error message lines to @linebuffer
-          linebuffer << e
-          break if e.empty?
+          deliversby = e
+          break
         end
-        return nil if agentname0.empty?
-        return nil if linebuffer.empty?
+        return nil if deliversby.empty?
 
-        MessagesOf[agentname0].each_key do |e|
+        MessagesOf[deliversby].each_key do |e|
           # Detect an error reason from message patterns of the MDA.
-          duplicated = linebuffer.dup
-          while f = duplicated.shift do
-            # Whether the error message include each message defined in $MessagesOf
-            next unless MessagesOf[agentname0][e].any? { |a| f.downcase.include?(a) }
+          linebuffer.each do |f|
+            # Whether the error message include each message defined in MessagesOf
+            next unless MessagesOf[deliversby][e].any? { |a| f.downcase.include?(a) }
             reasonname = e
             bouncemesg = f
             break
@@ -124,7 +110,7 @@ module Sisimai
         end
 
         return {
-          'mda'     => agentname0,
+          'mda'     => deliversby,
           'reason'  => reasonname || '',
           'message' => bouncemesg || '',
         }