sisimai 4.25.5-java → 4.25.6-java

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.+?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
         #
@@ -122,25 +119,16 @@ 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}[@]/
@@ -176,8 +164,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]
@@ -345,7 +331,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']
@@ -494,12 +479,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')
@@ -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[@].+/
@@ -103,9 +94,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 +114,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

data/lib/sisimai/lhost/gmx.rb

@@ -11,29 +11,16 @@ module Sisimai::Lhost
       StartingOf = { message: ['This message was created automatically by mail delivery software'] }.freeze
       MessagesOf = { 'expired' => ['delivery retry timeout exceeded'] }.freeze
 
-      def description; return 'GMX: https://www.gmx.net'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-
-      # Envelope-To: <kijitora@mail.example.com>
-      # X-GMX-Antispam: 0 (Mail was not recognized as spam); Detail=V3;
-      # X-GMX-Antivirus: 0 (no virus found)
-      # X-UI-Out-Filterresults: unknown:0;
-      def headerlist;  return %w[x-gmx-antispam]; end
-
       # Parse bounce messages from GMX
-      # @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/\AMAILER-DAEMON[@]/,
-        # :subject => %r/\AMail delivery failed: returning message to sender\z/,
+        # Envelope-To: <kijitora@mail.example.com>
+        # X-GMX-Antispam: 0 (Mail was not recognized as spam); Detail=V3;
+        # X-GMX-Antivirus: 0 (no virus found)
+        # X-UI-Out-Filterresults: unknown:0;
         return nil unless mhead['x-gmx-antispam']
 
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
@@ -108,7 +95,6 @@ module Sisimai::Lhost
         return nil unless recipients > 0
 
         dscontents.each do |e|
-          e['agent']     = self.smtpagent
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'].tr("\n", ' '))
 
           MessagesOf.each_key do |r|
@@ -121,7 +107,7 @@ module Sisimai::Lhost
 
         return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'GMX: https://www.gmx.net'; end
     end
   end
 end

data/lib/sisimai/lhost/googlegroups.rb

@@ -0,0 +1,77 @@
+module Sisimai::Lhost
+  # Sisimai::Lhost::GoogleGroups parses a bounce email which created by Google
+  # Groups. Methods in the module are called from only Sisimai::Message.
+  module GoogleGroups
+    class << self
+      # Imported from p5-Sisimail/lib/Sisimai/Lhost/GoogleGroups.pm
+      require 'sisimai/lhost'
+
+      Indicators = Sisimai::Lhost.INDICATORS
+      ReBackbone = %r/^-----[ ]Original[ ]message[ ]-----$/.freeze
+
+      # Parse bounce messages from Google Groups
+      # @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['from'].end_with?('<mailer-daemon@googlemail.com>')
+        return nil unless mhead['subject'].start_with?('Delivery Status Notification')
+        return nil unless mhead['x-failed-recipients']
+        return nil unless mhead['x-failed-recipients'].include?('@googlegroups.com')
+
+        # Hello kijitora@libsisimai.org,
+        #
+        # We're writing to let you know that the group you tried to contact (group-name)
+        # may not exist, or you may not have permission to post messages to the group.
+        # A few more details on why you weren't able to post:
+        #
+        #  * You might have spelled or formatted the group name incorrectly.
+        #  * The owner of the group may have removed this group.
+        #  * You may need to join the group before receiving permission to post.
+        #  * This group may not be open to posting.
+        #
+        # If you have questions related to this or any other Google Group,
+        # visit the Help Center at https://groups.google.com/support/.
+        #
+        # Thanks,
+        #
+        # Google Groups
+        dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
+        emailsteak = Sisimai::RFC5322.fillet(mbody, ReBackbone)
+        recordwide = { 'rhost' => '', 'reason' => '', 'diagnosis' => '' }
+        recipients = 0
+        v = dscontents[-1]
+
+        # * You might have spelled or formatted the group name incorrectly.
+        # * The owner of the group may have removed this group.
+        # * You may need to join the group before receiving permission to post.
+        # * This group may not be open to posting.
+        entiremesg = emailsteak[0].split(/\n\n/, 5).slice(0, 4).join(' ').tr("\n", ' ');
+        recordwide['diagnosis'] = Sisimai::String.sweep(entiremesg)
+        recordwide['reason']    = emailsteak[0].scan(/^[ ]?[*][ ]?/).size == 4 ? 'rejected' : 'onhold'
+        recordwide['rhost']     = Sisimai::RFC5322.received(mhead['received'][0]).shift
+
+        mhead['x-failed-recipients'].split(',').each do |e|
+          # X-Failed-Recipients: neko@example.jp, nyaan@example.org, ...
+          next unless e.end_with?('@googlegroups.com')
+          next unless Sisimai::RFC5322.is_emailaddress(e)
+
+          if v['recipient']
+            # There are multiple recipient addresses in the message body.
+            dscontents << Sisimai::Lhost.DELIVERYSTATUS
+            v = dscontents[-1]
+          end
+          v['recipient'] = Sisimai::Address.s3s4(e)
+          recipients += 1
+          recordwide.each_key { |r| v[r] = recordwide[r] }
+        end
+        return nil unless recipients > 0
+        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+      end
+      def description; return 'Google Groups: https://groups.google.com'; end
+    end
+  end
+end
+

data/lib/sisimai/lhost/gsuite.rb

@@ -19,21 +19,11 @@ module Sisimai::Lhost
         'networkerror' => [' had no relevant answers.', ' responded with code NXDOMAIN'],
       }.freeze
 
-      def description; return 'G Suite: https://gsuite.google.com'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      def headerlist;  return %w[x-gm-message-state]; end
-
       # Parse bounce messages from G Suite (Transfer from G Suite to a destinaion host)
-      # @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'].end_with?('<mailer-daemon@googlemail.com>')
         return nil unless mhead['subject'].start_with?('Delivery Status Notification')
@@ -189,8 +179,6 @@ module Sisimai::Lhost
           end
 
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
-          e['agent']     = self.smtpagent
-
           MessagesOf.each_key do |r|
             # Guess an reason of the bounce
             next unless MessagesOf[r].any? { |a| e['diagnosis'].include?(a) }
@@ -201,7 +189,7 @@ module Sisimai::Lhost
 
         return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'G Suite: https://gsuite.google.com'; end
     end
   end
 end

data/lib/sisimai/lhost/imailserver.rb

@@ -18,30 +18,21 @@ module Sisimai::Lhost
         'data' => %r|DATA command generated response:|,
       }.freeze
       ReFailures = {
-        'hostunknown' => %r/Unknown host/,
-        'userunknown' => %r/\A(?:Unknown user|Invalid final delivery userid)/,
-        'mailboxfull' => %r/\AUser mailbox exceeds allowed size/,
-        'securityerr' => %r/\ARequested action not taken: virus detected/,
-        'undefined'   => %r/\Aundeliverable to /,
-        'expired'     => %r/\ADelivery failed \d+ attempts/,
+        'hostunknown'   => %r/Unknown host/,
+        'userunknown'   => %r/\A(?:Unknown user|Invalid final delivery userid)/,
+        'mailboxfull'   => %r/\AUser mailbox exceeds allowed size/,
+        'securityerror' => %r/\ARequested action not taken: virus detected/,
+        'undefined'     => %r/\Aundeliverable to /,
+        'expired'       => %r/\ADelivery failed \d+ attempts/,
       }.freeze
 
-      def description; return 'IPSWITCH IMail Server'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      def headerlist;  return %w[x-mailer]; end
-
       # Parse bounce messages from IMailServer
-      # @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)
+        # X-Mailer: <SMTP32 v8.22>
         match  = 0
         match += 1 if mhead['subject'] =~ /\AUndeliverable Mail[ ]*\z/
         match += 1 if mhead['x-mailer'].to_s.start_with?('<SMTP32 v')
@@ -91,8 +82,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'] = if e['diagnosis']
@@ -118,12 +107,11 @@ module Sisimai::Lhost
             e['reason'] = r
             break
           end
-          e.each_key { |a| e[a] ||= '' }
         end
 
         return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'IPSWITCH IMail Server'; end
     end
   end
 end