sisimai 4.24.1-java → 4.25.0-java

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

@@ -19,28 +19,28 @@ module Sisimai::Bite::Email
       }.freeze
       ReFailures = {
         # notaccept: [ %r/The following recipients did not receive this message:/ ],
-        mailboxfull: [
+        'mailboxfull' => [
           %r/The user[(]s[)] account is temporarily over quota/,
         ],
-        suspend: [
+        'suspend' => [
           # http://www.naruhodo-au.kddi.com/qa3429203.html
           # The recipient may be unpaid user...?
           %r/The user[(]s[)] account is disabled[.]/,
           %r/The user[(]s[)] account is temporarily limited[.]/,
         ],
-        expired: [
+        'expired' => [
           # Your message was not delivered within 0 days and 1 hours.
           # Remote host is not responding.
           %r/Your message was not delivered within /,
         ],
-        onhold: [
+        'onhold' => [
           %r/Each of the following recipients was rejected by a remote mail server/,
         ],
       }.freeze
 
       def description; return 'au EZweb: http://www.au.kddi.com/mobile/'; end
       def smtpagent;   return Sisimai::Bite.smtpagent(self); end
-      def headerlist;  return ['X-SPASIGN']; end
+      def headerlist;  return %w[x-spasign]; end
 
       # Parse bounce messages from au EZweb
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -65,6 +65,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")
         rfc822list = []     # (Array) Each line in message/rfc822 part string
@@ -98,7 +100,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
@@ -106,7 +108,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?
 
@@ -134,29 +136,18 @@ module Sisimai::Bite::Email
               end
 
               r = Sisimai::Address.s3s4(cv[1])
-              if Sisimai::RFC5322.is_emailaddress(r)
-                v['recipient'] = r
-                recipients += 1
-              end
-
-            elsif cv = e.match(/\AStatus:[ ]*(\d[.]\d+[.]\d+)/)
-              # Status: 5.1.1
-              # Status:5.2.0
-              # Status: 5.1.0 (permanent failure)
-              v['status'] = cv[1]
+              next unless Sisimai::RFC5322.is_emailaddress(r)
+              v['recipient'] = r
+              recipients += 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
+              next unless o = Sisimai::RFC1894.field(e)
+              next unless fieldtable.key?(o[0])
+              v[fieldtable[o[0]]] = o[2]
 
-            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
+              # The line does not begin with a DSN field defined in RFC3464
               next if Sisimai::String.is_8bit(e)
               if cv = e.match(/\A[ \t]+[>]{3}[ \t]+([A-Z]{4})/)
                 #    >>> RCPT TO:<******@ezweb.ne.jp>
@@ -179,6 +170,8 @@ module Sisimai::Bite::Email
         return nil unless recipients > 0
 
         dscontents.each do |e|
+          e['agent'] = self.smtpagent
+
           unless e['alterrors'].to_s.empty?
             # Copy alternative error message
             e['diagnosis'] ||= e['alterrors']
@@ -207,7 +200,7 @@ module Sisimai::Bite::Email
                   ReFailures[r].each do |rr|
                     # Check each regular expression
                     next unless e['diagnosis'] =~ rr
-                    e['reason'] = r.to_s
+                    e['reason'] = r
                     throw :SESSION
                   end
                 end
@@ -215,14 +208,9 @@ module Sisimai::Bite::Email
 
             end
           end
-
-          unless e['reason']
-            # The value of "reason" is not set yet.
-            # Deal as "userunknown" when the domain part of the recipient
-            # is "ezweb.ne.jp".
-            e['reason'] = 'userunknown' unless e['recipient'].end_with?('@ezweb.ne.jp', '@au.com')
-          end
-          e['agent'] = self.smtpagent
+          next if e['reason']
+          next if e['recipient'].end_with?('@ezweb.ne.jp', '@au.com')
+          e['reason'] = 'userunknown'
         end
 
         rfc822part = Sisimai::RFC5322.weedout(rfc822list)

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

@@ -14,56 +14,56 @@ module Sisimai::Bite::Email
       ReFailures = {
         # http://postmaster.facebook.com/response_codes
         # NOT TESTD EXCEPT RCP-P2
-        userunknown: [
+        'userunknown' => [
           'RCP-P1', # The attempted recipient address does not exist.
           'INT-P1', # The attempted recipient address does not exist.
           'INT-P3', # The attempted recpient group address does not exist.
           'INT-P4', # The attempted recipient address does not exist.
         ],
-        filtered: [
+        'filtered' => [
           'RCP-P2', # The attempted recipient's preferences prevent messages from being delivered.
           'RCP-P3', # The attempted recipient's privacy settings blocked the delivery.
         ],
-        mesgtoobig: [
+        'mesgtoobig' => [
           'MSG-P1', # The message exceeds Facebook's maximum allowed size.
           'INT-P2', # The message exceeds Facebook's maximum allowed size.
         ],
-        contenterror: [
+        'contenterror' => [
           'MSG-P2', # The message contains an attachment type that Facebook does not accept.
           'MSG-P3', # The message contains multiple instances of a header field that can only be present once. Please see RFC 5322, section 3.6 for more information
           'POL-P6', # The message contains a url that has been blocked by Facebook.
           'POL-P7', # The message does not comply with Facebook's abuse policies and will not be accepted.
         ],
-        securityerror: [
+        'securityerror' => [
           'POL-P1', # Your mail server's IP Address is listed on the Spamhaus PBL.
           'POL-P2', # Facebook will no longer accept mail from your mail server's IP Address.
           'POL-P5', # The message contains a virus.
           'POL-P7', # The message does not comply with Facebook's Domain Authentication requirements.
         ],
-        notaccept: [
+        'notaccept' => [
           'POL-P3', # Facebook is not accepting messages from your mail server. This will persist for 4 to 8 hours.
           'POL-P4', # Facebook is not accepting messages from your mail server. This will persist for 24 to 48 hours.
           'POL-T1', # Facebook is not accepting messages from your mail server, but they may be retried later. This will persist for 1 to 2 hours.
           'POL-T2', # Facebook is not accepting messages from your mail server, but they may be retried later. This will persist for 4 to 8 hours.
           'POL-T3', # Facebook is not accepting messages from your mail server, but they may be retried later. This will persist for 24 to 48 hours.
         ],
-        rejected: [
+        'rejected' => [
           'DNS-P1', # Your SMTP MAIL FROM domain does not exist.
           'DNS-P2', # Your SMTP MAIL FROM domain does not have an MX record.
           'DNS-T1', # Your SMTP MAIL FROM domain exists but does not currently resolve.
           'DNS-P3', # Your mail server does not have a reverse DNS record.
           'DNS-T2', # You mail server's reverse DNS record does not currently resolve.
         ],
-        systemerror: [
+        'systemerror' => [
           'CON-T1', # Facebook's mail server currently has too many connections open to allow another one.
         ],
-        toomanyconn: [
+        'toomanyconn' => [
           'CON-T3', # Your mail server has opened too many new connections to Facebook's mail servers in a short period of time.
         ],
-        suspend: [
+        'suspend' => [
           'RCP-T4', # The attempted recipient address is currently deactivated. The user may or may not reactivate it.
         ],
-        undefined: [
+        'undefined' => [
           'RCP-T1', # The attempted recipient address is not currently available due to an internal system issue. This is a temporary condition.
           'MSG-T1', # The number of recipients on the message exceeds Facebook's allowed maximum.
           'CON-T2', # Your mail server currently has too many connections open to Facebook's mail servers.
@@ -90,6 +90,10 @@ module Sisimai::Bite::Email
         return nil unless mhead['from'] == 'Facebook <mailer-daemon@mx.facebook.com>'
         return nil unless mhead['subject'] == 'Sorry, your message could not be delivered'
 
+        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 = ['']
@@ -98,11 +102,6 @@ module Sisimai::Bite::Email
         readcursor = 0      # (Integer) Points the current cursor position
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
         fbresponse = ''     # (String) Response code from Facebook
-        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
@@ -111,7 +110,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 == StartingOf[:message][0]
               readcursor |= Indicators[:deliverystatus]
               next
@@ -119,7 +118,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
@@ -127,7 +126,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
@@ -135,80 +134,56 @@ 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
-              # Reporting-MTA: dns; 10.138.205.200
-              # Arrival-Date: Thu, 23 Jun 2011 02:29:43 -0700
+            if f = Sisimai::RFC1894.match(e)
+              # "e" matched with any field defined in RFC3464
+              o = Sisimai::RFC1894.field(e) || next
               v = dscontents[-1]
 
-              if cv = e.match(/\AFinal-Recipient:[ ]*(?:RFC|rfc)822;[ ]*([^ ]+)\z/)
-                # Final-Recipient: RFC822; userunknown@example.jp
-                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(/\AX-Actual-Recipient:[ ]*(?:RFC|rfc)822;[ ]*(.+)\z/)
-                # X-Actual-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
-                # Status:5.2.0
-                # Status: 5.1.0 (permanent failure)
-                v['status'] = cv[1]
-
-              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]
+              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.1 RCP-P2
-                  #     http://postmaster.facebook.com/response_codes?ip=192.0.2.135#rcp Refused due to recipient preferences
-                  v['spec'] = cv[1].upcase
-                  v['diagnosis'] = cv[2]
+                # Other DSN fields defined in RFC3464
+                next unless fieldtable.key?(o[0])
+                v[fieldtable[o[0]]] = o[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
+                next unless f == 1
+                permessage[fieldtable[o[0]]] = o[2]
               end
             else
-              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
-
-              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
-              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|
-          e['lhost']   ||= connheader['lhost']
+          e['lhost']   ||= permessage['lhost']
           e['agent']     = self.smtpagent
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
 
@@ -227,7 +202,7 @@ module Sisimai::Bite::Email
               ReFailures[r].each do |rr|
                 # Check each regular expression
                 next unless fbresponse == rr
-                e['reason'] = r.to_s
+                e['reason'] = r
                 throw :SESSION
               end
             end

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

@@ -9,24 +9,24 @@ module Sisimai::Bite::Email
       Indicators = Sisimai::Bite::Email.INDICATORS
       StartingOf = { rfc822: ['Original mail as follows:'] }.freeze
       ErrorTitle = {
-        :rejected => %r{(?>
+        'rejected' => %r{(?>
            (?:Ignored[ ])*NOT[ ]MEMBER[ ]article[ ]from[ ]
           |reject[ ]mail[ ](?:.+:|from)[ ],
           |Spam[ ]mail[ ]from[ ]a[ ]spammer[ ]is[ ]rejected
           |You[ ].+[ ]are[ ]not[ ]member
           )
         }x,
-        :systemerror => %r{(?:
+        'systemerror' => %r{(?:
            fml[ ]system[ ]error[ ]message
           |Loop[ ]Alert:[ ]
           |Loop[ ]Back[ ]Warning:[ ]
           |WARNING:[ ]UNIX[ ]FROM[ ]Loop
           )
         }x,
-        :securityerror => %r/Security Alert/,
+        'securityerror' => %r/Security Alert/,
       }.freeze
       ErrorTable = {
-        :rejected => %r{(?>
+        'rejected' => %r{(?>
           (?:Ignored[ ])*NOT[ ]MEMBER[ ]article[ ]from[ ]
           |reject[ ](?:
              mail[ ]from[ ].+[@].+
@@ -36,18 +36,18 @@ module Sisimai::Bite::Email
           |You[ ]are[ ]not[ ]a[ ]member[ ]of[ ]this[ ]mailing[ ]list
           )
         }x,
-        :systemerror => %r{(?:
+        'systemerror' => %r{(?:
            Duplicated[ ]Message-ID
           |fml[ ].+[ ]has[ ]detected[ ]a[ ]loop[ ]condition[ ]so[ ]that
           |Loop[ ]Back[ ]Warning:
           )
         }x,
-        :securityerror => %r/Security alert:/,
+        'securityerror' => %r/Security alert:/,
       }.freeze
 
       def description; return 'fml mailing list server/manager'; end
       def smtpagent;   return Sisimai::Bite.smtpagent(self); end
-      def headerlist;  return ['X-MLServer']; end
+      def headerlist;  return %w[x-mlserver]; end
 
       # Parse bounce messages from fml mailling list server/manager
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -97,7 +97,7 @@ module Sisimai::Bite::Email
             end
             rfc822list << e.lstrip
           else
-            # Before "message/rfc822"
+            # Error message part
             next if (readcursor & Indicators[:deliverystatus]) == 0
             next if e.empty?
 
@@ -133,7 +133,7 @@ module Sisimai::Bite::Email
           ErrorTable.each_key do |f|
             # Try to match with error messages defined in ErrorTable
             next unless e['diagnosis'] =~ ErrorTable[f]
-            e['reason'] = f.to_s
+            e['reason'] = f
             break
           end
 
@@ -142,7 +142,7 @@ module Sisimai::Bite::Email
             ErrorTitle.each_key do |f|
               # Try to match with the Subject string
               next unless mhead['subject'] =~ ErrorTitle[f]
-              e['reason'] = f.to_s
+              e['reason'] = f
               break
             end
           end

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

@@ -11,7 +11,7 @@ module Sisimai::Bite::Email
         message: ['This message was created automatically by mail delivery software'],
         rfc822:  ['--- The header of the original message is following'],
       }.freeze
-      MessagesOf = { expired: ['delivery retry timeout exceeded'] }.freeze
+      MessagesOf = { 'expired' => ['delivery retry timeout exceeded'] }.freeze
 
       def description; return 'GMX: http://www.gmx.net'; end
       def smtpagent;   return Sisimai::Bite.smtpagent(self); end
@@ -20,7 +20,7 @@ module Sisimai::Bite::Email
       # X-GMX-Antispam: 0 (Mail was not recognized as spam); Detail=V3;
       # X-GMX-Antivirus: 0 (no virus found)
       # X-UI-Out-Filterresults: unknown:0;
-      def headerlist;  return ['X-GMX-Antispam']; end
+      def headerlist;  return %w[x-gmx-antispam]; end
 
       # Parse bounce messages from GMX
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -64,7 +64,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
@@ -72,7 +72,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?
 
@@ -132,12 +132,12 @@ module Sisimai::Bite::Email
 
         dscontents.each do |e|
           e['agent']     = self.smtpagent
-          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'].gsub(/\\n/, ' '))
+          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'].tr("\n", ' '))
 
           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