sisimai 4.25.4-java → 4.25.5-java

data/lib/sisimai/lhost/yahoo.rb

@@ -7,10 +7,8 @@ module Sisimai::Lhost
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      StartingOf = {
-        message: ['Sorry, we were unable to deliver your message'],
-        rfc822:  ['--- Below this line is a copy of the message.'],
-      }.freeze
+      ReBackbone = %r|^--- Below this line is a copy of the message[.]|.freeze
+      StartingOf = { message: ['Sorry, we were unable to deliver your message'] }.freeze
 
       def description; return 'Yahoo! MAIL: https://www.yahoo.com'; end
       def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
@@ -37,85 +35,64 @@ module Sisimai::Lhost
         return nil unless mhead['x-ymailisg']
 
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
-        hasdivided = mbody.split("\n")
-        rfc822list = []     # (Array) Each line in message/rfc822 part string
-        blanklines = 0      # (Integer) The number of blank lines
+        emailsteak = Sisimai::RFC5322.fillet(mbody, ReBackbone)
+        bodyslices = emailsteak[0].split("\n")
         readcursor = 0      # (Integer) Points the current cursor position
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
         v = nil
 
-        while e = hasdivided.shift do
+        while e = bodyslices.shift do
+          # Read error messages and delivery status lines from the head of the email
+          # to the previous line of the beginning of the original message.
           if readcursor == 0
             # Beginning of the bounce message or delivery status part
-            if e.start_with?(StartingOf[:message][0])
-              readcursor |= Indicators[:deliverystatus]
-              next
-            end
+            readcursor |= Indicators[:deliverystatus] if e.start_with?(StartingOf[:message][0])
+            next
           end
+          next if (readcursor & Indicators[:deliverystatus]) == 0
+          next if e.empty?
 
-          if (readcursor & Indicators[:'message-rfc822']) == 0
-            # Beginning of the original message part
-            if e == StartingOf[:rfc822][0]
-              readcursor |= Indicators[:'message-rfc822']
-              next
-            end
-          end
+          # Sorry, we were unable to deliver your message to the following address.
+          #
+          # <kijitora@example.org>:
+          # Remote host said: 550 5.1.1 <kijitora@example.org>... User Unknown [RCPT_TO]
+          v = dscontents[-1]
 
-          if readcursor & Indicators[:'message-rfc822'] > 0
-            # Inside of the original message part
-            if e.empty?
-              blanklines += 1
-              break if blanklines > 1
-              next
+          if cv = e.match(/\A[<](.+[@].+)[>]:[ \t]*\z/)
+            # <kijitora@example.org>:
+            if v['recipient']
+              # There are multiple recipient addresses in the message body.
+              dscontents << Sisimai::Lhost.DELIVERYSTATUS
+              v = dscontents[-1]
             end
-            rfc822list << e
+            v['recipient'] = cv[1]
+            v['diagnosis'] = ''
+            recipients += 1
           else
-            # Error message part
-            next if (readcursor & Indicators[:deliverystatus]) == 0
-            next if e.empty?
-
-            # Sorry, we were unable to deliver your message to the following address.
-            #
-            # <kijitora@example.org>:
-            # Remote host said: 550 5.1.1 <kijitora@example.org>... User Unknown [RCPT_TO]
-            v = dscontents[-1]
+            if e.start_with?('Remote host said:')
+              # Remote host said: 550 5.1.1 <kijitora@example.org>... User Unknown [RCPT_TO]
+              v['diagnosis'] = e
 
-            if cv = e.match(/\A[<](.+[@].+)[>]:[ \t]*\z/)
-              # <kijitora@example.org>:
-              if v['recipient']
-                # There are multiple recipient addresses in the message body.
-                dscontents << Sisimai::Lhost.DELIVERYSTATUS
-                v = dscontents[-1]
-              end
-              v['recipient'] = cv[1]
-              v['diagnosis'] = ''
-              recipients += 1
+              # Get SMTP command from the value of "Remote host said:"
+              if cv = e.match(/\[([A-Z]{4}).*\]\z/) then v['command'] = cv[1] end
             else
-              if e.start_with?('Remote host said:')
-                # Remote host said: 550 5.1.1 <kijitora@example.org>... User Unknown [RCPT_TO]
-                v['diagnosis'] = e
-
-                # Get SMTP command from the value of "Remote host said:"
-                if cv = e.match(/\[([A-Z]{4}).*\]\z/) then v['command'] = cv[1] end
-              else
-                # <mailboxfull@example.jp>:
+              # <mailboxfull@example.jp>:
+              # Remote host said:
+              # 550 5.2.2 <mailboxfull@example.jp>... Mailbox Full
+              # [RCPT_TO]
+              if v['diagnosis'].start_with?('Remote host said:')
                 # Remote host said:
                 # 550 5.2.2 <mailboxfull@example.jp>... Mailbox Full
-                # [RCPT_TO]
-                if v['diagnosis'].start_with?('Remote host said:')
-                  # Remote host said:
-                  # 550 5.2.2 <mailboxfull@example.jp>... Mailbox Full
-                  if cv = e.match(/\[([A-Z]{4}).*\]\z/)
-                    # [RCPT_TO]
-                    v['command'] = cv[1]
-                  else
-                    # 550 5.2.2 <mailboxfull@example.jp>... Mailbox Full
-                    v['diagnosis'] = e
-                  end
+                if cv = e.match(/\[([A-Z]{4}).*\]\z/)
+                  # [RCPT_TO]
+                  v['command'] = cv[1]
                 else
-                  # Error message which does not start with 'Remote host said:'
-                  v['diagnosis'] << ' ' << e
+                  # 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,8 +105,7 @@ module Sisimai::Lhost
           e['command'] ||= 'RCPT' if e['diagnosis'] =~ /[<].+[@].+[>]/
         end
 
-        rfc822part = Sisimai::RFC5322.weedout(rfc822list)
-        return { 'ds' => dscontents, 'rfc822' => rfc822part }
+        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
 
     end

data/lib/sisimai/lhost/yandex.rb

@@ -7,10 +7,8 @@ module Sisimai::Lhost
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      StartingOf = {
-        message: ['This is the mail system at host yandex.ru.'],
-        rfc822:  ['Content-Type: message/rfc822'],
-      }.freeze
+      ReBackbone = %r|^Content-Type:[ ]message/rfc822|.freeze
+      StartingOf = { message: ['This is the mail system at host yandex.ru.'] }.freeze
 
       def description; return 'Yandex.Mail: https://www.yandex.ru'; end
       def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
@@ -44,100 +42,77 @@ module Sisimai::Lhost
         permessage = {}     # (Hash) Store values of each Per-Message field
 
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
-        hasdivided = mbody.split("\n")
-        havepassed = ['']
-        rfc822list = []     # (Array) Each line in message/rfc822 part string
-        blanklines = 0      # (Integer) The number of blank lines
+        emailsteak = Sisimai::RFC5322.fillet(mbody, ReBackbone)
+        bodyslices = emailsteak[0].split("\n")
+        readslices = ['']
         readcursor = 0      # (Integer) Points the current cursor position
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
         commandset = []     # (Array) ``in reply to * command'' list
         v = nil
 
-        while e = hasdivided.shift do
-          # Save the current line for the next loop
-          havepassed << e
-          p = havepassed[-2]
+        while e = bodyslices.shift do
+          # Read error messages and delivery status lines from the head of the email
+          # to the previous line of the beginning of the original message.
+          readslices << e # Save the current line for the next loop
 
           if readcursor == 0
             # Beginning of the bounce message or message/delivery-status part
-            if e.start_with?(StartingOf[:message][0])
-              readcursor |= Indicators[:deliverystatus]
-              next
-            end
+            readcursor |= Indicators[:deliverystatus] if e.start_with?(StartingOf[:message][0])
+            next
           end
-
-          if (readcursor & Indicators[:'message-rfc822']) == 0
-            # Beginning of the original message part(message/rfc822)
-            if e.start_with?(StartingOf[:rfc822][0])
-              readcursor |= Indicators[:'message-rfc822']
-              next
-            end
-          end
-
-          if readcursor & Indicators[:'message-rfc822'] > 0
-            # message/rfc822 OR text/rfc822-headers part
-            if e.empty?
-              blanklines += 1
-              break if blanklines > 1
-              next
-            end
-            rfc822list << e
-          else
-            # message/delivery-status part
-            next if (readcursor & Indicators[:deliverystatus]) == 0
-            next if e.empty?
-
-            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'
+          next if (readcursor & Indicators[:deliverystatus]) == 0
+          next if e.empty?
+
+          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
-                # 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::Lhost.DELIVERYSTATUS
-                    v = dscontents[-1]
-                  end
-                  v['recipient'] = o[2]
-                  recipients += 1
-                else
-                  # X-Actual-Recipient: rfc822; kijitora@example.co.jp
-                  v['alias'] = o[2]
+                if v['recipient']
+                  # There are multiple recipient addresses in the message body.
+                  dscontents << Sisimai::Lhost.DELIVERYSTATUS
+                  v = dscontents[-1]
                 end
-              elsif o[-1] == 'code'
-                # Diagnostic-Code: SMTP; 550 5.1.1 <userunknown@example.jp>... User Unknown
-                v['spec'] = o[1]
-                v['diagnosis'] = o[2]
+                v['recipient'] = o[2]
+                recipients += 1
               else
-                # 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]
+                # 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'] = o[1]
+              v['diagnosis'] = o[2]
             else
-              # The line does not begin with a DSN field defined in RFC3464
-              if cv = e.match(/[ \t][(]in reply to .*([A-Z]{4}).*/)
-                # 5.1.1 <userunknown@example.co.jp>... User Unknown (in reply to RCPT TO
-                commandset << cv[1]
-
-              elsif cv = e.match(/([A-Z]{4})[ \t]*.*command[)]\z/)
-                # to MAIL command)
-                commandset << cv[1]
-              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
+              # Other DSN fields defined in RFC3464
+              next unless fieldtable[o[0]]
+              v[fieldtable[o[0]]] = o[2]
+
+              next unless f == 1
+              permessage[fieldtable[o[0]]] = o[2]
             end
-          end # End of message/delivery-status
+          else
+            # The line does not begin with a DSN field defined in RFC3464
+            if cv = e.match(/[ \t][(]in reply to .*([A-Z]{4}).*/)
+              # 5.1.1 <userunknown@example.co.jp>... User Unknown (in reply to RCPT TO
+              commandset << cv[1]
+
+            elsif cv = e.match(/([A-Z]{4})[ \t]*.*command[)]\z/)
+              # to MAIL command)
+              commandset << cv[1]
+            else
+              # Continued line of the value of Diagnostic-Code field
+              next unless readslices[-2].start_with?('Diagnostic-Code:')
+              next unless cv = e.match(/\A[ \t]+(.+)\z/)
+              v['diagnosis'] << ' ' << cv[1]
+              readslices[-1] = 'Diagnostic-Code: ' << e
+            end
+          end
         end
         return nil unless recipients > 0
 
@@ -151,8 +126,7 @@ module Sisimai::Lhost
           e['agent']     = self.smtpagent
         end
 
-        rfc822part = Sisimai::RFC5322.weedout(rfc822list)
-        return { 'ds' => dscontents, 'rfc822' => rfc822part }
+        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
 
     end

data/lib/sisimai/lhost/zoho.rb

@@ -7,10 +7,8 @@ module Sisimai::Lhost
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      StartingOf = {
-        message: ['This message was created automatically by mail delivery'],
-        rfc822:  ['from mail.zoho.com by mx.zohomail.com'],
-      }.freeze
+      ReBackbone = %r|^Received:[ ]*from[ ]mail[.]zoho[.]com[ ]by[ ]mx[.]zohomail[.]com|.freeze
+      StartingOf = { message: ['This message was created automatically by mail delivery'] }.freeze
       MessagesOf = { 'expired' => ['Host not reachable'] }.freeze
 
       def description; return 'Zoho Mail: https://www.zoho.com'; end
@@ -43,90 +41,69 @@ module Sisimai::Lhost
         return nil unless mhead['x-zohomail']
 
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
-        hasdivided = mbody.split("\n")
-        rfc822list = []     # (Array) Each line in message/rfc822 part string
-        blanklines = 0      # (Integer) The number of blank lines
+        emailsteak = Sisimai::RFC5322.fillet(mbody, ReBackbone)
+        bodyslices = emailsteak[0].split("\n")
         readcursor = 0      # (Integer) Points the current cursor position
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
         qprintable = false
         v = nil
 
-        while e = hasdivided.shift do
+        while e = bodyslices.shift do
+          # Read error messages and delivery status lines from the head of the email
+          # to the previous line of the beginning of the original message.
           if readcursor == 0
             # Beginning of the bounce message or delivery status part
-            if e.start_with?(StartingOf[:message][0])
-              readcursor |= Indicators[:deliverystatus]
-              next
-            end
+            readcursor |= Indicators[:deliverystatus] if e.start_with?(StartingOf[:message][0])
+            next
           end
-
-          if (readcursor & Indicators[:'message-rfc822']) == 0
-            # Beginning of the original message part
-            if e.include?(StartingOf[:rfc822][0])
-              readcursor |= Indicators[:'message-rfc822']
-              next
+          next if (readcursor & Indicators[:deliverystatus]) == 0
+          next if e.empty?
+
+          # This message was created automatically by mail delivery software.
+          # A message that you sent could not be delivered to one or more of its recip=
+          # ients. This is a permanent error.=20
+          #
+          # kijitora@example.co.jp Invalid Address, ERROR_CODE :550, ERROR_CODE :5.1.=
+          # 1 <kijitora@example.co.jp>... User Unknown
+
+          # This message was created automatically by mail delivery software.
+          # A message that you sent could not be delivered to one or more of its recipients. This is a permanent error.
+          #
+          # shironeko@example.org Invalid Address, ERROR_CODE :550, ERROR_CODE :Requested action not taken: mailbox unavailable
+          v = dscontents[-1]
+
+          if cv = e.match(/\A([^ ]+[@][^ ]+)[ \t]+(.+)\z/)
+            # kijitora@example.co.jp Invalid Address, ERROR_CODE :550, ERROR_CODE :5.1.=
+            if v['recipient']
+              # There are multiple recipient addresses in the message body.
+              dscontents << Sisimai::Lhost.DELIVERYSTATUS
+              v = dscontents[-1]
             end
-          end
+            v['recipient'] = cv[1]
+            v['diagnosis'] = cv[2]
 
-          if readcursor & Indicators[:'message-rfc822'] > 0
-            # Inside of the original message part
-            if e.empty?
-              blanklines += 1
-              break if blanklines > 1
-              next
+            if v['diagnosis'].end_with?('=')
+              # Quoted printable
+              v['diagnosis'] = v['diagnosis'].chomp('=')
+              qprintable = true
             end
-            rfc822list << e
-          else
-            # Error message part
-            next if (readcursor & Indicators[:deliverystatus]) == 0
-            next if e.empty?
-
-            # This message was created automatically by mail delivery software.
-            # A message that you sent could not be delivered to one or more of its recip=
-            # ients. This is a permanent error.=20
-            #
-            # kijitora@example.co.jp Invalid Address, ERROR_CODE :550, ERROR_CODE :5.1.=
-            # 1 <kijitora@example.co.jp>... User Unknown
-
-            # This message was created automatically by mail delivery software.
-            # A message that you sent could not be delivered to one or more of its recipients. This is a permanent error.
-            #
-            # shironeko@example.org Invalid Address, ERROR_CODE :550, ERROR_CODE :Requested action not taken: mailbox unavailable
-            v = dscontents[-1]
-
-            if cv = e.match(/\A([^ ]+[@][^ ]+)[ \t]+(.+)\z/)
-              # kijitora@example.co.jp Invalid Address, ERROR_CODE :550, ERROR_CODE :5.1.=
-              if v['recipient']
-                # There are multiple recipient addresses in the message body.
-                dscontents << Sisimai::Lhost.DELIVERYSTATUS
-                v = dscontents[-1]
-              end
-              v['recipient'] = cv[1]
-              v['diagnosis'] = cv[2]
-
-              if v['diagnosis'].end_with?('=')
-                # Quoted printable
-                v['diagnosis'] = v['diagnosis'].chomp('=')
-                qprintable = true
-              end
-              recipients += 1
-
-            elsif cv = e.match(/\A\[Status: .+[<]([^ ]+[@][^ ]+)[>],/)
-              # Expired
-              # [Status: Error, Address: <kijitora@6kaku.example.co.jp>, ResponseCode 421, , Host not reachable.]
-              if v['recipient']
-                # There are multiple recipient addresses in the message body.
-                dscontents << Sisimai::Lhost.DELIVERYSTATUS
-                v = dscontents[-1]
-              end
-              v['recipient'] = cv[1]
-              v['diagnosis'] = e
-              recipients += 1
-            else
-              # Continued line
-              next unless qprintable
-              v['diagnosis'] << e
+            recipients += 1
+
+          elsif cv = e.match(/\A\[Status: .+[<]([^ ]+[@][^ ]+)[>],/)
+            # Expired
+            # [Status: Error, Address: <kijitora@6kaku.example.co.jp>, ResponseCode 421, , Host not reachable.]
+            if v['recipient']
+              # There are multiple recipient addresses in the message body.
+              dscontents << Sisimai::Lhost.DELIVERYSTATUS
+              v = dscontents[-1]
             end
+            v['recipient'] = cv[1]
+            v['diagnosis'] = e
+            recipients += 1
+          else
+            # Continued line
+            next unless qprintable
+            v['diagnosis'] << e
           end
         end
         return nil unless recipients > 0
@@ -143,8 +120,7 @@ module Sisimai::Lhost
           end
         end
 
-        rfc822part = Sisimai::RFC5322.weedout(rfc822list)
-        return { 'ds' => dscontents, 'rfc822' => rfc822part }
+        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
 
     end