sisimai 4.25.16 → 5.0.0

data/lib/sisimai/lhost/ezweb.rb

@@ -1,41 +1,28 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::EZweb parses a bounce email which created by au EZweb.
-  # Methods in the module are called from only Sisimai::Message.
+  # Sisimai::Lhost::EZweb parses a bounce email which created by au EZweb. Methods in the module are
+  # called from only Sisimai::Message.
   module EZweb
     class << self
-      # Imported from p5-Sisimail/lib/Sisimai/Lhost/EZweb.pm
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      ReBackbone = %r<^(?:[-]{50}|Content-Type:[ ]*message/rfc822)>.freeze
-      MarkingsOf = {
-        message: %r{\A(?:
-             The[ ]user[(]s[)][ ]
-            |Your[ ]message[ ]
-            |Each[ ]of[ ]the[ ]following
-            |[<][^ ]+[@][^ ]+[>]\z
-            )
-        }x,
-      }.freeze
+      Boundaries = ['--------------------------------------------------', 'Content-Type: message/rfc822'].freeze
+      MarkingsOf = { message: ['The user(s) ', 'Your message ', 'Each of the following', '<'] }.freeze
       ReFailures = {
-        # notaccept: [ %r/The following recipients did not receive this message:/ ],
-        'mailboxfull' => [
-          %r/The user[(]s[)] account is temporarily over quota/,
-        ],
+        # notaccept: ['The following recipients did not receive this message:'],
+        'mailboxfull' => ['The user(s) account is temporarily over quota'],
         'suspend' => [
           # http://www.naruhodo-au.kddi.com/qa3429203.html
           # The recipient may be unpaid user...?
-          %r/The user[(]s[)] account is disabled[.]/,
-          %r/The user[(]s[)] account is temporarily limited[.]/,
+          'The user(s) account is disabled.',
+          'The user(s) account is temporarily limited.',
         ],
         'expired' => [
           # Your message was not delivered within 0 days and 1 hours.
           # Remote host is not responding.
-          %r/Your message was not delivered within /,
-        ],
-        'onhold' => [
-          %r/Each of the following recipients was rejected by a remote mail server/,
+          'Your message was not delivered within ',
         ],
+        'onhold' => ['Each of the following recipients was rejected by a remote mail server'],
       }.freeze
 
       # Parse bounce messages from au EZweb
@@ -43,7 +30,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)
         match  = 0
         match += 1 if mhead['from'].include?('Postmaster@ezweb.ne.jp')
         match += 1 if mhead['from'].include?('Postmaster@au.com')
@@ -55,31 +42,21 @@ module Sisimai::Lhost
         end
         return nil if match < 2
 
-        require 'sisimai/rfc1894'
         fieldtable = Sisimai::RFC1894.FIELDTABLE
         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
-        rxboundary = %r/\A__SISIMAI_PSEUDO_BOUNDARY__\z/
+        rxmessages = []; ReFailures.each_value { |a| rxmessages << a }
         v = nil
 
-        if mhead['content-type']
-          # Get the boundary string and set regular expression for matching with
-          # the boundary string.
-          b0 = Sisimai::MIME.boundary(mhead['content-type'], 1)
-          rxboundary = Regexp.new('\A' << Regexp.escape(b0) << '\z') unless b0.empty?
-        end
-        rxmessages = []
-        ReFailures.each_value { |a| rxmessages << a }
-
         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.include?(a) }
           end
           next if (readcursor & Indicators[:deliverystatus]) == 0
           next if e.empty?
@@ -97,18 +74,17 @@ module Sisimai::Lhost
           #    <<< 550 <******@ezweb.ne.jp>: User unknown
           v = dscontents[-1]
 
-          if cv = e.match(/\A[<]([^ ]+[@][^ ]+)[>]\z/) ||
-                  e.match(/\A[<]([^ ]+[@][^ ]+)[>]:?(.*)\z/) ||
-                  e.match(/\A[ \t]+Recipient: [<]([^ ]+[@][^ ]+)[>]/)
+          if Sisimai::String.aligned(e, ['<', '@', '>']) && (e.include?('Recipient: <') || e.start_with?('<'))
+            #    Recipient: <******@ezweb.ne.jp> OR <***@ezweb.ne.jp>: 550 user unknown ...
+            p1 = e.index('<') || -1
+            p2 = e.index('>') || -1
 
             if v['recipient']
               # There are multiple recipient addresses in the message body.
               dscontents << Sisimai::Lhost.DELIVERYSTATUS
               v = dscontents[-1]
             end
-
-            r = Sisimai::Address.s3s4(cv[1])
-            v['recipient'] = r
+            v['recipient'] = Sisimai::Address.s3s4(e[p1, p2 - p1])
             recipients += 1
 
           elsif f = Sisimai::RFC1894.match(e)
@@ -120,12 +96,12 @@ module Sisimai::Lhost
           else
             # The line does not begin with a DSN field defined in RFC3464
             next if Sisimai::String.is_8bit(e)
-            if cv = e.match(/\A[ \t]+[>]{3}[ \t]+([A-Z]{4})/)
+            if e.include?('>>> ')
               #    >>> RCPT TO:<******@ezweb.ne.jp>
-              v['command'] = cv[1]
+              v['command'] = Sisimai::SMTP::Command.find(e) || ''
             else
               # Check error message
-              if rxmessages.any? { |messages| messages.any? { |message| e =~ message } }
+              if rxmessages.any? { |messages| messages.any? { |message| e.include?(message) } }
                 # Check with regular expressions of each error
                 v['diagnosis'] ||= ''
                 v['diagnosis'] << ' ' << e
@@ -149,7 +125,7 @@ module Sisimai::Lhost
             end
             e.delete('alterrors')
           end
-          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
+          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis']) || ''
 
           if mhead['x-spasign'].to_s == 'NG'
             # Content-Type: text/plain; ..., X-SPASIGN: NG (spamghetti, au by EZweb)
@@ -157,17 +133,16 @@ 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
               catch :SESSION do
                 ReFailures.each_key do |r|
-                  # Verify each regular expression of session errors
+                  # Try to match with each session error message
                   ReFailures[r].each do |rr|
-                    # Check each regular expression
-                    next unless e['diagnosis'] =~ rr
+                    # Check each error message pattern
+                    next unless e['diagnosis'].include?(rr)
                     e['reason'] = r
                     throw :SESSION
                   end
@@ -181,7 +156,7 @@ module Sisimai::Lhost
           e['reason'] = 'userunknown'
         end
 
-        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
       end
       def description; return 'au EZweb: http://www.au.kddi.com/mobile/'; end
     end

data/lib/sisimai/lhost/facebook.rb

@@ -1,13 +1,12 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::Facebook parses a bounce email which created by Facebook.
-  # Methods in the module are called from only Sisimai::Message.
+  # Sisimai::Lhost::Facebook parses a bounce email which created by Facebook. Methods in the module
+  # are called from only Sisimai::Message.
   module Facebook
     class << self
-      # Imported from p5-Sisimail/lib/Sisimai/Lhost/Facebook.pm
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      ReBackbone = %r|^Content-Disposition:[ ]inline|.freeze
+      Boundaries = ['Content-Disposition: inline'].freeze
       StartingOf = { message: ['This message was created automatically by Facebook.'] }.freeze
       ReFailures = {
         # http://postmaster.facebook.com/response_codes
@@ -22,21 +21,20 @@ module Sisimai::Lhost
           'RCP-P2', # The attempted recipient's preferences prevent messages from being delivered.
           'RCP-P3', # The attempted recipient's privacy settings blocked the delivery.
         ],
-        'blocked' => [
-          'POL-P1', # Your mail server's IP Address is listed on the Spamhaus PBL.
-          'POL-P2', # Facebook will no longer accept mail from your mail server's IP Address.
-        ],
         'mesgtoobig' => [
           'MSG-P1', # The message exceeds Facebook's maximum allowed size.
           'INT-P2', # The message exceeds Facebook's maximum allowed size.
         ],
         'contenterror' => [
           'MSG-P2', # The message contains an attachment type that Facebook does not accept.
-          'MSG-P3', # The message contains multiple instances of a header field that can only be present once.
+          'MSG-P3', # The message contains multiple instances of a header field that can only be present once. Please see RFC 5322, section 3.6 for more information
           'POL-P6', # The message contains a url that has been blocked by Facebook.
           'POL-P7', # The message does not comply with Facebook's abuse policies and will not be accepted.
         ],
         'securityerror' => [
+          'POL-P1', # Your mail server's IP Address is listed on the Spamhaus PBL.
+          'POL-P2', # Facebook will no longer accept mail from your mail server's IP Address.
+          'POL-P5', # The message contains a virus.
           'POL-P7', # The message does not comply with Facebook's Domain Authentication requirements.
         ],
         'notaccept' => [
@@ -55,20 +53,17 @@ module Sisimai::Lhost
         ],
         'systemerror' => [
           'CON-T1', # Facebook's mail server currently has too many connections open to allow another one.
-          'RCP-T1', # The attempted recipient address is not currently available due to an internal system issue. This is a temporary condition.
-        ],
-        'virusdetected' => [
-          'POL-P5', # The message contains a virus.
         ],
         'toomanyconn' => [
-          'CON-T2', # Your mail server currently has too many connections open to Facebook's mail servers.
           'CON-T3', # Your mail server has opened too many new connections to Facebook's mail servers in a short period of time.
         ],
         'suspend' => [
           'RCP-T4', # The attempted recipient address is currently deactivated. The user may or may not reactivate it.
         ],
         'undefined' => [
+          'RCP-T1', # The attempted recipient address is not currently available due to an internal system issue. This is a temporary condition.
           'MSG-T1', # The number of recipients on the message exceeds Facebook's allowed maximum.
+          'CON-T2', # Your mail server currently has too many connections open to Facebook's mail servers.
           'CON-T4', # Your mail server has exceeded the maximum number of recipients for its current connection.
         ],
       }.freeze
@@ -78,17 +73,16 @@ 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'] == 'Facebook <mailer-daemon@mx.facebook.com>'
         return nil unless mhead['subject'] == 'Sorry, your message could not be delivered'
 
-        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
@@ -96,8 +90,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
@@ -138,14 +132,14 @@ 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
             # 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'] << ' ' << e[e.rindex(' ') + 1, e.size]
             readslices[-1] = 'Diagnostic-Code: ' << e
           end
         end
@@ -155,14 +149,8 @@ module Sisimai::Lhost
           e['lhost']   ||= permessage['lhost']
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
 
-          if cv = e['diagnosis'].match(/\b([A-Z]{3})[-]([A-Z])(\d)\b/)
-            # Diagnostic-Code: smtp; 550 5.1.1 RCP-P2
-            lhs = cv[1]
-            rhs = cv[2]
-            num = cv[3]
-
-            fbresponse = sprintf('%s-%s%d', lhs, rhs, num)
-          end
+          p0 = e['diagnosis'].index('-') || -1
+          fbresponse = e['diagnosis'][p0 - 3, 6] if p0 > 0
 
           catch :SESSION do
             ReFailures.each_key do |r|
@@ -188,11 +176,11 @@ module Sisimai::Lhost
           # https://groups.google.com/forum/#!topic/cdmix/eXfi4ddgYLQ
           # This block has not been tested because we have no email sample
           # including "INT-T?" error code.
-          next unless fbresponse =~ /\AINT-T\d+\z/
+          next unless fbresponse.start_with?('INT-T')
           e['reason'] = 'systemerror'
         end
 
-        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
       end
       def description; return 'Facebook: https://www.facebook.com'; end
     end

data/lib/sisimai/lhost/fml.rb

@@ -1,48 +1,41 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::FML parses a bounce email which created by fml.
-  # Methods in the module are called from only Sisimai::Message.
+  # Sisimai::Lhost::FML parses a bounce email which created by fml. Methods in the module are called
+  # from only Sisimai::Message.
   module FML
     class << self
-      # Imported from p5-Sisimail/lib/Sisimai/Lhost/FML.pm
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      ReBackbone = %r|^Original[ ]mail[ ]as[ ]follows:|.freeze
+      Boundaries = ['Original mail as follows:'].freeze
       ErrorTitle = {
-        'rejected' => %r{(?>
-           (?:Ignored[ ])*NOT[ ]MEMBER[ ]article[ ]from[ ]
-          |reject[ ]mail[ ](?:.+:|from)[ ],
-          |Spam[ ]mail[ ]from[ ]a[ ]spammer[ ]is[ ]rejected
-          |You[ ].+[ ]are[ ]not[ ]member
-          )
-        }x,
-        'systemerror' => %r{(?:
-           fml[ ]system[ ]error[ ]message
-          |Loop[ ]Alert:[ ]
-          |Loop[ ]Back[ ]Warning:[ ]
-          |WARNING:[ ]UNIX[ ]FROM[ ]Loop
-          )
-        }x,
-        'securityerror' => %r/Security Alert/,
+        'rejected' => [
+          ' are not member',
+          'NOT MEMBER article from ',
+          'reject mail ',
+          'Spam mail from a spammer is rejected',
+        ],
+        'systemerror' => [
+          'fml system error message',
+          'Loop Alert: ',
+          'Loop Back Warning: ',
+          'WARNING: UNIX FROM Loop',
+        ],
+        'securityerror' => ['Security Alert'],
       }.freeze
       ErrorTable = {
-        'rejected' => %r{(?>
-          (?:Ignored[ ])*NOT[ ]MEMBER[ ]article[ ]from[ ]
-          |reject[ ](?:
-             mail[ ]from[ ].+[@].+
-            |since[ ].+[ ]header[ ]may[ ]cause[ ]mail[ ]loop
-            |spammers:
-            )
-          |You[ ]are[ ]not[ ]a[ ]member[ ]of[ ]this[ ]mailing[ ]list
-          )
-        }x,
-        'systemerror' => %r{(?:
-           Duplicated[ ]Message-ID
-          |fml[ ].+[ ]has[ ]detected[ ]a[ ]loop[ ]condition[ ]so[ ]that
-          |Loop[ ]Back[ ]Warning:
-          )
-        }x,
-        'securityerror' => %r/Security alert:/,
+        'rejected' => [
+          ' header may cause mail loop',
+          'NOT MEMBER article from ',
+          'reject mail from ',
+          'reject spammers:',
+          'You are not a member of this mailing list',
+        ],
+        'systemerror' => [
+          ' has detected a loop condition so that',
+          'Duplicated Message-ID',
+          'Loop Back Warning:',
+        ],
+        'securityerror' => ['Security alert:'],
       }.freeze
 
       # Parse bounce messages from fml mailling list server/manager
@@ -51,34 +44,36 @@ 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.22.3
-      def make(mhead, mbody)
+      def inquire(mhead, mbody)
         return nil unless mhead['x-mlserver']
-        return nil unless mhead['from'] =~ /.+[-]admin[@].+/
-        return nil unless mhead['message-id'] =~ /\A[<]\d+[.]FML.+[@].+[>]\z/
+        return nil unless mhead['from'].include?('-admin@')
+        return nil unless mhead['message-id'].index('.FML') > 1
 
         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?
 
           # Duplicated Message-ID in <2ndml@example.com>.
           # Original mail as follows:
           v = dscontents[-1]
 
-          if cv = e.match(/[<]([^ ]+?[@][^ ]+?)[>][.]\z/)
-            # Duplicated Message-ID in <2ndml@example.com>.
+          p1 = e.index('<')  || -1
+          p2 = e.rindex('>') || -1
+          if p1 > 0 && p2 > 0
+            # You are not a member of this mailing list <neko-nyaan@example.org>.
             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['recipient'] = e[p1 + 1, p2 - p1 - 1]
             v['diagnosis'] = e
             recipients += 1
           else
@@ -94,7 +89,7 @@ module Sisimai::Lhost
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
           ErrorTable.each_key do |f|
             # Try to match with error messages defined in ErrorTable
-            next unless e['diagnosis'] =~ ErrorTable[f]
+            next unless ErrorTable[f].any? { |a| e['diagnosis'].include?(a) }
             e['reason'] = f
             break
           end
@@ -110,7 +105,7 @@ module Sisimai::Lhost
           end
         end
 
-        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
       end
       def description; return 'fml mailing list server/manager'; end
     end

data/lib/sisimai/lhost/gmail.rb

@@ -1,18 +1,16 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::Gmail parses a bounce email which created by Gmail.
-  # Methods in the module are called from only Sisimai::Message.
+  # Sisimai::Lhost::Gmail parses a bounce email which created by Gmail. Methods in the module are
+  # called from only Sisimai::Message.
   module Gmail
     class << self
-      # Imported from p5-Sisimail/lib/Sisimai/Lhost/Gmail.pm
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      ReBackbone = %r/^[ ]*-----[ ](?:Original[ ]message|Message[ ]header[ ]follows)[ ]-----/.freeze
+      Boundaries = ['----- Original message -----', '----- Message header follows -----'].freeze
       StartingOf = {
         message: ['Delivery to the following recipient'],
         error:   ['The error that the other server returned was:'],
       }.freeze
-      MarkingsOf = { start: %r/Technical details of (?:permanent|temporary) failure:/ }.freeze
       MessagesOf = {
         'expired' => [
           'DNS Error: Could not contact DNS servers',
@@ -103,7 +101,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)
         # From: Mail Delivery Subsystem <mailer-daemon@googlemail.com>
         # Received: from vw-in-f109.1e100.net [74.125.113.109] by ...
         #
@@ -154,16 +152,15 @@ module Sisimai::Lhost
         return nil unless mhead['subject'].start_with?('Delivery Status Notification')
 
         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
-        statecode0 = 0      # (Integer) The value of (state *) in the error message
         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])
@@ -188,7 +185,7 @@ module Sisimai::Lhost
           #
           v = dscontents[-1]
 
-          if cv = e.match(/\A[ \t]+([^ ]+[@][^ ]+)\z/)
+          if e.start_with?(' ') && e.include?('@')
             # kijitora@example.jp: 550 5.2.2 <kijitora@example>... Mailbox Full
             if v['recipient']
               # There are multiple recipient addresses in the message body.
@@ -196,8 +193,8 @@ module Sisimai::Lhost
               v = dscontents[-1]
             end
 
-            r = Sisimai::Address.s3s4(cv[1])
-            next unless Sisimai::RFC5322.is_emailaddress(r)
+            r = Sisimai::Address.s3s4(e[e.rindex(' ') + 1, e.size])
+            next unless Sisimai::Address.is_emailaddress(r)
             v['recipient'] = r
             recipients += 1
           else
@@ -212,22 +209,24 @@ module Sisimai::Lhost
 
           unless e['rhost']
             # Get the value of remote host
-            if cv = e['diagnosis'].match(/[ \t]+by[ \t]+([^ ]+)[.][ \t]+\[(\d+[.]\d+[.]\d+[.]\d+)\][.]/)
-              # Google tried to deliver your message, but it was rejected by
-              # the server for the recipient domain example.jp by mx.example.jp. [192.0.2.153].
-              hostname = cv[1]
-              ipv4addr = cv[2]
-              e['rhost'] = if hostname =~ /[-0-9a-zA-Z]+[.][a-zA-Z]+\z/
-                             # Maybe valid hostname
-                             hostname.downcase
-                           else
-                             # Use IP address instead
-                             ipv4addr
-                           end
+            if Sisimai::String.aligned(e['diagnosis'], [' by ', '. [', ']. '])
+              # Google tried to deliver your message, but it was rejected by the server for the recipient
+              # domain example.jp by mx.example.jp. [192.0.2.153].
+              p1 = e['diagnosis'].rindex(' by ') || -1
+              p2 = e['diagnosis'].rindex('. [' ) || -1
+              hostname = e['diagnosis'][p1 + 4, p2 - p1 - 4]
+              ipv4addr = e['diagnosis'][p2 + 3, e['diagnosis'].rindex(']. ') - p2 - 3]
+              lastchar = hostname[-1, 1].upcase.ord
+
+              e['rhost']   = hostname if lastchar > 64 && lastchar < 91
+              e['rhost'] ||= ipv4addr
             end
           end
 
-          if cv = e['diagnosis'].match(/[(]state[ ](\d+)[)][.]/) then statecode0 = cv[1] end
+          p1 = e['diagnosis'].rindex(' ') || -1
+          p2 = e['diagnosis'].rindex(')') || -1
+          statecode0 = e['diagnosis'][p1 + 1, p2 - p1 - 1] || 0
+
           if StateTable[statecode0]
             # (state *)
             e['reason']  = StateTable[statecode0]['reason']
@@ -245,10 +244,11 @@ module Sisimai::Lhost
 
           # Set pseudo status code
           e['status'] = Sisimai::SMTP::Status.find(e['diagnosis']) || ''
-          e['reason'] = Sisimai::SMTP::Status.name(e['status']).to_s if e['status'] =~ /\A[45][.][1-7][.][1-9]\z/
+          next if e['status'].size == 0 || e['status'].include?('.0')
+          e['reason'] = Sisimai::SMTP::Status.name(e['status']).to_s || ''
         end
 
-        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
       end
       def description; return 'Gmail: https://mail.google.com'; end
     end