sisimai 4.25.5 → 4.25.6

data/lib/sisimai/lhost/mxlogic.rb

@@ -69,26 +69,15 @@ module Sisimai::Lhost
         'was frozen on arrival by ',
       ].freeze
 
-      def description; return 'McAfee SaaS'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      # X-MX-Bounce: mta/src/queue/bounce
-      # X-MXL-NoteHash: ffffffffffffffff-0000000000000000000000000000000000000000
-      # X-MXL-Hash: 4c9d4d411993da17-bbd4212b6c887f6c23bab7db4bd87ef5edc00758
-      def headerlist;  return %w[x-mxl-notehash x-mxl-hash x-mx-bounce]; end
-
       # Parse bounce messages from MXLogic
-      # @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)
-        # :'message-id' => %r/\A[<]mxl[~][0-9a-f]+/,
+        # X-MX-Bounce: mta/src/queue/bounce
+        # X-MXL-NoteHash: ffffffffffffffff-0000000000000000000000000000000000000000
+        # X-MXL-Hash: 4c9d4d411993da17-bbd4212b6c887f6c23bab7db4bd87ef5edc00758
         match  = 0
         match += 1 if mhead['x-mx-bounce']
         match += 1 if mhead['x-mxl-hash']
@@ -160,7 +149,6 @@ module Sisimai::Lhost
         end
 
         dscontents.each do |e|
-          e['agent'] = self.smtpagent
           e['lhost'] = localhost0
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'].gsub(/[-]{2}.*\z/, ''))
 
@@ -208,12 +196,11 @@ module Sisimai::Lhost
               end
             end
           end
-          e.each_key { |a| e[a] ||= '' }
         end
 
         return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'McAfee SaaS'; end
     end
   end
 end

data/lib/sisimai/lhost/notes.rb

@@ -1,5 +1,5 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::::Email::Notes parses a bounce email which created by Lotus
+  # Sisimai::Lhost::Notes parses a bounce email which created by Lotus
   # Notes Server. Methods in the module are called from only Sisimai::Message.
   module Notes
     class << self
@@ -17,21 +17,11 @@ module Sisimai::Lhost
         networkerror: ['Message has exceeded maximum hop count'],
       }.freeze
 
-      def description; return 'Lotus Notes'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      def headerlist;  return []; end
-
       # Parse bounce messages from Lotus Notes
-      # @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?('Undeliverable message')
 
@@ -115,7 +105,6 @@ module Sisimai::Lhost
         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'])
 
@@ -126,12 +115,11 @@ module Sisimai::Lhost
             e['status'] = Sisimai::SMTP::Status.code(r.to_s) || ''
             break
           end
-          e.each_key { |a| e[a] ||= '' }
         end
 
         return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'Lotus Notes'; end
     end
   end
 end

data/lib/sisimai/lhost/office365.rb

@@ -14,8 +14,11 @@ module Sisimai::Lhost
         eoerr:  ['Original message headers:'],
       }.freeze
       MarkingsOf = {
+        eoe:     %r/\A(?:Original[ ][Mm]essage[ ][Hh]eaders:?|Message[ ]Hops)/,
+        error:   %r/\A(?:Diagnostic[ ]information[ ]for[ ]administrators:|Error[ ]Details)/,
         message: %r{\A(?:
            Delivery[ ]has[ ]failed[ ]to[ ]these[ ]recipients[ ]or[ ]groups:
+          |Original[ ]Message[ ]Details
           |.+[ ]rejected[ ]your[ ]message[ ]to[ ]the[ ]following[ ]e[-]?mail[ ]addresses:
           )
         }x,
@@ -37,6 +40,8 @@ module Sisimai::Lhost
         %r/\A4[.]7[.]26\z/       => 'securityerror',
         %r/\A4[.]7[.][56]\d\d\z/ => 'blocked',
         %r/\A4[.]7[.]8[5-9]\d\z/ => 'blocked',
+        %r/\A5[.]0[.]350\z/      => 'contenterror',
+        %r/\A5[.]1[.]10\z/       => 'userunknown',
         %r/\A5[.]4[.]1\z/        => 'norelaying',
         %r/\A5[.]4[.]312\z/      => 'networkerror',
         %r/\A5[.]4[.]316\z/      => 'expired',
@@ -46,6 +51,7 @@ module Sisimai::Lhost
         %r/\A5[.]7[.]1[23]\z/    => 'rejected',
         %r/\A5[.]7[.]124\z/      => 'rejected',
         %r/\A5[.]7[.]13[3-6]\z/  => 'rejected',
+        %r/\A5[.]7[.]23\z/       => 'blocked',
         %r/\A5[.]7[.]25\z/       => 'networkerror',
         %r/\A5[.]7[.]50[1-3]\z/  => 'spamdetected',
         %r/\A5[.]7[.]50[4-5]\z/  => 'filtered',
@@ -55,6 +61,7 @@ module Sisimai::Lhost
         %r/\A5[.]7[.]510\z/      => 'notaccept',
         %r/\A5[.]7[.]511\z/      => 'rejected',
         %r/\A5[.]7[.]512\z/      => 'securityerror',
+        %r/\A5[.]7[.]57\z/       => 'securityerror',
         %r/\A5[.]7[.]60[6-9]\z/  => 'blocked',
         %r/\A5[.]7[.]6[1-4]\d\z/ => 'blocked',
         %r/\A5[.]7[.]7[0-4]\d\z/ => 'toomanyconn',
@@ -63,9 +70,12 @@ module Sisimai::Lhost
         RCPT: %r/unknown recipient or mailbox unavailable ->.+[<]?.+[@].+[.][a-zA-Z]+[>]?/,
       }.freeze
 
-      def description; return 'Microsoft Office 365: https://office.microsoft.com/'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      def headerlist
+      # Parse bounce messages from Microsoft Office 365
+      # @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)
         # X-MS-Exchange-Message-Is-Ndr:
         # X-Microsoft-Antispam-PRVS: <....@...outlook.com>
         # X-Exchange-Antispam-Report-Test: UriScan:;
@@ -73,30 +83,6 @@ module Sisimai::Lhost
         # X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2015 23:34:45.6789 (JST)
         # X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
         # X-MS-Exchange-Transport-CrossTenantHeadersStamped: ...
-        return %w[
-          content-language
-          x-ms-exchange-message-is-ndr
-          x-microsoft-antispam-prvs
-          x-exchange-antispam-report-test
-          x-exchange-antispam-report-cfa-test
-          x-ms-exchange-crosstenant-originalarrivaltime
-          x-ms-exchange-crosstenant-fromentityheader
-          x-ms-exchange-transport-crosstenantheadersstamped
-        ]
-      end
-
-      # Parse bounce messages from Microsoft Office 365
-      # @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
-      def make(mhead, mbody)
         tryto  = %r/.+[.](?:outbound[.]protection|prod)[.]outlook[.]com\b/
         match  = 0
         match += 1 if mhead['subject'].include?('Undeliverable:')
@@ -115,7 +101,6 @@ module Sisimai::Lhost
         require 'sisimai/rfc1894'
         fieldtable = Sisimai::RFC1894.FIELDTABLE
         permessage = {}     # (Hash) Store values of each Per-Message field
-
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
         emailsteak = Sisimai::RFC5322.fillet(mbody, ReBackbone)
         bodyslices = emailsteak[0].split("\n")
@@ -141,9 +126,16 @@ module Sisimai::Lhost
           # The email address wasn't found at the destination domain. It might
           # be misspelled or it might not exist any longer. Try retyping the
           # address and resending the message.
+          #
+          # Original Message Details
+          # Created Date:   4/29/2017 6:40:30 AM
+          # Sender Address: neko@example.jp
+          # Recipient Address:      kijitora@example.org
+          # Subject:        Nyaan#
           v = dscontents[-1]
 
-          if cv = e.match(/\A.+[@].+[<]mailto:(.+[@].+)[>]\z/)
+          if cv = e.match(/\A.+[@].+[<]mailto:(.+[@].+)[>]\z/) ||
+                  e.match(/\ARecipient[ ]Address:[ ]+(.+)\z/)
             # kijitora@example.com<mailto:kijitora@example.com>
             if v['recipient']
               # There are multiple recipient addresses in the message body.
@@ -168,7 +160,7 @@ module Sisimai::Lhost
               next unless f == 1
               permessage[fieldtable[o[0]]] = o[2]
             else
-              if e == StartingOf[:error][0]
+              if e =~ MarkingsOf[:error]
                 # Diagnostic information for administrators:
                 v['diagnosis'] = e
               else
@@ -176,7 +168,7 @@ module Sisimai::Lhost
                 # Remote Server returned '550 5.1.10 RESOLVER.ADR.RecipientNotFound; Recipien=
                 # t not found by SMTP address lookup'
                 next unless v['diagnosis']
-                if e == StartingOf[:eoerr][0]
+                if e =~ MarkingsOf[:eoe]
                   # Original message headers:
                   endoferror = true
                   next
@@ -192,10 +184,8 @@ module Sisimai::Lhost
           # Set default values if each value is empty.
           permessage.each_key { |a| e[a] ||= permessage[a] || '' }
 
-          e['agent']     = self.smtpagent
           e['status']  ||= ''
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis']) || ''
-
           if e['status'].empty? || e['status'].end_with?('.0.0')
             # There is no value of Status header or the value is 5.0.0, 4.0.0
             e['status'] = Sisimai::SMTP::Status.find(e['diagnosis']) || ''
@@ -219,7 +209,7 @@ module Sisimai::Lhost
 
         return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'Microsoft Office 365: https://office.microsoft.com/'; end
     end
   end
 end

data/lib/sisimai/lhost/opensmtpd.rb

@@ -65,21 +65,11 @@ module Sisimai::Lhost
         'securityerror' => ['Could not retrieve credentials'],
       }.freeze
 
-      def description; return 'OpenSMTPD'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      def headerlist;  return []; end
-
       # Parse bounce messages from OpenSMTPD
-      # @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 status notification')
         return nil unless mhead['from'].start_with?('Mailer Daemon <')
@@ -130,21 +120,17 @@ module Sisimai::Lhost
         return nil unless recipients > 0
 
         dscontents.each do |e|
-          e['agent']     = self.smtpagent
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
-
           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
             break
           end
-          e.each_key { |a| e[a] ||= '' }
         end
-
         return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'OpenSMTPD'; end
     end
   end
 end

data/lib/sisimai/lhost/outlook.rb

@@ -15,26 +15,14 @@ module Sisimai::Lhost
         'userunknown' => ['Requested action not taken: mailbox unavailable'],
       }.freeze
 
-      def description; return 'Microsoft Outlook.com: https://www.outlook.com/'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-
-      # X-Message-Delivery: Vj0xLjE7RD0wO0dEPTA7U0NMPTk7bD0xO3VzPTE=
-      # X-Message-Info: AuEzbeVr9u5fkDpn2vR5iCu5wb6HBeY4iruBjnutBzpStnUabbM...
-      def headerlist;  return %w[x-message-delivery x-message-info]; end
-
       # Parse bounce messages from Microsoft Outlook.com
-      # @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)
-        # :from => %r/postmaster[@]/,
+        # X-Message-Delivery: Vj0xLjE7RD0wO0dEPTA7U0NMPTk7bD0xO3VzPTE=
+        # X-Message-Info: AuEzbeVr9u5fkDpn2vR5iCu5wb6HBeY4iruBjnutBzpStnUabbM...
         match  = 0
         match += 1 if mhead['subject'].start_with?('Delivery Status Notification')
         match += 1 if mhead['x-message-delivery']
@@ -115,9 +103,7 @@ module Sisimai::Lhost
           e['lhost'] ||= permessage['rhost']
           permessage.each_key { |a| e[a] ||= permessage[a] || '' }
 
-          e['agent']     = self.smtpagent
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis']) || ''
-
           if e['diagnosis'].empty?
             # No message in 'diagnosis'
             if e['action'] == 'delayed'
@@ -140,7 +126,7 @@ module Sisimai::Lhost
 
         return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'Microsoft Outlook.com: https://www.outlook.com/'; end
     end
   end
 end

data/lib/sisimai/lhost/postfix.rb

@@ -31,23 +31,14 @@ module Sisimai::Lhost
         # :from => %r/ [(]Mail Delivery System[)]\z/,
       }.freeze
 
-      def description; return 'Postfix'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      def headerlist;  return []; end
-
       # Parse bounce messages from Postfix
-      # @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'] == 'Undelivered Mail Returned to Sender'
+        return nil if mhead['x-aol-ip']
 
         require 'sisimai/rfc1894'
         require 'sisimai/address'
@@ -247,13 +238,11 @@ module Sisimai::Lhost
           e['command']   = commandset.shift || nil
           e['command'] ||= 'HELO' if e['diagnosis'] =~ /refused to talk to me:/
           e['spec']    ||= 'SMTP' if e['diagnosis'] =~ /host .+ said:/
-          e['agent']     = self.smtpagent
-          e.each_key { |a| e[a] ||= '' }
         end
 
         return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'Postfix'; end
     end
   end
 end

data/lib/sisimai/lhost/powermta.rb

@@ -0,0 +1,120 @@
+module Sisimai::Lhost
+  # Sisimai::Lhost::PowerMTA parses a bounce email which created by
+  # amavsid-new. Methods in the module are called from only Sisimai::Message.
+  module PowerMTA
+    class << self
+      # Imported from p5-Sisimail/lib/Sisimai/Lhost/PowerMTA.pm
+      require 'sisimai/lhost'
+
+      Indicators = Sisimai::Lhost.INDICATORS
+      ReBackbone = %r|^Content-Type:[ ]text/rfc822-headers|.freeze
+      StartingOf = { message: ['Hello, this is the mail server on '] }.freeze
+      Categories = {
+        'bad-domain'          => 'hostunknown',
+        'bad-mailbox'         => 'userunknown',
+        'inactive-mailbox'    => 'disabled',
+        'message-expired'     => 'expired',
+        'no-answer-from-host' => 'networkerror',
+        'policy-related'      => 'policyviolation',
+        'quota-issues'        => 'mailboxfull',
+        'routing-errors'      => 'systemerror',
+        'spam-related'        => 'spamdetected',
+      }.freeze
+
+      # Parse bounce messages from PowerMTA
+      # @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
+      # @since v4.25.6
+      def make(mhead, mbody)
+        return nil unless mhead['subject'].to_s.start_with?('Delivery report')
+
+        require 'sisimai/rfc1894'
+        fieldtable = Sisimai::RFC1894.FIELDTABLE
+        permessage = {}     # (Hash) Store values of each Per-Message field
+
+        dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
+        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 = 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 message/delivery-status part
+            readcursor |= Indicators[:deliverystatus] if e.start_with?(StartingOf[:message][0])
+            next
+          end
+          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
+                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]
+              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
+              # 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
+            # Hello, this is the mail server on neko2.example.org.
+            #
+            # I am sending you this message to inform you on the delivery status of a
+            # message you previously sent.  Immediately below you will find a list of
+            # the affected recipients;  also attached is a Delivery Status Notification
+            # (DSN) report in standard format, as well as the headers of the original
+            # message.
+            #
+            #  <kijitora@example.jp>  delivery failed; will not continue trying
+            #
+            if cv = e.match(/\AX-PowerMTA-BounceCategory:[ ]*(.+)\z/)
+              # X-PowerMTA-BounceCategory: bad-mailbox
+              v['category'] = cv[1]
+            end
+          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'].to_s.tr("\n", ' '))
+          e['reason']    = Categories[e['category']] || ''
+        end
+
+        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+      end
+      def description; return 'PowerMTA: https://www.sparkpost.com/powermta/'; end
+    end
+  end
+end
+