sisimai 4.25.5-java → 4.25.11-java

data/lib/sisimai/lhost/sendmail.rb

@@ -21,28 +21,14 @@ module Sisimai::Lhost
         error:   ['... while talking to '],
       }.freeze
 
-      def description; return 'V8Sendmail: /usr/sbin/sendmail'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      def headerlist;  return []; end
-
       # Parse bounce messages from Sendmail
-      # @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'] =~ /(?:see transcript for details\z|\AWarning: )/
-        unless mhead['subject'].downcase =~ /\A[ \t]*fwd?:/
-          # Fwd: Returned mail: see transcript for details
-          # Do not execute this code if the bounce mail is a forwarded message.
-          return nil unless mhead['from'].start_with?('Mail Delivery Subsystem')
-        end
+        return nil if mhead['x-aol-ip']
 
         require 'sisimai/rfc1894'
         fieldtable = Sisimai::RFC1894.FIELDTABLE
@@ -178,7 +164,6 @@ module Sisimai::Lhost
           e['lhost'] ||= permessage['rhost']
           permessage.each_key { |a| e[a] ||= permessage[a] || '' }
 
-          e['agent']     = self.smtpagent
           e['command'] ||= commandtxt
           if e['command'].empty?
             e['command'] = 'EHLO' unless esmtpreply.empty?
@@ -199,7 +184,7 @@ module Sisimai::Lhost
 
           if anotherset['status']
             # Check alternative status code
-            if e['status'].empty? || e['status'] !~ /\A[45][.]\d[.]\d\z/
+            if e['status'].empty? || e['status'] !~ /\A[45][.]\d[.]\d{1,3}\z/
               # Override alternative status code
               e['status'] = anotherset['status']
             end
@@ -212,12 +197,11 @@ module Sisimai::Lhost
               e['recipient'] = cv[1]
             end
           end
-          e.each_key { |a| e[a] ||= '' }
         end
 
         return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'V8Sendmail: /usr/sbin/sendmail'; end
     end
   end
 end

data/lib/sisimai/lhost/surfcontrol.rb

@@ -11,26 +11,15 @@ module Sisimai::Lhost
       ReBackbone = %r|^Content-Type:[ ]message/rfc822|.freeze
       StartingOf = { message: ['Your message could not be sent.'] }.freeze
 
-      def description; return 'WebSense SurfControl'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      # X-SEF-ZeroHour-RefID: fgs=000000000
-      # X-SEF-Processed: 0_0_0_000__2010_04_29_23_34_45
-      # X-Mailer: SurfControl E-mail Filter
-      def headerlist;  return %w[x-sef-processed x-mailer]; end
-
       # Parse bounce messages from SurfControl
-      # @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/ [(]Mail Delivery System[)]\z/,
+        # X-SEF-ZeroHour-RefID: fgs=000000000
+        # X-SEF-Processed: 0_0_0_000__2010_04_29_23_34_45
+        # X-Mailer: SurfControl E-mail Filter
         return nil unless mhead['x-sef-processed']
         return nil unless mhead['x-mailer']
         return nil unless mhead['x-mailer'] == 'SurfControl E-mail Filter'
@@ -106,15 +95,10 @@ module Sisimai::Lhost
         end
         return nil unless recipients > 0
 
-        dscontents.each do |e|
-          e['agent']     = self.smtpagent
-          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
-          e.each_key { |a| e[a] ||= '' }
-        end
-
+        dscontents.each { |e| e['diagnosis'] = Sisimai::String.sweep(e['diagnosis']) }
         return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'WebSense SurfControl'; end
     end
   end
 end

data/lib/sisimai/lhost/v5sendmail.rb

@@ -30,21 +30,11 @@ module Sisimai::Lhost
         error:   %r/\A[.]+ while talking to .+[:]\z/,
       }.freeze
 
-      def description; return 'Sendmail version 5'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      def headerlist;  return []; end
-
       # Parse bounce messages from Sendmail version 5
-      # @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/\AMail Delivery Subsystem/,
         return nil unless mhead['subject'] =~ /\AReturned mail: [A-Z]/
@@ -131,9 +121,7 @@ module Sisimai::Lhost
 
         dscontents.each do |e|
           errorindex += 1
-          e['agent']   = self.smtpagent
           e['command'] = commandset[errorindex] || ''
-
           e['diagnosis'] ||= if anotherset['diagnosis'].to_s.size > 0
                                # Copy alternative error message
                                anotherset['diagnosis']
@@ -151,12 +139,11 @@ module Sisimai::Lhost
             end
           end
           e.delete('sessionerr')
-          e.each_key { |a| e[a] ||= '' }
         end
 
         return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'Sendmail version 5'; end
     end
   end
 end

data/lib/sisimai/lhost/verizon.rb

@@ -8,21 +8,11 @@ module Sisimai::Lhost
       require 'sisimai/lhost'
       Indicators = Sisimai::Lhost.INDICATORS
 
-      def description; return 'Verizon Wireless: https://www.verizonwireless.com'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      def headerlist;  return []; end
-
       # Parse bounce messages from Verizon
-      # @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 = -1
         while true
@@ -54,8 +44,8 @@ module Sisimai::Lhost
             # The attempted recipient address does not exist.
             'userunknown' => ['550 - Requested action not taken: no such user here'],
           }
-          boundary00 = Sisimai::MIME.boundary(mhead['content-type']) || ''
-          rebackbone = Regexp.new('^' << Regexp.escape('--' << boundary00 << '--')) unless boundary00.empty?
+          boundary00 = Sisimai::MIME.boundary(mhead['content-type'], 1) || ''
+          rebackbone = Regexp.new('^' << Regexp.escape(boundary00)) unless boundary00.empty?
           emailsteak = Sisimai::RFC5322.fillet(mbody, rebackbone)
           bodyslices = emailsteak[0].split("\n")
 
@@ -103,8 +93,8 @@ module Sisimai::Lhost
           # vzwpix.com
           startingof = { message: ['Message could not be delivered to mobile'] }
           messagesof = { 'userunknown' => ['No valid recipients for this MM'] }
-          boundary00 = Sisimai::MIME.boundary(mhead['content-type'])
-          rebackbone = Regexp.new('^' << Regexp.escape('--' << boundary00 << '--')) unless boundary00.empty?
+          boundary00 = Sisimai::MIME.boundary(mhead['content-type'], 1)
+          rebackbone = Regexp.new('^' << Regexp.escape(boundary00)) unless boundary00.empty?
           emailsteak = Sisimai::RFC5322.fillet(mbody, rebackbone)
           bodyslices = emailsteak[0].split("\n")
 
@@ -156,9 +146,7 @@ module Sisimai::Lhost
         emailsteak[1] << ('Subject: ' << subjecttxt << "\n") unless emailsteak[1] =~ /^Subject: /
 
         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) }
@@ -169,7 +157,7 @@ module Sisimai::Lhost
 
         return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'Verizon Wireless: https://www.verizonwireless.com'; end
     end
   end
 end

data/lib/sisimai/lhost/x1.rb

@@ -1,6 +1,6 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::X1 parses a bounce email which created by Unknown
-  # MTA #1. Methods in the module are called from only Sisimai::Message.
+  # Sisimai::Lhost::X1 parses a bounce email which created by Unknown MTA #1.
+  # Methods in the module are called from only Sisimai::Message.
   module X1
     class << self
       # Imported from p5-Sisimail/lib/Sisimai/Lhost/X1.pm
@@ -10,21 +10,11 @@ module Sisimai::Lhost
       ReBackbone = %r|^Received: from \d+[.]\d+[.]\d+[.]\d|.freeze
       MarkingsOf = { message: %r/\AThe original message was received at (.+)\z/ }.freeze
 
-      def description; return 'Unknown MTA #1'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      def headerlist;  return []; end
-
       # Parse bounce messages from Unknown MTA #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['subject'].start_with?('Returned Mail: ')
         return nil unless mhead['from'].start_with?('"Mail Deliver System" ')
@@ -75,15 +65,13 @@ module Sisimai::Lhost
         return nil unless recipients > 0
 
         dscontents.each do |e|
-          e['agent']     = self.smtpagent
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
           e['date']      = datestring || ''
-          e.each_key { |a| e[a] ||= '' }
         end
 
         return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'Unknown MTA #1'; end
     end
   end
 end

data/lib/sisimai/lhost/x2.rb

@@ -1,6 +1,6 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::X2 parses a bounce email which created by Unknown
-  # MTA #2. Methods in the module are called from only Sisimai::Message.
+  # Sisimai::Lhost::X2 parses a bounce email which created by Unknown MTA #2.
+  # Methods in the module are called from only Sisimai::Message.
   module X2
     class << self
       # Imported from p5-Sisimail/lib/Sisimai/Lhost/X2.pm
@@ -10,21 +10,11 @@ module Sisimai::Lhost
       ReBackbone = %r|^--- Original message follows[.]|.freeze
       StartingOf = { message: ['Unable to deliver message to the following address'] }.freeze
 
-      def description; return 'Unknown MTA #2'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      def headerlist;  return []; end
-
       # Parse bounce messages from Unknown MTA #2
-      # @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'].include?('MAILER-DAEMON@')
         return nil unless mhead['subject'] =~ %r/\A(?>Delivery failure|fail(?:ure|ed) delivery)/
@@ -71,15 +61,10 @@ module Sisimai::Lhost
         end
         return nil unless recipients > 0
 
-        dscontents.each do |e|
-          e['agent']     = self.smtpagent
-          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
-          e.each_key { |a| e[a] ||= '' }
-        end
-
+        dscontents.each { |e| e['diagnosis'] = Sisimai::String.sweep(e['diagnosis']) }
         return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'Unknown MTA #2'; end
     end
   end
 end

data/lib/sisimai/lhost/x3.rb

@@ -1,6 +1,6 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::X3 parses a bounce email which created by Unknown
-  # MTA #3. Methods in the module are called from only Sisimai::Message.
+  # Sisimai::Lhost::X3 parses a bounce email which created by Unknown MTA #3.
+  # Methods in the module are called from only Sisimai::Message.
   module X3
     class << self
       # Imported from p5-Sisimail/lib/Sisimai/Lhost/X3.pm
@@ -10,21 +10,11 @@ module Sisimai::Lhost
       ReBackbone = %r|^Content-Type:[ ]message/rfc822|.freeze
       StartingOf = { message: ['      This is an automatically generated Delivery Status Notification.'] }.freeze
 
-      def description; return 'Unknown MTA #3'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      def headerlist;  return []; end
-
       # Parse bounce messages from Unknown MTA #3
-      # @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?('Mail Delivery System')
@@ -83,21 +73,23 @@ module Sisimai::Lhost
             elsif cv = e.match(/\ARouting: (.+)/)
               # Routing: Could not find a gateway for kijitora@example.co.jp
               v['diagnosis'] = cv[1]
+
+            elsif cv = e.match(/\ADiagnostic-Code: smtp; (.+)/)
+              # Diagnostic-Code: smtp; 552 5.2.2 Over quota
+              v['diagnosis'] = 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['status']    = Sisimai::SMTP::Status.find(e['diagnosis']) || ''
-          e.each_key { |a| e[a] ||= '' }
         end
 
         return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'Unknown MTA #3'; end
     end
   end
 end

data/lib/sisimai/lhost/x4.rb

@@ -1,6 +1,6 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::X4 parses a bounce email which created by some qmail
-  # clone.  Methods in the module are called from only Sisimai::Message.
+  # Sisimai::Lhost::X4 parses a bounce email which created by some qmail clone.
+  # Methods in the module are called from only Sisimai::Message.
   module X4
     class << self
       # Imported from p5-Sisimail/lib/Sisimai/Lhost/X4.pm
@@ -19,7 +19,7 @@ module Sisimai::Lhost
         # Characters: K,Z,D in qmail-qmqpc.c, qmail-send.c, qmail-rspawn.c
         #  K = success, Z = temporary error, D = permanent error
         message: %r{\A(?>
-           He/Her[ ]is[ ]not.+[ ]user
+           He/Her[ ]is[ ]not[ ].+[ ]user
           |Hi[.][ ].+[ ]unable[ ]to[ ]deliver[ ]your[ ]message[ ]to[ ]
             the[ ]following[ ]addresses
           |Su[ ]mensaje[ ]no[ ]pudo[ ]ser[ ]entregado
@@ -41,29 +41,29 @@ module Sisimai::Lhost
       ReSMTP = {
         # Error text regular expressions which defined in qmail-remote.c
         # qmail-remote.c:225|  if (smtpcode() != 220) quit("ZConnected to "," but greeting failed");
-        'conn' => %r/(?:Error:)?Connected to .+ but greeting failed[.]/,
+        'conn' => %r/(?:Error:)?Connected to [^ ]+ but greeting failed[.]/,
         # qmail-remote.c:231|  if (smtpcode() != 250) quit("ZConnected to "," but my name was rejected");
-        'ehlo' => %r/(?:Error:)?Connected to .+ but my name was rejected[.]/,
+        'ehlo' => %r/(?:Error:)?Connected to [^ ]+ but my name was rejected[.]/,
         # qmail-remote.c:238|  if (code >= 500) quit("DConnected to "," but sender was rejected");
         # reason = rejected
-        'mail' => %r/(?:Error:)?Connected to .+ but sender was rejected[.]/,
+        'mail' => %r/(?:Error:)?Connected to [^ ]+ but sender was rejected[.]/,
         # qmail-remote.c:249|  out("h"); outhost(); out(" does not like recipient.\n");
         # qmail-remote.c:253|  out("s"); outhost(); out(" does not like recipient.\n");
         # reason = userunknown
-        'rcpt' => %r/(?:Error:)?.+ does not like recipient[.]/,
+        'rcpt' => %r/(?:Error:)?[^ ]+ does not like recipient[.]/,
         # qmail-remote.c:265|  if (code >= 500) quit("D"," failed on DATA command");
         # qmail-remote.c:266|  if (code >= 400) quit("Z"," failed on DATA command");
         # qmail-remote.c:271|  if (code >= 500) quit("D"," failed after I sent the message");
         # qmail-remote.c:272|  if (code >= 400) quit("Z"," failed after I sent the message");
         'data' => %r{(?:
-           (?:Error:)?.+[ ]failed[ ]on[ ]DATA[ ]command[.]
-          |(?:Error:)?.+[ ]failed[ ]after[ ]I[ ]sent[ ]the[ ]message[.]
+           (?:Error:)?[^ ]+[ ]failed[ ]on[ ]DATA[ ]command[.]
+          |(?:Error:)?[^ ]+[ ]failed[ ]after[ ]I[ ]sent[ ]the[ ]message[.]
           )
         }x,
       }.freeze
       # qmail-remote.c:261|  if (!flagbother) quit("DGiving up on ","");
       ReHost = %r{(?:
-         Giving[ ]up[ ]on[ ](.+[0-9a-zA-Z])[.]?\z
+         Giving[ ]up[ ]on[ ]([^ ]+[0-9a-zA-Z])[.]?\z
         |Connected[ ]to[ ]([-0-9a-zA-Z.]+[0-9a-zA-Z])[ ]
         |remote[ ]host[ ]([-0-9a-zA-Z.]+[0-9a-zA-Z])[ ]said:
         )
@@ -117,21 +117,11 @@ module Sisimai::Lhost
         ],
       }.freeze
 
-      def description; return 'Unknown MTA #4'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      def headerlist;  return []; end
-
       # Parse bounce messages from Unknown MTA #4
-      # @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)
         # Pre process email headers and the body part of the message which generated
         # by qmail, see https://cr.yp.to/qmail.html
@@ -192,7 +182,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['command']
@@ -254,12 +243,11 @@ module Sisimai::Lhost
               end
             end
           end
-          e.each_key { |a| e[a] ||= '' }
         end
 
         return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'Unknown MTA #4'; end
     end
   end
 end