Go sisimai compatibility 7e8a

lib/sisimai/fact.rb

@@ -2,6 +2,7 @@
   # Sisimai::Fact generate the list of decoded bounce data
   class Fact
     require 'sisimai/message'
+    require 'sisimai/rfc1123'
     require 'sisimai/rfc1894'
     require 'sisimai/rfc5322'
     require 'sisimai/reason'
@@ -196,12 +197,28 @@
         next unless piece['timestamp']
 
         # OTHER_TEXT_HEADERS:
-        rr = mesg1['header']['received'] || []
-        unless rr.empty?
-          # Get a localhost and a remote host name from Received header.
-          piece['rhost'] = Sisimai::RFC5322.received(rr[-1])[1] if piece['rhost'].empty?
-          piece['lhost'] = '' if piece['rhost'] == piece['lhost']
-          piece['lhost'] = Sisimai::RFC5322.received(rr[ 0])[0] if piece['lhost'].empty?
+        recv = mesg1['header']['received'] || []
+        if piece['rhost'].empty?
+          # Try to pick a remote hostname from Received: headers of the bounce message
+          recv.reverse.each do |re|
+            # Check the Received: headers backwards and get a remote hostname
+            cv = Sisimai::RFC5322.received(re)[0]
+            next unless Sisimai::RFC1123.is_validhostname(cv)
+            piece['rhost'] = cv
+            break
+          end
+        end
+        piece['lhost'] = '' if piece['rhost'] == piece['lhost']
+
+        if piece['rhost'].empty?
+          # Try to pick a local hostname from Received: headers of the bounce message
+          recv.each do |le|
+            # Check the Received: headers backwards and get a local hostname
+            cv = Sisimai::RFC5322.received(le)[0]
+            next unless Sisimai::RFC1123.is_validhostname(cv)
+            piece['lhost'] = cv
+            break
+          end
         end
 
         # Remove square brackets and curly brackets from the host variable
@@ -388,7 +405,7 @@
         if thing['reason'].empty? || RetryIndex[thing['reason']]
           # The value of "reason" is empty or is needed to check with other values again
           re = thing['reason'].empty? ? 'undefined' : thing['reason']
-          thing['reason'] = Sisimai::Rhost.find(thing) || Sisimai::Reason.get(thing)
+          thing['reason'] = Sisimai::Rhost.find(thing) || Sisimai::Reason.find(thing)
           thing['reason'] = re if thing['reason'].empty?
         end
 

lib/sisimai/lhost/gmail.rb

@@ -151,6 +151,7 @@ def inquire(mhead, mbody)
         return nil unless mhead['from'].end_with?('<[email protected]>')
         return nil unless mhead['subject'].start_with?('Delivery Status Notification')
 
+        require 'sisimai/address'
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
         emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
         bodyslices = emailparts[0].split("\n")
@@ -204,43 +205,47 @@ def inquire(mhead, mbody)
         end
         return nil unless recipients > 0
 
+        require 'sisimai/string'
+        require 'sisimai/rfc1123'
         dscontents.each do |e|
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
 
-          unless e['rhost']
+          if Sisimai::String.aligned(e['diagnosis'], [' by ', '. [', ']. '])
             # Get the value of remote host
-            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
+            # 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]
 
-              e['rhost']   = hostname if lastchar > 64 && lastchar < 91
-              e['rhost'] ||= ipv4addr
-            end
+            e['rhost']   = hostname if Sisimai::RFC1123.is_validhostname(hostname)
+            e['rhost'] ||= ipv4addr
           end
 
-          p1 = e['diagnosis'].rindex(' ') || -1
-          p2 = e['diagnosis'].rindex(')') || -1
-          statecode0 = e['diagnosis'][p1 + 1, p2 - p1 - 1] || 0
+          while true do
+            # Find "(state 18)" and pick "18" as a key of statetable
+            p1 = e['diagnosis'].rindex(' (state ');   break unless p1
+            p2 = e['diagnosis'].rindex(')');          break unless p2
+                                                      break if p1 > p2
+            cu = e['diagnosis'][p1 + 8, p2 - p1 - 8]
+            break if cu.empty?
+            break unless StateTable[cu]
+            e['reason']  = StateTable[cu]['reason']
+            e['command'] = StateTable[cu]['command']
+            break
+          end
 
-          if StateTable[statecode0]
-            # (state *)
-            e['reason']  = StateTable[statecode0]['reason']
-            e['command'] = StateTable[statecode0]['command']
-          else
-            # No state code
+          if e['reason'].nil?
+            # There is no no state code in the error message
             MessagesOf.each_key do |r|
               # Verify each regular expression of session errors
               next unless MessagesOf[r].any? { |a| e['diagnosis'].include?(a) }
               e['reason'] = r
               break
             end
           end
-          next unless e['reason']
+          e['reason'] ||= ''; next if e['reason'].empty?
 
           # Set pseudo status code
           e['status'] = Sisimai::SMTP::Status.find(e['diagnosis']) || ''

lib/sisimai/lhost/gmx.rb

@@ -76,21 +76,10 @@ def inquire(mhead, mbody)
             # host: mx.example.jp
             v['rhost'] = e[6, e.size]
           else
-            # Get error message
-            if Sisimai::SMTP::Status.find(e) || Sisimai::String.aligned(e, ['<', '@', '>'])
-              # 5.1.1 <[email protected]>... User Unknown
-              v['diagnosis'] ||= e
-            else
-              next if e.empty?
-              if e.start_with?('Reason:')
-                # Reason:
-                # delivery retry timeout exceeded
-                v['diagnosis'] = e
-
-              elsif v['diagnosis'] == 'Reason:'
-                v['diagnosis'] = e
-              end
-            end
+            # Get error messages
+            next if e.empty?
+            v['diagnosis'] ||= ''
+            v['diagnosis']  += e + ' '
           end
         end
         return nil unless recipients > 0

lib/sisimai/lhost/googlegroups.rb

@@ -4,9 +4,7 @@ module Sisimai::Lhost
   module GoogleGroups
     class << self
       require 'sisimai/lhost'
-
-      Indicators = Sisimai::Lhost.INDICATORS
-      Boundaries = ['----- Original message -----'].freeze
+      Boundaries = ['----- Original message -----', 'Content-Type: message/rfc822'].freeze
 
       # @abstract Decodes the bounce message from Google Groups
       # @param  [Hash] mhead    Message headers of a bounce email
@@ -39,7 +37,6 @@ def inquire(mhead, mbody)
         # Google Groups
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
         emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
-        recordwide = { 'rhost' => '', 'reason' => '', 'diagnosis' => '' }
         recipients = 0
         v = dscontents[-1]
 
@@ -49,9 +46,12 @@ def inquire(mhead, mbody)
         # * This group may not be open to posting.
         entiremesg = emailparts[0].split(/\n\n/, 5).slice(0, 4).join(' ').tr("\n", ' ');
         receivedby = mhead['received'] || []
-        recordwide['diagnosis'] = Sisimai::String.sweep(entiremesg)
-        recordwide['reason']    = emailparts[0].scan(/^[ ]?[*][ ]?/).size == 4 ? 'rejected' : 'onhold'
-        recordwide['rhost']     = Sisimai::RFC5322.received(receivedby[0])[1]
+        recordwide = {
+          'diagnosis' => Sisimai::String.sweep(entiremesg),
+          'reason'    => 'onhold',
+          'rhost'     => Sisimai::RFC5322.received(receivedby[0])[1],
+        }
+        recordwide['reason'] = 'rejected' if emailparts[0].scan(/^[ ]?[*][ ]?/).size == 4
 
         mhead['x-failed-recipients'].split(',').each do |e|
           # X-Failed-Recipients: [email protected], [email protected], ...

lib/sisimai/lhost/imailserver.rb

@@ -8,12 +8,12 @@ class << self
 
       Boundaries = ['Original message follows.'].freeze
       StartingOf = { error: ['Body of message generated response:'] }.freeze
-      ReFailures = {
+      MessagesOf = {
         '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'],
+        'spamdetected'  => ['Blacklisted URL in message'],
         'expired'       => ['Delivery failed '],
       }.freeze
 
@@ -45,24 +45,15 @@ def inquire(mhead, mbody)
           v = dscontents[-1]
 
           p0 = e.index(': ') || -1
-          if p0 > 8 && Sisimai::String.aligned(e, [': ', '@'])
+          if (p0 > 8 && Sisimai::String.aligned(e, [': ', '@'])) || e.start_with?('undeliverable ')
             # Unknown user: [email protected]
-            if v['recipient']
-              # There are multiple recipient addresses in the message body.
-              dscontents << Sisimai::Lhost.DELIVERYSTATUS
-              v = dscontents[-1]
-            end
-            v['diagnosis'] = e
-            v['recipient'] = Sisimai::Address.s3s4(e[p0 + 2, e.size])
-            recipients += 1
-
-          elsif e.start_with?('undeliverable ')
             # undeliverable to [email protected]
             if v['recipient']
               # There are multiple recipient addresses in the message body.
               dscontents << Sisimai::Lhost.DELIVERYSTATUS
               v = dscontents[-1]
             end
+            v['diagnosis'] = e
             v['recipient'] = Sisimai::Address.s3s4(e)
             recipients += 1
           else
@@ -88,9 +79,9 @@ def inquire(mhead, mbody)
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis']) || ''
           e['command']   = Sisimai::SMTP::Command.find(e['diagnosis'])
 
-          ReFailures.each_key do |r|
+          MessagesOf.each_key do |r|
             # Verify each regular expression of session errors
-            next unless ReFailures[r].any? { |a| e['diagnosis'].include?(a) }
+            next unless MessagesOf[r].any? { |a| e['diagnosis'].include?(a) }
             e['reason'] = r
             break
           end

lib/sisimai/lhost/kddi.rb

@@ -7,7 +7,7 @@ class << self
 
       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'],
@@ -40,7 +40,7 @@ def inquire(mhead, mbody)
           # 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

lib/sisimai/lhost/mailfoundry.rb

@@ -55,17 +55,14 @@ def inquire(mhead, mbody)
             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 <[email protected]> No such user here
               v['diagnosis'] << ' ' << e
             end
           end

lib/sisimai/lhost/mcafee.rb

@@ -66,7 +66,7 @@ def inquire(mhead, mbody)
             issuedcode = e[e.index('(') + 1, e.size]
             recipients += 1
 
-          elsif f = Sisimai::RFC1894.match(e)
+          elsif Sisimai::RFC1894.match(e)
             # "e" matched with any field defined in RFC3464
             o = Sisimai::RFC1894.field(e)
             unless o

lib/sisimai/lhost/messagingserver.rb

@@ -60,20 +60,21 @@ def inquire(mhead, mbody)
           #   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: [email protected]
-            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: [email protected]
+            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: [email protected]
-            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]

lib/sisimai/lhost/opensmtpd.rb

@@ -106,7 +106,7 @@ def inquire(mhead, mbody)
           #    Below is a copy of the original message:
           v = dscontents[-1]
 
-          if e.include?('@') && Sisimai::String.aligned(e, ['@', ' '])
+          if Sisimai::String.aligned(e, ['@', ' '])
             # [email protected]: 550 5.2.2 <kijitora@example>... Mailbox Full
             if v['recipient']
               # There are multiple recipient addresses in the message body.