sisimai 4.25.16 → 5.0.1

data/lib/sisimai/lhost/gmx.rb

@@ -1,13 +1,12 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::GMX parses a bounce email which created by GMX.
-  # Methods in the module are called from only Sisimai::Message.
+  # Sisimai::Lhost::GMX parses a bounce email which created by GMX. Methods in the module are called
+  # from only Sisimai::Message.
   module GMX
     class << self
-      # Imported from p5-Sisimail/lib/Sisimai/Lhost/GMX.pm
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      ReBackbone = %r|^---[ ]The[ ]header[ ]of[ ]the[ ]original[ ]message[ ]is[ ]following[.][ ]---|.freeze
+      Boundaries = ['--- The header of the original message is following. ---'].freeze
       StartingOf = { message: ['This message was created automatically by mail delivery software'] }.freeze
       MessagesOf = { 'expired' => ['delivery retry timeout exceeded'] }.freeze
 
@@ -16,23 +15,24 @@ 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)
         # Envelope-To: <kijitora@mail.example.com>
         # X-GMX-Antispam: 0 (Mail was not recognized as spam); Detail=V3;
         # X-GMX-Antivirus: 0 (no virus found)
         # X-UI-Out-Filterresults: unknown:0;
         return nil unless mhead['x-gmx-antispam']
 
+        require 'sisimai/smtp/command'
         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
         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])
@@ -53,7 +53,7 @@ module Sisimai::Lhost
           # 5.1.1 <shironeko@example.jp>... User Unknown
           v = dscontents[-1]
 
-          if cv = e.match(/\A["]([^ ]+[@][^ ]+)["]:\z/) || e.match(/\A[<]([^ ]+[@][^ ]+)[>]\z/)
+          if e.include?('@') && ( e.start_with?('"') || e.start_with?('<') )
             # "shironeko@example.jp":
             # ---- OR ----
             # <kijitora@6jo.example.co.jp>
@@ -65,19 +65,20 @@ module Sisimai::Lhost
               dscontents << Sisimai::Lhost.DELIVERYSTATUS
               v = dscontents[-1]
             end
-            v['recipient'] = cv[1]
+            v['recipient'] = Sisimai::Address.s3s4(e)
             recipients += 1
 
-          elsif cv = e.match(/\ASMTP error .+ ([A-Z]{4}) command:\z/)
+          elsif e.start_with?('SMTP error ')
             # SMTP error from remote server after RCPT command:
-            v['command'] = cv[1]
+            v['command'] = Sisimai::SMTP::Command.find(e)
 
-          elsif cv = e.match(/\Ahost:[ \t]*(.+)\z/)
+          elsif e.start_with?('host:')
             # host: mx.example.jp
-            v['rhost'] = cv[1]
+            v['rhost'] = e[6, e.size]
           else
             # Get error message
-            if e =~ /\b[45][.]\d[.]\d\b/ || e =~ /[<][^ ]+[@][^ ]+[>]/ || e =~ /\b[45]\d{2}\b/
+            if Sisimai::SMTP::Status.find(e) || Sisimai::String.aligned(e, ['<', '@', '>'])
+              # 5.1.1 <shironeko@example.jp>... User Unknown
               v['diagnosis'] ||= e
             else
               next if e.empty?
@@ -105,7 +106,7 @@ module Sisimai::Lhost
           end
         end
 
-        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
       end
       def description; return 'GMX: https://www.gmx.net'; end
     end

data/lib/sisimai/lhost/googlegroups.rb

@@ -1,13 +1,12 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::GoogleGroups parses a bounce email which created by Google
-  # Groups. Methods in the module are called from only Sisimai::Message.
+  # Sisimai::Lhost::GoogleGroups parses a bounce email which created by Google Groups. Methods in the
+  # module are called from only Sisimai::Message.
   module GoogleGroups
     class << self
-      # Imported from p5-Sisimail/lib/Sisimai/Lhost/GoogleGroups.pm
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      ReBackbone = %r/^-----[ ]Original[ ]message[ ]-----$/.freeze
+      Boundaries = ['----- Original message -----'].freeze
 
       # Parse bounce messages from Google Groups
       # @param  [Hash] mhead    Message headers of a bounce email
@@ -15,7 +14,7 @@ module Sisimai::Lhost
       # @return [Hash]          Bounce data list and message/rfc822 part
       # @return [Nil]           it failed to parse or the arguments are missing
       # @since v4.25.6
-      def make(mhead, mbody)
+      def inquire(mhead, mbody)
         return nil unless mhead['from'].end_with?('<mailer-daemon@googlemail.com>')
         return nil unless mhead['subject'].start_with?('Delivery Status Notification')
         return nil unless mhead['x-failed-recipients']
@@ -39,7 +38,7 @@ module Sisimai::Lhost
         #
         # Google Groups
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
-        emailsteak = Sisimai::RFC5322.fillet(mbody, ReBackbone)
+        emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
         recordwide = { 'rhost' => '', 'reason' => '', 'diagnosis' => '' }
         recipients = 0
         v = dscontents[-1]
@@ -48,14 +47,14 @@ module Sisimai::Lhost
         # * The owner of the group may have removed this group.
         # * You may need to join the group before receiving permission to post.
         # * This group may not be open to posting.
-        entiremesg = emailsteak[0].split(/\n\n/, 5).slice(0, 4).join(' ').tr("\n", ' ');
+        entiremesg = emailparts[0].split(/\n\n/, 5).slice(0, 4).join(' ').tr("\n", ' ');
         recordwide['diagnosis'] = Sisimai::String.sweep(entiremesg)
-        recordwide['reason']    = emailsteak[0].scan(/^[ ]?[*][ ]?/).size == 4 ? 'rejected' : 'onhold'
+        recordwide['reason']    = emailparts[0].scan(/^[ ]?[*][ ]?/).size == 4 ? 'rejected' : 'onhold'
         recordwide['rhost']     = Sisimai::RFC5322.received(mhead['received'][0]).shift
 
         mhead['x-failed-recipients'].split(',').each do |e|
           # X-Failed-Recipients: neko@example.jp, nyaan@example.org, ...
-          next unless Sisimai::RFC5322.is_emailaddress(e)
+          next unless Sisimai::Address.is_emailaddress(e)
 
           if v['recipient']
             # There are multiple recipient addresses in the message body.
@@ -67,7 +66,7 @@ module Sisimai::Lhost
           recordwide.each_key { |r| v[r] = recordwide[r] }
         end
         return nil unless recipients > 0
-        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
       end
       def description; return 'Google Groups: https://groups.google.com'; end
     end

data/lib/sisimai/lhost/gsuite.rb

@@ -1,17 +1,15 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::GSuite parses a bounce email which created by G Suite.
-  # Methods in the module are called from only Sisimai::Message.
+  # Sisimai::Lhost::GSuite parses a bounce email which created by G Suite. Methods in the module are
+  # called from only Sisimai::Message.
   module GSuite
     class << self
-      # Imported from p5-Sisimail/lib/Sisimai/Lhost/GSuite.pm
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      ReBackbone = %r<^Content-Type:[ ](?:message/rfc822|text/rfc822-headers)>.freeze
+      Boundaries = ['Content-Type: message/rfc822', 'Content-Type: text/rfc822-headers'].freeze
       MarkingsOf = {
-        message: %r/\A[*][*][ ].+[ ][*][*]\z/,
-        error:   %r/\AThe[ ]response([ ]from[ ]the[ ]remote[ ]server)?[ ]was:\z/,
-        html:    %r{\AContent-Type:[ ]*text/html;[ ]*charset=['"]?(?:UTF|utf)[-]8['"]?\z},
+        message: ['** '],
+        error:   ['The response was:', 'The response from the remote server was:'],
       }.freeze
       MessagesOf = {
         'userunknown'  => ["because the address couldn't be found. Check for typos or unnecessary spaces and try again."],
@@ -24,18 +22,17 @@ 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)
         return nil unless mhead['from'].end_with?('<mailer-daemon@googlemail.com>')
         return nil unless mhead['subject'].start_with?('Delivery Status Notification')
         return nil unless mhead['x-gm-message-state']
 
-        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")
         readcursor = 0      # (Integer) Points the current cursor position
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
         endoferror = false  # (Integer) Flag for a blank line after error messages
@@ -44,11 +41,11 @@ 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.
           if readcursor == 0
             # Beginning of the bounce message or message/delivery-status part
-            readcursor |= Indicators[:deliverystatus] if e =~ MarkingsOf[:message]
+            readcursor |= Indicators[:deliverystatus] if MarkingsOf[:message].any? { |a| e.start_with?(a) }
           end
           next if (readcursor & Indicators[:deliverystatus]) == 0
 
@@ -87,12 +84,12 @@ module Sisimai::Lhost
                 v['lhost'] = '' if v['lhost'].include?('@')
               end
 
-              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
-            # Append error messages continued from the previous line
+            # The line does not begin with a DSN field defined in RFC3464 Append error messages continued
+            # from the previous line
             if endoferror == false && v && ! v['diagnosis'].to_s.empty?
               endoferror ||= true if e.empty?
 
@@ -100,10 +97,10 @@ module Sisimai::Lhost
               next unless e.start_with?(' ')
               v['diagnosis'] << e
 
-            elsif e =~ MarkingsOf[:error]
+            elsif MarkingsOf[:error].any? { |a| e.start_with?(a) }
               # Detect SMTP session error or connection error
               # The response from the remote server was:
-              anotherset['diagnosis'] << e
+              anotherset['diagnosis'] << ' ' << e
             else
               # ** Address not found **
               #
@@ -112,12 +109,9 @@ module Sisimai::Lhost
               #
               # The response from the remote server was:
               # 550 #5.1.0 Address rejected.
-              next if e =~ MarkingsOf[:html]
-
+              next if e.start_with?('Content-Type:')
               if anotherset['diagnosis']
-                # Continued error messages from the previous line like
-                # "550 #5.1.0 Address rejected."
-                next if e =~ /\AContent-Type:/
+                # Continued error messages from the previous line like "550 #5.1.0 Address rejected."
                 next if emptylines > 5
                 if e.empty?
                   # Count and next()
@@ -131,7 +125,7 @@ module Sisimai::Lhost
                 # Your message wasn't delivered to * because the address couldn't be found.
                 # Check for typos or unnecessary spaces and try again.
                 next if e.empty?
-                next unless e =~ MarkingsOf[:message]
+                next unless MarkingsOf[:message].any? { |a| e.start_with?(a) }
                 anotherset['diagnosis'] = e
               end
             end
@@ -148,7 +142,7 @@ module Sisimai::Lhost
             # Copy alternative error message
             e['diagnosis'] = anotherset['diagnosis'] unless e['diagnosis']
 
-            if e['diagnosis'] =~ /\A\d+\z/
+            if e['diagnosis'].include?(' ') == false && e['diagnosis'].to_i > 0
               e['diagnosis'] = anotherset['diagnosis']
             else
               # More detailed error message is in "anotherset"
@@ -192,7 +186,7 @@ module Sisimai::Lhost
           end
         end
 
-        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
       end
       def description; return 'G Suite: https://gsuite.google.com'; end
     end

data/lib/sisimai/lhost/imailserver.rb

@@ -1,29 +1,19 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::IMailServer parses a bounce email which created by
-  # Ipswitch IMail Server.
+  # Sisimai::Lhost::IMailServer parses a bounce email which created by Ipswitch IMail Server.
   # Methods in the module are called from only Sisimai::Message.
   module IMailServer
     class << self
-      # Imported from p5-Sisimail/lib/Sisimai/Lhost/IMailServer.pm
       require 'sisimai/lhost'
 
-      ReBackbone = %r|^Original[ ]message[ ]follows[.]|.freeze
+      Boundaries = ['Original message follows.'].freeze
       StartingOf = { error: ['Body of message generated response:'] }.freeze
-
-      ReSMTP = {
-        'conn' => %r/(?:SMTP connection failed,|Unexpected connection response from server:)/,
-        'ehlo' => %r|Unexpected response to EHLO/HELO:|,
-        'mail' => %r|Server response to MAIL FROM:|,
-        'rcpt' => %r|Additional RCPT TO generated following response:|,
-        'data' => %r|DATA command generated response:|,
-      }.freeze
       ReFailures = {
-        'hostunknown'   => %r/Unknown host/,
-        'userunknown'   => %r/\A(?:Unknown user|Invalid final delivery userid)/,
-        'mailboxfull'   => %r/\AUser mailbox exceeds allowed size/,
-        'virusdetected' => %r/\ARequested action not taken: virus detected/,
-        'undefined'     => %r/\Aundeliverable to /,
-        'expired'       => %r/\ADelivery failed \d+ attempts/,
+        'hostunknown'   => ['Unknown host'],
+        'userunknown'   => ['Unknown user', 'Invalid final delivery userid'],
+        'mailboxfull'   => ['User mailbox exceeds allowed size'],
+        'virusdetected' => ['Requested action not taken: virus detected'],
+        'undefined'     => ['undeliverable to'],
+        'expired'       => ['Delivery failed '],
       }.freeze
 
       # Parse bounce messages from IMailServer
@@ -31,47 +21,48 @@ 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-Mailer: <SMTP32 v8.22>
         match  = 0
-        match += 1 if mhead['subject'] =~ /\AUndeliverable Mail[ ]*\z/
+        match += 1 if mhead['subject'].start_with?('Undeliverable Mail ')
         match += 1 if mhead['x-mailer'].to_s.start_with?('<SMTP32 v')
         return nil unless match > 0
 
         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")
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
         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.
 
           # Unknown user: kijitora@example.com
           #
           # Original message follows.
           v = dscontents[-1]
 
-          if cv = e.match(/\A([^ ]+)[ ](.+)[:][ \t]*([^ ]+[@][^ ]+)/)
+          p0 = e.index(': ') || -1
+          if p0 > 8 && Sisimai::String.aligned(e, [': ', '@'])
             # Unknown user: kijitora@example.com
             if v['recipient']
               # There are multiple recipient addresses in the message body.
               dscontents << Sisimai::Lhost.DELIVERYSTATUS
               v = dscontents[-1]
             end
-            v['diagnosis'] = cv[1] + ' ' + cv[2]
-            v['recipient'] = cv[3]
+            v['diagnosis'] = e
+            v['recipient'] = Sisimai::Address.s3s4(e[p0 + 2, e.size])
             recipients += 1
 
-          elsif cv = e.match(/\Aundeliverable[ ]+to[ ]+(.+)\z/)
+          elsif e.start_with?('undeliverable ')
             # undeliverable to kijitora@example.com
             if v['recipient']
               # There are multiple recipient addresses in the message body.
               dscontents << Sisimai::Lhost.DELIVERYSTATUS
               v = dscontents[-1]
             end
-            v['recipient'] = Sisimai::Address.s3s4(cv[1])
+            v['recipient'] = Sisimai::Address.s3s4(e)
             recipients += 1
           else
             # Other error message text
@@ -81,6 +72,7 @@ module Sisimai::Lhost
         end
         return nil unless recipients > 0
 
+        require 'sisimai/smtp/command'
         dscontents.each do |e|
           unless e['alterrors'].to_s.empty?
             # Copy alternative error message
@@ -92,24 +84,18 @@ module Sisimai::Lhost
             e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
             e.delete('alterrors')
           end
-          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
-
-          ReSMTP.each_key do |r|
-            # Detect SMTP command from the message
-            next unless e['diagnosis'] =~ ReSMTP[r]
-            e['command'] = r.upcase
-            break
-          end
+          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis']) || ''
+          e['command']   = Sisimai::SMTP::Command.find(e['diagnosis'])
 
           ReFailures.each_key do |r|
             # Verify each regular expression of session errors
-            next unless e['diagnosis'] =~ ReFailures[r]
+            next unless ReFailures[r].any? { |a| e['diagnosis'].include?(a) }
             e['reason'] = r
             break
           end
         end
 
-        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
       end
       def description; return 'IPSWITCH IMail Server'; end
     end

data/lib/sisimai/lhost/interscanmss.rb

@@ -1,19 +1,17 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::InterScanMSS parses a bounce email which created by
-  # Trend Micro InterScan Messaging Security Suite. Methods in the module are
-  # called from only Sisimai::Message.
+  # Sisimai::Lhost::InterScanMSS parses a bounce email which created by Trend Micro InterScan Messaging
+  # Security Suite. Methods in the module are called from only Sisimai::Message.
   module InterScanMSS
     class << self
-      # Imported from p5-Sisimail/lib/Sisimai/Lhost/InterScanMSS.pm
       require 'sisimai/lhost'
-      ReBackbone = %r|^Content-type:[ ]message/rfc822|.freeze
+      Boundaries = ['Content-Type: message/rfc822'].freeze
 
       # Parse bounce messages from InterScanMSS
       # @param  [Hash] mhead    Message headers of a bounce email
       # @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)
         # :received => %r/[ ][(]InterScanMSS[)][ ]with[ ]/,
         match = 0
         tryto = [
@@ -26,60 +24,59 @@ module Sisimai::Lhost
         match += 1 if tryto.any? { |a| mhead['subject'] == a }
         return nil unless match > 0
 
+        require 'sisimai/smtp/command'
         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")
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
         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.
           next if e.empty?
 
-          v = dscontents[-1]
-          if cv = e.match(/\A.+[<>]{3}[ \t]+.+[<]([^ ]+[@][^ ]+)[>]\z/) ||
-                  e.match(/\A.+[<>]{3}[ \t]+.+[<]([^ ]+[@][^ ]+)[>]/)   ||
-                  e.match(/\A(?:Reason:[ ]+)?Unable[ ]to[ ]deliver[ ]message[ ]to[ ][<](.+)[>]/)
+          v  = dscontents[-1]
+          p1 = e.index(' <<< ') || -1 # Sent <<< ...
+          p2 = e.index(' >>> ') || -1 # Received >>> ...
+          if e.include?('@') && e.include?(' <') && ( p1 > 1 || p2 > 1 || e.include?('Unable to deliver ') )
             # Sent <<< RCPT TO:<kijitora@example.co.jp>
             # Received >>> 550 5.1.1 <kijitora@example.co.jp>... user unknown
             # Unable to deliver message to <kijitora@neko.example.jp>
-            if v['recipient'] && cv[1] != v['recipient']
+            cr = e[e.rindex('<') + 1, e.rindex('>') - e.rindex('<') - 1]
+
+            if v['recipient'] && cr != 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'] = e if e =~ /Unable[ ]to[ ]deliver[ ]/
+            v['recipient'] = cr
+            v['diagnosis'] = e if e.include?('Unable to deliver ')
             recipients = dscontents.size
           end
 
-          if cv = e.match(/\ASent[ ]+[<]{3}[ ]+([A-Z]{4})[ ]/)
+          if e.start_with?('Sent <<< ')
             # Sent <<< RCPT TO:<kijitora@example.co.jp>
-            v['command'] = cv[1]
+            v['command'] = Sisimai::SMTP::Command.find(e)
 
-          elsif cv = e.match(/\AReceived[ ]+[>]{3}[ ]+(\d{3}[ ]+.+)\z/)
+          elsif e.start_with?('Received >>> ')
             # Received >>> 550 5.1.1 <kijitora@example.co.jp>... user unknown
-            v['diagnosis'] = cv[1]
+            v['diagnosis'] = e[e.index(' >>> ') + 4, e.size]
           else
             # Error message in non-English
-            if cv = e.match(/[ ][>]{3}[ ]([A-Z]{4})/)
-              # >>> RCPT TO ...
-              v['command'] = cv[1]
-
-            elsif cv = e.match(/[ ][<]{3}[ ](.+)/)
-              # <<< 550 5.1.1 User unknown
-              v['diagnosis'] = cv[1]
-            end
+            v['command'] = Sisimai::SMTP::Command.find(e) if e.include?(' >>> ')
+            p3 = e.index(' <<< ')
+            next unless p3
+            v['diagnosis'] = e[p3 + 4, e.size]
           end
         end
         return nil unless recipients > 0
 
         dscontents.each do |e|
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
-          e['reason'] = 'userunknown' if e['diagnosis'] =~ /Unable[ ]to[ ]deliver/
+          e['reason'] = 'userunknown' if e['diagnosis'].include?('Unable to deliver')
         end
-        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
       end
       def description; return 'Trend Micro InterScan Messaging Security Suite'; end
     end

data/lib/sisimai/lhost/kddi.rb

@@ -1,20 +1,13 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::KDDI parses a bounce email which created by au by KDDI.
-  # Methods in the module are called from only Sisimai::Message.
+  # Sisimai::Lhost::KDDI parses a bounce email which created by au by KDDI. Methods in the module are
+  # called from only Sisimai::Message.
   module KDDI
     class << self
-      # Imported from p5-Sisimail/lib/Sisimai/Lhost/KDDI.pm
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      ReBackbone = %r|^Content-Type:[ ]message/rfc822|.freeze
-      MarkingsOf = {
-        message: %r/\AYour[ ]mail[ ](?:
-             sent[ ]on:?[ ][A-Z][a-z]{2}[,]
-            |attempted[ ]to[ ]be[ ]delivered[ ]on:?[ ][A-Z][a-z]{2}[,]
-            )
-        /x,
-      }.freeze
+      Boundaries = ['Content-Type: message/rfc822'].freeze
+      MarkingsOf = { message: ['Your mail sent on:', 'Your mail attempted to be delivered on:'] }.freeze
       MessagesOf = {
         'mailboxfull' => ['As their mailbox is full'],
         'norelaying'  => ['Due to the following SMTP relay error'],
@@ -26,35 +19,35 @@ 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)
         # :'message-id' => %r/[@].+[.]ezweb[.]ne[.]jp[>]\z/,
         match  = 0
-        match += 1 if mhead['from'] =~ /no-reply[@].+[.]dion[.]ne[.]jp/
+        match += 1 if Sisimai::String.aligned(mhead['from'], ['no-reply@.', '.dion.ne.jp'])
         match += 1 if mhead['reply-to'].to_s == 'no-reply@app.auone-net.jp'
         match += 1 if mhead['received'].any? { |a| a.include?('ezweb.ne.jp (') }
         match += 1 if mhead['received'].any? { |a| a.include?('.au.com (') }
         return nil unless match > 0
 
         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
         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 =~ MarkingsOf[:message]
+            readcursor |= Indicators[:deliverystatus] if MarkingsOf[:message].any? { |a| e.start_with?(a) }
             next
           end
           next if (readcursor & Indicators[:deliverystatus]) == 0
           next if e.empty?
 
           v = dscontents[-1]
-          if cv = e.match(/\A[ \t]+Could not be delivered to: [<]([^ ]+[@][^ ]+)[>]/)
+          if e.include?(' Could not be delivered to: <')
             # Your mail sent on: Thu, 29 Apr 2010 11:04:47 +0900
             #     Could not be delivered to: <******@**.***.**>
             #     As their mailbox is full.
@@ -63,24 +56,26 @@ module Sisimai::Lhost
               dscontents << Sisimai::Lhost.DELIVERYSTATUS
               v = dscontents[-1]
             end
-            r = Sisimai::Address.s3s4(cv[1])
-            next unless Sisimai::RFC5322.is_emailaddress(r)
+            r = Sisimai::Address.s3s4(e[e.index('<') + 1, e.size])
+            next unless Sisimai::Address.is_emailaddress(r)
             v['recipient'] = r
             recipients += 1
 
-          elsif cv = e.match(/Your mail sent on: (.+)\z/)
+          elsif e.include?('Your mail sent on: ')
             # Your mail sent on: Thu, 29 Apr 2010 11:04:47 +0900
-            v['date'] = cv[1]
+            v['date'] = e[19, e.size]
           else
             #     As their mailbox is full.
             v['diagnosis'] ||= ''
-            v['diagnosis'] << e + ' ' if e.start_with?(' ', "\t")
+            v['diagnosis'] << e + ' ' if e.start_with?(' ')
           end
         end
         return nil unless recipients > 0
 
+        require 'sisimai/smtp/command'
         dscontents.each do |e|
-          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
+          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis']) || ''
+          e['command']   = Sisimai::SMTP::Command.find(e['diagnosis'])
 
           if mhead['x-spasign'].to_s == 'NG'
             # Content-Type: text/plain; ..., X-SPASIGN: NG (spamghetti, au by KDDI)
@@ -88,8 +83,7 @@ module Sisimai::Lhost
             e['reason'] = 'filtered'
           else
             if e['command'] == 'RCPT'
-              # set "userunknown" when the remote server rejected after RCPT
-              # command.
+              # set "userunknown" when the remote server rejected after RCPT command.
               e['reason'] = 'userunknown'
             else
               # SMTP command is not RCPT
@@ -104,7 +98,7 @@ module Sisimai::Lhost
 
         end
 
-        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
       end
       def description; return 'au by KDDI: https://www.au.kddi.com'; end
     end