sisimai 4.24.1-java → 4.25.0-java

data/lib/sisimai/bite/email/google.rb

@@ -21,12 +21,12 @@ module Sisimai::Bite::Email
       }.freeze
 
       MessagesOf = {
-        expired: [
+        '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: [
+        'hostunknown' => [
           'DNS Error: Domain name not found',
           'DNS Error: DNS server returned answer with no data',
         ],
@@ -107,7 +107,7 @@ module Sisimai::Bite::Email
 
       def description; return 'Google Gmail: https://mail.google.com'; end
       def smtpagent;   return Sisimai::Bite.smtpagent(self); end
-      def headerlist;  return ['X-Failed-Recipients']; end
+      def headerlist;  return %w[x-failed-recipients]; end
 
       # Parse bounce messages from Google Gmail
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -195,7 +195,7 @@ module Sisimai::Bite::Email
           end
 
           if readcursor & Indicators[:'message-rfc822'] > 0
-            # After "message/rfc822"
+            # Inside of the original message part
             if e.empty?
               blanklines += 1
               break if blanklines > 1
@@ -203,7 +203,7 @@ module Sisimai::Bite::Email
             end
             rfc822list << e
           else
-            # Before "message/rfc822"
+            # Error message part
             next if (readcursor & Indicators[:deliverystatus]) == 0
             next if e.empty?
 
@@ -232,11 +232,10 @@ module Sisimai::Bite::Email
                 v = dscontents[-1]
               end
 
-              addr0 = Sisimai::Address.s3s4(cv[1])
-              if Sisimai::RFC5322.is_emailaddress(addr0)
-                v['recipient'] = addr0
-                recipients += 1
-              end
+              r = Sisimai::Address.s3s4(cv[1])
+              next unless Sisimai::RFC5322.is_emailaddress(r)
+              v['recipient'] = r
+              recipients += 1
             else
               v['diagnosis'] ||= ''
               v['diagnosis'] << e + ' '
@@ -276,15 +275,15 @@ module Sisimai::Bite::Email
             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.to_s
+              e['reason'] = r
               break
             end
           end
           next unless e['reason']
 
           # Set pseudo status code
-          e['status'] = Sisimai::SMTP::Status.find(e['diagnosis'])
-          e['reason'] = Sisimai::SMTP::Status.name(e['status']) if e['status'] =~ /\A[45][.][1-7][.][1-9]\z/
+          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/
         end
 
         rfc822part = Sisimai::RFC5322.weedout(rfc822list)

data/lib/sisimai/bite/email/gsuite.rb

@@ -14,14 +14,14 @@ module Sisimai::Bite::Email
         html:    %r{\AContent-Type:[ ]*text/html;[ ]*charset=['"]?(?:UTF|utf)[-]8['"]?\z},
       }.freeze
       MessagesOf = {
-        userunknown:  ["because the address couldn't be found. Check for typos or unnecessary spaces and try again."],
-        notaccept:    ['Null MX'],
-        networkerror: [' responded with code NXDOMAIN'],
+        'userunknown'  => ["because the address couldn't be found. Check for typos or unnecessary spaces and try again."],
+        'notaccept'    => ['Null MX'],
+        'networkerror' => [' responded with code NXDOMAIN'],
       }.freeze
 
       def description; return 'G Suite: https://gsuite.google.com'; end
       def smtpagent;   return Sisimai::Bite.smtpagent(self); end
-      def headerlist;  return ['X-Gm-Message-State']; end
+      def headerlist;  return %w[x-gm-message-state]; end
 
       # Parse bounce messages from G Suite (Transfer from G Suite to a destinaion host)
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -39,6 +39,10 @@ module Sisimai::Bite::Email
         return nil unless mhead['subject'].start_with?('Delivery Status Notification')
         return nil unless mhead['x-gm-message-state']
 
+        require 'sisimai/rfc1894'
+        fieldtable = Sisimai::RFC1894.FIELDTABLE
+        permessage = {}     # (Hash) Store values of each Per-Message field
+
         dscontents = [Sisimai::Bite.DELIVERYSTATUS]
         hasdivided = mbody.split("\n")
         rfc822list = []     # (Array) Each line in message/rfc822 part string
@@ -48,21 +52,16 @@ module Sisimai::Bite::Email
         endoferror = false  # (Integer) Flag for a blank line after error messages
         anotherset = {}     # (Hash) Another error information
         emptylines = 0      # (Integer) The number of empty lines
-        connvalues = 0      # (Integer) Flag, 1 if all the value of connheader have been set
-        connheader = {
-          'date'  => '',    # The value of Arrival-Date header
-          'lhost' => '',    # The value of Reporting-MTA header
-        }
         v = nil
 
         while e = hasdivided.shift do
           if readcursor == 0
-            # Beginning of the bounce message or delivery status part
+            # Beginning of the bounce message or message/delivery-status part
             readcursor |= Indicators[:deliverystatus] if e =~ MarkingsOf[:message]
           end
 
           if (readcursor & Indicators[:'message-rfc822']) == 0
-            # Beginning of the original message part
+            # Beginning of the original message part(message/rfc822)
             if e =~ MarkingsOf[:rfc822]
               readcursor |= Indicators[:'message-rfc822']
               next
@@ -70,7 +69,7 @@ module Sisimai::Bite::Email
           end
 
           if readcursor & Indicators[:'message-rfc822'] > 0
-            # After "message/rfc822"
+            # message/rfc822 OR text/rfc822-headers part
             if e.empty?
               blanklines += 1
               break if blanklines > 1
@@ -78,123 +77,96 @@ module Sisimai::Bite::Email
             end
             rfc822list << e
           else
-            # Before "message/rfc822"
+            # message/delivery-status part
             next if (readcursor & Indicators[:deliverystatus]) == 0
 
-            if connvalues == connheader.keys.size
-              # Final-Recipient: rfc822; kijitora@example.de
-              # Action: failed
-              # Status: 5.0.0
-              # Remote-MTA: dns; 192.0.2.222 (192.0.2.222, the server for the domain.)
-              # Diagnostic-Code: smtp; 550 #5.1.0 Address rejected.
-              # Last-Attempt-Date: Fri, 24 Mar 2017 23:34:10 -0700 (PDT)
+            if f = Sisimai::RFC1894.match(e)
+              # "e" matched with any field defined in RFC3464
+              next unless o = Sisimai::RFC1894.field(e)
               v = dscontents[-1]
 
-              if cv = e.match(/\AFinal-Recipient:[ ]*(?:RFC|rfc)822;[ ]*(.+)\z/)
-                # Final-Recipient: rfc822; kijitora@example.de
-                if v['recipient']
-                  # There are multiple recipient addresses in the message body.
-                  dscontents << Sisimai::Bite.DELIVERYSTATUS
-                  v = dscontents[-1]
+              if o[-1] == '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']
+                    # There are multiple recipient addresses in the message body.
+                    dscontents << Sisimai::Bite.DELIVERYSTATUS
+                    v = dscontents[-1]
+                  end
+                  v['recipient'] = o[2]
+                  recipients += 1
+                else
+                  # X-Actual-Recipient: rfc822; kijitora@example.co.jp
+                  v['alias'] = o[2]
                 end
-                v['recipient'] = cv[1]
-                recipients += 1
-
-              elsif cv = e.match(/\AAction:[ ]*(.+)\z/)
-                # Action: failed
-                v['action'] = cv[1].downcase
-
-              elsif cv = e.match(/\AStatus:[ ]*(\d[.]\d+[.]\d+)/)
-                # Status: 5.0.0
-                v['status'] = cv[1]
-
-              elsif cv = e.match(/\ARemote-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
-                # Remote-MTA: dns; 192.0.2.222 (192.0.2.222, the server for the domain.)
-                v['rhost'] = cv[1].downcase
-                v['rhost'] = '' if v['rhost'] =~ /\A\s+\z/  # Remote-MTA: DNS;
-
-              elsif cv = e.match(/\ALast-Attempt-Date:[ ]*(.+)\z/)
-                # Last-Attempt-Date: Fri, 24 Mar 2017 23:34:10 -0700 (PDT)
-                v['date'] = cv[1]
+              elsif o[-1] == 'code'
+                # Diagnostic-Code: SMTP; 550 5.1.1 <userunknown@example.jp>... User Unknown
+                v['spec'] = o[1]
+                v['diagnosis'] = o[2]
               else
-                if cv = e.match(/\ADiagnostic-Code:[ ]*(.+?);[ ]*(.+)\z/)
-                  # Diagnostic-Code: smtp; 550 #5.1.0 Address rejected.
-                  v['spec'] = cv[1].upcase
-                  v['diagnosis'] = cv[2]
-                else
-                  # Append error messages continued from the previous line
-                  if endoferror == false && !v['diagnosis'].to_s.empty?
-                    endoferror ||= true if e.empty?
-                    endoferror ||= true if e.start_with?('--')
+                # Other DSN fields defined in RFC3464
+                next unless fieldtable.key?(o[0])
+                v[fieldtable[o[0]]] = o[2]
 
-                    next if endoferror
-                    next unless e.start_with?(' ')
-                    v['diagnosis'] << e
-                  end
-                end
+                next unless f == 1
+                permessage[fieldtable[o[0]]] = o[2]
               end
             else
-              # Reporting-MTA: dns; googlemail.com
-              # Received-From-MTA: dns; sironeko@example.jp
-              # Arrival-Date: Fri, 24 Mar 2017 23:34:07 -0700 (PDT)
-              # X-Original-Message-ID: <06C1ED5C-7E02-4036-AEE1-AA448067FB2C@example.jp>
-              if cv = e.match(/\AReporting-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
-                # Reporting-MTA: dns; mx.example.jp
-                next unless connheader['lhost'].empty?
-                connheader['lhost'] = cv[1].downcase
-                connvalues += 1
+              # The line does not begin with a DSN field defined in RFC3464
+              # Append error messages continued from the previous line
+              if endoferror == false && v && ! v['diagnosis'].to_s.empty?
+                endoferror ||= true if e.empty?
 
-              elsif cv = e.match(/\AArrival-Date:[ ]*(.+)\z/)
-                # Arrival-Date: Wed, 29 Apr 2009 16:03:18 +0900
-                next unless connheader['date'].empty?
-                connheader['date'] = cv[1]
-                connvalues += 1
-              else
+                next if endoferror
+                next unless e.start_with?(' ')
+                v['diagnosis'] << e
+
+              elsif e =~ MarkingsOf[:error]
                 # Detect SMTP session error or connection error
-                if e =~ MarkingsOf[:error]
-                  # The response from the remote server was:
-                  anotherset['diagnosis'] << e
+                # The response from the remote server was:
+                anotherset['diagnosis'] << e
+              else
+                # ** Address not found **
+                #
+                # Your message wasn't delivered to * because the address couldn't be found.
+                # Check for typos or unnecessary spaces and try again.
+                #
+                # The response from the remote server was:
+                # 550 #5.1.0 Address rejected.
+                next if e =~ MarkingsOf[:html]
+
+                if anotherset['diagnosis']
+                  # Continued error messages from the previous line like
+                  # "550 #5.1.0 Address rejected."
+                  next if e =~ /\AContent-Type:/
+                  next if emptylines > 5
+                  if e.empty?
+                    # Count and next()
+                    emptylines += 1
+                    next
+                  end
+                  anotherset['diagnosis'] << ' ' << e
                 else
                   # ** Address not found **
                   #
                   # Your message wasn't delivered to * because the address couldn't be found.
                   # Check for typos or unnecessary spaces and try again.
-                  #
-                  # The response from the remote server was:
-                  # 550 #5.1.0 Address rejected.
-                  next if e =~ MarkingsOf[:html]
-
-                  if anotherset['diagnosis']
-                    # Continued error messages from the previous line like
-                    # "550 #5.1.0 Address rejected."
-                    next if e =~ /\AContent-Type:/
-                    next if emptylines > 5
-                    if e.empty?
-                      # Count and next()
-                      emptylines += 1
-                      next
-                    end
-                    anotherset['diagnosis'] << ' ' << e
-                  else
-                    # ** Address not found **
-                    #
-                    # Your message wasn't delivered to * because the address couldn't be found.
-                    # Check for typos or unnecessary spaces and try again.
-                    next if e.empty?
-                    next unless e =~ MarkingsOf[:message]
-                    anotherset['diagnosis'] = e
-                  end
+                  next if e.empty?
+                  next unless e =~ MarkingsOf[:message]
+                  anotherset['diagnosis'] = e
                 end
-
               end
             end
-          end
+          end # End of message/delivery-status
         end
         return nil unless recipients > 0
 
         dscontents.each do |e|
           # Set default values if each value is empty.
-          connheader.each_key { |a| e[a] ||= connheader[a] || '' }
+          e['lhost'] ||= permessage['rhost']
+          permessage.each_key { |a| e[a] ||= permessage[a] || '' }
 
           if anotherset['diagnosis']
             # Copy alternative error message
@@ -213,7 +185,7 @@ module Sisimai::Bite::Email
               if e['status'] == '' || 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'])
-                if !as.empty? && as[-3, 3] != '0.0'
+                if as && as[-3, 3] != '0.0'
                   # The D.S.N. is neither an empty nor *.0.0
                   e['status'] = as
                 end
@@ -222,7 +194,7 @@ module Sisimai::Bite::Email
               if e['replycode'].empty? || e['replycode'].start_with?('400', '500')
                 # Check the value of SMTP reply code in anotherset
                 ar = Sisimai::SMTP::Reply.find(anotherset['diagnosis'])
-                if !ar.empty? && ar[-2, 2].to_i != 0
+                if ar && ar[-2, 2].to_i != 0
                   # The SMTP reply code is neither an empty nor *00
                   e['replycode'] = ar
                 end
@@ -241,7 +213,7 @@ module Sisimai::Bite::Email
           MessagesOf.each_key do |r|
             # Guess an reason of the bounce
             next unless MessagesOf[r].any? { |a| e['diagnosis'].include?(a) }
-            e['reason'] = r.to_s
+            e['reason'] = r
             break
           end
         end

data/lib/sisimai/bite/email/imailserver.rb

@@ -15,24 +15,24 @@ module Sisimai::Bite::Email
       }.freeze
 
       ReSMTP = {
-        conn: %r/(?:SMTP connection failed,|Unexpected connection response from server:)/,
-        ehlo: %r|Unexpected response to EHLO/HELO:|,
-        mail: %r|Server response to MAIL FROM:|,
-        rcpt: %r|Additional RCPT TO generated following response:|,
-        data: %r|DATA command generated response:|,
+        'conn' => %r/(?:SMTP connection failed,|Unexpected connection response from server:)/,
+        'ehlo' => %r|Unexpected response to EHLO/HELO:|,
+        'mail' => %r|Server response to MAIL FROM:|,
+        'rcpt' => %r|Additional RCPT TO generated following response:|,
+        'data' => %r|DATA command generated response:|,
       }.freeze
       ReFailures = {
-        hostunknown: %r/Unknown host/,
-        userunknown: %r/\A(?:Unknown user|Invalid final delivery userid)/,
-        mailboxfull: %r/\AUser mailbox exceeds allowed size/,
-        securityerr: %r/\ARequested action not taken: virus detected/,
-        undefined:   %r/\Aundeliverable to /,
-        expired:     %r/\ADelivery failed \d+ attempts/,
+        'hostunknown' => %r/Unknown host/,
+        'userunknown' => %r/\A(?:Unknown user|Invalid final delivery userid)/,
+        'mailboxfull' => %r/\AUser mailbox exceeds allowed size/,
+        'securityerr' => %r/\ARequested action not taken: virus detected/,
+        'undefined'   => %r/\Aundeliverable to /,
+        'expired'     => %r/\ADelivery failed \d+ attempts/,
       }.freeze
 
       def description; return 'IPSWITCH IMail Server'; end
       def smtpagent;   return Sisimai::Bite.smtpagent(self); end
-      def headerlist;  return ['X-Mailer']; end
+      def headerlist;  return %w[x-mailer]; end
 
       # Parse bounce messages from IMailServer
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -77,7 +77,7 @@ module Sisimai::Bite::Email
           end
 
           if readcursor & Indicators[:'message-rfc822'] > 0
-            # After "message/rfc822"
+            # Inside of the original message part
             if e.empty?
               blanklines += 1
               break if blanklines > 1
@@ -85,7 +85,7 @@ module Sisimai::Bite::Email
             end
             rfc822list << e
           else
-            # Before "message/rfc822"
+            # Error message part
             break if readcursor & Indicators[:'message-rfc822'] > 0
 
             # Unknown user: kijitora@example.com
@@ -140,14 +140,14 @@ module Sisimai::Bite::Email
           ReSMTP.each_key do |r|
             # Detect SMTP command from the message
             next unless e['diagnosis'] =~ ReSMTP[r]
-            e['command'] = r.to_s.upcase
+            e['command'] = r.upcase
             break
           end
 
           ReFailures.each_key do |r|
             # Verify each regular expression of session errors
             next unless e['diagnosis'] =~ ReFailures[r]
-            e['reason'] = r.to_s
+            e['reason'] = r
             break
           end
           e.each_key { |a| e[a] ||= '' }

data/lib/sisimai/bite/email/interscanmss.rb

@@ -33,10 +33,8 @@ module Sisimai::Bite::Email
         match = 0
         tryto = [
           'Mail could not be delivered',
-          # メッセージを配信できません。
-          '=?iso-2022-jp?B?GyRCJWElQyU7ITwlOCRyR1s/LiRHJC0kXiQ7JHMhIxsoQg==?=',
-          # メール配信に失敗しました
-          '=?iso-2022-jp?B?GyRCJWEhPCVrR1s/LiRLPDpHVCQ3JF4kNyQ/GyhCDQo=?=',
+          'メッセージを配信できません。',
+          'メール配信に失敗しました',
         ]
         match += 1 if mhead['from'].start_with?('"InterScan MSS"')
         match += 1 if tryto.any? { |a| mhead['subject'] == a }
@@ -68,7 +66,7 @@ module Sisimai::Bite::Email
           end
 
           if readcursor & Indicators[:'message-rfc822'] > 0
-            # After "message/rfc822"
+            # Inside of the original message part
             if e.empty?
               blanklines += 1
               break if blanklines > 1
@@ -76,7 +74,7 @@ module Sisimai::Bite::Email
             end
             rfc822list << e
           else
-            # Before "message/rfc822"
+            # Error message part
             next if (readcursor & Indicators[:deliverystatus]) == 0
             next if e.empty?