sisimai 4.24.1-java → 4.25.0-java

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

@@ -12,13 +12,13 @@ module Sisimai::Bite::Email
         rfc822:  ['Content-Type: message/delivery-status'],
       }.freeze
       MessagesOf = {
-        userunknown: [
+        'userunknown' => [
           'not listed in Domino Directory',
           'not listed in public Name & Address Book',
           'Domino ディレクトリには見つかりません',
         ],
-        filtered:    ['Cannot route mail to user'],
-        systemerror: ['Several matches found in Domino Directory'],
+        'filtered' => ['Cannot route mail to user'],
+        'systemerror' => ['Several matches found in Domino Directory'],
       }.freeze
 
       def description; return 'IBM Domino Server'; end
@@ -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
 
             # Your message
@@ -133,9 +133,8 @@ module Sisimai::Bite::Email
           MessagesOf.each_key do |r|
             # Check each regular expression of Domino error messages
             next unless MessagesOf[r].any? { |a| e['diagnosis'].include?(a) }
-            e['reason'] = r.to_s
-            pseudostatus = Sisimai::SMTP::Status.code(r.to_s, false)
-            e['status'] = pseudostatus unless pseudostatus.empty?
+            e['reason'] = r
+            e['status'] = Sisimai::SMTP::Status.code(r.to_s, false) || ''
             break
           end
           e.each_key { |a| e[a] ||= '' }

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

@@ -12,11 +12,10 @@ module Sisimai::Bite::Email
         error:   ['For the following reason:'],
         rfc822:  ['--- The header of the original message is following'],
       }.freeze
-      MessagesOf = { mesgtoobig: ['Mail size limit exceeded'] }.freeze
+      MessagesOf = { 'mesgtoobig' => ['Mail size limit exceeded'] }.freeze
 
       def description; return '1&1: http://www.1and1.de'; end
       def smtpagent;   return Sisimai::Bite.smtpagent(self); end
-      # X-UI-Out-Filterresults: unknown:0;
       def headerlist;  return []; end
 
       # Parse bounce messages from 1&1
@@ -60,7 +59,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
@@ -68,7 +67,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?
 
@@ -110,7 +109,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/exchange2003.rb

@@ -14,36 +14,36 @@ module Sisimai::Bite::Email
         rfc822:  ['Content-Type: message/rfc822'],
       }.freeze
       ErrorCodes = {
-        onhold: [
+        'onhold' => [
           '000B099C', # Host Unknown, Message exceeds size limit, ...
           '000B09AA', # Unable to relay for, Message exceeds size limit,...
           '000B09B6', # Error messages by remote MTA
         ],
-        userunknown: [
+        'userunknown' => [
           '000C05A6', # Unknown Recipient,
         ],
-        systemerror: [
+        'systemerror' => [
           '00010256', # Too many recipients.
           '000D06B5', # No proxy for recipient (non-smtp mail?)
         ],
-        networkerror: [
+        'networkerror' => [
           '00120270', # Too Many Hops
         ],
-        contenterr: [
+        'contenterr' => [
           '00050311', # Conversion to Internet format failed
           '000502CC', # Conversion to Internet format failed
         ],
-        securityerr: [
+        'securityerr' => [
           '000B0981', # 502 Server does not support AUTH
         ],
-        filtered: [
+        'filtered' => [
           '000C0595', # Ambiguous Recipient
         ],
       }.freeze
 
       def description; return 'Microsoft Exchange Server 2003'; end
       def smtpagent;   return Sisimai::Bite.smtpagent(self); end
-      def headerlist;  return ['X-MS-Embedded-Report', 'X-MimeOLE']; end
+      def headerlist;  return %w[x-ms-embedded-report x-mimeole]; end
 
       # Parse bounce messages from Microsoft Exchange Server 2003
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -124,7 +124,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
@@ -132,7 +132,7 @@ module Sisimai::Bite::Email
             end
             rfc822list << e
           else
-            # Before "message/rfc822"
+            # Error message part
             next if (readcursor & Indicators[:deliverystatus]) == 0
             next if statuspart
 
@@ -214,18 +214,18 @@ module Sisimai::Bite::Email
         return nil unless recipients > 0
 
         dscontents.each do |e|
+          e['agent'] = self.smtpagent
+          e.delete('msexch')
           if cv = e['diagnosis'].match(/\AMSEXCH:.+[ \t]*[(]([0-9A-F]{8})[)][ \t]*(.*)\z/)
             #     MSEXCH:IMS:KIJITORA CAT:EXAMPLE:EXCHANGE 0 (000C05A6) Unknown Recipient
             capturedcode = cv[1]
             errormessage = cv[2]
-            pseudostatus = ''
 
             ErrorCodes.each_key do |r|
               # Find captured code from the error code table
               next unless ErrorCodes[r].index(capturedcode)
-              e['reason'] = r.to_s
-              pseudostatus = Sisimai::SMTP::Status.code(r.to_s)
-              e['status'] = pseudostatus unless pseudostatus.empty?
+              e['reason'] = r
+              e['status'] = Sisimai::SMTP::Status.code(r.to_s) || ''
               break
             end
             e['diagnosis'] = errormessage
@@ -233,15 +233,14 @@ module Sisimai::Bite::Email
 
           unless e['reason']
             # Could not detect the reason from the value of "diagnosis".
-            if e['alterrors']
-              # Copy alternative error message
-              e['diagnosis'] = e['alterrors'] + ' ' + e['diagnosis']
-              e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
-              e.delete('alterrors')
-            end
+            next unless e['alterrors']
+            next if e['alterrors'].empty?
+
+            # Copy alternative error message
+            e['diagnosis'] = e['alterrors'] + ' ' + e['diagnosis']
+            e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
+            e.delete('alterrors')
           end
-          e['agent'] = self.smtpagent
-          e.delete('msexch')
           e.each_key { |a| e[a] ||= '' }
         end
 

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

@@ -10,28 +10,28 @@ module Sisimai::Bite::Email
       Indicators = Sisimai::Bite::Email.INDICATORS
       StartingOf = { rfc822: ['Original message headers:'] }.freeze
       MarkingsOf = {
-        message: %r/ Microsoft Exchange Server 20\d{2}/,
+        message: %r/\ADiagnostic[ ]information[ ]for[ ]administrators:/,
         error:   %r/ ((?:RESOLVER|QUEUE)[.][A-Za-z]+(?:[.]\w+)?);/,
         rhost:   %r/\AGenerating server:[ ]?(.*)/,
       }.freeze
       NDRSubject = {
-        :'SMTPSEND.DNS.NonExistentDomain'=> 'hostunknown',   # 554 5.4.4 SMTPSEND.DNS.NonExistentDomain
-        :'SMTPSEND.DNS.MxLoopback'       => 'networkerror',  # 554 5.4.4 SMTPSEND.DNS.MxLoopback
-        :'RESOLVER.ADR.BadPrimary'       => 'systemerror',   # 550 5.2.0 RESOLVER.ADR.BadPrimary
-        :'RESOLVER.ADR.RecipNotFound'    => 'userunknown',   # 550 5.1.1 RESOLVER.ADR.RecipNotFound
-        :'RESOLVER.ADR.ExRecipNotFound'  => 'userunknown',   # 550 5.1.1 RESOLVER.ADR.ExRecipNotFound
-        :'RESOLVER.ADR.RecipLimit'       => 'toomanyconn',   # 550 5.5.3 RESOLVER.ADR.RecipLimit
-        :'RESOLVER.ADR.InvalidInSmtp'    => 'systemerror',   # 550 5.1.0 RESOLVER.ADR.InvalidInSmtp
-        :'RESOLVER.ADR.Ambiguous'        => 'systemerror',   # 550 5.1.4 RESOLVER.ADR.Ambiguous, 420 4.2.0 RESOLVER.ADR.Ambiguous
-        :'RESOLVER.RST.AuthRequired'     => 'filtered',      # 550 5.7.1 RESOLVER.RST.AuthRequired
-        :'RESOLVER.RST.NotAuthorized'    => 'rejected',      # 550 5.7.1 RESOLVER.RST.NotAuthorized
-        :'RESOLVER.RST.RecipSizeLimit'   => 'mesgtoobig',    # 550 5.2.3 RESOLVER.RST.RecipSizeLimit
-        :'QUEUE.Expired'                 => 'expired',       # 550 4.4.7 QUEUE.Expired
+        'SMTPSEND.DNS.NonExistentDomain' => 'hostunknown',   # 554 5.4.4 SMTPSEND.DNS.NonExistentDomain
+        'SMTPSEND.DNS.MxLoopback'        => 'networkerror',  # 554 5.4.4 SMTPSEND.DNS.MxLoopback
+        'RESOLVER.ADR.BadPrimary'        => 'systemerror',   # 550 5.2.0 RESOLVER.ADR.BadPrimary
+        'RESOLVER.ADR.RecipNotFound'     => 'userunknown',   # 550 5.1.1 RESOLVER.ADR.RecipNotFound
+        'RESOLVER.ADR.ExRecipNotFound'   => 'userunknown',   # 550 5.1.1 RESOLVER.ADR.ExRecipNotFound
+        'RESOLVER.ADR.RecipLimit'        => 'toomanyconn',   # 550 5.5.3 RESOLVER.ADR.RecipLimit
+        'RESOLVER.ADR.InvalidInSmtp'     => 'systemerror',   # 550 5.1.0 RESOLVER.ADR.InvalidInSmtp
+        'RESOLVER.ADR.Ambiguous'         => 'systemerror',   # 550 5.1.4 RESOLVER.ADR.Ambiguous, 420 4.2.0 RESOLVER.ADR.Ambiguous
+        'RESOLVER.RST.AuthRequired'      => 'securityerror', # 550 5.7.1 RESOLVER.RST.AuthRequired
+        'RESOLVER.RST.NotAuthorized'     => 'rejected',      # 550 5.7.1 RESOLVER.RST.NotAuthorized
+        'RESOLVER.RST.RecipSizeLimit'    => 'mesgtoobig',    # 550 5.2.3 RESOLVER.RST.RecipSizeLimit
+        'QUEUE.Expired'                  => 'expired',       # 550 4.4.7 QUEUE.Expired
       }.freeze
 
       def description; return 'Microsoft Exchange Server 2007'; end
       def smtpagent;   return Sisimai::Bite.smtpagent(self); end
-      def headerlist;  return ['Content-Language']; end
+      def headerlist;  return %w[content-language]; end
 
       # Parse bounce messages from Microsoft Exchange Server 2007
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -79,7 +79,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
@@ -87,7 +87,7 @@ module Sisimai::Bite::Email
             end
             rfc822list << e
           else
-            # Before "message/rfc822"
+            # Error message part
             next if (readcursor & Indicators[:deliverystatus]) == 0
 
             if connvalues == connheader.keys.size
@@ -120,22 +120,20 @@ module Sisimai::Bite::Email
                 v['status']    = cv[2]
                 v['diagnosis'] = e
               else
-                if !v['diagnosis'].to_s.empty? && v['diagnosis'].end_with?('=')
-                  # Continued line of error messages
-                  v['diagnosis']  = v['diagnosis'].chomp('=')
-                  v['diagnosis'] << e
-                end
+                # Continued line of error messages
+                next if v['diagnosis'].to_s.empty?
+                next unless v['diagnosis'].end_with?('=')
+                v['diagnosis']  = v['diagnosis'].chomp('=')
+                v['diagnosis'] << e
               end
             else
               # Diagnostic information for administrators:
               #
               # Generating server: mta22.neko.example.org
-              if cv = e.match(MarkingsOf[:rhost])
-                # Generating server: mta22.neko.example.org
-                next unless connheader['rhost'].empty?
-                connheader['rhost'] = cv[1]
-                connvalues += 1
-              end
+              next unless cv = e.match(MarkingsOf[:rhost])
+              next unless connheader['rhost'].empty?
+              connheader['rhost'] = cv[1]
+              connvalues += 1
             end
           end
         end
@@ -147,7 +145,7 @@ module Sisimai::Bite::Email
             f = cv[1]
             NDRSubject.each_key do |r|
               # Try to match with error subject strings
-              next unless f == r.to_s
+              next unless f == r
               e['reason'] = NDRSubject[r]
               break
             end

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

@@ -62,11 +62,11 @@ module Sisimai::Bite::Email
       MessagesOf = {
         # find exim/ -type f -exec grep 'message = US' {} /dev/null \;
         # route.c:1158|  DEBUG(D_uid) debug_printf("getpwnam() returned NULL (user not found)\n");
-        userunknown: ['user not found'],
+        'userunknown' => ['user not found'],
         # transports/smtp.c:3524|  addr->message = US"all host address lookups failed permanently";
         # routers/dnslookup.c:331|  addr->message = US"all relevant MX records point to non-existent hosts";
         # route.c:1826|  uschar *message = US"Unrouteable address";
-        hostunknown: [
+        'hostunknown' => [
           'all host address lookups failed permanently',
           'all relevant MX records point to non-existent hosts',
           'Unrouteable address',
@@ -74,10 +74,10 @@ module Sisimai::Bite::Email
         # transports/appendfile.c:2567|  addr->user_message = US"mailbox is full";
         # transports/appendfile.c:3049|  addr->message = string_sprintf("mailbox is full "
         # transports/appendfile.c:3050|  "(quota exceeded while writing to file %s)", filename);
-        mailboxfull: ['mailbox is full', 'error: quota exceed'],
+        'mailboxfull' => ['mailbox is full', 'error: quota exceed'],
         # routers/dnslookup.c:328|  addr->message = US"an MX or SRV record indicated no SMTP service";
         # transports/smtp.c:3502|  addr->message = US"no host found for existing SMTP connection";
-        notaccept: [
+        'notaccept' => [
           'an MX or SRV record indicated no SMTP service',
           'no host found for existing SMTP connection',
         ],
@@ -85,7 +85,7 @@ module Sisimai::Bite::Email
         # parser.c:701| if(bracket_count++ > 5) FAILED(US"angle-brackets nested too deep");
         # parser.c:738| FAILED(US"domain missing in source-routed address");
         # parser.c:747| : string_sprintf("malformed address: %.32s may not follow %.*s",
-        syntaxerror: [
+        'syntaxerror' => [
           'angle-brackets nested too deep',
           'expected word or "<"',
           'domain missing in source-routed address',
@@ -94,14 +94,14 @@ module Sisimai::Bite::Email
         # deliver.c:5614|  addr->message = US"delivery to file forbidden";
         # deliver.c:5624|  addr->message = US"delivery to pipe forbidden";
         # transports/pipe.c:1156|  addr->user_message = US"local delivery failed";
-        systemerror: [
+        'systemerror' => [
           'delivery to file forbidden',
           'delivery to pipe forbidden',
           'local delivery failed',
           'LMTP error after ',
         ],
         # deliver.c:5425|  new->message = US"Too many \"Received\" headers - suspected mail loop";
-        contenterror: ['Too many "Received" headers'],
+        'contenterror' => ['Too many "Received" headers'],
       }.freeze
 
       # retry.c:902|  addr->message = (addr->message == NULL)? US"retry timeout exceeded" :
@@ -125,7 +125,7 @@ module Sisimai::Bite::Email
 
       def description; return 'Exim'; 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 Exim
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -152,6 +152,8 @@ module Sisimai::Bite::Email
           )
         }x
 
+        require 'sisimai/rfc1894'
+        fieldtable = Sisimai::RFC1894.FIELDTABLE
         dscontents = [Sisimai::Bite.DELIVERYSTATUS]
         hasdivided = mbody.split("\n")
         rfc822list = []     # (Array) Each line in message/rfc822 part string
@@ -175,7 +177,7 @@ module Sisimai::Bite::Email
           break if e == StartingOf[:endof][0]
 
           if readcursor == 0
-            # Beginning of the bounce message or delivery status part
+            # Beginning of the bounce message or message/delivery-status part
             if e =~ MarkingsOf[:message]
               readcursor |= Indicators[:deliverystatus]
               next unless e =~ MarkingsOf[:frozen]
@@ -183,7 +185,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 =~ MarkingsOf[:rfc822]
               readcursor |= Indicators[:'message-rfc822']
               next
@@ -191,7 +193,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
@@ -199,7 +201,7 @@ 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?
 
@@ -266,34 +268,34 @@ module Sisimai::Bite::Email
                   # --NNNNNNNNNN-eximdsn-MMMMMMMMMM
                   # Content-type: message/delivery-status
                   # ...
-                  if cv = e.match(/\AReporting-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
-                    # Reporting-MTA: dns; mx.example.jp
-                    v['lhost'] = cv[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(/\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 cv = e.match(/\AFinal-Recipient:[ ]*(?:RFC|rfc)822;[ ]*(.+)\z/)
-                    # Final-Recipient: rfc822;|/bin/echo "Some pipe output"
-                    v['spec'] ||= cv[1].include?('@') ? 'SMTP' : 'X-UNIX'
+                  if Sisimai::RFC1894.match(e)
+                    # "e" matched with any field defined in RFC3464
+                    next unless o = Sisimai::RFC1894.field(e)
+
+                    if o[-1] == 'addr'
+                      # Final-Recipient: rfc822; kijitora@example.jp
+                      # X-Actual-Recipient: rfc822; kijitora@example.co.jp
+                      next unless o[0] == 'final-recipient'
+                      v['spec'] ||= o[2].include?('@') ? 'SMTP' : 'X-UNIX'
+
+                    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
+                      # Other DSN fields defined in RFC3464
+                      next unless fieldtable.key?(o[0])
+                      v[fieldtable[o[0]]] = o[2]
+                    end
                   else
                     # Error message ?
-                    if havepassed[:deliverystatus] == 0
-                      # Content-type: message/delivery-status
-                      havepassed[:deliverystatus] = 1 if e.start_with?(StartingOf[:deliverystatus][0])
-                      v['alterrors'] ||= ''
-                      v['alterrors'] << e + ' ' if e.start_with?(' ')
-                    end
+                    next if havepassed[:deliverystatus] == 1
+
+                    # Content-type: message/delivery-status
+                    havepassed[:deliverystatus] = 1 if e.start_with?(StartingOf[:deliverystatus][0])
+                    v['alterrors'] ||= ''
+                    v['alterrors'] << e + ' ' if e.start_with?(' ')
                   end
                 else
                   if dscontents.size == recipients
@@ -313,12 +315,11 @@ module Sisimai::Bite::Email
                       v['alterrors'] ||= ''
                       v['alterrors'] << e + ' '
                     end
-
                   end
                 end
               end
             end
-          end
+          end # End of message/delivery-status
         end
 
         if recipients > 0
@@ -448,7 +449,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
 
@@ -473,10 +474,10 @@ module Sisimai::Bite::Email
           s1 = 0  # First character of Status as integer
           r1 = 0  # First character of SMTP reply code as integer
 
-          # "Status:" field did not exist in the bounce message
           while true
-            break unless sv.empty?
-            break if rv.empty?
+            # "Status:" field did not exist in the bounce message
+            break if sv
+            break unless rv
 
             # Check SMTP reply code
             # Generate pseudo DSN code from SMTP reply code
@@ -492,8 +493,8 @@ module Sisimai::Bite::Email
             break
           end
 
-          s1  = sv[0, 1].to_i unless sv.empty?
-          v1  = s1 + r1
+          s1 = sv[0, 1].to_i if sv
+          v1 = s1 + r1
           v1 << e['status'][0, 1].to_i if e['status']
 
           if v1 > 0
@@ -510,7 +511,7 @@ module Sisimai::Bite::Email
                    Sisimai::SMTP::Status.code(e['reason'], false)
                  end
           end
-          e['status'] ||= sv
+          e['status'] ||= sv.to_s
           e.each_key { |a| e[a] ||= '' }
         end