sisimai 5.6.0-java → 5.7.1-java

data/lib/sisimai/lhost/gmail.rb

@@ -3,6 +3,7 @@ module Sisimai::Lhost
   # Methods in the module are called from only Sisimai::Message.
   module Gmail
     class << self
+      require 'sisimai/eb'
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
@@ -11,24 +12,13 @@ module Sisimai::Lhost
         message: ['Delivery to the following recipient'],
         error:   ['The error that the other server returned was:'],
       }.freeze
-      MessagesOf = {
-        'expired' => [
-          'DNS Error: Could not contact DNS servers',
-          'Delivery to the following recipient has been delayed',
-          'The recipient server did not accept our requests to connect',
-        ],
-        'hostunknown' => [
-          'DNS Error: Domain name not found',
-          'DNS Error: DNS server returned answer with no data',
-        ],
-      }.freeze
       StateTable = {
         # Technical details of permanent failure:
         # Google tried to deliver your message, but it was rejected by the recipient domain.
         # We recommend contacting the other email provider for further information about the
         # cause of this error. The error that the other server returned was:
         # 500 Remote server does not support TLS (state 6).
-        '6'  => { 'command' => 'MAIL', 'reason' => 'failedstarttls' },
+        '6'  => { 'command' => Sisimai::Eb::CeMAIL, 'reason' => Sisimai::Eb::ReTTLS },
 
         # https://www.google.td/support/forum/p/gmail/thread?tid=08a60ebf5db24f7b&hl=en
         # Technical details of permanent failure:
@@ -36,7 +26,7 @@ module Sisimai::Lhost
         # We recommend contacting the other email provider for further information about the
         # cause of this error. The error that the other server returned was:
         # 535 SMTP AUTH failed with the remote server. (state 8).
-        '8'  => { 'command' => 'AUTH', 'reason' => 'systemerror' },
+        '8'  => { 'command' => Sisimai::Eb::CeAUTH, 'reason' => Sisimai::Eb::RePROC },
 
         # https://www.google.co.nz/support/forum/p/gmail/thread?tid=45208164dbca9d24&hl=en
         # Technical details of temporary failure:
@@ -44,7 +34,7 @@ module Sisimai::Lhost
         # We recommend contacting the other email provider for further information about the
         # cause of this error. The error that the other server returned was:
         # 454 454 TLS missing certificate: error:0200100D:system library:fopen:Permission denied (#4.3.0) (state 9).
-        '9'  => { 'command' => 'AUTH', 'reason' => 'failedstarttls' },
+        '9'  => { 'command' => Sisimai::Eb::CeAUTH, 'reason' => Sisimai::Eb::ReTTLS },
 
         # https://www.google.com/support/forum/p/gmail/thread?tid=5cfab8c76ec88638&hl=en
         # Technical details of permanent failure:
@@ -52,14 +42,14 @@ module Sisimai::Lhost
         # We recommend contacting the other email provider for further information about the
         # cause of this error. The error that the other server returned was:
         # 500 Remote server does not support SMTP Authenticated Relay (state 12).
-        '12' => { 'command' => 'AUTH', 'reason' => 'norelaying' },
+        '12' => { 'command' => Sisimai::Eb::CeAUTH, 'reason' => Sisimai::Eb::RePASS },
 
         # Technical details of permanent failure:
         # Google tried to deliver your message, but it was rejected by the recipient domain.
         # We recommend contacting the other email provider for further information about the
         # cause of this error. The error that the other server returned was:
         # 550 550 5.7.1 <****@gmail.com>... Access denied (state 13).
-        '13' => { 'command' => 'EHLO', 'reason' => 'blocked' },
+        '13' => { 'command' => Sisimai::Eb::CeEHLO, 'reason' => Sisimai::Eb::ReBLOC },
 
         # Technical details of permanent failure:
         # Google tried to deliver your message, but it was rejected by the recipient domain.
@@ -68,7 +58,7 @@ module Sisimai::Lhost
         # 550 550 5.1.1 <******@*********.**>... User Unknown (state 14).
         # 550 550 5.2.2 <*****@****.**>... Mailbox Full (state 14).
         #
-        '14' => { 'command' => 'RCPT', 'reason' => 'userunknown' },
+        '14' => { 'command' => Sisimai::Eb::CeRCPT, 'reason' => Sisimai::Eb::ReUSER },
 
         # https://www.google.cz/support/forum/p/gmail/thread?tid=7090cbfd111a24f9&hl=en
         # Technical details of permanent failure:
@@ -77,7 +67,7 @@ module Sisimai::Lhost
         # cause of this error. The error that the other server returned was:
         # 550 550 5.7.1 SPF unauthorized mail is prohibited. (state 15).
         # 554 554 Error: no valid recipients (state 15).
-        '15' => { 'command' => 'DATA', 'reason' => 'filtered' },
+        '15' => { 'command' => Sisimai::Eb::CeDATA, 'reason' => Sisimai::Eb::ReFILT },
 
         # https://www.google.com/support/forum/p/Google%20Apps/thread?tid=0aac163bc9c65d8e&hl=en
         # Technical details of permanent failure:
@@ -86,14 +76,14 @@ module Sisimai::Lhost
         # cause of this error. The error that the other server returned was:
         # 550 550 <****@***.**> No such user here (state 17).
         # 550 550 #5.1.0 Address rejected ***@***.*** (state 17).
-        '17' => { 'command' => 'DATA', 'reason' => 'filtered' },
+        '17' => { 'command' => Sisimai::Eb::CeDATA, 'reason' => Sisimai::Eb::ReFILT },
 
         # Technical details of permanent failure:
         # Google tried to deliver your message, but it was rejected by the recipient domain.
         # We recommend contacting the other email provider for further information about the
         # cause of this error. The error that the other server returned was:
         # 550 550 Unknown user *****@***.**.*** (state 18).
-        '18' => { 'command' => 'DATA', 'reason' => 'filtered' },
+        '18' => { 'command' => Sisimai::Eb::CeDATA, 'reason' => Sisimai::Eb::ReFILT },
       }.freeze
 
       # @abstract Decodes the bounce message from Gmail
@@ -205,8 +195,6 @@ module Sisimai::Lhost
         require 'sisimai/string'
         require 'sisimai/rfc1123'
         dscontents.each do |e|
-          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
-
           if Sisimai::String.aligned(e['diagnosis'], [' by ', '. [', ']. '])
             # Get the value of remote host
             # Google tried to deliver your message, but it was rejected by the server for the recipient
@@ -232,16 +220,6 @@ module Sisimai::Lhost
             e['command'] = StateTable[cu]['command']
             break
           end
-
-          if e['reason'].empty?
-            # There is no no state code in the error message
-            MessagesOf.each_key do |r|
-              # Verify each regular expression of session errors
-              next if MessagesOf[r].none? { |a| e['diagnosis'].include?(a) }
-              e['reason'] = r
-              break
-            end
-          end
           next if e['reason'].empty?
 
           # Set pseudo status code

data/lib/sisimai/lhost/gmx.rb

@@ -8,7 +8,6 @@ module Sisimai::Lhost
       Indicators = Sisimai::Lhost.INDICATORS
       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
 
       # @abstract Decodes the bounce message from GMX
       # @param  [Hash] mhead    Message headers of a bounce email
@@ -65,33 +64,17 @@ module Sisimai::Lhost
             end
             v['recipient'] = Sisimai::Address.s3s4(e)
             recipients += 1
-
-          elsif e.start_with?('SMTP error ')
-            # SMTP error from remote server after RCPT command:
-            v['command'] = Sisimai::SMTP::Command.find(e)
-
-          elsif e.start_with?('host:')
-            # host: mx.example.jp
-            v['rhost'] = e[6, e.size]
           else
-            # Get error messages
-            next if e.empty?
-            v['diagnosis'] += "#{e }"
+            # - SMTP error from remote server after RCPT command:
+            # - host: mx.example.jp
+            case
+              when e.start_with?('SMTP error ') then v['command'] = Sisimai::SMTP::Command.find(e)
+              when e.start_with?('host:')       then v['rhost'] = e[6, e.size]
+              else v['diagnosis'] += "#{e }" if e.empty? == false
+            end
           end
         end
         return nil if recipients == 0
-
-        dscontents.each do |e|
-          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'].tr("\n", ' '))
-
-          MessagesOf.each_key do |r|
-            # Verify each regular expression of session errors
-            next if MessagesOf[r].none? { |a| e['diagnosis'].include?(a) }
-            e['reason'] = r
-            break
-          end
-        end
-
         return {"ds" => dscontents, "rfc822" => emailparts[1]}
       end
       def description; return 'GMX: https://www.gmx.net'; end

data/lib/sisimai/lhost/googlegroups.rb

@@ -3,6 +3,7 @@ module Sisimai::Lhost
   # Methods in the module are called from only Sisimai::Message.
   module GoogleGroups
     class << self
+      require 'sisimai/eb'
       require 'sisimai/lhost'
       Boundaries = ['----- Original message -----', 'Content-Type: message/rfc822'].freeze
 
@@ -13,10 +14,10 @@ module Sisimai::Lhost
       # @return [Nil]           it failed to decode or the arguments are missing
       # @since v4.25.6
       def inquire(mhead, mbody)
-        return nil if mbody.include?("Google Groups") == false
+        return nil if mbody.include?("Google Group") == false
         return nil if mhead['from'].end_with?('<mailer-daemon@googlemail.com>') == false
         return nil if mhead['subject'].start_with?('Delivery Status Notification') == false
-        return nil if mhead['x-failed-recipients'].nil? || mhead['x-google-smtp-source'].nil?
+        return nil if mhead['x-failed-recipients'].nil?
 
         # Hello kijitora@libsisimai.org,
         #
@@ -46,11 +47,11 @@ module Sisimai::Lhost
         entiremesg = emailparts[0].split(/\n\n/, 5).slice(0, 4).join(' ').tr("\n", ' ');
         receivedby = mhead['received'] || []
         recordwide = {
-          'diagnosis' => Sisimai::String.sweep(entiremesg),
-          'reason'    => 'onhold',
+          'diagnosis' => entiremesg,
+          'reason'    => Sisimai::Eb::Re___1,
           'rhost'     => Sisimai::RFC5322.received(receivedby[0])[1],
         }
-        recordwide['reason'] = 'rejected' if emailparts[0].scan(/^[ ]?[*][ ]?/).size == 4
+        recordwide['reason'] = Sisimai::Eb::ReFROM if emailparts[0].scan(/^[ ]?[*][ ]?/).size == 4
 
         mhead['x-failed-recipients'].split(',').each do |e|
           # X-Failed-Recipients: neko@example.jp, nyaan@example.org, ...

data/lib/sisimai/lhost/googleworkspace.rb

@@ -3,6 +3,7 @@ module Sisimai::Lhost
   # Methods in the module are called only from Sisimai::Message.
   module GoogleWorkspace
     class << self
+      require 'sisimai/eb'
       require 'sisimai/lhost'
       require 'sisimai/string'
       require 'sisimai/address'
@@ -14,9 +15,7 @@ module Sisimai::Lhost
         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."],
-        "notaccept"    => ["Null MX"],
-        "networkerror" => [" had no relevant answers.", " responded with code NXDOMAIN"],
+        Sisimai::Eb::ReUSER => ["because the address couldn't be found. Check for typos or unnecessary spaces and try again."],
       }.freeze
 
       # @abstract Decodes the bounce message from Google Workspace
@@ -73,8 +72,6 @@ module Sisimai::Lhost
 
         dscontents[0]["diagnosis"] = entiremesg
         dscontents.each do |e|
-          # Tidy up the error message in e["diagnosis"], Try to detect the bounce reason.
-          e["diagnosis"] = Sisimai::String.sweep(e["diagnosis"])
           MessagesOf.each_key do |r|
             # Guess an reason of the bounce
             next if MessagesOf[r].none? { |a| e["diagnosis"].include?(a) }

data/lib/sisimai/lhost/imailserver.rb

@@ -4,17 +4,14 @@ module Sisimai::Lhost
   # Methods in the module are called from only Sisimai::Message.
   module IMailServer
     class << self
+      require 'sisimai/eb'
       require 'sisimai/lhost'
 
       Boundaries = ['Original message follows.'].freeze
       StartingOf = {error: ['Body of message generated response:']}.freeze
       MessagesOf = {
-        'hostunknown'   => ['Unknown host'],
-        'userunknown'   => ['Unknown user', 'Invalid final delivery userid'],
-        'mailboxfull'   => ['User mailbox exceeds allowed size'],
-        'virusdetected' => ['Requested action not taken: virus detected'],
-        'spamdetected'  => ['Blacklisted URL in message'],
-        'expired'       => ['Delivery failed '],
+        Sisimai::Eb::ReUSER => ['Unknown user', 'Invalid final delivery userid'],
+        Sisimai::Eb::ReTIME => ['Delivery failed '],
       }.freeze
 
       # @abstract Decodes the bounce message from Progress iMail Server
@@ -72,11 +69,9 @@ module Sisimai::Lhost
                              else
                                e['alterrors']
                              end
-            e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
             e.delete('alterrors')
           end
-          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis']) || ''
-          e['command']   = Sisimai::SMTP::Command.find(e['diagnosis'])
+          e['command'] = Sisimai::SMTP::Command.find(e['diagnosis'])
 
           MessagesOf.each_key do |r|
             # Verify each regular expression of session errors

data/lib/sisimai/lhost/kddi.rb

@@ -3,16 +3,12 @@ module Sisimai::Lhost
   # Methods in the module are called from only Sisimai::Message.
   module KDDI
     class << self
+      require 'sisimai/eb'
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
       Boundaries = ['Content-Type: message/rfc822'].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
 
       # @abstract Decodes the bounce message from au by KDDI
       # @param  [Hash] mhead    Message headers of a bounce email
@@ -45,7 +41,8 @@ module Sisimai::Lhost
           next if (readcursor & Indicators[:deliverystatus]) == 0 || e.empty?
 
           v = dscontents[-1]
-          if e.include?(' Could not be delivered to: <')
+          case
+          when 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.
@@ -59,7 +56,7 @@ module Sisimai::Lhost
             v['recipient'] = r
             recipients += 1
 
-          elsif e.include?('Your mail sent on: ')
+          when e.include?('Your mail sent on: ')
             # Your mail sent on: Thu, 29 Apr 2010 11:04:47 +0900
             v['date'] = e[19, e.size]
           else
@@ -71,26 +68,16 @@ module Sisimai::Lhost
 
         require 'sisimai/smtp/command'
         dscontents.each do |e|
-          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)
             # Filtered recipient returns message that include 'X-SPASIGN' header
-            e['reason'] = 'filtered'
+            e['reason'] = Sisimai::Eb::ReFILT
           else
-            if e['command'] == 'RCPT'
-              # set "userunknown" when the remote server rejected after RCPT command.
-              e['reason'] = 'userunknown'
-            else
-              # SMTP command is not RCPT
-              MessagesOf.each_key do |r|
-                # Verify each regular expression of session errors
-                next if MessagesOf[r].none? { |a| e['diagnosis'].include?(a) }
-                e['reason'] = r
-                break
-              end
-            end
+            # There is no X-SPASIGN: header in the bounce message
+            # set "UserUnknown" when the remote server rejected after RCPT command.
+            e['reason'] = Sisimai::Eb::ReUSER if e['command'] == Sisimai::Eb::CeRCPT
           end
         end
 

data/lib/sisimai/lhost/mailfoundry.rb

@@ -65,8 +65,6 @@ module Sisimai::Lhost
           end
         end
         return nil if recipients == 0
-
-        dscontents.each { |e| e['diagnosis'] = Sisimai::String.sweep(e['diagnosis']) }
         return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
       end
       def description; return 'MailFoundry'; end

data/lib/sisimai/lhost/mailmarshal.rb

@@ -103,15 +103,13 @@ module Sisimai::Lhost
                 p1 = e.index(' From:') || e.index(' Subject:')
                 p2 = e.index(':')
                 cf = e[p1 + 1, p2 - p1 - 1]
-                cv = Sisimai::String.sweep(e[p2 + 1, e.size])
+                cv = e[p2 + 1, e.size]
                 emailparts[1] += sprintf("%s: %s\n", cf, cv)
               end
             end
           end
         end
         return nil if recipients == 0
-
-        dscontents.each { |e| e['diagnosis'] = Sisimai::String.sweep(e['diagnosis']) }
         return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
       end
       def description; return 'Trustwave Secure Email Gateway'; end

data/lib/sisimai/lhost/messagingserver.rb

@@ -9,7 +9,6 @@ module Sisimai::Lhost
       Indicators = Sisimai::Lhost.INDICATORS
       Boundaries = ['Content-Type: message/rfc822', 'Return-path: '].freeze
       StartingOf = {message: ['This report relates to a message you sent with the following header fields:']}.freeze
-      MessagesOf = {'hostunknown' => ['Illegal host/domain name found']}.freeze
 
       # @abstract Decodes the bounce message from MessagingServer
       # @param  [Hash] mhead    Message headers of a bounce email
@@ -115,18 +114,19 @@ module Sisimai::Lhost
             #  (6jo.example.jp ESMTP SENDMAIL-VM)
             # Diagnostic-code: smtp;550 5.1.1 <kijitora@example.jp>... User Unknown
             #
-            if e.start_with?('Status: ')
+            case
+            when e.start_with?('Status: ')
               # Status: 5.1.1 (Remote SMTP server has rejected address)
               p1 = e.index(':')
               p2 = e.index('('); next if p2.nil?
               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: ')
+            when e.start_with?('Arrival-Date: ')
               # Arrival-date: Thu, 29 Apr 2014 23:34:45 +0000 (GMT)
               v['date'] = e[e.index(':') + 2, e.size] if v["date"].empty?
 
-            elsif e.start_with?('Reporting-MTA: ')
+            when e.start_with?('Reporting-MTA: ')
               # Reporting-MTA: dns;mr21p30im-asmtp004.me.com (tcp-daemon)
               localhost = e[e.index(';') + 1, e.size]
               v['lhost'] = localhost if v["lhost"].empty?
@@ -135,17 +135,6 @@ module Sisimai::Lhost
           end
         end
         return nil if recipients == 0
-
-        dscontents.each do |e|
-          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
-          MessagesOf.each_key do |r|
-            # Verify each regular expression of session errors
-            next if MessagesOf[r].none? { |a| e['diagnosis'].include?(a) }
-            e['reason'] = r
-            break
-          end
-        end
-
         return {"ds" => dscontents, "rfc822" => emailparts[1]}
       end
       def description; return 'Oracle Communications Messaging Server'; end

data/lib/sisimai/lhost/mfilter.rb

@@ -98,7 +98,6 @@ module Sisimai::Lhost
         return nil if recipients == 0
 
         dscontents.each do |e|
-          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
           e['agent'] = 'mFILTER'
 
           # Get localhost and remote host name from Received header.

data/lib/sisimai/lhost/mimecast.rb

@@ -93,7 +93,6 @@ module Sisimai::Lhost
         dscontents.each do |e|
           # Set default values if each value is empty.
           permessage.each_key { |a| e[a] ||= permessage[a] || '' }
-          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis']) || ''
         end
 
         return { 'ds' => dscontents, 'rfc822' => emailparts[1] }

data/lib/sisimai/lhost/notes.rb

@@ -3,17 +3,17 @@ module Sisimai::Lhost
   # (formerly Lotus Notes Server)). Methods in the module are called from only Sisimai::Message.
   module Notes
     class << self
+      require 'sisimai/eb'
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
       Boundaries = ['------- Returned Message --------'].freeze
       StartingOf = {message: ['------- Failure Reasons ']}.freeze
       MessagesOf = {
-        'userunknown' => [
+        Sisimai::Eb::ReUSER => [
           'User not listed in public Name & Address Book',
           'ディレクトリのリストにありません',
         ],
-        'networkerror' => ['Message has exceeded maximum hop count'],
       }.freeze
 
       # @abstract Decodes the bounce messages from HCL Notes (Formerly IBM Notes (Formerly Lotus Notes))
@@ -101,7 +101,7 @@ module Sisimai::Lhost
         return nil if recipients == 0
 
         dscontents.each do |e|
-          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
+          e['diagnosis'] = e['diagnosis'].split.join(" ")
           e['recipient'] = Sisimai::Address.s3s4(e['recipient'])
 
           MessagesOf.each_key do |r|

data/lib/sisimai/lhost/opensmtpd.rb

@@ -35,36 +35,6 @@ module Sisimai::Lhost
         #   bounce.c/339:
         message: ['    This is the MAILER-DAEMON, please DO NOT REPLY to this '],
       }.freeze
-      MessagesOf = {
-        # smtpd/queue.c:221|  envelope_set_errormsg(&evp, "Envelope expired");
-        'expired' => ['Envelope expired'],
-        # smtpd/mta.c:976|  relay->failstr = "Invalid domain name";
-        # smtpd/mta.c:980|  relay->failstr = "Domain does not exist";
-        'hostunknown' => [
-          'Invalid domain name',
-          'Domain does not exist',
-        ],
-        # smtp/mta.c:1085|  relay->failstr = "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',
-          'All routes to destination blocked',
-          'bad DNS lookup error code',
-          'Could not retrieve source address',
-          'Loop detected',
-          'Network error on destination MXs',
-          'No valid route to remote MX',
-          'No valid route to destination',
-          'Temporary failure in MX lookup',
-        ],
-        # smtpd/mta.c:1013|  relay->failstr = "Could not retrieve credentials";
-        'securityerror' => ['Could not retrieve credentials'],
-      }.freeze
 
       # @abstract Decodes the bounce message from OpenSMTPD
       # @param  [Hash] mhead    Message headers of a bounce email
@@ -117,16 +87,6 @@ module Sisimai::Lhost
           end
         end
         return nil if recipients == 0
-
-        dscontents.each do |e|
-          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
-          MessagesOf.each_key do |r|
-            # Verify each regular expression of session errors
-            next if MessagesOf[r].none? { |a| e['diagnosis'].include?(a) }
-            e['reason'] = r
-            break
-          end
-        end
         return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
       end
       def description; return 'OpenSMTPD'; end

data/lib/sisimai/lhost/postfix.rb

@@ -3,6 +3,7 @@ module Sisimai::Lhost
   # Methods in the module are called from only Sisimai::Message.
   module Postfix
     class << self
+      require 'sisimai/eb'
       require 'sisimai/lhost'
       require 'sisimai/rfc1123'
       require 'sisimai/smtp/reply'
@@ -63,15 +64,14 @@ module Sisimai::Lhost
             v ||= dscontents[-1]
             p   = e['response']
 
-            if e['command'] == 'HELO' || e['command'] == 'EHLO'
-              # Use the argument of EHLO/HELO command as a value of "lhost"
-              v['lhost'] = e['argument']
-
-            elsif e['command'] == 'MAIL'
+            case e["command"]
+            # Use the argument of EHLO/HELO command as a value of "lhost"
+            when Sisimai::Eb::CeHELO, Sisimai::Eb::CeEHLO then v['lhost'] = e['argument']
+            when Sisimai::Eb::CeMAIL
               # Set the argument of "MAIL" command to pseudo To: header of the original message
               emailparts[1] += sprintf("To: %s\n", e['argument']) if emailparts[1].size == 0
 
-            elsif e['command'] == 'RCPT'
+            when Sisimai::Eb::CeRCPT
               # RCPT TO: <...>
               if v["recipient"] != ""
                 # There are multiple recipient addresses in the transcript of session
@@ -110,7 +110,8 @@ module Sisimai::Lhost
               next unless o = Sisimai::RFC1894.field(e)
               v = dscontents[-1]
 
-              if o[3] == 'addr'
+              case o[3]
+              when "addr"
                 # Final-Recipient: rfc822; kijitora@example.jp
                 # X-Actual-Recipient: rfc822; kijitora@example.co.jp
                 if Sisimai::Address.is_emailaddress(o[2])
@@ -130,7 +131,7 @@ module Sisimai::Lhost
                     v['alias'] = o[2]
                   end
                 end
-              elsif o[3] == 'code'
+              when "code"
                 # Diagnostic-Code: SMTP; 550 5.1.1 <userunknown@example.jp>... User Unknown
                 v['spec'] = o[1]
                 v['spec'] = 'SMTP' if v['spec'].upcase == 'X-POSTFIX'
@@ -154,7 +155,7 @@ module Sisimai::Lhost
               # 5.1.1 <userunknown@example.co.jp>... User Unknown (in reply to RCPT TO command)
               if readslices[-2].start_with?('Diagnostic-Code:') && e.include?(' ')
                 # Continued line of the value of Diagnostic-Code header
-                v['diagnosis'] += " #{Sisimai::String.sweep(e)}"
+                v['diagnosis'] += " " + e.split.join(" ")
                 readslices[-1]  = "Diagnostic-Code: #{e}"
 
               elsif Sisimai::String.aligned(e, ['X-Postfix-Sender:', 'rfc822;', '@'])
@@ -238,7 +239,7 @@ module Sisimai::Lhost
 
           if anotherset['diagnosis']
             # Copy alternative error message
-            anotherset['diagnosis'] = Sisimai::String.sweep(anotherset['diagnosis'])
+            anotherset['diagnosis'] = anotherset['diagnosis'].split.join(" ")
             e['diagnosis'] = anotherset['diagnosis'] if e['diagnosis'].nil? || e['diagnosis'].empty?
 
             if e['diagnosis'] =~ /\A\d+\z/
@@ -277,10 +278,9 @@ module Sisimai::Lhost
             end
           end
 
-          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis']) || ''
-          e['command']   = commandset.shift || Sisimai::SMTP::Command.find(e['diagnosis'])
-          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:'])
+          e['command'] = commandset.shift || Sisimai::SMTP::Command.find(e['diagnosis'])
+          e['command'] = Sisimai::Eb::CeHELO 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] }