sisimai 4.25.4-java → 4.25.10-java

data/lib/sisimai/lhost/gmx.rb

@@ -7,123 +7,87 @@ module Sisimai::Lhost
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      StartingOf = {
-        message: ['This message was created automatically by mail delivery software'],
-        rfc822:  ['--- The header of the original message is following'],
-      }.freeze
+      ReBackbone = %r|^---[ ]The[ ]header[ ]of[ ]the[ ]original[ ]message[ ]is[ ]following[.][ ]---|.freeze
+      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]
-        hasdivided = mbody.split("\n")
-        rfc822list = []     # (Array) Each line in message/rfc822 part string
-        blanklines = 0      # (Integer) The number of blank lines
+        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 = hasdivided.shift do
+        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.
           if readcursor == 0
             # Beginning of the bounce message or delivery status part
-            if e.start_with?(StartingOf[:message][0])
-              readcursor |= Indicators[:deliverystatus]
-              next
-            end
-          end
-
-          if (readcursor & Indicators[:'message-rfc822']) == 0
-            # Beginning of the original message part
-            if e.start_with?(StartingOf[:rfc822][0])
-              readcursor |= Indicators[:'message-rfc822']
-              next
-            end
+            readcursor |= Indicators[:deliverystatus] if e.start_with?(StartingOf[:message][0])
+            next
           end
-
-          if readcursor & Indicators[:'message-rfc822'] > 0
-            # Inside of the original message part
-            if e.empty?
-              blanklines += 1
-              break if blanklines > 1
-              next
+          next if (readcursor & Indicators[:deliverystatus]) == 0
+          next if e.empty?
+
+          # This message was created automatically by mail delivery software.
+          #
+          # A message that you sent could not be delivered to one or more of
+          # its recipients. This is a permanent error. The following address
+          # failed:
+          #
+          # "shironeko@example.jp":
+          # SMTP error from remote server after RCPT command:
+          # host: mx.example.jp
+          # 5.1.1 <shironeko@example.jp>... User Unknown
+          v = dscontents[-1]
+
+          if cv = e.match(/\A["]([^ ]+[@][^ ]+)["]:\z/) || e.match(/\A[<]([^ ]+[@][^ ]+)[>]\z/)
+            # "shironeko@example.jp":
+            # ---- OR ----
+            # <kijitora@6jo.example.co.jp>
+            #
+            # Reason:
+            # delivery retry timeout exceeded
+            if v['recipient']
+              # There are multiple recipient addresses in the message body.
+              dscontents << Sisimai::Lhost.DELIVERYSTATUS
+              v = dscontents[-1]
             end
-            rfc822list << e
-          else
-            # Error message part
-            next if (readcursor & Indicators[:deliverystatus]) == 0
-            next if e.empty?
+            v['recipient'] = cv[1]
+            recipients += 1
 
-            # This message was created automatically by mail delivery software.
-            #
-            # A message that you sent could not be delivered to one or more of
-            # its recipients. This is a permanent error. The following address
-            # failed:
-            #
-            # "shironeko@example.jp":
+          elsif cv = e.match(/\ASMTP error .+ ([A-Z]{4}) command:\z/)
             # SMTP error from remote server after RCPT command:
-            # host: mx.example.jp
-            # 5.1.1 <shironeko@example.jp>... User Unknown
-            v = dscontents[-1]
-
-            if cv = e.match(/\A["]([^ ]+[@][^ ]+)["]:\z/) || e.match(/\A[<]([^ ]+[@][^ ]+)[>]\z/)
-              # "shironeko@example.jp":
-              # ---- OR ----
-              # <kijitora@6jo.example.co.jp>
-              #
-              # Reason:
-              # delivery retry timeout exceeded
-              if v['recipient']
-                # There are multiple recipient addresses in the message body.
-                dscontents << Sisimai::Lhost.DELIVERYSTATUS
-                v = dscontents[-1]
-              end
-              v['recipient'] = cv[1]
-              recipients += 1
-
-            elsif cv = e.match(/\ASMTP error .+ ([A-Z]{4}) command:\z/)
-              # SMTP error from remote server after RCPT command:
-              v['command'] = cv[1]
+            v['command'] = cv[1]
 
-            elsif cv = e.match(/\Ahost:[ \t]*(.+)\z/)
-              # host: mx.example.jp
-              v['rhost'] = cv[1]
+          elsif cv = e.match(/\Ahost:[ \t]*(.+)\z/)
+            # host: mx.example.jp
+            v['rhost'] = cv[1]
+          else
+            # Get error message
+            if e =~ /\b[45][.]\d[.]\d\b/ || e =~ /[<][^ ]+[@][^ ]+[>]/ || e =~ /\b[45]\d{2}\b/
+              v['diagnosis'] ||= e
             else
-              # Get error message
-              if e =~ /\b[45][.]\d[.]\d\b/ || e =~ /[<][^ ]+[@][^ ]+[>]/ || e =~ /\b[45]\d{2}\b/
-                v['diagnosis'] ||= e
-              else
-                next if e.empty?
-                if e.start_with?('Reason:')
-                  # Reason:
-                  # delivery retry timeout exceeded
-                  v['diagnosis'] = e
-
-                elsif v['diagnosis'] == 'Reason:'
-                  v['diagnosis'] = e
-                end
+              next if e.empty?
+              if e.start_with?('Reason:')
+                # Reason:
+                # delivery retry timeout exceeded
+                v['diagnosis'] = e
+
+              elsif v['diagnosis'] == 'Reason:'
+                v['diagnosis'] = e
               end
             end
           end
@@ -131,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|
@@ -142,10 +105,9 @@ module Sisimai::Lhost
           end
         end
 
-        rfc822part = Sisimai::RFC5322.weedout(rfc822list)
-        return { 'ds' => dscontents, 'rfc822' => rfc822part }
+        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

@@ -7,9 +7,9 @@ module Sisimai::Lhost
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
+      ReBackbone = %r<^Content-Type:[ ](?:message/rfc822|text/rfc822-headers)>.freeze
       MarkingsOf = {
         message: %r/\A[*][*][ ].+[ ][*][*]\z/,
-        rfc822:  %r{\AContent-Type:[ ]*(?:message/rfc822|text/rfc822-headers)\z},
         error:   %r/\AThe[ ]response([ ]from[ ]the[ ]remote[ ]server)?[ ]was:\z/,
         html:    %r{\AContent-Type:[ ]*text/html;[ ]*charset=['"]?(?:UTF|utf)[-]8['"]?\z},
       }.freeze
@@ -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')
@@ -44,9 +34,8 @@ module Sisimai::Lhost
         permessage = {}     # (Hash) Store values of each Per-Message field
 
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
-        hasdivided = mbody.split("\n")
-        rfc822list = []     # (Array) Each line in message/rfc822 part string
-        blanklines = 0      # (Integer) The number of blank lines
+        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
         endoferror = false  # (Integer) Flag for a blank line after error messages
@@ -54,112 +43,94 @@ module Sisimai::Lhost
         emptylines = 0      # (Integer) The number of empty lines
         v = nil
 
-        while e = hasdivided.shift do
+        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.
           if readcursor == 0
             # Beginning of the bounce message or message/delivery-status part
             readcursor |= Indicators[:deliverystatus] if e =~ MarkingsOf[:message]
           end
+          next if (readcursor & Indicators[:deliverystatus]) == 0
 
-          if (readcursor & Indicators[:'message-rfc822']) == 0
-            # Beginning of the original message part(message/rfc822)
-            if e =~ MarkingsOf[:rfc822]
-              readcursor |= Indicators[:'message-rfc822']
-              next
-            end
-          end
+          if f = Sisimai::RFC1894.match(e)
+            # "e" matched with any field defined in RFC3464
+            next unless o = Sisimai::RFC1894.field(e)
+            v = dscontents[-1]
 
-          if readcursor & Indicators[:'message-rfc822'] > 0
-            # message/rfc822 OR text/rfc822-headers part
-            if e.empty?
-              blanklines += 1
-              break if blanklines > 1
-              next
-            end
-            rfc822list << e
-          else
-            # message/delivery-status part
-            next if (readcursor & Indicators[:deliverystatus]) == 0
-
-            if f = Sisimai::RFC1894.match(e)
-              # "e" matched with any field defined in RFC3464
-              next unless o = Sisimai::RFC1894.field(e)
-              v = dscontents[-1]
-
-              if o[-1] == 'addr'
+            if o[-1] == 'addr'
+              # Final-Recipient: rfc822; kijitora@example.jp
+              # X-Actual-Recipient: rfc822; kijitora@example.co.jp
+              if o[0] == 'final-recipient'
                 # Final-Recipient: rfc822; kijitora@example.jp
-                # X-Actual-Recipient: rfc822; kijitora@example.co.jp
-                if o[0] == 'final-recipient'
-                  # Final-Recipient: rfc822; kijitora@example.jp
-                  if v['recipient']
-                    # There are multiple recipient addresses in the message body.
-                    dscontents << Sisimai::Lhost.DELIVERYSTATUS
-                    v = dscontents[-1]
-                  end
-                  v['recipient'] = o[2]
-                  recipients += 1
-                else
-                  # X-Actual-Recipient: rfc822; kijitora@example.co.jp
-                  v['alias'] = o[2]
+                if v['recipient']
+                  # There are multiple recipient addresses in the message body.
+                  dscontents << Sisimai::Lhost.DELIVERYSTATUS
+                  v = dscontents[-1]
                 end
-              elsif o[-1] == 'code'
-                # Diagnostic-Code: SMTP; 550 5.1.1 <userunknown@example.jp>... User Unknown
-                v['spec'] = o[1]
-                v['diagnosis'] = o[2]
+                v['recipient'] = o[2]
+                recipients += 1
               else
-                # Other DSN fields defined in RFC3464
-                next unless fieldtable.key?(o[0])
-                v[fieldtable[o[0]]] = o[2]
-
-                next unless f == 1
-                permessage[fieldtable[o[0]]] = o[2]
+                # X-Actual-Recipient: rfc822; kijitora@example.co.jp
+                v['alias'] = o[2]
               end
+            elsif o[-1] == 'code'
+              # Diagnostic-Code: SMTP; 550 5.1.1 <userunknown@example.jp>... User Unknown
+              v['spec'] = o[1]
+              v['diagnosis'] = o[2]
             else
-              # The line does not begin with a DSN field defined in RFC3464
-              # Append error messages continued from the previous line
-              if endoferror == false && v && ! v['diagnosis'].to_s.empty?
-                endoferror ||= true if e.empty?
-
-                next if endoferror
-                next unless e.start_with?(' ')
-                v['diagnosis'] << e
-
-              elsif e =~ MarkingsOf[:error]
-                # Detect SMTP session error or connection error
-                # The response from the remote server was:
-                anotherset['diagnosis'] << e
+              # Other DSN fields defined in RFC3464
+              next unless fieldtable[o[0]]
+              v[fieldtable[o[0]]] = o[2]
+
+              next unless f == 1
+              permessage[fieldtable[o[0]]] = o[2]
+            end
+          else
+            # The line does not begin with a DSN field defined in RFC3464
+            # Append error messages continued from the previous line
+            if endoferror == false && v && ! v['diagnosis'].to_s.empty?
+              endoferror ||= true if e.empty?
+
+              next if endoferror
+              next unless e.start_with?(' ')
+              v['diagnosis'] << e
+
+            elsif e =~ MarkingsOf[:error]
+              # Detect SMTP session error or connection error
+              # The response from the remote server was:
+              anotherset['diagnosis'] << e
+            else
+              # ** Address not found **
+              #
+              # Your message wasn't delivered to * because the address couldn't be found.
+              # Check for typos or unnecessary spaces and try again.
+              #
+              # The response from the remote server was:
+              # 550 #5.1.0 Address rejected.
+              next if e =~ MarkingsOf[:html]
+
+              if anotherset['diagnosis']
+                # Continued error messages from the previous line like
+                # "550 #5.1.0 Address rejected."
+                next if e =~ /\AContent-Type:/
+                next if emptylines > 5
+                if e.empty?
+                  # Count and next()
+                  emptylines += 1
+                  next
+                end
+                anotherset['diagnosis'] << ' ' << e
               else
                 # ** Address not found **
                 #
                 # Your message wasn't delivered to * because the address couldn't be found.
                 # Check for typos or unnecessary spaces and try again.
-                #
-                # The response from the remote server was:
-                # 550 #5.1.0 Address rejected.
-                next if e =~ MarkingsOf[:html]
-
-                if anotherset['diagnosis']
-                  # Continued error messages from the previous line like
-                  # "550 #5.1.0 Address rejected."
-                  next if e =~ /\AContent-Type:/
-                  next if emptylines > 5
-                  if e.empty?
-                    # Count and next()
-                    emptylines += 1
-                    next
-                  end
-                  anotherset['diagnosis'] << ' ' << e
-                else
-                  # ** Address not found **
-                  #
-                  # Your message wasn't delivered to * because the address couldn't be found.
-                  # Check for typos or unnecessary spaces and try again.
-                  next if e.empty?
-                  next unless e =~ MarkingsOf[:message]
-                  anotherset['diagnosis'] = e
-                end
+                next if e.empty?
+                next unless e =~ MarkingsOf[:message]
+                anotherset['diagnosis'] = e
               end
             end
-          end # End of message/delivery-status
+          end
         end
         return nil unless recipients > 0
 
@@ -208,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) }
@@ -218,10 +187,9 @@ module Sisimai::Lhost
           end
         end
 
-        rfc822part = Sisimai::RFC5322.weedout(rfc822list)
-        return { 'ds' => dscontents, 'rfc822' => rfc822part }
+        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'G Suite: https://gsuite.google.com'; end
     end
   end
 end