sisimai 4.24.1-java → 4.25.0-java

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

@@ -16,9 +16,9 @@ module Sisimai::Bite::Email
         /x,
       }.freeze
       MessagesOf = {
-        mailboxfull: ['As their mailbox is full'],
-        norelaying:  ['Due to the following SMTP relay error'],
-        hostunknown: ['As the remote domain doesnt exist'],
+        'mailboxfull' => ['As their mailbox is full'],
+        'norelaying'  => ['Due to the following SMTP relay error'],
+        'hostunknown' => ['As the remote domain doesnt exist'],
       }.freeze
 
       def description; return 'au by KDDI: http://www.au.kddi.com'; end
@@ -71,7 +71,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
@@ -79,7 +79,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?
 
@@ -93,12 +93,10 @@ module Sisimai::Bite::Email
                 dscontents << Sisimai::Bite.DELIVERYSTATUS
                 v = dscontents[-1]
               end
-
               r = Sisimai::Address.s3s4(cv[1])
-              if Sisimai::RFC5322.is_emailaddress(r)
-                v['recipient'] = r
-                recipients += 1
-              end
+              next unless Sisimai::RFC5322.is_emailaddress(r)
+              v['recipient'] = r
+              recipients += 1
 
             elsif cv = e.match(/Your mail sent on: (.+)\z/)
               # Your mail sent on: Thu, 29 Apr 2010 11:04:47 +0900
@@ -130,7 +128,7 @@ 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

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

@@ -58,7 +58,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
@@ -66,7 +66,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?
 

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

@@ -68,7 +68,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 +76,7 @@ module Sisimai::Bite::Email
             end
             rfc822list << e
           else
-            # Before "message/rfc822"
+            # Error message part
             next if (readcursor & Indicators[:deliverystatus]) == 0
             break if e =~ regularexp
 

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

@@ -18,39 +18,39 @@ module Sisimai::Bite::Email
         %r/SMTP error from remote (?:mail server|mailer) after end of ([A-Za-z]{4})/,
       ].freeze
       MessagesOf = {
-        expired: [
+        'expired' => [
           'retry timeout exceeded',
           'No action is required on your part',
         ],
-        userunknown: ['user not found'],
-        hostunknown: [
+        'userunknown' => ['user not found'],
+        'hostunknown' => [
           'all host address lookups failed permanently',
           'all relevant MX records point to non-existent hosts',
           'Unrouteable address',
         ],
-        mailboxfull: ['mailbox is full', 'error: quota exceed'],
-        notaccept: [
+        'mailboxfull' => ['mailbox is full', 'error: quota exceed'],
+        'notaccept' => [
           'an MX or SRV record indicated no SMTP service',
           'no host found for existing SMTP connection',
         ],
-        syntaxerror: [
+        'syntaxerror' => [
           'angle-brackets nested too deep',
           'expected word or "<"',
           'domain missing in source-routed address',
           'malformed address:',
         ],
-        systemerror: [
+        'systemerror' => [
           'delivery to file forbidden',
           'delivery to pipe forbidden',
           'local delivery failed',
           'LMTP error after ',
         ],
-        contenterror: ['Too many "Received" headers'],
+        'contenterror' => ['Too many "Received" headers'],
       }.freeze
 
       def description; return '@mail.ru: https://mail.ru'; 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 @mail.ru
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -103,8 +103,7 @@ module Sisimai::Bite::Email
           end
 
           if readcursor & Indicators[:'message-rfc822'] > 0
-            # After "message/rfc822"
-            # After "message/rfc822"
+            # Inside of the original message part
             if e.empty?
               blanklines += 1
               break if blanklines > 1
@@ -112,7 +111,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?
 
@@ -235,7 +234,7 @@ module Sisimai::Bite::Email
               MessagesOf.each_key do |r|
                 # Check each regular expression
                 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/mcafee.rb

@@ -12,12 +12,18 @@ module Sisimai::Bite::Email
         rfc822:  ['Content-Type: message/rfc822'],
       }.freeze
       ReFailures = {
-        userunknown: %r/(?:User [(].+[@].+[)] unknown[.]|550 Unknown user [^ ]+[@][^ ]+)/,
+        'userunknown' => %r{(?:
+           [ ]User[ ][(].+[@].+[)][ ]unknown[.][ ]
+          |550[ ]Unknown[ ]user[ ][^ ]+[@][^ ]+
+          |550[ ][<].+?[@].+?[>][.]+[ ]User[ ]not[ ]exist
+          |No[ ]such[ ]user
+          )
+        }x,
       }.freeze
 
       def description; return 'McAfee Email Appliance'; end
       def smtpagent;   return Sisimai::Bite.smtpagent(self); end
-      def headerlist;  return ['X-NAI-Header']; end
+      def headerlist;  return %w[x-nai-header]; end
 
       # Parse bounce messages from McAfee Email Appliance
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -35,6 +41,8 @@ module Sisimai::Bite::Email
         return nil unless mhead['x-nai-header'].start_with?('Modified by McAfee ')
         return nil unless mhead['subject'] == 'Delivery Status'
 
+        require 'sisimai/rfc1894'
+        fieldtable = Sisimai::RFC1894.FIELDTABLE
         dscontents = [Sisimai::Bite.DELIVERYSTATUS]
         hasdivided = mbody.split("\n")
         havepassed = ['']
@@ -67,7 +75,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
@@ -75,7 +83,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?
 
@@ -101,28 +109,26 @@ module Sisimai::Bite::Email
               diagnostic = cv[2]
               recipients += 1
 
-            elsif cv = e.match(/\AOriginal-Recipient:[ ]*([^ ]+)\z/)
-              # Original-Recipient: <kijitora@example.co.jp>
-              v['alias'] = Sisimai::Address.s3s4(cv[1])
-
-            elsif cv = e.match(/\AAction:[ ]*(.+)\z/)
-              # Action: failed
-              v['action'] = cv[1].downcase
+            elsif f = Sisimai::RFC1894.match(e)
+              # "e" matched with any field defined in RFC3464
+              o = Sisimai::RFC1894.field(e)
+              unless o
+                # Fallback code for empty value or invalid formatted value
+                # - Original-Recipient: <kijitora@example.co.jp>
+                if cv = e.match(/\AOriginal-Recipient:[ ]*([^ ]+)\z/)
+                  v['alias'] = Sisimai::Address.s3s4(cv[1])
+                end
+                next
+              end
+              next unless fieldtable.key?(o[0])
+              v[fieldtable[o[0]]] = o[2]
 
-            elsif cv = e.match(/\ARemote-MTA:[ ]*(.+)\z/)
-              # Remote-MTA: 192.0.2.192
-              v['rhost'] = cv[1].downcase
             else
-              if cv = e.match(/\ADiagnostic-Code:[ ]*(.+?);[ ]*(.+)\z/)
-                # Diagnostic-Code: SMTP; 550 5.1.1 <userunknown@example.jp>... User Unknown
-                v['spec'] = cv[1].upcase
-                v['diagnosis'] = cv[2]
-
-              elsif p.start_with?('Diagnostic-Code:') && cv = e.match(/\A[ \t]+(.+)\z/)
-                # Continued line of the value of Diagnostic-Code header
-                v['diagnosis'] << ' ' << cv[1]
-                havepassed[-1] = 'Diagnostic-Code: ' << e
-              end
+              # Continued line of the value of Diagnostic-Code field
+              next unless p.start_with?('Diagnostic-Code:')
+              next unless cv = e.match(/\A[ \t]+(.+)\z/)
+              v['diagnosis'] << ' ' << cv[1]
+              havepassed[-1] = 'Diagnostic-Code: ' << e
             end
           end
         end
@@ -135,7 +141,7 @@ module Sisimai::Bite::Email
           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/messagelabs.rb

@@ -13,8 +13,8 @@ module Sisimai::Bite::Email
         rfc822:  ['Content-Type: text/rfc822-headers'],
       }.freeze
       ReFailures = {
-        userunknown:   %r/(?:542 .+ Rejected|No such user)/,
-        securityerror: %r/Please turn on SMTP Authentication in your mail client/,
+        'userunknown'   => %r/(?:542 .+ Rejected|No such user)/,
+        'securityerror' => %r/Please turn on SMTP Authentication in your mail client/,
       }.freeze
 
       def description; return 'Symantec.cloud http://www.messagelabs.com'; end
@@ -25,7 +25,7 @@ module Sisimai::Bite::Email
       # X-StarScan-Received:
       # X-StarScan-Version: 6.12.5; banners=-,-,-
       # X-VirusChecked: Checked
-      def headerlist;  return ['X-Msg-Ref']; end
+      def headerlist;  return %w[x-msg-ref]; end
 
       # Parse bounce messages from Symantec.cloud(MessageLabs)
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -43,6 +43,10 @@ module Sisimai::Bite::Email
         return nil unless mhead['from'].include?('MAILER-DAEMON@messagelabs.com')
         return nil unless mhead['subject'].start_with?('Mail Delivery Failure')
 
+        require 'sisimai/rfc1894'
+        fieldtable = Sisimai::RFC1894.FIELDTABLE
+        permessage = {}     # (Hash) Store values of each Per-Message field
+
         dscontents = [Sisimai::Bite.DELIVERYSTATUS]
         hasdivided = mbody.split("\n")
         havepassed = ['']
@@ -51,11 +55,6 @@ module Sisimai::Bite::Email
         readcursor = 0      # (Integer) Points the current cursor position
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
         commandset = []     # (Array) ``in reply to * command'' list
-        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
@@ -64,7 +63,7 @@ module Sisimai::Bite::Email
           p = havepassed[-2]
 
           if readcursor == 0
-            # Beginning of the bounce message or delivery status part
+            # Beginning of the bounce message or message/delivery-status part
             if e.start_with?(StartingOf[:message][0])
               readcursor |= Indicators[:deliverystatus]
               next
@@ -72,7 +71,7 @@ module Sisimai::Bite::Email
           end
 
           if (readcursor & Indicators[:'message-rfc822']) == 0
-            # Beginning of the original message part
+            # Beginning of the original message part(message/rfc822)
             if e == StartingOf[:rfc822][0]
               readcursor |= Indicators[:'message-rfc822']
               next
@@ -80,7 +79,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
@@ -88,96 +87,58 @@ module Sisimai::Bite::Email
             end
             rfc822list << e
           else
-            # Before "message/rfc822"
+            # message/delivery-status part
             next if (readcursor & Indicators[:deliverystatus]) == 0
             next if e.empty?
 
-            if connvalues == connheader.keys.size
-              # This is the mail delivery agent at messagelabs.com.
-              #
-              # I was unable to deliver your message to the following addresses:
-              #
-              # maria@dest.example.net
-              #
-              # Reason: 550 maria@dest.example.net... No such user
-              #
-              # The message subject was: Re: BOAS FESTAS!
-              # The message date was: Tue, 23 Dec 2014 20:39:24 +0000
-              # The message identifier was: DB/3F-17375-60D39495
-              # The message reference was: server-5.tower-143.messagelabs.com!1419367172!32=
-              # 691968!1
-              #
-              # Please do not reply to this email as it is sent from an unattended mailbox.
-              # Please visit www.messagelabs.com/support for more details
-              # about this error message and instructions to resolve this issue.
-              #
-              #
-              # --b0Nvs+XKfKLLRaP/Qo8jZhQPoiqeWi3KWPXMgw==
-              # Content-Type: message/delivery-status
-              #
-              # Reporting-MTA: dns; server-15.bemta-3.messagelabs.com
-              # Arrival-Date: Tue, 23 Dec 2014 20:39:34 +0000
-              #
-              # Action: failed
-              # Status: 5.0.0
-              # Last-Attempt-Date: Tue, 23 Dec 2014 20:39:35 +0000
-              # Remote-MTA: dns; mail.dest.example.net
-              # Diagnostic-Code: smtp; 550 maria@dest.example.net... No such user
-              # Final-Recipient: rfc822; maria@dest.example.net
+            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; maria@dest.example.net
-                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 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 maria@dest.example.net... No such user
-                  v['spec'] = cv[1].upcase
-                  v['diagnosis'] = cv[2]
-
-                elsif p.start_with?('Diagnostic-Code:') && cv = e.match(/\A[ \t]+(.+)\z/)
-                  # Continued line of the value of Diagnostic-Code header
-                  v['diagnosis'] << ' ' << cv[1]
-                  havepassed[-1] = 'Diagnostic-Code: ' << e
-                end
+                # Other DSN fields defined in RFC3464
+                next unless fieldtable.key?(o[0])
+                v[fieldtable[o[0]]] = o[2]
+
+                next unless f == 1
+                permessage[fieldtable[o[0]]] = o[2]
               end
             else
-              # Reporting-MTA: dns; server-15.bemta-3.messagelabs.com
-              # Arrival-Date: Tue, 23 Dec 2014 20:39:34 +0000
-              if cv = e.match(/\AReporting-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
-                # Reporting-MTA: dns; server-15.bemta-3.messagelabs.com
-                next unless connheader['lhost'].empty?
-                connheader['lhost'] = cv[1].downcase
-                connvalues += 1
-
-              elsif cv = e.match(/\AArrival-Date:[ ]*(.+)\z/)
-                # Arrival-Date: Tue, 23 Dec 2014 20:39:34 +0000
-                next unless connheader['date'].empty?
-                connheader['date'] = cv[1]
-                connvalues += 1
-              end
+              # Continued line of the value of Diagnostic-Code field
+              next unless p.start_with?('Diagnostic-Code:')
+              next unless cv = e.match(/\A[ \t]+(.+)\z/)
+              v['diagnosis'] << ' ' << cv[1]
+              havepassed[-1] = 'Diagnostic-Code: ' << e
             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] || '' }
           e['command']   = commandset.shift || ''
           e['agent']     = self.smtpagent
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
@@ -185,7 +146,7 @@ module Sisimai::Bite::Email
           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
         end