sisimai 4.25.16-java → 5.0.2-java

data/lib/sisimai/lhost/office365.rb

@@ -1,25 +1,44 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::Office365 parses a bounce email which created by
-  # Microsoft Office 365.
-  # Methods in the module are called from only Sisimai::Message.
+  # Sisimai::Lhost::Office365 parses a bounce email which created by Microsoft Office 365. Methods in
+  # the module are called from only Sisimai::Message.
   module Office365
     class << self
-      # Imported from p5-Sisimail/lib/Sisimai/Lhost/Office365.pm
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      ReBackbone = %r|^Content-Type:[ ]message/rfc822|.freeze
+      Boundaries = ['Content-Type: message/rfc822', 'Original message headers:'].freeze
       StartingOf = {
         error:  ['Diagnostic information for administrators:'],
         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)/,
+        eoe:     %r{\A(?:
+           Original[ ][Mm]essage[ ][Hh]eaders:?
+          |Message[ ]Hops
+          |Cabe.+alhos[ ]originais[ ]da[ ]mensagem:
+          |Oorspronkelijke[ ]berichtkoppen:
+          )
+        }x,
+        rfc3464: %r|\AContent-Type:[ ]message/delivery-status|,
+        lhost:   %r{\A(?:
+           Generating[ ]server
+          |Bronserver
+          |Servidor[ ]de[ ]origem
+          ):[ ](.+)\z
+        }x,
+        error:   %r{\A(?:
+           Diagnostic[ ]information[ ]for[ ]administrators:
+          |Error[ ]Details
+          |Diagnostische[ ]gegevens[ ]voor[ ]beheerders:
+          |Informa.+es[ ]de[ ]diagn.+stico[ ]para[ ]administradores:
+          )
+        }x,
         message: %r{\A(?:
            Delivery[ ]has[ ]failed[ ]to[ ]these[ ]recipients[ ]or[ ]groups:
           |Original[ ]Message[ ]Details
           |.+[ ]rejected[ ]your[ ]message[ ]to[ ]the[ ]following[ ]e[-]?mail[ ]addresses:
+          |Falha[ ]na[ ]entrega[ ]a[ ]estes[ ]destinat.+rios[ ]ou[ ]grupos:
+          |Uw[ ]bericht[ ]kan[ ]niet[ ]worden[ ]bezorgd[ ]bij[ ]de[ ]volgende[ ]geadresseerden[ ]of[ ]groepen:
           )
         }x,
       }.freeze
@@ -37,7 +56,7 @@ module Sisimai::Lhost
         %r/\A4[.]4[.]7\z/        => 'expired',
         %r/\A4[.]4[.]312\z/      => 'networkerror',
         %r/\A4[.]4[.]316\z/      => 'expired',
-        %r/\A4[.]7[.]26\z/       => 'securityerror',
+        %r/\A4[.]7[.]26\z/       => 'authfailure',
         %r/\A4[.]7[.][56]\d\d\z/ => 'blocked',
         %r/\A4[.]7[.]8[5-9]\d\z/ => 'blocked',
         %r/\A5[.]0[.]350\z/      => 'contenterror',
@@ -51,16 +70,16 @@ 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[.]23\z/       => 'authfailure',
         %r/\A5[.]7[.]25\z/       => 'networkerror',
         %r/\A5[.]7[.]50[1-3]\z/  => 'spamdetected',
         %r/\A5[.]7[.]50[4-5]\z/  => 'filtered',
         %r/\A5[.]7[.]50[6-7]\z/  => 'blocked',
         %r/\A5[.]7[.]508\z/      => 'toomanyconn',
-        %r/\A5[.]7[.]509\z/      => 'securityerror',
+        %r/\A5[.]7[.]509\z/      => 'authfailure',
         %r/\A5[.]7[.]510\z/      => 'notaccept',
         %r/\A5[.]7[.]511\z/      => 'rejected',
-        %r/\A5[.]7[.]512\z/      => 'securityerror',
+        %r/\A5[.]7[.]512\z/      => 'authfailure',
         %r/\A5[.]7[.]57\z/       => 'securityerror',
         %r/\A5[.]7[.]60[6-9]\z/  => 'blocked',
         %r/\A5[.]7[.]6[1-4]\d\z/ => 'blocked',
@@ -75,7 +94,7 @@ module Sisimai::Lhost
       # @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)
+      def inquire(mhead, mbody)
         # X-MS-Exchange-Message-Is-Ndr:
         # X-Microsoft-Antispam-PRVS: <....@...outlook.com>
         # X-Exchange-Antispam-Report-Test: UriScan:;
@@ -86,6 +105,9 @@ module Sisimai::Lhost
         tryto  = %r/.+[.](?:outbound[.]protection|prod)[.]outlook[.]com\b/
         match  = 0
         match += 1 if mhead['subject'].include?('Undeliverable:')
+        match += 1 if mhead['subject'].include?('Onbestelbaar:')
+        match += 1 if mhead['subject'].include?('Não_entregue:')
+
         Headers365.each do |e|
           next if mhead[e].nil?
           next if mhead[e].empty?
@@ -102,8 +124,8 @@ module Sisimai::Lhost
         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")
+        emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
+        bodyslices = emailparts[0].split("\n")
         readcursor = 0      # (Integer) Points the current cursor position
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
         connheader = {}
@@ -112,8 +134,8 @@ module Sisimai::Lhost
         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.
+          # 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
             readcursor |= Indicators[:deliverystatus] if e =~ MarkingsOf[:message]
@@ -145,7 +167,7 @@ module Sisimai::Lhost
             v['recipient'] = cv[1]
             recipients += 1
 
-          elsif cv = e.match(/\AGenerating server: (.+)\z/)
+          elsif cv = e.match(MarkingsOf[:lhost])
             # Generating server: FFFFFFFFFFFF.e0.prod.outlook.com
             connheader['lhost'] = cv[1].downcase
           else
@@ -154,11 +176,20 @@ module Sisimai::Lhost
               next unless f = Sisimai::RFC1894.match(e)
               next unless o = Sisimai::RFC1894.field(e)
               next unless fieldtable[o[0]]
-              next if o[0] =~ /\A(?:diagnostic-code|final-recipient)\z/
-              v[fieldtable[o[0]]] = o[2]
 
-              next unless f == 1
-              permessage[fieldtable[o[0]]] = o[2]
+              if v['diagnosis']
+                # Do not capture "Diagnostic-Code:" field because error message have already
+                # been captured
+                next if o[0] =~ /\A(?:diagnostic-code|final-recipient)\z/
+                v[fieldtable[o[0]]] = o[2]
+
+                next unless f
+                permessage[fieldtable[o[0]]] = o[2]
+              else
+                # Capture "Diagnostic-Code:" field because no error messages have been captured
+                v[fieldtable[o[0]]] = o[2]
+                permessage[fieldtable[o[0]]] = o[2]
+              end
             else
               if e =~ MarkingsOf[:error]
                 # Diagnostic information for administrators:
@@ -167,13 +198,18 @@ module Sisimai::Lhost
                 # kijitora@example.com
                 # Remote Server returned '550 5.1.10 RESOLVER.ADR.RecipientNotFound; Recipien=
                 # t not found by SMTP address lookup'
-                next unless v['diagnosis']
-                if e =~ MarkingsOf[:eoe]
-                  # Original message headers:
-                  endoferror = true
-                  next
+                if v['diagnosis']
+                  # The error message text have already captured
+                  if e =~ MarkingsOf[:eoe]
+                    # Original message headers:
+                    endoferror = true
+                    next
+                  end
+                  v['diagnosis'] << ' ' << e
+                else
+                  # The error message text has not been captured yet
+                  endoferror = true if e =~ MarkingsOf[:rfc3464]
                 end
-                v['diagnosis'] << ' ' << e
               end
             end
           end
@@ -207,7 +243,7 @@ module Sisimai::Lhost
           end
         end
 
-        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
       end
       def description; return 'Microsoft Office 365: https://office.microsoft.com/'; end
     end

data/lib/sisimai/lhost/opensmtpd.rb

@@ -1,13 +1,12 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::OpenSMTPD parses a bounce email which created by
-  # OpenSMTPD. Methods in the module are called from only Sisimai::Message.
+  # Sisimai::Lhost::OpenSMTPD parses a bounce email which created by OpenSMTPD. Methods in the module
+  # are called from only Sisimai::Message.
   module OpenSMTPD
     class << self
-      # Imported from p5-Sisimail/lib/Sisimai/Lhost/OpenSMTPD.pm
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      ReBackbone = %r|^[ ]+Below is a copy of the original message:|.freeze
+      Boundaries = ['    Below is a copy of the original message:'].freeze
       StartingOf = {
         # http://www.openbsd.org/cgi-bin/man.cgi?query=smtpd&sektion=8
         # opensmtpd-5.4.2p1/smtpd/
@@ -70,21 +69,21 @@ module Sisimai::Lhost
       # @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)
+      def inquire(mhead, mbody)
         return nil unless mhead['subject'].start_with?('Delivery status notification')
         return nil unless mhead['from'].start_with?('Mailer Daemon <')
         return nil unless mhead['received'].any? { |a| a.include?(' (OpenSMTPD) with ') }
 
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
-        emailsteak = Sisimai::RFC5322.fillet(mbody, ReBackbone)
-        bodyslices = emailsteak[0].split("\n")
+        emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
+        bodyslices = emailparts[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.
+          # 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
             readcursor |= Indicators[:deliverystatus] if e.start_with?(StartingOf[:message][0])
@@ -105,15 +104,15 @@ module Sisimai::Lhost
           #    Below is a copy of the original message:
           v = dscontents[-1]
 
-          if cv = e.match(/\A([^ ]+?[@][^ ]+?):?[ ](.+)\z/)
+          if e.include?('@') && Sisimai::String.aligned(e, ['@', ' '])
             # kijitora@example.jp: 550 5.2.2 <kijitora@example>... Mailbox Full
             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]
+            v['recipient'] = e[0, e.index(':')]
+            v['diagnosis'] = e[e.index(':') + 1, e.size]
             recipients += 1
           end
         end
@@ -128,7 +127,7 @@ module Sisimai::Lhost
             break
           end
         end
-        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
       end
       def description; return 'OpenSMTPD'; end
     end

data/lib/sisimai/lhost/outlook.rb

@@ -1,14 +1,12 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::Outlook parses a bounce email which created by
-  # Microsoft Outlook.com.
-  # Methods in the module are called from only Sisimai::Message.
+  # Sisimai::Lhost::Outlook parses a bounce email which created by Microsoft Outlook.com. Methods in
+  # the module are called from only Sisimai::Message.
   module Outlook
     class << self
-      # Imported from p5-Sisimail/lib/Sisimai/Lhost/US/Outlook.pm
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      ReBackbone = %r|^Content-Type: message/rfc822|.freeze
+      Boundaries = ['Content-Type: message/rfc822'].freeze
       StartingOf = { message: ['This is an automatically generated Delivery Status Notification'] }.freeze
       MessagesOf = {
         'hostunknown' => ['The mail could not be delivered to the recipient because the domain is not reachable'],
@@ -20,7 +18,7 @@ module Sisimai::Lhost
       # @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)
+      def inquire(mhead, mbody)
         # X-Message-Delivery: Vj0xLjE7RD0wO0dEPTA7U0NMPTk7bD0xO3VzPTE=
         # X-Message-Info: AuEzbeVr9u5fkDpn2vR5iCu5wb6HBeY4iruBjnutBzpStnUabbM...
         match  = 0
@@ -30,21 +28,20 @@ module Sisimai::Lhost
         match += 1 if mhead['received'].any? { |a| a.include?('.hotmail.com') }
         return nil if match < 2
 
-        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")
+        emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
+        bodyslices = emailparts[0].split("\n")
         readslices = ['']
         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.
+          # 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
@@ -85,14 +82,14 @@ module Sisimai::Lhost
               next unless fieldtable[o[0]]
               v[fieldtable[o[0]]] = o[2]
 
-              next unless f == 1
+              next unless f
               permessage[fieldtable[o[0]]] = o[2]
             end
           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]
+            next unless e.start_with?(' ')
+            v['diagnosis'] << ' ' << Sisimai::String.sweep(e)
             readslices[-1] = 'Diagnostic-Code: ' << e
           end
         end
@@ -100,7 +97,6 @@ module Sisimai::Lhost
 
         dscontents.each do |e|
           # Set default values if each value is empty.
-          e['lhost'] ||= permessage['rhost']
           permessage.each_key { |a| e[a] ||= permessage[a] || '' }
 
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis']) || ''
@@ -124,7 +120,7 @@ module Sisimai::Lhost
           end
         end
 
-        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
       end
       def description; return 'Microsoft Outlook.com: https://www.outlook.com/'; end
     end