sisimai 4.24.1-java → 4.25.0-java

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

@@ -18,7 +18,7 @@ module Sisimai::Bite::Email
       # X-SEF-ZeroHour-RefID: fgs=000000000
       # X-SEF-Processed: 0_0_0_000__2010_04_29_23_34_45
       # X-Mailer: SurfControl E-mail Filter
-      def headerlist;  return ['X-SEF-Processed', 'X-Mailer']; end
+      def headerlist;  return %w[x-sef-processed x-mailer]; end
 
       # Parse bounce messages from SurfControl
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -37,6 +37,8 @@ module Sisimai::Bite::Email
         return nil unless mhead['x-mailer']
         return nil unless mhead['x-mailer'] == 'SurfControl E-mail Filter'
 
+        require 'sisimai/rfc1894'
+        fieldtable = Sisimai::RFC1894.FIELDTABLE
         dscontents = [Sisimai::Bite.DELIVERYSTATUS]
         hasdivided = mbody.split("\n")
         havepassed = ['']
@@ -68,7 +70,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 +78,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?
 
@@ -111,23 +113,18 @@ module Sisimai::Bite::Email
               v['diagnosis'] = cv[2]
             else
               # Fallback, parse RFC3464 headers.
-              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[ ]+(.+)\z/)
-                # Continued line of the value of Diagnostic-Code header
+              if f = Sisimai::RFC1894.match(e)
+                # "e" matched with any field defined in RFC3464
+                next unless o = Sisimai::RFC1894.field(e)
+                next if o[1] == 'final-recipient'
+                next unless fieldtable.key?(o[0])
+                v[fieldtable[o[0]]] = o[2]
+              else
+                # 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
-
-              elsif cv = e.match(/\AAction:[ ]*(.+)\z/)
-                # Action: failed
-                v['action'] = cv[1].downcase
-
-              elsif cv = e.match(/\AStatus:[ ]*(\d[.]\d+[.]\d+)/)
-                # Status: 5.0.-
-                v['status'] = cv[1]
               end
             end
           end

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

@@ -21,7 +21,7 @@ module Sisimai::Bite::Email
 
       def description; return 'Module description'; end
       def smtpagent;   return Sisimai::Bite.smtpagent(self); end
-      def headerlist;  return ['X-Some-UserDefined-Header']; end
+      def headerlist;  return %w[x-some-userdefined-header]; end
 
       # @abstract Template for User-Defined MTA module
       # @param         [Hash] mhead       Message headers of a bounce email

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

@@ -83,7 +83,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
@@ -91,7 +91,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?
 
@@ -149,9 +149,8 @@ module Sisimai::Bite::Email
         if recipients == 0
           # Get the recipient address from the original message
           rfc822list.each do |e|
-            next unless cv = e.match(/^To: (.+)$/m)
-
             # The value of To: header in the original message
+            next unless cv = e.match(/^To: (.+)$/m)
             dscontents[0]['recipient'] = Sisimai::Address.s3s4(cv[1])
             recipients = 1
             break

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

@@ -47,7 +47,6 @@ module Sisimai::Bite::Email
         markingsof = {}     # (Hash) Delimiter patterns
         startingof = {}     # (Hash) Delimiter strings
         messagesof = {}     # (Hash) Error message patterns
-        boundary00 = ''     # (String) Boundary string
         v = nil
 
         if match == 1
@@ -58,7 +57,7 @@ module Sisimai::Bite::Email
           }
           messagesof = {
             # The attempted recipient address does not exist.
-            userunknown: ['550 - Requested action not taken: no such user here'],
+            'userunknown' => ['550 - Requested action not taken: no such user here'],
           }
           boundary00 = Sisimai::MIME.boundary(mhead['content-type']) || ''
           markingsof[:rfc822] = Regexp.new('\A' << Regexp.escape('--' << boundary00 << '--') << '\z') unless boundary00.empty?
@@ -81,7 +80,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
@@ -89,7 +88,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?
 
@@ -128,7 +127,7 @@ module Sisimai::Bite::Email
           # vzwpix.com
           startingof = { message: ['Message could not be delivered to mobile'] }
           markingsof = { rfc822:  %r/\A__BOUNDARY_STRING_HERE__\z/ }
-          messagesof = { userunknown: ['No valid recipients for this MM'] }
+          messagesof = { 'userunknown' => ['No valid recipients for this MM'] }
           boundary00 = Sisimai::MIME.boundary(mhead['content-type'])
           markingsof[:rfc822] = Regexp.new('\A' << Regexp.escape('--' << boundary00 << '--') << '\z') unless boundary00.empty?
 
@@ -150,7 +149,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
@@ -158,7 +157,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?
 
@@ -211,7 +210,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/x1.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/x2.rb

@@ -57,7 +57,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 > 2
@@ -65,7 +65,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/x3.rb

@@ -57,7 +57,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
@@ -65,7 +65,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?
 
@@ -114,7 +114,7 @@ module Sisimai::Bite::Email
         dscontents.each do |e|
           e['agent']     = self.smtpagent
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
-          e['status']    = Sisimai::SMTP::Status.find(e['diagnosis'])
+          e['status']    = Sisimai::SMTP::Status.find(e['diagnosis']) || ''
           e.each_key { |a| e[a] ||= '' }
         end
 

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

@@ -43,21 +43,21 @@ module Sisimai::Bite::Email
       ReSMTP = {
         # Error text regular expressions which defined in qmail-remote.c
         # qmail-remote.c:225|  if (smtpcode() != 220) quit("ZConnected to "," but greeting failed");
-        conn: %r/(?:Error:)?Connected to .+ but greeting failed[.]/,
+        'conn' => %r/(?:Error:)?Connected to .+ but greeting failed[.]/,
         # qmail-remote.c:231|  if (smtpcode() != 250) quit("ZConnected to "," but my name was rejected");
-        ehlo: %r/(?:Error:)?Connected to .+ but my name was rejected[.]/,
+        'ehlo' => %r/(?:Error:)?Connected to .+ but my name was rejected[.]/,
         # qmail-remote.c:238|  if (code >= 500) quit("DConnected to "," but sender was rejected");
         # reason = rejected
-        mail: %r/(?:Error:)?Connected to .+ but sender was rejected[.]/,
+        'mail' => %r/(?:Error:)?Connected to .+ but sender was rejected[.]/,
         # qmail-remote.c:249|  out("h"); outhost(); out(" does not like recipient.\n");
         # qmail-remote.c:253|  out("s"); outhost(); out(" does not like recipient.\n");
         # reason = userunknown
-        rcpt: %r/(?:Error:)?.+ does not like recipient[.]/,
+        'rcpt' => %r/(?:Error:)?.+ does not like recipient[.]/,
         # qmail-remote.c:265|  if (code >= 500) quit("D"," failed on DATA command");
         # qmail-remote.c:266|  if (code >= 400) quit("Z"," failed on DATA command");
         # qmail-remote.c:271|  if (code >= 500) quit("D"," failed after I sent the message");
         # qmail-remote.c:272|  if (code >= 400) quit("Z"," failed after I sent the message");
-        data: %r{(?:
+        'data' => %r{(?:
            (?:Error:)?.+[ ]failed[ ]on[ ]DATA[ ]command[.]
           |(?:Error:)?.+[ ]failed[ ]after[ ]I[ ]sent[ ]the[ ]message[.]
           )
@@ -77,10 +77,10 @@ module Sisimai::Bite::Email
       ReCommands = %r/Sorry, no SMTP connection got far enough; most progress was ([A-Z]{4})[ ]/
       FailOnLDAP = {
         # qmail-ldap-1.03-20040101.patch:19817 - 19866
-        suspend:     ['Mailaddress is administrative?le?y disabled'],   # 5.2.1
-        userunknown: ['Sorry, no mailbox here by that name'],           # 5.1.1
-        exceedlimit: ['The message exeeded the maximum size the user accepts'], # 5.2.3
-        systemerror: [
+        'suspend'     => ['Mailaddress is administrative?le?y disabled'],   # 5.2.1
+        'userunknown' => ['Sorry, no mailbox here by that name'],           # 5.1.1
+        'exceedlimit' => ['The message exeeded the maximum size the user accepts'], # 5.2.3
+        'systemerror' => [
             'Automatic homedir creator crashed',                # 4.3.0
             'Illegal value in LDAP attribute',                  # 5.3.5
             'LDAP attribute is not given but mandatory',        # 5.3.5
@@ -97,22 +97,22 @@ module Sisimai::Bite::Email
       MessagesOf = {
         # qmail-local.c:589|  strerr_die1x(100,"Sorry, no mailbox here by that name. (#5.1.1)");
         # qmail-remote.c:253|  out("s"); outhost(); out(" does not like recipient.\n");
-        userunknown: ['no mailbox here by that name', 'does not like recipient.'],
+        'userunknown'  => ['no mailbox here by that name', 'does not like recipient.'],
         # error_str.c:192|  X(EDQUOT,"disk quota exceeded")
-        mailboxfull: ['disk quota exceeded'],
+        'mailboxfull'  => ['disk quota exceeded'],
         # qmail-qmtpd.c:233| ... result = "Dsorry, that message size exceeds my databytes limit (#5.3.4)";
         # qmail-smtpd.c:391| ... out("552 sorry, that message size exceeds my databytes limit (#5.3.4)\r\n"); return;
-        mesgtoobig:  ['Message size exceeds fixed maximum message size:'],
+        'mesgtoobig'   => ['Message size exceeds fixed maximum message size:'],
         # qmail-remote.c:68|  Sorry, I couldn't find any host by that name. (#4.1.2)\n"); zerodie();
         # qmail-remote.c:78|  Sorry, I couldn't find any host named ");
-        hostunknown: ["Sorry, I couldn't find any host "],
-        systemfull:  ['Requested action not taken: mailbox unavailable (not enough free space)'],
-        systemerror: [
+        'hostunknown'  => ["Sorry, I couldn't find any host "],
+        'systemfull'   => ['Requested action not taken: mailbox unavailable (not enough free space)'],
+        'systemerror'  => [
           'bad interpreter: No such file or directory',
           'system error',
           'Unable to',
         ],
-        networkerror: [
+        'networkerror' => [
           "Sorry, I wasn't able to establish an SMTP connection",
           "Sorry, I couldn't find a mail exchanger or IP address",
           "Sorry. Although I'm listed as a best-preference MX or A for that host",
@@ -171,7 +171,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
@@ -179,7 +179,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?
 
@@ -223,7 +223,7 @@ module Sisimai::Bite::Email
             ReSMTP.each_key do |r|
               # Verify each regular expression of SMTP commands
               next unless e['diagnosis'] =~ ReSMTP[r]
-              e['command'] = r.to_s.upcase
+              e['command'] = r.upcase
               break
             end
 
@@ -254,12 +254,12 @@ module Sisimai::Bite::Email
                 if e['alterrors']
                   # Check the value of "alterrors"
                   next unless MessagesOf[r].any? { |a| e['alterrors'].include?(a) }
-                  e['reason'] = r.to_s
+                  e['reason'] = r
                 end
                 break if e['reason']
 
                 next unless MessagesOf[r].any? { |a| e['diagnosis'].include?(a) }
-                e['reason'] = r.to_s
+                e['reason'] = r
                 break
               end
 
@@ -267,7 +267,7 @@ module Sisimai::Bite::Email
                 FailOnLDAP.each_key do |r|
                   # Verify each regular expression of LDAP errors
                   next unless FailOnLDAP[r].any? { |a| e['diagnosis'].include?(a) }
-                  e['reason'] = r.to_s
+                  e['reason'] = r
                   break
                 end
               end

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

@@ -48,6 +48,8 @@ module Sisimai::Bite::Email
         end
         return nil if match < 2
 
+        require 'sisimai/rfc1894'
+        fieldtable = Sisimai::RFC1894.FIELDTABLE
         dscontents = [Sisimai::Bite.DELIVERYSTATUS]
         hasdivided = mbody.split("\n")
         havepassed = ['']
@@ -63,7 +65,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
@@ -71,7 +73,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.start_with?(StartingOf[:rfc822][0])
               readcursor |= Indicators[:'message-rfc822']
               next
@@ -79,60 +81,49 @@ module Sisimai::Bite::Email
           end
 
           if readcursor & Indicators[:'message-rfc822'] > 0
-            # Before "message/rfc822"
+            # message/delivery-status part
             next if e.empty?
             v = dscontents[-1]
 
-            if cv = e.match(/\AFinal-Recipient:[ ]*(?:RFC|rfc)822;[ ]*([^ ]+)\z/)
-              # 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'] = cv[1]
-              recipients += 1
-
-            elsif cv = e.match(/\AX-Actual-Recipient:[ ]*(?:RFC|rfc)822;[ ]*([^ ]+)\z/) ||
-                       e.match(/\AOriginal-Recipient:[ ]*(?:RFC|rfc)822;[ ]*([^ ]+)\z/)
-              # X-Actual-Recipient: RFC822; kijitora@example.co.jp
-              # Original-Recipient: rfc822;kijitora@example.co.jp
-              v['alias'] = 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.1.1
-              v['status'] = cv[1]
-
-            elsif cv = e.match(/\AReporting-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
-              # Reporting-MTA: dns; mx.example.jp
-              v['lhost'] = cv[1].downcase
-
-            elsif cv = e.match(/\ARemote-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
-              # Remote-MTA: DNS; mx.example.jp
-              v['rhost'] = cv[1].downcase
-
-            elsif cv = e.match(/\ALast-Attempt-Date:[ ]*(.+)\z/)
-              # Last-Attempt-Date: Fri, 14 Feb 2014 12:30:08 -0500
-              v['date'] = cv[1]
-            else
-              # Get an error message from Diagnostic-Code: field
-              if cv = e.match(/\ADiagnostic-Code:[ ]*(.+?);[ ]*(.+)\z/)
+            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 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
+              elsif o[-1] == 'code'
                 # Diagnostic-Code: SMTP; 550 5.1.1 <userunknown@example.jp>... User Unknown
-                v['spec'] = cv[1].downcase
-                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
+                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
+              # 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
           else
-            # After "message/rfc822"
+            # message/rfc822 OR text/rfc822-headers part
             next unless recipients > 0
             next if (readcursor & Indicators['deliverystatus']) == 0