sisimai 4.25.4-java → 4.25.10-java

data/lib/sisimai/lhost/courier.rb

@@ -8,10 +8,10 @@ module Sisimai::Lhost
 
       # https://www.courier-mta.org/courierdsn.html
       Indicators = Sisimai::Lhost.INDICATORS
+      ReBackbone = %r<^Content-Type:[ ](?:message/rfc822|text/rfc822-headers)>.freeze
       StartingOf = {
         # courier/module.dsn/dsn*.txt
         message: ['DELAYS IN DELIVERING YOUR MESSAGE', 'UNDELIVERABLE MAIL'],
-        rfc822:  ['Content-Type: message/rfc822', 'Content-Type: text/rfc822-headers'],
       }.freeze
 
       MessagesOf = {
@@ -24,21 +24,11 @@ module Sisimai::Lhost
         'networkerror' => ['DNS lookup failed.'],
       }.freeze
 
-      def description; return 'Courier MTA'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      def headerlist;  return []; end
-
       # Parse bounce messages from Courier MTA
-      # @param         [Hash] mhead       Message headers of a bounce email
-      # @options mhead [String] from      From header
-      # @options mhead [String] date      Date header
-      # @options mhead [String] subject   Subject header
-      # @options mhead [Array]  received  Received headers
-      # @options mhead [String] others    Other required headers
-      # @param         [String] mbody     Message body of a bounce email
-      # @return        [Hash, Nil]        Bounce data list and message/rfc822
-      #                                   part or nil if it failed to parse or
-      #                                   the arguments are missing
+      # @param  [Hash] mhead    Message headers of a bounce email
+      # @param  [String] mbody  Message body of a bounce email
+      # @return [Hash]          Bounce data list and message/rfc822 part
+      # @return [Nil]           it failed to parse or the arguments are missing
       def make(mhead, mbody)
         match  = 0
         match += 1 if mhead['from'].include?('Courier mail server at ')
@@ -54,19 +44,18 @@ 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
         commandtxt = ''     # (String) SMTP Command name begin with the string '>>>'
         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
@@ -75,89 +64,70 @@ module Sisimai::Lhost
               next
             end
           end
-
-          if (readcursor & Indicators[:'message-rfc822']) == 0
-            # Beginning of the original message part(message/rfc822)
-            if e.start_with?(StartingOf[:rfc822][0], StartingOf[:rfc822][1])
-              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(/\A[>]{3}[ ]+([A-Z]{4})[ ]?/)
-                # Your message to the following recipients cannot be delivered:
-                #
-                # <kijitora@example.co.jp>:
-                #    mx.example.co.jp [74.207.247.95]:
-                # >>> RCPT TO:<kijitora@example.co.jp>
-                # <<< 550 5.1.1 <kijitora@example.co.jp>... User Unknown
-                #
-                next unless commandtxt.empty?
-                commandtxt = 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
+          else
+            # The line does not begin with a DSN field defined in RFC3464
+            if cv = e.match(/\A[>]{3}[ ]+([A-Z]{4})[ ]?/)
+              # Your message to the following recipients cannot be delivered:
+              #
+              # <kijitora@example.co.jp>:
+              #    mx.example.co.jp [74.207.247.95]:
+              # >>> RCPT TO:<kijitora@example.co.jp>
+              # <<< 550 5.1.1 <kijitora@example.co.jp>... User Unknown
+              #
+              next unless commandtxt.empty?
+              commandtxt = 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 of message/delivery-status
+          end
         end
         return nil unless recipients > 0
 
         dscontents.each do |e|
           # Set default values if each value is empty.
           permessage.each_key { |a| e[a] ||= permessage[a] || '' }
-          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
+          e['command'] ||= commandtxt || ''
+          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis']) || ''
 
           MessagesOf.each_key do |r|
             # Verify each regular expression of session errors
@@ -165,16 +135,11 @@ module Sisimai::Lhost
             e['reason'] = r
             break
           end
-
-          e['agent']     = self.smtpagent
-          e['command'] ||= commandtxt || ''
-          e.each_key { |a| e[a] ||= '' }
         end
 
-        rfc822part = Sisimai::RFC5322.weedout(rfc822list)
-        return { 'ds' => dscontents, 'rfc822' => rfc822part }
+        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'Courier MTA'; end
     end
   end
 end

data/lib/sisimai/lhost/domino.rb

@@ -7,10 +7,8 @@ module Sisimai::Lhost
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      StartingOf = {
-        message: ['Your message'],
-        rfc822:  ['Content-Type: message/delivery-status'],
-      }.freeze
+      ReBackbone = %r|^Content-Type:[ ]message/delivery-status|.freeze
+      StartingOf = { message: ['Your message'] }.freeze
       MessagesOf = {
         'userunknown' => [
           'not listed in Domino Directory',
@@ -21,112 +19,80 @@ module Sisimai::Lhost
         'systemerror' => ['Several matches found in Domino Directory'],
       }.freeze
 
-      def description; return 'IBM Domino Server'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      def headerlist;  return []; end
-
       # Parse bounce messages from IBM Domino Server
-      # @param         [Hash] mhead       Message headers of a bounce email
-      # @options mhead [String] from      From header
-      # @options mhead [String] date      Date header
-      # @options mhead [String] subject   Subject header
-      # @options mhead [Array]  received  Received headers
-      # @options mhead [String] others    Other required headers
-      # @param         [String] mbody     Message body of a bounce email
-      # @return        [Hash, Nil]        Bounce data list and message/rfc822
-      #                                   part or nil if it failed to parse or
-      #                                   the arguments are missing
+      # @param  [Hash] mhead    Message headers of a bounce email
+      # @param  [String] mbody  Message body of a bounce email
+      # @return [Hash]          Bounce data list and message/rfc822 part
+      # @return [Nil]           it failed to parse or the arguments are missing
       def make(mhead, mbody)
         return nil unless mhead['subject'].start_with?('DELIVERY FAILURE:')
 
         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
         subjecttxt = ''     # (String) The value of Subject:
         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.
           next if e.empty?
 
           if readcursor == 0
             # Beginning of the bounce message or delivery status part
-            if e.start_with?(StartingOf[:message][0])
-              readcursor |= Indicators[:deliverystatus]
-              next
-            end
-          end
-
-          if (readcursor & Indicators[:'message-rfc822']) == 0
-            # Beginning of the original message part
-            if e == StartingOf[:rfc822][0]
-              readcursor |= Indicators[:'message-rfc822']
-              next
-            end
+            readcursor |= Indicators[:deliverystatus] if e.start_with?(StartingOf[:message][0])
+            next
           end
-
-          if readcursor & Indicators[:'message-rfc822'] > 0
-            # Inside of the original message part
-            if e.empty?
-              blanklines += 1
-              break if blanklines > 1
-              next
+          next if (readcursor & Indicators[:deliverystatus]) == 0
+
+          # Your message
+          #
+          #   Subject: Test Bounce
+          #
+          # was not delivered to:
+          #
+          #   kijitora@example.net
+          #
+          # because:
+          #
+          #   User some.name (kijitora@example.net) not listed in Domino Directory
+          #
+          v = dscontents[-1]
+
+          if e.start_with?('was not delivered to:')
+            # was not delivered to:
+            if v['recipient']
+              # There are multiple recipient addresses in the message body.
+              dscontents << Sisimai::Lhost.DELIVERYSTATUS
+              v = dscontents[-1]
             end
-            rfc822list << e
-          else
-            # Error message part
-            next if (readcursor & Indicators[:deliverystatus]) == 0
+            v['recipient'] ||= e
+            recipients += 1
 
-            # Your message
-            #
-            #   Subject: Test Bounce
-            #
-            # was not delivered to:
-            #
+          elsif cv = e.match(/\A[ ][ ]([^ ]+[@][^ ]+)\z/)
+            # Continued from the line "was not delivered to:"
             #   kijitora@example.net
-            #
-            # because:
-            #
-            #   User some.name (kijitora@example.net) not listed in Domino Directory
-            #
-            v = dscontents[-1]
-
-            if e.start_with?('was not delivered to:')
-              # was not delivered to:
-              if v['recipient']
-                # There are multiple recipient addresses in the message body.
-                dscontents << Sisimai::Lhost.DELIVERYSTATUS
-                v = dscontents[-1]
-              end
-              v['recipient'] ||= e
-              recipients += 1
+            v['recipient'] = Sisimai::Address.s3s4(cv[1])
 
-            elsif cv = e.match(/\A[ ][ ]([^ ]+[@][^ ]+)\z/)
-              # Continued from the line "was not delivered to:"
-              #   kijitora@example.net
-              v['recipient'] = Sisimai::Address.s3s4(cv[1])
-
-            elsif e.start_with?('because:')
-              # because:
+          elsif e.start_with?('because:')
+            # because:
+            v['diagnosis'] = e
+          else
+            if v['diagnosis'].to_s == 'because:'
+              # Error message, continued from the line "because:"
               v['diagnosis'] = e
-            else
-              if v['diagnosis'].to_s == 'because:'
-                # Error message, continued from the line "because:"
-                v['diagnosis'] = e
 
-              elsif cv = e.match(/\A[ ][ ]Subject: (.+)\z/)
-                #   Subject: Nyaa
-                subjecttxt = cv[1]
-              end
+            elsif cv = e.match(/\A[ ][ ]Subject: (.+)\z/)
+              #   Subject: Nyaa
+              subjecttxt = cv[1]
             end
           end
         end
         return nil unless recipients > 0
 
         dscontents.each do |e|
-          e['agent']     = self.smtpagent
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
           e['recipient'] = Sisimai::Address.s3s4(e['recipient'])
 
@@ -137,19 +103,15 @@ module Sisimai::Lhost
             e['status'] = Sisimai::SMTP::Status.code(r.to_s, false) || ''
             break
           end
-          e.each_key { |a| e[a] ||= '' }
         end
 
-        unless rfc822list.any? { |a| a.start_with?('Subject:') }
-          # Set the value of subjecttxt as a Subject if there is no original
-          # message in the bounce mail.
-          rfc822list << ('Subject: ' << subjecttxt)
-        end
+        # Set the value of subjecttxt as a Subject if there is no original
+        # message in the bounce mail.
+        emailsteak[1] << ('Subject: ' << subjecttxt << "\n") unless emailsteak[1] =~ /^Subject: /
 
-        rfc822part = Sisimai::RFC5322.weedout(rfc822list)
-        return { 'ds' => dscontents, 'rfc822' => rfc822part }
+        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'IBM Domino Server'; end
     end
   end
 end

data/lib/sisimai/lhost/einsundeins.rb

@@ -7,104 +7,96 @@ module Sisimai::Lhost
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
+      ReBackbone = %r|^---[ ]The[ ]header[ ]of[ ]the[ ]original[ ]message[ ]is[ ]following[.][ ]---|.freeze
       StartingOf = {
         message: ['This message was created automatically by mail delivery software'],
         error:   ['For the following reason:'],
-        rfc822:  ['--- The header of the original message is following'],
       }.freeze
       MessagesOf = { 'mesgtoobig' => ['Mail size limit exceeded'] }.freeze
 
-      def description; return '1&1: https://www.1und1.de'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      def headerlist;  return []; end
-
       # Parse bounce messages from 1&1
-      # @param         [Hash] mhead       Message headers of a bounce email
-      # @options mhead [String] from      From header
-      # @options mhead [String] date      Date header
-      # @options mhead [String] subject   Subject header
-      # @options mhead [Array]  received  Received headers
-      # @options mhead [String] others    Other required headers
-      # @param         [String] mbody     Message body of a bounce email
-      # @return        [Hash, Nil]        Bounce data list and message/rfc822
-      #                                   part or nil if it failed to parse or
-      #                                   the arguments are missing
+      # @param  [Hash] mhead    Message headers of a bounce email
+      # @param  [String] mbody  Message body of a bounce email
+      # @return [Hash]          Bounce data list and message/rfc822 part
+      # @return [Nil]           it failed to parse or the arguments are missing
       def make(mhead, mbody)
         return nil unless mhead['from'].start_with?('"Mail Delivery System"')
         return nil unless mhead['subject'] == 'Mail delivery failed: returning message to sender'
 
         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.start_with?(StartingOf[:rfc822][0])
-              readcursor |= Indicators[:'message-rfc822']
-              next
-            end
-          end
+          # The following address failed:
+          #
+          # general@example.eu
+          #
+          # For the following reason:
+          #
+          # Mail size limit exceeded. For explanation visit
+          # http://postmaster.1and1.com/en/error-messages?ip=%1s
+          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([^ ]+[@][^ ]+)\z/)
+            # general@example.eu
+            if v['recipient']
+              # There are multiple recipient addresses in the message body.
+              dscontents << Sisimai::Lhost.DELIVERYSTATUS
+              v = dscontents[-1]
             end
-            rfc822list << e
-          else
-            # Error message part
-            next if (readcursor & Indicators[:deliverystatus]) == 0
-            next if e.empty?
+            v['recipient'] = cv[1]
+            recipients += 1
 
-            # The following address failed:
-            #
-            # general@example.eu
-            #
+          elsif e.start_with?(StartingOf[:error][0])
             # For the following reason:
-            #
-            # Mail size limit exceeded. For explanation visit
-            # http://postmaster.1and1.com/en/error-messages?ip=%1s
-            v = dscontents[-1]
-
-            if cv = e.match(/\A([^ ]+[@][^ ]+)\z/)
-              # general@example.eu
-              if v['recipient']
-                # There are multiple recipient addresses in the message body.
-                dscontents << Sisimai::Lhost.DELIVERYSTATUS
-                v = dscontents[-1]
-              end
-              v['recipient'] = cv[1]
-              recipients += 1
-
-            elsif e.start_with?(StartingOf[:error][0])
-              # For the following reason:
-              v['diagnosis'] = e
-            else
+            v['diagnosis'] = e
+          else
+            if v['diagnosis']
               # Get error message and append error message strings
-              v['diagnosis'] << ' ' << e if v['diagnosis']
+              v['diagnosis'] << ' ' << e
+            else
+              # OR the following format:
+              #   neko@example.fr:
+              #   SMTP error from remote server for TEXT command, host: ...
+              v['alterrors'] ||= ''
+              v['alterrors'] << ' ' << e
             end
           end
         end
         return nil unless recipients > 0
 
         dscontents.each do |e|
-          e['agent']     = self.smtpagent
-          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'].to_s.gsub(/\A#{StartingOf[:error][0]}/, ''))
+          e['diagnosis'] ||= ''
+          e['diagnosis']   = e['alterrors'] if e['diagnosis'].empty?
+
+          if cv = e['diagnosis'].match(/host:[ ]+(.+?)[ ]+.+[ ]+reason:.+/)
+            # SMTP error from remote server for TEXT command,
+            #   host: smtp-in.orange.fr (193.252.22.65)
+            #   reason: 550 5.2.0 Mail rejete. Mail rejected. ofr_506 [506]
+            e['rhost']   = cv[1]
+            e['command'] = 'DATA' if e['diagnosis'] =~ /for TEXT command/
+            e['spec']    = 'SMTP' if e['diagnosis'] =~ /SMTP error/
+            e['status']  = Sisimai::SMTP::Status.find(e['diagnosis'])
+          else
+            # For the following reason:
+            e['diagnosis'].gsub(/\A#{StartingOf[:error][0]}/, '')
+          end
+          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
 
           MessagesOf.each_key do |r|
             # Verify each regular expression of session errors
@@ -114,10 +106,9 @@ module Sisimai::Lhost
           end
         end
 
-        rfc822part = Sisimai::RFC5322.weedout(rfc822list)
-        return { 'ds' => dscontents, 'rfc822' => rfc822part }
+        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return '1&1: https://www.1und1.de'; end
     end
   end
 end