sisimai 4.25.5-java → 4.25.11-java

data/lib/sisimai/lhost/exchange2003.rb

@@ -29,11 +29,11 @@ module Sisimai::Lhost
         'networkerror' => [
           '00120270', # Too Many Hops
         ],
-        'contenterr' => [
+        'contenterror' => [
           '00050311', # Conversion to Internet format failed
           '000502CC', # Conversion to Internet format failed
         ],
-        'securityerr' => [
+        'securityerror' => [
           '000B0981', # 502 Server does not support AUTH
         ],
         'filtered' => [
@@ -41,25 +41,18 @@ module Sisimai::Lhost
         ],
       }.freeze
 
-      def description; return 'Microsoft Exchange Server 2003'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      def headerlist;  return %w[x-ms-embedded-report x-mimeole]; end
-
       # Parse bounce messages from Microsoft Exchange Server 2003
-      # @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
         tryto = []
 
+        # X-MS-TNEF-Correlator: <00000000000000000000000000000000000000@example.com>
+        # X-Mailer: Internet Mail Service (5.5.1960.3)
+        # X-MS-Embedded-Report:
         match += 1 if mhead['x-ms-embedded-report']
         catch :EXCHANGE_OR_NOT do
           while true
@@ -193,7 +186,6 @@ module Sisimai::Lhost
         return nil unless recipients > 0
 
         dscontents.each do |e|
-          e['agent'] = self.smtpagent
           e.delete('msexch')
           if cv = e['diagnosis'].match(/\AMSEXCH:.+[ \t]*[(]([0-9A-F]{8})[)][ \t]*(.*)\z/)
             #     MSEXCH:IMS:KIJITORA CAT:EXAMPLE:EXCHANGE 0 (000C05A6) Unknown Recipient
@@ -220,7 +212,6 @@ module Sisimai::Lhost
             e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
             e.delete('alterrors')
           end
-          e.each_key { |a| e[a] ||= '' }
         end
 
         if emailsteak[1].empty?
@@ -232,7 +223,7 @@ module Sisimai::Lhost
 
         return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'Microsoft Exchange Server 2003'; end
     end
   end
 end

data/lib/sisimai/lhost/exchange2007.rb

@@ -9,23 +9,26 @@ module Sisimai::Lhost
 
       Indicators = Sisimai::Lhost.INDICATORS
       ReBackbone = %r{^(?:
-         Original[ ]message[ ]headers:            # en-US
-        |En-t.tes[ ]de[ ]message[ ]d'origine[ ]:  # fr-FR/En-têtes de message d'origine
+         Original[ ]message[ ]headers:                # en-US
+        |En-t.tes[ ]de[ ]message[ ]d'origine[ ]:      # fr-FR/En-têtes de message d'origine
+        |Intestazioni[ ]originali[ ]del[ ]messaggio:  # it-CH
         )
       }x.freeze
       MarkingsOf = {
         message: %r{\A(?:
            Diagnostic[ ]information[ ]for[ ]administrators:               # en-US
           |Informations[ ]de[ ]diagnostic[ ]pour[ ]les[ ]administrateurs  # fr-FR
+          |Informazioni[ ]di[ ]diagnostica[ ]per[ ]gli[ ]amministratori   # it-CH
           )
         }x,
         error:   %r/ ((?:RESOLVER|QUEUE)[.][A-Za-z]+(?:[.]\w+)?);/,
         rhost:   %r{\A(?:
            Generating[ ]server            # en-US
-          |Serveur[ ]de[ ]g.+ration[ ]    # fr-FR/Serveur de génération
+          |Serveur[ ]de[ ]g[^ ]+ration[ ] # fr-FR/Serveur de génération
+          |Server[ ]di[ ]generazione      # it-CH
           ):[ ]?(.*)
         }x,
-        subject: %r/\A(?:Undeliverable|Non_remis_):/,
+        subject: %r/\A(?:Undeliverable|Non_remis_|Non[ ]recapitabile):/,
       }.freeze
       NDRSubject = {
         'SMTPSEND.DNS.NonExistentDomain' => 'hostunknown',   # 554 5.4.4 SMTPSEND.DNS.NonExistentDomain
@@ -42,26 +45,21 @@ module Sisimai::Lhost
         'QUEUE.Expired'                  => 'expired',       # 550 4.4.7 QUEUE.Expired
       }.freeze
 
-      def description; return 'Microsoft Exchange Server 2007'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      def headerlist;  return %w[content-language]; end
-
       # Parse bounce messages from Microsoft Exchange Server 2007
-      # @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)
+        # Content-Language: en-US, fr-FR
         return nil unless mhead['subject'] =~ MarkingsOf[:subject]
         return nil unless mhead['content-language']
         return nil unless mhead['content-language'] =~ /\A[a-z]{2}(?:[-][A-Z]{2})?\z/
 
+        # These headers exist only a bounce mail from Office365
+        return nil if mhead['x-ms-exchange-crosstenant-originalarrivaltime']
+        return nil if mhead['x-ms-exchange-crosstenant-fromentityheader']
+
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
         emailsteak = Sisimai::RFC5322.fillet(mbody, ReBackbone)
         bodyslices = emailsteak[0].split("\n")
@@ -144,12 +142,11 @@ module Sisimai::Lhost
             end
           end
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
-          e['agent']     = self.smtpagent
         end
 
         return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'Microsoft Exchange Server 2007'; end
     end
   end
 end

data/lib/sisimai/lhost/exim.rb

@@ -12,14 +12,11 @@ module Sisimai::Lhost
       # deliver.c:6425|          else fprintf(f,
       # deliver.c:6426|"------ This is a copy of the message's headers. ------\n");
       ReBackbone = %r{^(?:
-         [-]+[ ]This[ ]is[ ]a[ ]copy[ ]of[ ](?:the|your)[ ]message.+headers[.][ ][-]+
-        |Content-Type:[ ]*message/rfc822
+         [-]+[ ]This[ ]is[ ]a[ ]copy[ ]of[ ](?:the|your)[ ]message,[ ]including[ ]all[ ]the[ ]headers[.][ ][-]+
+        |Content-Type:[ ]*message/rfc822\n(?:[\s\t]+.*?\n\n)?
         )
       }x.freeze
-      StartingOf = {
-        deliverystatus: ['Content-type: message/delivery-status'],
-        endof:          ['__END_OF_EMAIL_MESSAGE__'],
-      }.freeze
+      StartingOf = { deliverystatus: ['Content-type: message/delivery-status'] }.freeze
       MarkingsOf = {
         # Error text regular expressions which defined in exim/src/deliver.c
         #
@@ -39,13 +36,14 @@ module Sisimai::Lhost
         # deliver.c:6305|"address(es) failed:\n", sender_address);
         # deliver.c:6306|          }
         alias:   %r/\A([ ]+an undisclosed address)\z/,
-        frozen:  %r/\AMessage .+ (?:has been frozen|was frozen on arrival)/,
+        frozen:  %r/\AMessage [^ ]+ (?:has been frozen|was frozen on arrival)/,
         message: %r{\A(?>
            This[ ]message[ ]was[ ]created[ ]automatically[ ]by[ ]mail[ ]delivery[ ]software[.]
           |A[ ]message[ ]that[ ]you[ ]sent[ ]was[ ]rejected[ ]by[ ]the[ ]local[ ]scanning[ ]code
           |A[ ]message[ ]that[ ]you[ ]sent[ ]contained[ ]one[ ]or[ ]more[ ]recipient[ ]addresses[ ]
-          |Message[ ].+[ ](?:has[ ]been[ ]frozen|was[ ]frozen[ ]on[ ]arrival)
-          |The[ ].+[ ]router[ ]encountered[ ]the[ ]following[ ]error[(]s[)]:
+          |A[ ]message[ ]that[ ]you[ ]sent[ ]could[ ]not[ ]be[ ]delivered[ ]to[ ]all[ ]of[ ]its[ ]recipients
+          |Message[ ][^ ]+[ ](?:has[ ]been[ ]frozen|was[ ]frozen[ ]on[ ]arrival)
+          |The[ ][^ ]+[ ]router[ ]encountered[ ]the[ ]following[ ]error[(]s[)]:
           )
          }x,
       }.freeze
@@ -122,31 +120,22 @@ module Sisimai::Lhost
         'was frozen on arrival by ',
       ].freeze
 
-      def description; return 'Exim'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      def headerlist;  return %w[x-failed-recipients]; end
-
       # Parse bounce messages from Exim
-      # @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 if mhead['from'] =~ /[@].+[.]mail[.]ru[>]?/
 
         # Message-Id: <E1P1YNN-0003AD-Ga@example.org>
+        # X-Failed-Recipients: kijitora@example.ed.jp
         match  = 0
         match += 1 if mhead['from'].start_with?('Mail Delivery System')
         match += 1 if mhead['message-id'].to_s =~ %r/\A[<]\w{7}[-]\w{6}[-]\w{2}[@]/
         match += 1 if mhead['subject'] =~ %r{(?:
            Mail[ ]delivery[ ]failed(:[ ]returning[ ]message[ ]to[ ]sender)?
-          |Warning:[ ]message[ ].+[ ]delayed[ ]+
+          |Warning:[ ]message[ ][^ ]+[ ]delayed[ ]+
           |Delivery[ ]Status[ ]Notification
           |Mail[ ]failure
           |Message[ ]frozen
@@ -176,8 +165,6 @@ module Sisimai::Lhost
         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.
-          break if e == StartingOf[:endof][0]
-
           if readcursor == 0
             # Beginning of the bounce message or message/delivery-status part
             if e =~ MarkingsOf[:message]
@@ -278,7 +265,10 @@ module Sisimai::Lhost
                   # Content-type: message/delivery-status
                   nextcursor = 1 if e.start_with?(StartingOf[:deliverystatus][0])
                   v['alterrors'] ||= ''
-                  v['alterrors'] << e + ' ' if e.start_with?(' ')
+                  if e.start_with?("\s", "\t")
+                    e.sub!(/\A[\s\t]+/, '')
+                    v['alterrors'] << e + ' ' unless v['alterrors'].include?(e)
+                  end
                 end
               else
                 if dscontents.size == recipients
@@ -289,7 +279,7 @@ module Sisimai::Lhost
                 else
                   # Error message when email address above does not include '@'
                   # and domain part.
-                  if e =~ %r<\A[ ]+pipe[ ]to[ ][|]/.+>
+                  if e =~ %r<\A[ ]+pipe[ ]to[ ][|]/[^ ]+>
                     # pipe to |/path/to/prog ...
                     #   generated by kijitora@example.com
                     v['diagnosis'] = e
@@ -345,7 +335,6 @@ module Sisimai::Lhost
 
         dscontents.each do |e|
           # Set default values if each value is empty.
-          e['agent']   = self.smtpagent
           e['lhost'] ||= localhost0
 
           unless e['diagnosis']
@@ -389,7 +378,7 @@ module Sisimai::Lhost
                 rxdiagnosis = %r/e['diagnosis']/i
                 # Override the value of diagnostic code message because
                 # the value of alterrors includes the value of diagnosis.
-                e['diagnosis'] = e['alterrors'] if e['alterrors'] =~ rxdiagnosis
+                e['diagnosis'] = e['alterrors'] if e['alterrors'].downcase.include?(e['diagnosis'].downcase)
               end
             end
             e.delete('alterrors')
@@ -494,12 +483,11 @@ module Sisimai::Lhost
                  end
           end
           e['status'] ||= sv.to_s
-          e.each_key { |a| e[a] ||= '' }
         end
 
         return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'Exim'; end
     end
   end
 end

data/lib/sisimai/lhost/ezweb.rb

@@ -38,21 +38,11 @@ module Sisimai::Lhost
         ],
       }.freeze
 
-      def description; return 'au EZweb: http://www.au.kddi.com/mobile/'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      def headerlist;  return %w[x-spasign]; end
-
       # Parse bounce messages from au EZweb
-      # @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?('Postmaster@ezweb.ne.jp')
@@ -135,7 +125,7 @@ module Sisimai::Lhost
               v['command'] = cv[1]
             else
               # Check error message
-              if rxmessages.any? { |a| e =~ a }
+              if rxmessages.any? { |messages| messages.any? { |message| e =~ message } }
                 # Check with regular expressions of each error
                 v['diagnosis'] ||= ''
                 v['diagnosis'] << ' ' << e
@@ -150,8 +140,6 @@ module Sisimai::Lhost
         return nil unless recipients > 0
 
         dscontents.each do |e|
-          e['agent'] = self.smtpagent
-
           unless e['alterrors'].to_s.empty?
             # Copy alternative error message
             e['diagnosis'] ||= e['alterrors']
@@ -195,7 +183,7 @@ module Sisimai::Lhost
 
         return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'au EZweb: http://www.au.kddi.com/mobile/'; end
     end
   end
 end

data/lib/sisimai/lhost/facebook.rb

@@ -69,21 +69,11 @@ module Sisimai::Lhost
         ],
       }.freeze
 
-      def description; return 'Facebook: https://www.facebook.com'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      def headerlist;  return []; end
-
       # Parse bounce messages from Facebook
-      # @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'] == 'Facebook <mailer-daemon@mx.facebook.com>'
         return nil unless mhead['subject'] == 'Sorry, your message could not be delivered'
@@ -159,7 +149,6 @@ module Sisimai::Lhost
 
         dscontents.each do |e|
           e['lhost']   ||= permessage['lhost']
-          e['agent']     = self.smtpagent
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
 
           if cv = e['diagnosis'].match(/\b([A-Z]{3})[-]([A-Z])(\d)\b/)
@@ -201,7 +190,7 @@ module Sisimai::Lhost
 
         return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'Facebook: https://www.facebook.com'; end
     end
   end
 end

data/lib/sisimai/lhost/fml.rb

@@ -45,21 +45,12 @@ module Sisimai::Lhost
         'securityerror' => %r/Security alert:/,
       }.freeze
 
-      def description; return 'fml mailing list server/manager'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      def headerlist;  return %w[x-mlserver]; end
-
       # Parse bounce messages from fml mailling list server/manager
-      # @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
+      # @since v4.22.3
       def make(mhead, mbody)
         return nil unless mhead['x-mlserver']
         return nil unless mhead['from'] =~ /.+[-]admin[@].+/
@@ -68,14 +59,12 @@ module Sisimai::Lhost
         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.
-          next if (readcursor & Indicators[:deliverystatus]) == 0
           next if e.empty?
 
           # Duplicated Message-ID in <2ndml@example.com>.
@@ -103,9 +92,6 @@ module Sisimai::Lhost
 
         dscontents.each do |e|
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
-          e['agent']     = self.smtpagent
-          e.each_key { |a| e[a] ||= '' }
-
           ErrorTable.each_key do |f|
             # Try to match with error messages defined in ErrorTable
             next unless e['diagnosis'] =~ ErrorTable[f]
@@ -126,7 +112,7 @@ module Sisimai::Lhost
 
         return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'fml mailing list server/manager'; end
     end
   end
 end

data/lib/sisimai/lhost/{google.rb → gmail.rb}

@@ -1,9 +1,9 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::Google parses a bounce email which created by Gmail.
+  # Sisimai::Lhost::Gmail parses a bounce email which created by Gmail.
   # Methods in the module are called from only Sisimai::Message.
-  module Google
+  module Gmail
     class << self
-      # Imported from p5-Sisimail/lib/Sisimai/Lhost/Google.pm
+      # Imported from p5-Sisimail/lib/Sisimai/Lhost/Gmail.pm
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
@@ -98,23 +98,12 @@ module Sisimai::Lhost
         '18' => { 'command' => 'DATA', 'reason' => 'filtered' },
       }.freeze
 
-      def description; return 'Google Gmail: https://mail.google.com'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      def headerlist;  return %w[x-failed-recipients]; end
-
-      # Parse bounce messages from Google Gmail
-      # @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
+      # Parse bounce messages from Gmail
+      # @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)
-        # Google Mail
         # From: Mail Delivery Subsystem <mailer-daemon@googlemail.com>
         # Received: from vw-in-f109.1e100.net [74.125.113.109] by ...
         #
@@ -219,7 +208,6 @@ module Sisimai::Lhost
         return nil unless recipients > 0
 
         dscontents.each do |e|
-          e['agent']     = self.smtpagent
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
 
           unless e['rhost']
@@ -262,7 +250,7 @@ module Sisimai::Lhost
 
         return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'Gmail: https://mail.google.com'; end
     end
   end
 end