sisimai 4.22.5 → 4.22.6

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

@@ -13,12 +13,12 @@ module Sisimai::Bite::Email
         message: ['This message could not be delivered.'],
         rfc822:  ['content-type: text/rfc822-headers'],
       }.freeze
-      ReFailures = {
+      MessagesOf = {
         # The followings are error messages in Rule sets/*/Actions/Template
-        filtered:     %r/Mailbox does not exist/,
-        mesgtoobig:   %r/Message too large/,
-        mailboxfull:  %r/Mailbox full/,
-        contenterror: %r/Message content rejected/,
+        filtered:     ['Mailbox does not exist'],
+        mesgtoobig:   ['Message too large'],
+        mailboxfull:  ['Mailbox full'],
+        contenterror: ['Message content rejected'],
       }.freeze
 
       def description; return 'Amazon SES(Receiving): http://aws.amazon.com/ses/'; end
@@ -192,9 +192,9 @@ module Sisimai::Bite::Email
             e['status'] = pseudostatus if pseudostatus.size > 0
           end
 
-          ReFailures.each_key do |r|
+          MessagesOf.each_key do |r|
             # Verify each regular expression of session errors
-            next unless e['diagnosis'] =~ ReFailures[r]
+            next unless MessagesOf[r].find { |a| e['diagnosis'].include?(a) }
             e['reason'] = r.to_s
             break
           end

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

@@ -51,7 +51,7 @@ module Sisimai::Bite::Email
 
         markingsof = {}     # (Hash) Delimiter patterns
         startingof = {}     # (Hash) Delimiter strings
-        reFailures = {}     # (Hash) Error message patterns
+        messagesof = {}     # (Hash) Error message patterns
         boundary00 = ''     # (String) Boundary string
         v = nil
 
@@ -61,9 +61,9 @@ module Sisimai::Bite::Email
             message: %r/\AError:[ \t]/,
             rfc822:  %r/\A__BOUNDARY_STRING_HERE__\z/,
           }
-          reFailures = {
+          messagesof = {
             # The attempted recipient address does not exist.
-            userunknown: %r/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']) || ''
 
@@ -137,7 +137,7 @@ module Sisimai::Bite::Email
           # vzwpix.com
           startingof = { message: ['Message could not be delivered to mobile'] }
           markingsof = { rfc822:  %r/\A__BOUNDARY_STRING_HERE__\z/ }
-          reFailures = { userunknown: %r/No valid recipients for this MM/ }
+          messagesof = { userunknown: ['No valid recipients for this MM'] }
           boundary00 = Sisimai::MIME.boundary(mhead['content-type'])
 
           if boundary00.size > 0
@@ -222,9 +222,9 @@ module Sisimai::Bite::Email
           e['agent']     = self.smtpagent
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
 
-          reFailures.each_key do |r|
+          messagesof.each_key do |r|
             # Verify each regular expression of session errors
-            next unless e['diagnosis'] =~ reFailures[r]
+            next unless messagesof[r].find { |a| e['diagnosis'].include?(a) }
             e['reason'] = r.to_s
             break
           end

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

@@ -70,62 +70,53 @@ module Sisimai::Bite::Email
         |remote[ ]host[ ]([-0-9a-zA-Z.]+[0-9a-zA-Z])[ ]said:
         )
       }x
-      # qmail-ldap-1.03-20040101.patch:19817 - 19866
-      ReLDAP = {
-        suspend:     %r/Mailaddress is administrative?le?y disabled/,            # 5.2.1
-        userunknown: %r/[Ss]orry, no mailbox here by that name/,                 # 5.1.1
-        exceedlimit: %r/The message exeeded the maximum size the user accepts/,  # 5.2.3
-        systemerror: %r{(?>
-           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
-          |Timeout[ ]while[ ]performing[ ]search[ ]on[ ]LDAP[ ]server # 4.4.3
-          |Too[ ]many[ ]results[ ]returned[ ]but[ ]needs[ ]to[ ]be[ ]unique # 5.3.5
-          |Permanent[ ]error[ ]while[ ]executing[ ]qmail[-]forward    # 5.4.4
-          |Temporary[ ](?:
-             error[ ](?:
-               in[ ]automatic[ ]homedir[ ]creation            # 4.3.0 or 5.3.0
-              |while[ ]executing[ ]qmail[-]forward            # 4.4.4
-              )
-            |failure[ ]in[ ]LDAP[ ]lookup                       # 4.4.3
-            )
-          |Unable[ ]to[ ](?:
-             contact[ ]LDAP[ ]server                            # 4.4.3
-            |login[ ]into[ ]LDAP[ ]server,[ ]bad[ ]credentials  # 4.4.3
-            )
-          )
-        }x,
-      }.freeze
 
       # qmail-send.c:922| ... (&dline[c],"I'm not going to try again; this message has been in the queue too long.\n")) nomem();
-      ReDelaying = %r/this message has been in the queue too long[.]\z/
+      HasExpired = 'this message has been in the queue too long.'
       ReIsOnHold = %r/\A[^ ]+ does not like recipient[.][ ]+.+this message has been in the queue too long[.]\z/
       ReCommands = %r/Sorry, no SMTP connection got far enough; most progress was ([A-Z]{4})[ ]/
-      ReFailures = {
+      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: [
+            '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
+            'Timeout while performing search on LDAP server',   # 4.4.3
+            'Too many results returned but needs to be unique', # 5.3.5
+            'Permanent error while executing qmail-forward',    # 5.4.4
+            'Temporary error in automatic homedir creation',    # 4.3.0 or 5.3.0
+            'Temporary error while executing qmail-forward',    # 4.4.4
+            'Temporary failure in LDAP lookup',                 # 4.4.3
+            'Unable to contact LDAP server',                    # 4.4.3
+            'Unable to login into LDAP server, bad credentials',# 4.4.3
+        ],
+      }.freeze
+      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: %r/(?: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: %r/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:  %r/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: %r/\ASorry, I couldn't find any host /,
-        systemfull:  %r/Requested action not taken: mailbox unavailable [(]not enough free space[)]/,
-        systemerror: %r{(?>
-           bad[ ]interpreter:[ ]No[ ]such[ ]file[ ]or[ ]directory
-          |system[ ]error
-          |Unable[ ]to\b
-          )
-        }x,
-        networkerror: %r{Sorry(?:
-           [,][ ]I[ ]wasn[']t[ ]able[ ]to[ ]establish[ ]an[ ]SMTP[ ]connection
-          |[,][ ]I[ ]couldn[']t[ ]find[ ]a[ ]mail[ ]exchanger[ ]or[ ]IP[ ]address
-          |[.][ ]Although[ ]I[']m[ ]listed[ ]as[ ]a[ ]best[-]preference[ ]MX[ ]or[ ]A[ ]for[ ]that[ ]host
-          )
-        }x,
+        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: [
+          "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",
+        ],
       }.freeze
 
       def description; return 'Unknown MTA #4'; end
@@ -265,31 +256,31 @@ module Sisimai::Bite::Email
               # Sisimai::Reason::* modules
               e['reason'] = 'onhold'
             else
-              ReFailures.each_key do |r|
+              MessagesOf.each_key do |r|
                 # Verify each regular expression of session errors
                 if e['alterrors']
                   # Check the value of "alterrors"
-                  next unless e['alterrors'] =~ ReFailures[r]
+                  next unless MessagesOf[r].find { |a| e['alterrors'].include?(a) }
                   e['reason'] = r.to_s
                 end
                 break if e['reason']
 
-                next unless e['diagnosis'] =~ ReFailures[r]
+                next unless MessagesOf[r].find { |a| e['diagnosis'].include?(a) }
                 e['reason'] = r.to_s
                 break
               end
 
               unless e['reason']
-                ReLDAP.each_key do |r|
+                FailOnLDAP.each_key do |r|
                   # Verify each regular expression of LDAP errors
-                  next unless e['diagnosis'] =~ ReLDAP[r]
+                  next unless FailOnLDAP[r].find { |a| e['diagnosis'].include?(a) }
                   e['reason'] = r.to_s
                   break
                 end
               end
 
               unless e['reason']
-                e['reason'] = 'expired' if e['diagnosis'] =~ ReDelaying
+                e['reason'] = 'expired' if e['diagnosis'].include?(HasExpired)
               end
             end
           end

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

@@ -91,6 +91,7 @@ module Sisimai::Bite::Email
                 v = dscontents[-1]
               end
               v['recipient'] = cv[1]
+              v['diagnosis'] = ''
               recipients += 1
             else
               if e.start_with?('Remote host said:')
@@ -116,6 +117,9 @@ module Sisimai::Bite::Email
                     # 550 5.2.2 <mailboxfull@example.jp>... Mailbox Full
                     v['diagnosis'] = e
                   end
+                else
+                  # Error message which does not start with 'Remote host said:'
+                  v['diagnosis'] << ' ' << e
                 end
               end
             end
@@ -128,6 +132,7 @@ module Sisimai::Bite::Email
           e['diagnosis'] = e['diagnosis'].gsub(/\\n/, ' ')
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
           e['agent']     = self.smtpagent
+          e['command'] ||= 'RCPT' if e['diagnosis'] =~ /[<].+[@].+[>]/
         end
 
         rfc822part = Sisimai::RFC5322.weedout(rfc822list)

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

@@ -11,7 +11,7 @@ module Sisimai::Bite::Email
         message: ['This message was created automatically by mail delivery'],
         rfc822:  ['from mail.zoho.com by mx.zohomail.com'],
       }.freeze
-      ReFailures = { expired: %r/Host not reachable/ }.freeze
+      MessagesOf = { expired: ['Host not reachable'] }.freeze
 
       def description; return 'Zoho Mail: https://www.zoho.com'; end
       def smtpagent;   return Sisimai::Bite.smtpagent(self); end
@@ -140,9 +140,9 @@ module Sisimai::Bite::Email
           e['diagnosis'] = e['diagnosis'].gsub(/\\n/, ' ')
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
 
-          ReFailures.each_key do |r|
+          MessagesOf.each_key do |r|
             # Verify each regular expression of session errors
-            next unless e['diagnosis'] =~ ReFailures[r]
+            next unless MessagesOf[r].find { |a| e['diagnosis'].include?(a) }
             e['reason'] = r.to_s
             break
           end

data/lib/sisimai/data.rb

@@ -237,6 +237,7 @@ module Sisimai
 
           # Check space character in each value and get the first element
           p[v] = p[v].split(' ', 2).shift if p[v].include?(' ')
+          p[v] = p[v].chomp('.')        # Remove "." at the end of the value
         end
 
         # Subject: header of the original message

data/lib/sisimai/mda.rb

@@ -23,59 +23,54 @@ module Sisimai
       }.freeze
 
       # dovecot/src/deliver/mail-send.c:94
-      ReFailures = {
+      MessagesOf = {
         :'dovecot' => {
-          :userunknown => %r/\Amailbox doesn't exist: /,
-          :mailboxfull => %r{\A(?:
-             quota[ ]exceeded # Dovecot 1.2 dovecot/src/plugins/quota/quota.c
-            |quota[ ]exceeded[ ][(]mailbox[ ]for[ ]user[ ]is[ ]full[)]  # dovecot/src/plugins/quota/quota.c
-            |not[ ]enough[ ]disk[ ]space
-            )
-          }x,
+          userunknown: ["mailbox doesn't exist: "],
+          mailboxfull: [
+            'quota exceeded',   # Dovecot 1.2 dovecot/src/plugins/quota/quota.c
+            'quota exceeded (mailbox for user is full)',    # dovecot/src/plugins/quota/quota.c
+            'not enough disk space',
+          ],
         },
         :'mail.local' => {
-          :userunknown => %r{[:][ ](?:
-             unknown[ ]user[:]
-            |user[ ]unknown
-            |invalid[ ]mailbox[ ]path
-            |user[ ]missing[ ]home[ ]directory
-            )
-          }x,
-          :mailboxfull => %r{(?:
-             disc[ ]quota[ ]exceeded
-            |mailbox[ ]full[ ]or[ ]quota[ ]exceeded
-            )
-          }x,
-          :systemerror => %r/temporary file write error/,
+          userunknown: [
+            ': unknown user:',
+            ': user unknown',
+            ': invalid mailbox path',
+            ': user missing home directory',
+          ],
+          mailboxfull: [
+            'disc quota exceeded',
+            'mailbox full or quota exceeded',
+          ],
+          systemerror: ['temporary file write error'],
         },
         :'procmail' => {
-          :mailboxfull => %r/quota exceeded while writing/,
-          :systemfull  => %r/no space left to finish writing/,
+          :mailboxfull => ['quota exceeded while writing'],
+          :systemfull  => ['no space left to finish writing'],
         },
         :'maildrop' => {
-          :userunknown => %r{(?:
-             invalid[ ]user[ ]specified[.]
-            |Cannot[ ]find[ ]system[ ]user
-            )
-          }x,
-          :mailboxfull => %r/maildir over quota[.]\z/,
+          :userunknown => [
+            'invalid user specified.',
+            'Cannot find system user',
+          ],
+          :mailboxfull => ['maildir over quota.'],
         },
         :'vpopmail' => {
-          :userunknown => %r/sorry, no mailbox here by that name[.]/,
-          :filtered    => %r{(?:
-             account[ ]is[ ]locked[ ]email[ ]bounced
-            |user[ ]does[ ]not[ ]exist,[ ]but[ ]will[ ]deliver[ ]to[ ]
-            )
-          }x,
-          :mailboxfull => %r/(?:domain|user) is over quota/,
+          :userunknown => ['sorry, no mailbox here by that name.'],
+          :filtered    => [
+            'account is locked email bounced',
+            'user does not exist, but will deliver to '
+          ],
+          :mailboxfull => ['domain is over quota', 'user is over quota'],
         },
         :'vmailmgr' => {
-          :userunknown => %r{(?>
-             invalid[ ]or[ ]unknown[ ](?:base[ ]user[ ]or[ ]domain|virtual[ ]user)
-            |user[ ]name[ ]does[ ]not[ ]refer[ ]to[ ]a[ ]virtual[ ]user/
-            )
-          }x,
-          :mailboxfull => %r/delivery failed due to system quota violation/,
+          :userunknown => [
+            'invalid or unknown base user or domain',
+            'invalid or unknown virtual user',
+            'user name does not refer to a virtual user'
+          ],
+          mailboxfull: ['delivery failed due to system quota violation'],
         },
       }.freeze
 
@@ -125,11 +120,12 @@ module Sisimai
         return nil unless agentname0.size > 0
         return nil unless linebuffer.size > 0
 
-        ReFailures[agentname0.to_sym].each_key do |e|
+        MessagesOf[agentname0.to_sym].each_key do |e|
           # Detect an error reason from message patterns of the MDA.
           linebuffer.each do |f|
-            # Try to match with each regular expression
-            next unless f.downcase =~ ReFailures[agentname0.to_sym][e]
+            # Whether the error message include each message defined in $MessagesOf
+            g = f.downcase
+            next unless MessagesOf[agentname0.to_sym][e].find { |a| g.include?(a) }
             reasonname = e.to_s
             bouncemesg = f
             break

data/lib/sisimai/mime.rb

@@ -131,10 +131,6 @@ module Sisimai
         return argv1.unpack('M').first unless argv1.downcase =~ ReE[:'quoted-print']
 
         boundary01 = Sisimai::MIME.boundary(heads['content-type'], 1)
-        reboundary = {
-          :begin => Regexp.new('\A' << Regexp.escape(boundary00)),
-          :until => Regexp.new(Regexp.escape(boundary01) << '\z')
-        }
         bodystring = ''
         notdecoded = ''
         getencoded = ''
@@ -143,6 +139,7 @@ module Sisimai
         encodename = nil
         ctencoding = nil
         mimeinside = false
+        mustencode = false
         hasdivided = argv1.split("\n")
 
         while e = hasdivided.shift do
@@ -153,11 +150,10 @@ module Sisimai
           # Content-Transfer-Encoding: quoted-printable
           if mimeinside
             # Quoted-Printable encoded text block
-            if e =~ reboundary[:begin]
+            if e == boundary00
               # The next boundary string has appeared
               # --=_gy7C4Gpes0RP4V5Bs9cK4o2Us2ZT57b-3OLnRN+4klS8dTmQ
               getencoded = Sisimai::String.to_utf8(notdecoded.unpack('M').first, encodename)
-
               bodystring << getencoded
               bodystring << e + "\n"
 
@@ -166,7 +162,39 @@ module Sisimai
               ctencoding = false
               encodename = nil
             else
-              # Inside of Queoted printable encoded text
+              # Inside of Quoted-Printable encoded text
+              if e.size > 76
+                # Invalid line exists in "quoted-printable" part
+                e = [e].pack('M').chomp
+              else
+                # A bounce message generated by Office365(Outlook) include lines
+                # which are not proper as Quoted-Printable:
+                #   - `=` is not encoded
+                #   - Longer than 76 charaters a line
+                #
+                # Content-Transfer-Encoding: quoted-printable
+                # X-Microsoft-Exchange-Diagnostics:
+                #     1;SLXP216MB0381;27:IdH7U/WHGgJu6J8lFrE7KvVxhnAwyKrNbSXMFYs3/Gzz6ZdXYYjzHj55K2O+cndpeVwkvBJqmo6y0IF4AhLfHtFzznw/BzhERU6wi/TCWRpyjYuW8v0/aTcflH3oAdgZ4Pwrp7PxLiiA8rYgU/E7SQ==
+                # ...
+                mustencode = true
+                while true do
+                  break if e.end_with?(' ', "\t")
+                  break if e.split('').find { |c| c.ord < 32 || c.ord > 126 }
+                  if e.end_with?('=')
+                    # Padding character of Base64 or not
+                    break if e =~ /[\+\/0-9A-Za-z]{32,}[=]+\z/
+                  else
+                    if e.include?('=') && ! e.upcase.include?('=3D')
+                      # Including "=" not as "=3D"
+                      break
+                    end
+                  end
+                  mustencode = false
+                  break
+                end
+                e = [e].pack('M').chomp if mustencode
+                mustencode = false
+              end
               notdecoded << e + "\n"
             end
           else
@@ -179,10 +207,6 @@ module Sisimai
                 # New boundary string has appeared
                 boundary00 = e
                 boundary01 = e + '--'
-                reboundary = {
-                  :begin => Regexp.new('\A' << Regexp.escape(boundary00)),
-                  :until => Regexp.new(Regexp.escape(boundary01) << '\z')
-                }
               end
             elsif cv = lowercased.match(ReE[:'with-charset']) || lowercased.match(ReE[:'only-charset'])
               # Content-Type: text/plain; charset=ISO-2022-JP
@@ -194,7 +218,7 @@ module Sisimai
               ctencoding = true
               mimeinside = true if encodename
 
-            elsif e =~ reboundary[:until]
+            elsif e == boundary01
               # The end of boundary block
               # --=_gy7C4Gpes0RP4V5Bs9cK4o2Us2ZT57b-3OLnRN+4klS8dTmQ--
               mimeinside = false
@@ -204,6 +228,7 @@ module Sisimai
           end
         end
 
+        bodystring << notdecoded unless notdecoded.empty?
         return bodystring
       end