sisimai 4.25.5-java → 4.25.11-java

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')
@@ -92,6 +82,11 @@ module Sisimai::Lhost
               next unless fieldtable[o[0]]
               v[fieldtable[o[0]]] = o[2]
 
+              if fieldtable[o[0]] == 'lhost'
+                # Do not set an email address as a hostname in "lhost" value
+                v['lhost'] = '' if v['lhost'].include?('@')
+              end
+
               next unless f == 1
               permessage[fieldtable[o[0]]] = o[2]
             end
@@ -189,8 +184,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 +194,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')
@@ -80,7 +71,7 @@ module Sisimai::Lhost
               dscontents << Sisimai::Lhost.DELIVERYSTATUS
               v = dscontents[-1]
             end
-            v['recipient'] = cv[1]
+            v['recipient'] = Sisimai::Address.s3s4(cv[1])
             recipients += 1
           else
             # Other error message text
@@ -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

data/lib/sisimai/lhost/interscanmss.rb

@@ -6,23 +6,13 @@ module Sisimai::Lhost
     class << self
       # Imported from p5-Sisimail/lib/Sisimai/Lhost/InterScanMSS.pm
       require 'sisimai/lhost'
-
       ReBackbone = %r|^Content-type:[ ]message/rfc822|.freeze
-      def description; return 'Trend Micro InterScan Messaging Security Suite'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      def headerlist;  return []; end
 
       # Parse bounce messages from InterScanMSS
-      # @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)
         # :received => %r/[ ][(]InterScanMSS[)][ ]with[ ]/,
         match = 0
@@ -32,6 +22,7 @@ module Sisimai::Lhost
           'メール配信に失敗しました',
         ]
         match += 1 if mhead['from'].start_with?('"InterScan MSS"')
+        match += 1 if mhead['from'].start_with?('"InterScan Notification"')
         match += 1 if tryto.any? { |a| mhead['subject'] == a }
         return nil unless match > 0
 
@@ -46,20 +37,20 @@ module Sisimai::Lhost
           # to the previous line of the beginning of the original message.
           next if e.empty?
 
-          # Sent <<< RCPT TO:<kijitora@example.co.jp>
-          # Received >>> 550 5.1.1 <kijitora@example.co.jp>... user unknown
           v = dscontents[-1]
-
           if cv = e.match(/\A.+[<>]{3}[ \t]+.+[<]([^ ]+[@][^ ]+)[>]\z/) ||
-                  e.match(/\A.+[<>]{3}[ \t]+.+[<]([^ ]+[@][^ ]+)[>]/)
+                  e.match(/\A.+[<>]{3}[ \t]+.+[<]([^ ]+[@][^ ]+)[>]/)   ||
+                  e.match(/\A(?:Reason:[ ]+)?Unable[ ]to[ ]deliver[ ]message[ ]to[ ][<](.+)[>]/)
             # Sent <<< RCPT TO:<kijitora@example.co.jp>
             # Received >>> 550 5.1.1 <kijitora@example.co.jp>... user unknown
+            # Unable to deliver message to <kijitora@neko.example.jp>
             if v['recipient'] && cv[1] != 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'] = e if e =~ /Unable[ ]to[ ]deliver[ ]/
             recipients = dscontents.size
           end
 
@@ -85,14 +76,12 @@ module Sisimai::Lhost
         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] ||= '' }
+          e['reason'] = 'userunknown' if e['diagnosis'] =~ /Unable[ ]to[ ]deliver/
         end
-
         return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'Trend Micro InterScan Messaging Security Suite'; end
     end
   end
 end

data/lib/sisimai/lhost/kddi.rb

@@ -21,21 +21,11 @@ module Sisimai::Lhost
         'hostunknown' => ['As the remote domain doesnt exist'],
       }.freeze
 
-      def description; return 'au by KDDI: https://www.au.kddi.com'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      def headerlist;  return []; end
-
       # Parse bounce messages from au by KDDI
-      # @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/[@].+[.]ezweb[.]ne[.]jp[>]\z/,
         match  = 0
@@ -90,7 +80,6 @@ module Sisimai::Lhost
         return nil unless recipients > 0
 
         dscontents.each do |e|
-          e['agent']     = self.smtpagent
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
 
           if mhead['x-spasign'].to_s == 'NG'
@@ -117,7 +106,7 @@ module Sisimai::Lhost
 
         return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'au by KDDI: https://www.au.kddi.com'; end
     end
   end
 end

data/lib/sisimai/lhost/mailfoundry.rb

@@ -9,25 +9,15 @@ module Sisimai::Lhost
       Indicators = Sisimai::Lhost.INDICATORS
       ReBackbone = %r|^Content-Type:[ ]message/rfc822|.freeze
       StartingOf = {
-        message: ['This is a MIME encoded message'],
+        message: ['Unable to deliver message to:'],
         error:   ['Delivery failed for the following reason:'],
       }.freeze
 
-      def description; return 'MailFoundry'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      def headerlist;  return []; end
-
       # Parse bounce messages from MailFoundry
-      # @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'] == 'Message delivery has failed'
         return nil unless mhead['received'].any? { |a| a.include?('(MAILFOUNDRY) id ') }
@@ -44,8 +34,7 @@ module Sisimai::Lhost
           # 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 == StartingOf[:message][0]
-            next
+            readcursor |= Indicators[:deliverystatus] if e.start_with?(StartingOf[:message][0])
           end
           next if (readcursor & Indicators[:deliverystatus]) == 0
           next if e.empty?
@@ -54,7 +43,7 @@ module Sisimai::Lhost
           # Delivery failed for the following reason:
           # Server mx22.example.org[192.0.2.222] failed with: 550 <kijitora@example.org> No such user here
           #
-          # This has been a permanent failure.  No further delivery attempts will be made.
+          # This has been a permanent failure. No further delivery attempts will be made.
           v = dscontents[-1]
 
           if cv = e.match(/\AUnable to deliver message to: [<]([^ ]+[@][^ ]+)[>]\z/)
@@ -84,15 +73,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 'MailFoundry'; end
     end
   end
 end