sisimai 5.0.3 → 5.2.0

data/lib/sisimai/lhost/interscanmss.rb

@@ -1,16 +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 decodes a bounce email which created by Trend Micro InterScan
+  # Messaging Security Suite https://www.trendmicro.com/en_us/business/products/user-protection/sps/email-and-collaboration/interscan-messaging.html.
+  # Methods in the module are called from only Sisimai::Message.
   module InterScanMSS
     class << self
       require 'sisimai/lhost'
       Boundaries = ['Content-Type: message/rfc822'].freeze
 
-      # Parse bounce messages from InterScanMSS
+        # @abstract Decodes the bounce message from Trend Micro InterScanMSS Messaging Secutiry Suie
       # @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
+      # @return [Nil]           it failed to decode or the arguments are missing
       def inquire(mhead, mbody)
         # :received => %r/[ ][(]InterScanMSS[)][ ]with[ ]/,
         match = 0
@@ -45,7 +46,7 @@ module Sisimai::Lhost
             # Unable to deliver message to <kijitora@neko.example.jp>
             cr = e[e.rindex('<') + 1, e.rindex('>') - e.rindex('<') - 1]
 
-            if v['recipient'] && cr != v['recipient']
+            if v["recipient"] != "" && cr != v['recipient']
               # There are multiple recipient addresses in the message body.
               dscontents << Sisimai::Lhost.DELIVERYSTATUS
               v = dscontents[-1]

data/lib/sisimai/lhost/kddi.rb

@@ -1,24 +1,24 @@
 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 decodes a bounce email which created by au by KDDI https://www.au.com/.
+  # Methods in the module are called from only Sisimai::Message.
   module KDDI
     class << self
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
       Boundaries = ['Content-Type: message/rfc822'].freeze
-      MarkingsOf = { message: ['Your mail sent on:', 'Your mail attempted to be delivered on:'] }.freeze
+      StartingOf = { 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'],
         'hostunknown' => ['As the remote domain doesnt exist'],
       }.freeze
 
-      # Parse bounce messages from au by KDDI
+      # @abstract Decodes the bounce message from au by KDDI
       # @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
+      # @return [Nil]           it failed to decode or the arguments are missing
       def inquire(mhead, mbody)
         # :'message-id' => %r/[@].+[.]ezweb[.]ne[.]jp[>]\z/,
         match  = 0
@@ -40,7 +40,7 @@ module Sisimai::Lhost
           # line of the beginning of the original message.
           if readcursor == 0
             # Beginning of the bounce message or delivery status part
-            readcursor |= Indicators[:deliverystatus] if MarkingsOf[:message].any? { |a| e.start_with?(a) }
+            readcursor |= Indicators[:deliverystatus] if StartingOf[:message].any? { |a| e.start_with?(a) }
             next
           end
           next if (readcursor & Indicators[:deliverystatus]) == 0
@@ -51,7 +51,7 @@ module Sisimai::Lhost
             # Your mail sent on: Thu, 29 Apr 2010 11:04:47 +0900
             #     Could not be delivered to: <******@**.***.**>
             #     As their mailbox is full.
-            if v['recipient']
+            if v["recipient"] != ""
               # There are multiple recipient addresses in the message body.
               dscontents << Sisimai::Lhost.DELIVERYSTATUS
               v = dscontents[-1]
@@ -66,7 +66,6 @@ module Sisimai::Lhost
             v['date'] = e[19, e.size]
           else
             #     As their mailbox is full.
-            v['diagnosis'] ||= ''
             v['diagnosis'] << e + ' ' if e.start_with?(' ')
           end
         end

data/lib/sisimai/lhost/mailfoundry.rb

@@ -1,6 +1,6 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::MailFoundry parses a bounce email which created by MailFoundry. Methods in the
-  # module are called from only Sisimai::Message.
+  # Sisimai::Lhost::MailFoundry decodes a bounce email which created by MailFoundry https://www.barracuda.com/.
+  # Methods in the module are called from only Sisimai::Message.
   module MailFoundry
     class << self
       require 'sisimai/lhost'
@@ -12,11 +12,11 @@ module Sisimai::Lhost
         error:   ['Delivery failed for the following reason:'],
       }.freeze
 
-      # Parse bounce messages from MailFoundry
+      # @abstract Decodes the bounce message from MailFoundry
       # @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
+      # @return [Nil]           it failed to decode or the arguments are missing
       def inquire(mhead, mbody)
         return nil unless mhead['subject'] == 'Message delivery has failed'
         return nil unless mhead['received'].any? { |a| a.include?('(MAILFOUNDRY) id ') }
@@ -47,7 +47,7 @@ module Sisimai::Lhost
 
           if e.start_with?('Unable to deliver message to: <') && e.index('@') > 1
             # Unable to deliver message to: <kijitora@example.org>
-            if v['recipient']
+            if v["recipient"] != ""
               # There are multiple recipient addresses in the message body.
               dscontents << Sisimai::Lhost.DELIVERYSTATUS
               v = dscontents[-1]
@@ -55,17 +55,14 @@ module Sisimai::Lhost
             v['recipient'] = e[e.index('<'), e.size]
             recipients += 1
           else
-            # Error message
+            # Error messages
             if e == StartingOf[:error][0]
               # Delivery failed for the following reason:
               v['diagnosis'] = e
             else
               # Detect error message
-              next if e.empty?
               next if v['diagnosis'].nil? || v['diagnosis'].empty?
               next if e.start_with?('-')
-
-              # Server mx22.example.org[192.0.2.222] failed with: 550 <kijitora@example.org> No such user here
               v['diagnosis'] << ' ' << e
             end
           end

data/lib/sisimai/lhost/mailmarshalsmtp.rb

@@ -1,6 +1,7 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::MailMarshalSMTP parses a bounce email which created by Trustwave Secure Email
-  # Gateway: formerly MailMarshal SMTP. Methods in the module are called from only Sisimai::Message.
+  # Sisimai::Lhost::MailMarshalSMTP decodes a bounce email which created by Trustwave Secure Email
+  # Gateway: formerly MailMarshal SMTP https://www.trustwave.com/en-us/services/email-security/.
+  # Methods in the module are called from only Sisimai::Message.
   module MailMarshalSMTP
     class << self
       require 'sisimai/lhost'
@@ -13,11 +14,11 @@ module Sisimai::Lhost
         rcpts:   ['The following recipients were affected:'],
       }.freeze
 
-      # Parse bounce messages from MailMarshalSMTP
+      # @abstract Decodes the bounce message from Trustwave Secure Email Gateway (Formerly MailMarshalSMTP)
       # @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
+      # @return [Nil]           it failed to decode or the arguments are missing
       def inquire(mhead, mbody)
         return nil unless mhead['subject'].start_with?('Undeliverable Mail: "')
 
@@ -27,7 +28,6 @@ module Sisimai::Lhost
         readcursor = 0      # (Integer) Points the current cursor position
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
         endoferror = false  # (Boolean) Flag for the end of error message
-        regularexp = nil
         q = Sisimai::RFC2045.boundary(mhead['content-type'], 1); Boundaries << q if q
         v = nil
 
@@ -55,7 +55,7 @@ module Sisimai::Lhost
           if e.start_with?('    ') && e.index('@') > 1
             # The following recipients were affected:
             #    dummyuser@blabla.xxxxxxxxxxxx.com
-            if v['recipient']
+            if v["recipient"] != ""
               # There are multiple recipient addresses in the message body.
               dscontents << Sisimai::Lhost.DELIVERYSTATUS
               v = dscontents[-1]

data/lib/sisimai/lhost/messagingserver.rb

@@ -1,6 +1,7 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::MessagingServer parses a bounce email which created by Oracle Communications Messaging
-  # Server and Sun Java System Messaging Server. Methods in the module are called from only Sisimai::Message.
+  # Sisimai::Lhost::MessagingServer decodes a bounce email which created by Oracle Communications
+  # Messaging Server and Sun Java System Messaging Server https://docs.oracle.com/en/industries/communications/messaging-server/index.html.
+  # Methods in the module are called from only Sisimai::Message.
   module MessagingServer
     class << self
       require 'sisimai/lhost'
@@ -10,11 +11,11 @@ module Sisimai::Lhost
       StartingOf = { message: ['This report relates to a message you sent with the following header fields:'] }.freeze
       MessagesOf = { 'hostunknown' => ['Illegal host/domain name found'] }.freeze
 
-      # Parse bounce messages from MessagingServer
+      # @abstract Decodes the bounce message from MessagingServer
       # @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
+      # @return [Nil]           it failed to decode or the arguments are missing
       def inquire(mhead, mbody)
         match  = 0
         match += 1 if mhead['content-type'].include?('Boundary_(ID_')
@@ -59,20 +60,21 @@ module Sisimai::Lhost
           #   Remote system: dns;mx.example.jp (TCP|17.111.174.67|47323|192.0.2.225|25) (6jo.example.jp ESMTP SENDMAIL-VM)
           v = dscontents[-1]
 
-          if e.start_with?('  Recipient address: ') && e.index('@') > 1
-            #   Recipient address: kijitora@example.jp
-            if v['recipient']
+          if Sisimai::String.aligned(e, ['  Recipient address: ', '@', '.']) ||
+             Sisimai::String.aligned(e, ['  Original address: ',  '@', '.'])
+            #   Recipient address: @smtp.example.net:kijitora@server
+            #   Original address: kijitora@example.jp
+            cv = Sisimai::Address.s3s4(e[e.rindex(' ') + 1, e.size])
+            next unless Sisimai::Address.is_emailaddress(cv)
+
+            if v["recipient"] != "" && cv != v['recipient']
               # There are multiple recipient addresses in the message body.
               dscontents << Sisimai::Lhost.DELIVERYSTATUS
               v = dscontents[-1]
             end
-            v['recipient'] = Sisimai::Address.s3s4(e[e.rindex(' ') + 1, e.size])
+            v['recipient'] = cv
             recipients += 1
 
-          elsif e.start_with?('  Original address: ') && e.index('@') > 1
-            #   Original address: kijitora@example.jp
-            v['recipient'] = Sisimai::Address.s3s4(e[e.rindex(' ') + 1, e.size])
-
           elsif e.start_with?('  Date: ')
             #   Date: Fri, 21 Nov 2014 23:34:45 +0900
             v['date'] = e[e.index(':') + 2, e.size]
@@ -119,18 +121,18 @@ module Sisimai::Lhost
               # Status: 5.1.1 (Remote SMTP server has rejected address)
               p1 = e.index(':')
               p2 = e.index('(')
-              v['status']      = e[p1 + 2, p2 - p1 - 3]
-              v['diagnosis'] ||= e[p2 + 1, e[e.index(')') - p2 - 1]]
+              v['status']    = e[p1 + 2, p2 - p1 - 3]
+              v['diagnosis'] = e[p2 + 1, e[e.index(')') - p2 - 1]] if v["diagnosis"].empty?
 
             elsif e.start_with?('Arrival-Date: ')
               # Arrival-date: Thu, 29 Apr 2014 23:34:45 +0000 (GMT)
-              v['date'] ||= e[e.index(':') + 2, e.size]
+              v['date'] = e[e.index(':') + 2, e.size] if v["date"].empty?
 
             elsif e.start_with?('Reporting-MTA: ')
               # Reporting-MTA: dns;mr21p30im-asmtp004.me.com (tcp-daemon)
               localhost = e[e.index(';') + 1, e.size]
-              v['lhost'] ||= localhost
-              v['lhost']   = localhost unless v['lhost'].index('.') > 0
+              v['lhost'] = localhost if v["lhost"].empty?
+              v['lhost'] = localhost unless v['lhost'].index('.') > 0
             end
           end
         end

data/lib/sisimai/lhost/mfilter.rb

@@ -1,6 +1,6 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::mFILTER parses a bounce email which created by Digital Arts m-FILTER. Methods in
-  # the module are called from only Sisimai::Message.
+  # Sisimai::Lhost::mFILTER decodes a bounce email which created by Digital Arts m-FILTER https://www.daj.jp/bs/mf/.
+  # Methods in the module are called from only Sisimai::Message.
   module MFILTER
     class << self
       require 'sisimai/lhost'
@@ -12,11 +12,11 @@ module Sisimai::Lhost
         command: ['-------SMTP command'],
       }.freeze
 
-      # Parse bounce messages from Digital Arts m-FILTER
+      # @abstract Decodes the bounce message from Digital Arts m-FILTER
       # @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
+      # @return [Nil]           it failed to decode or the arguments are missing
       def inquire(mhead, mbody)
         # X-Mailer: m-FILTER
         return nil unless mhead['x-mailer'].to_s == 'm-FILTER'
@@ -62,7 +62,7 @@ module Sisimai::Lhost
           if e.include?('@') && e.include?(' ') == false
             # 以下のメールアドレスへの送信に失敗しました。
             # kijitora@example.jp
-            if v['recipient']
+            if v["recipient"] != ""
               # There are multiple recipient addresses in the message body.
               dscontents << Sisimai::Lhost.DELIVERYSTATUS
               v = dscontents[-1]
@@ -75,6 +75,7 @@ module Sisimai::Lhost
             # DATA
             next if v['command']
             v['command'] = e if markingset['command']
+
           else
             # Get error message and SMTP command
             if e == StartingOf[:error][0]
@@ -87,7 +88,7 @@ module Sisimai::Lhost
             else
               # 550 5.1.1 unknown user <kijitora@example.jp>
               next if e.start_with?('-')
-              next if v['diagnosis']
+              next if v['diagnosis'] != ""
               v['diagnosis'] = e
             end
           end
@@ -103,7 +104,7 @@ module Sisimai::Lhost
           rheads = mhead['received']
           rhosts = Sisimai::RFC5322.received(rheads[-1])
 
-          e['lhost'] ||= Sisimai::RFC5322.received(rheads[0]).shift
+          e['lhost'] = Sisimai::RFC5322.received(rheads[0]).shift if e["lhost"].empty?
           [rhosts[0], rhosts[1]].each do |ee|
             # Avoid "... by m-FILTER"
             next unless ee.include?('.')

data/lib/sisimai/lhost/notes.rb

@@ -1,6 +1,6 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::Notes parses a bounce email which created by Lotus Notes Server. Methods in the
-  # module are called from only Sisimai::Message.
+  # Sisimai::Lhost::Notes decodes a bounce email which created by HCL Notes (formerly IMB Notes Server
+  # (formerly Lotus Notes Server)). Methods in the module are called from only Sisimai::Message.
   module Notes
     class << self
       require 'sisimai/lhost'
@@ -16,11 +16,11 @@ module Sisimai::Lhost
         'networkerror' => ['Message has exceeded maximum hop count'],
       }.freeze
 
-      # Parse bounce messages from Lotus Notes
+      # @abstract Decodes the bounce messages from HCL Notes (Formerly IBM Notes (Formerly Lotus Notes))
       # @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
+      # @return [Nil]           it failed to decode or the arguments are missing
       def inquire(mhead, mbody)
         return nil unless mhead['subject'].start_with?('Undeliverable message')
 
@@ -58,12 +58,12 @@ module Sisimai::Lhost
           v = dscontents[-1]
           if e.include?('@') && e.index(' ').nil?
             # kijitora@notes.example.jp
-            if v['recipient']
+            if v["recipient"] != ""
               # There are multiple recipient addresses in the message body.
               dscontents << Sisimai::Lhost.DELIVERYSTATUS
               v = dscontents[-1]
             end
-            v['recipient'] ||= e
+            v["recipient"] = e if v["recipient"].empty?
             recipients += 1
           else
             next if e.empty?
@@ -83,11 +83,9 @@ module Sisimai::Lhost
                 # No character set in Content-Type header
                 encodedmsg = removedmsg
               end
-              v['diagnosis'] ||= ''
               v['diagnosis'] << encodedmsg
             else
               # Error message does not include multi-byte character
-              v['diagnosis'] ||= ''
               v['diagnosis'] << e
             end
           end

data/lib/sisimai/lhost/opensmtpd.rb

@@ -1,6 +1,6 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::OpenSMTPD parses a bounce email which created by OpenSMTPD. Methods in the module
-  # are called from only Sisimai::Message.
+  # Sisimai::Lhost::OpenSMTPD decodes a bounce email which created by OpenSMTPD https://www.opensmtpd.org/.
+  # Methods in the module are called from only Sisimai::Message.
   module OpenSMTPD
     class << self
       require 'sisimai/lhost'
@@ -45,7 +45,11 @@ module Sisimai::Lhost
           'Domain does not exist',
         ],
         # smtp/mta.c:1085|  relay->failstr = "Destination seem to reject all mails";
-        'notaccept' => ['Destination seem to reject all mails'],
+        'notaccept' => [
+          'Destination seem to reject all mails',
+          'No MX found for domain',
+          'No MX found for destination',
+        ],
         #  smtpd/mta.c:972|  relay->failstr = "Temporary failure in MX lookup";
         'networkerror' => [
           'Address family mismatch on destination MXs',
@@ -54,8 +58,6 @@ module Sisimai::Lhost
           'Could not retrieve source address',
           'Loop detected',
           'Network error on destination MXs',
-          'No MX found for domain',
-          'No MX found for destination',
           'No valid route to remote MX',
           'No valid route to destination',
           'Temporary failure in MX lookup',
@@ -64,11 +66,11 @@ module Sisimai::Lhost
         'securityerror' => ['Could not retrieve credentials'],
       }.freeze
 
-      # Parse bounce messages from OpenSMTPD
+      # @abstract Decodes the bounce message from OpenSMTPD
       # @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
+      # @return [Nil]           it failed to decode or the arguments are missing
       def inquire(mhead, mbody)
         return nil unless mhead['subject'].start_with?('Delivery status notification')
         return nil unless mhead['from'].start_with?('Mailer Daemon <')
@@ -104,9 +106,9 @@ module Sisimai::Lhost
           #    Below is a copy of the original message:
           v = dscontents[-1]
 
-          if e.include?('@') && Sisimai::String.aligned(e, ['@', ' '])
+          if Sisimai::String.aligned(e, ['@', ' '])
             # kijitora@example.jp: 550 5.2.2 <kijitora@example>... Mailbox Full
-            if v['recipient']
+            if v["recipient"] != ""
               # There are multiple recipient addresses in the message body.
               dscontents << Sisimai::Lhost.DELIVERYSTATUS
               v = dscontents[-1]

data/lib/sisimai/lhost/postfix.rb

@@ -1,9 +1,11 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::Postfix parses a bounce email which created by Postfix. Methods in the module are
-  # called from only Sisimai::Message.
+  # Sisimai::Lhost::Postfix decodes a bounce email which created by Postfix https://www.postfix.org/.
+  # Methods in the module are called from only Sisimai::Message.
   module Postfix
     class << self
       require 'sisimai/lhost'
+      require 'sisimai/rfc1123'
+      require 'sisimai/smtp/reply'
       require 'sisimai/smtp/command'
 
       # Postfix manual - bounce(5) - http://www.postfix.org/bounce.5.html
@@ -20,25 +22,23 @@ module Sisimai::Lhost
         ],
       }.freeze
 
-      # Parse bounce messages from Postfix
+      # @abstract Decodes the bounce message from Postfix
       # @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
+      # @return [Nil]           it failed to decode or the arguments are missing
       def inquire(mhead, mbody)
-        match = nil
-        sessx = nil
+        match = 0
 
         if mhead['subject'].include?('SMTP server: errors from ')
           # src/smtpd/smtpd_chat.c:|337: post_mail_fprintf(notice, "Subject: %s SMTP server: errors from %s",
           # src/smtpd/smtpd_chat.c:|338:   var_mail_name, state->namaddr);
-          match = true
-          sessx = true
+          match = 2
         else
           # Subject: Undelivered Mail Returned to Sender
-          match = true if mhead['subject'] == 'Undelivered Mail Returned to Sender'
+          match = 1 if mhead['subject'] == 'Undelivered Mail Returned to Sender'
         end
-        return nil unless match
+        return nil if match == 0
         return nil if mhead['x-aol-ip']
 
         permessage = {}     # (Hash) Store values of each Per-Message field
@@ -52,7 +52,7 @@ module Sisimai::Lhost
         anotherset = {}     # Another error information
         v = nil
 
-        if sessx
+        if match == 2
           # The message body starts with 'Transcript of session follows.'
           require 'sisimai/smtp/transcript'
           transcript = Sisimai::SMTP::Transcript.rise(emailparts[0], 'In:', 'Out:')
@@ -75,7 +75,7 @@ module Sisimai::Lhost
 
             elsif e['command'] == 'RCPT'
               # RCPT TO: <...>
-              if v['recipient']
+              if v["recipient"] != ""
                 # There are multiple recipient addresses in the transcript of session
                 dscontents << Sisimai::Lhost.DELIVERYSTATUS
                 v = dscontents[-1]
@@ -86,9 +86,9 @@ module Sisimai::Lhost
 
             next if p['reply'].to_i < 400
             commandset << e['command']
-            v['diagnosis'] ||= p['text'].join(' ')
-            v['replycode'] ||= p['reply']
-            v['status']    ||= p['status']
+            v['diagnosis'] = p['text'].join(' ') if v["diagnosis"].empty?
+            v['replycode'] = p['reply'] if v["replycode"].empty?
+            v['status']    = p['status'] if v["status"].empty?
           end
         else
           fieldtable = Sisimai::RFC1894.FIELDTABLE
@@ -107,17 +107,18 @@ module Sisimai::Lhost
             next if (readcursor & Indicators[:deliverystatus]) == 0
             next if e.empty?
 
-            if f = Sisimai::RFC1894.match(e)
+            f = Sisimai::RFC1894.match(e)
+            if f > 0
               # "e" matched with any field defined in RFC3464
               next unless o = Sisimai::RFC1894.field(e)
               v = dscontents[-1]
 
-              if o[-1] == 'addr'
+              if o[3] == 'addr'
                 # Final-Recipient: rfc822; kijitora@example.jp
                 # X-Actual-Recipient: rfc822; kijitora@example.co.jp
                 if o[0] == 'final-recipient'
                   # Final-Recipient: rfc822; kijitora@example.jp
-                  if v['recipient']
+                  if v["recipient"] != ""
                     # There are multiple recipient addresses in the message body.
                     dscontents << Sisimai::Lhost.DELIVERYSTATUS
                     v = dscontents[-1]
@@ -128,17 +129,18 @@ module Sisimai::Lhost
                   # X-Actual-Recipient: rfc822; kijitora@example.co.jp
                   v['alias'] = o[2]
                 end
-              elsif o[-1] == 'code'
+              elsif o[3] == 'code'
                 # Diagnostic-Code: SMTP; 550 5.1.1 <userunknown@example.jp>... User Unknown
                 v['spec'] = o[1]
-                v['spec'] = 'SMTP' if v['spec'] == 'X-POSTFIX'
+                v['spec'] = 'SMTP' if v['spec'].upcase == 'X-POSTFIX'
                 v['diagnosis'] = o[2]
               else
                 # Other DSN fields defined in RFC3464
                 next unless fieldtable[o[0]]
+                next if o[3] == "host" && Sisimai::RFC1123.is_internethost(o[2]) == false
                 v[fieldtable[o[0]]] = o[2]
 
-                next unless f
+                next unless f == 1
                 permessage[fieldtable[o[0]]] = o[2]
               end
             else
@@ -162,7 +164,7 @@ module Sisimai::Lhost
                 # Alternative error message and recipient
                 if e.include?(' (in reply to ') || e.include?('command)')
                   # 5.1.1 <userunknown@example.co.jp>... User Unknown (in reply to RCPT TO
-                  q = Sisimai::SMTP::Command.find(e); commandset << q if q
+                  cv = Sisimai::SMTP::Command.find(e) || ""; commandset << cv unless cv.empty?
                   anotherset['diagnosis'] ||= ''
                   anotherset['diagnosis'] << ' ' << e
 
@@ -205,7 +207,7 @@ module Sisimai::Lhost
 
         end
 
-        unless recipients > 0
+        if recipients == 0
           # Fallback: get a recipient address from error messages
           if anotherset['recipient'].to_s.size > 0
             # Set a recipient address
@@ -241,13 +243,9 @@ module Sisimai::Lhost
               # More detailed error message is in "anotherset"
               as = '' # status
               ar = '' # replycode
-
-              e['status']    ||= ''
-              e['replycode'] ||= ''
-
               if e['status'].empty? || e['status'].start_with?('4.0.0', '5.0.0')
                 # Check the value of D.S.N. in anotherset
-                as = Sisimai::SMTP::Status.find(anotherset['diagnosis']) || ''
+                as = Sisimai::SMTP::Status.find(anotherset['diagnosis'])
                 if as.size > 0 && as[-4, 4] != '.0.0'
                   # The D.S.N. is neither an empty nor *.0.0
                   e['status'] = as
@@ -256,7 +254,7 @@ module Sisimai::Lhost
 
               if e['replycode'].empty? || e['replycode'].end_with?('00')
                 # Check the value of SMTP reply code in $anotherset
-                ar = Sisimai::SMTP::Reply.find(anotherset['diagnosis']) || ''
+                ar = Sisimai::SMTP::Reply.find(anotherset['diagnosis'])
                 if ar.size > 0 && ar.end_with?('00') == false
                   # The SMTP reply code is neither an empty nor *00
                   e['replycode'] = ar
@@ -278,8 +276,8 @@ module Sisimai::Lhost
 
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis']) || ''
           e['command']   = commandset.shift || Sisimai::SMTP::Command.find(e['diagnosis'])
-          e['command'] ||= 'HELO' if e['diagnosis'].include?('refused to talk to me:')
-          e['spec']    ||= 'SMTP' if Sisimai::String.aligned(e['diagnosis'], ['host ', ' said:'])
+          e['command']   = 'HELO' if e["command"].empty? && e['diagnosis'].include?('refused to talk to me:')
+          e['spec']      = 'SMTP' if e["spec"].empty?    && Sisimai::String.aligned(e['diagnosis'], ['host ', ' said:'])
         end
 
         return { 'ds' => dscontents, 'rfc822' => emailparts[1] }