sisimai 4.25.4 → 4.25.9

data/lib/sisimai/lhost/receivingses.rb

@@ -9,10 +9,8 @@ module Sisimai::Lhost
 
       # https://aws.amazon.com/ses/
       Indicators = Sisimai::Lhost.INDICATORS
-      StartingOf = {
-        message: ['This message could not be delivered.'],
-        rfc822:  ['content-type: text/rfc822-headers'],
-      }.freeze
+      ReBackbone = %r|^content-type:[ ]text/rfc822-headers|.freeze
+      StartingOf = { message: ['This message could not be delivered.'] }.freeze
       MessagesOf = {
         # The followings are error messages in Rule sets/*/Actions/Template
         'filtered'     => ['Mailbox does not exist'],
@@ -21,27 +19,14 @@ module Sisimai::Lhost
         'contenterror' => ['Message content rejected'],
       }.freeze
 
-      def description; return 'Amazon SES(Receiving): https://aws.amazon.com/ses/'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-
-      # X-SES-Outgoing: 2015.10.01-54.240.27.7
-      # Feedback-ID: 1.us-west-2.HX6/J9OVlHTadQhEu1+wdF9DBj6n6Pa9sW5Y/0pSOi8=:AmazonSES
-      def headerlist;  return %w[x-ses-outgoing]; end
-
       # Parse bounce messages from Amazon SES/Receiving
-      # @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)
-        # :subject  => %r/\ADelivery Status Notification [(]Failure[)]\z/,
-        # :received => %r/.+[.]smtp-out[.].+[.]amazonses[.]com\b/,
+        # X-SES-Outgoing: 2015.10.01-54.240.27.7
+        # Feedback-ID: 1.us-west-2.HX6/J9OVlHTadQhEu1+wdF9DBj6n6Pa9sW5Y/0pSOi8=:AmazonSES
         return nil unless mhead['x-ses-outgoing']
 
         require 'sisimai/rfc1894'
@@ -49,89 +34,66 @@ module Sisimai::Lhost
         permessage = {}     # (Hash) Store values of each Per-Message field
 
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
-        hasdivided = mbody.split("\n")
-        havepassed = ['']
-        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")
+        readslices = ['']
         readcursor = 0      # (Integer) Points the current cursor position
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
         v = nil
 
-        while e = hasdivided.shift do
-          # Save the current line for the next loop
-          havepassed << e
-          p = havepassed[-2]
+        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.
+          readslices << e # Save the current line for the next loop
 
           if readcursor == 0
             # Beginning of the bounce message or message/delivery-status part
-            if e == StartingOf[:message][0]
-              readcursor |= Indicators[:deliverystatus]
-              next
-            end
+            readcursor |= Indicators[:deliverystatus] if e == StartingOf[:message][0]
+            next
           end
-
-          if (readcursor & Indicators[:'message-rfc822']) == 0
-            # Beginning of the original message part(message/rfc822)
-            if e == StartingOf[:rfc822][0]
-              readcursor |= Indicators[:'message-rfc822']
-              next
-            end
-          end
-
-          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
-            next if e.empty?
-
-            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'
+          next if (readcursor & Indicators[:deliverystatus]) == 0
+          next if e.empty?
+
+          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'
+              # 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
-              # Continued line of the value of Diagnostic-Code field
-              next unless p.start_with?('Diagnostic-Code:')
-              next unless cv = e.match(/\A[ \t]+(.+)\z/)
-              v['diagnosis'] << ' ' << cv[1]
-              havepassed[-1] = 'Diagnostic-Code: ' << 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
-          end # End of message/delivery-status
+          else
+            # Continued line of the value of Diagnostic-Code field
+            next unless readslices[-2].start_with?('Diagnostic-Code:')
+            next unless cv = e.match(/\A[ \t]+(.+)\z/)
+            v['diagnosis'] << ' ' << cv[1]
+            readslices[-1] = 'Diagnostic-Code: ' << e
+          end
         end
         return nil unless recipients > 0
 
@@ -158,15 +120,12 @@ module Sisimai::Lhost
             e['reason'] = r
             break
           end
-
           e['reason'] ||= Sisimai::SMTP::Status.name(e['status']) || ''
-          e['agent']    = self.smtpagent
         end
 
-        rfc822part = Sisimai::RFC5322.weedout(rfc822list)
-        return { 'ds' => dscontents, 'rfc822' => rfc822part }
+        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'Amazon SES(Receiving): https://aws.amazon.com/ses/'; end
     end
   end
 end

data/lib/sisimai/lhost/sendgrid.rb

@@ -7,31 +7,17 @@ module Sisimai::Lhost
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      StartingOf = {
-        message: ['This is an automatically generated message from SendGrid.'],
-        rfc822:  ['Content-Type: message/rfc822'],
-      }.freeze
-
-      def description; return 'SendGrid: https://sendgrid.com/'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-
-      # Return-Path: <apps@sendgrid.net>
-      # X-Mailer: MIME-tools 5.502 (Entity 5.502)
-      def headerlist;  return %w[return-path x-mailer]; end
+      ReBackbone = %r|^Content-Type:[ ]message/rfc822|.freeze
+      StartingOf = { message: ['This is an automatically generated message from SendGrid.'] }.freeze
 
       # Parse bounce messages from SendGrid
-      # @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\z/,
+        # Return-Path: <apps@sendgrid.net>
+        # X-Mailer: MIME-tools 5.502 (Entity 5.502)
         return nil unless mhead['return-path']
         return nil unless mhead['return-path'] == '<apps@sendgrid.net>'
         return nil unless mhead['subject'] == 'Undelivered Mail Returned to Sender'
@@ -41,112 +27,89 @@ module Sisimai::Lhost
         permessage = {}     # (Hash) Store values of each Per-Message field
 
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
-        hasdivided = mbody.split("\n")
-        havepassed = ['']
-        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")
+        readslices = ['']
         readcursor = 0      # (Integer) Points the current cursor position
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
         commandtxt = ''     # (String) SMTP Command name begin with the string '>>>'
         v = nil
 
-        while e = hasdivided.shift do
-          # Save the current line for the next loop
-          havepassed << e
-          p = havepassed[-2]
+        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.
+          readslices << e # Save the current line for the next loop
 
           if readcursor == 0
             # Beginning of the bounce message or message/delivery-status part
-            if e == StartingOf[:message][0]
-              readcursor |= Indicators[:deliverystatus]
-              next
-            end
+            readcursor |= Indicators[:deliverystatus] if e == StartingOf[:message][0]
+            next
           end
-
-          if (readcursor & Indicators[:'message-rfc822']) == 0
-            # Beginning of the original message part(message/rfc822)
-            if e == StartingOf[:rfc822][0]
-              readcursor |= Indicators[:'message-rfc822']
+          next if (readcursor & Indicators[:deliverystatus]) == 0
+          next if e.empty?
+
+          if f = Sisimai::RFC1894.match(e)
+            # "e" matched with any field defined in RFC3464
+            o = Sisimai::RFC1894.field(e)
+            v = dscontents[-1]
+
+            unless o
+              # Fallback code for empty value or invalid formatted value
+              # - Status: (empty)
+              # - Diagnostic-Code: 550 5.1.1 ... (No "diagnostic-type" sub field)
+              next unless cv = e.match(/\ADiagnostic-Code:[ ]*(.+)/)
+              v['diagnosis'] = cv[1]
               next
             end
-          end
-
-          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
-            next if e.empty?
 
-            if f = Sisimai::RFC1894.match(e)
-              # "e" matched with any field defined in RFC3464
-              o = Sisimai::RFC1894.field(e)
-              v = dscontents[-1]
-
-              unless o
-                # Fallback code for empty value or invalid formatted value
-                # - Status: (empty)
-                # - Diagnostic-Code: 550 5.1.1 ... (No "diagnostic-type" sub field)
-                next unless cv = e.match(/\ADiagnostic-Code:[ ]*(.+)/)
-                v['diagnosis'] = cv[1]
-                next
-              end
-
-              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]
-              elsif o[-1] == 'date'
-                # Arrival-Date: 2012-12-31 23-59-59
-                next unless cv = e.match(/\AArrival-Date: (\d{4})[-](\d{2})[-](\d{2}) (\d{2})[-](\d{2})[-](\d{2})\z/)
-                o[1] << 'Thu, ' << cv[3] + ' '
-                o[1] << Sisimai::DateTime.monthname(0)[cv[2].to_i - 1]
-                o[1] << ' ' << cv[1] + ' ' << [cv[4], cv[5], cv[6]].join(':')
-                o[1] << ' ' << Sisimai::DateTime.abbr2tz('CDT')
+                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]
+            elsif o[-1] == 'date'
+              # Arrival-Date: 2012-12-31 23-59-59
+              next unless cv = e.match(/\AArrival-Date: (\d{4})[-](\d{2})[-](\d{2}) (\d{2})[-](\d{2})[-](\d{2})\z/)
+              o[1] << 'Thu, ' << cv[3] + ' '
+              o[1] << Sisimai::DateTime.monthname(0)[cv[2].to_i - 1]
+              o[1] << ' ' << cv[1] + ' ' << [cv[4], cv[5], cv[6]].join(':')
+              o[1] << ' ' << Sisimai::DateTime.abbr2tz('CDT')
             else
-              # The line does not begin with a DSN field defined in RFC3464
-              if cv = e.match(/.+ in (?:End of )?([A-Z]{4}).*\z/)
-                # in RCPT TO, in MAIL FROM, end of DATA
-                commandtxt = cv[1]
-              else
-                # Continued line of the value of Diagnostic-Code field
-                next unless p.start_with?('Diagnostic-Code:')
-                next unless cv = e.match(/\A[ \t]+(.+)\z/)
-                v['diagnosis'] << ' ' << cv[1]
-                havepassed[-1] = 'Diagnostic-Code: ' << e
-              end
+              # 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
-          end # End of message/delivery-status
+          else
+            # The line does not begin with a DSN field defined in RFC3464
+            if cv = e.match(/.+ in (?:End of )?([A-Z]{4}).*\z/)
+              # in RCPT TO, in MAIL FROM, end of DATA
+              commandtxt = cv[1]
+            else
+              # Continued line of the value of Diagnostic-Code field
+              next unless readslices[-2].start_with?('Diagnostic-Code:')
+              next unless cv = e.match(/\A[ \t]+(.+)\z/)
+              v['diagnosis'] << ' ' << cv[1]
+              readslices[-1] = 'Diagnostic-Code: ' << e
+            end
+          end
         end
         return nil unless recipients > 0
 
@@ -175,123 +138,12 @@ module Sisimai::Lhost
           end
 
           e['lhost'] ||= permessage['rhost']
-          e['agent']   = self.smtpagent
           e['command'] = commandtxt
         end
 
-        rfc822part = Sisimai::RFC5322.weedout(rfc822list)
-        return { 'ds' => dscontents, 'rfc822' => rfc822part }
+        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
-      # @abstract Adapt SendGrid bounce object for Sisimai::Message format
-      # @param        [Hash] argvs  bounce object(JSON) retrieved from SendGrid API
-      # @return       [Hash, Nil]   Bounce data list and message/rfc822 part or
-      #                             nil if it failed to parse or the
-      #                             arguments are missing
-      # @since v4.20.0
-      # @until v4.25.5
-      def json(argvs)
-        return nil unless argvs.is_a? Hash
-        return nil if argvs.empty?
-        return nil unless argvs.key?('email')
-        return nil unless Sisimai::RFC5322.is_emailaddress(argvs['email'])
-
-        dscontents = nil
-        rfc822head = {}
-        v = nil
-
-        if argvs.key?('event')
-          # https://sendgrid.com/docs/API_Reference/Webhooks/event.html
-          # {
-          #   'tls' => 0,
-          #   'timestamp' => 1504555832,
-          #   'event' => 'bounce',
-          #   'email' => 'mailboxfull@example.jp',
-          #   'ip' => '192.0.2.22',
-          #   'sg_message_id' => '03_Wof6nRbqqzxRvLpZbfw.filter0017p3mdw1-11399-59ADB335-16.0',
-          #   'type' => 'blocked',
-          #   'sg_event_id' => 'S4wr46YHS0qr3BKhawTQjQ',
-          #   'reason' => '550 5.2.2 <mailboxfull@example.jp>... Mailbox Full ',
-          #   'smtp-id' => '<201709042010.v84KAQ5T032530@example.nyaan.jp>',
-          #   'status' => '5.2.2'
-          # },
-          return nil unless %w[bounce deferred delivered spamreport].include?(argvs['event'])
-          dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
-          diagnostic = argvs['reason']   || ''
-          diagnostic = argvs['response'] || '' if diagnostic.empty?
-          timestamp0 = Sisimai::Time.parse(::Time.at(argvs['timestamp']).to_s)
-          v = dscontents[-1]
-
-          v['date']      = timestamp0.strftime("%a, %d %b %Y %T %z")
-          v['agent']     = self.smtpagent
-          v['lhost']     = argvs['ip'] || ''
-          v['status']    = argvs['status'] || nil
-          v['diagnosis'] = Sisimai::String.sweep(diagnostic)
-          v['recipient'] = argvs['email']
-
-          if argvs['event'] == 'delivered'
-            # "event": "delivered"
-            v['reason'] = 'delivered'
-          elsif argvs['event'] == 'spamreport'
-            # [
-            #   {
-            #     "email": "kijitora@example.com",
-            #     "timestamp": 1504837383,
-            #     "sg_message_id": "6_hrAeKvTDaB5ynBI2nbnQ.filter0002p3las1-27574-59B1FDA3-19.0",
-            #     "sg_event_id": "o70uHqbMSXOaaoveMZIjjg",
-            #     "event": "spamreport"
-            #   }
-            # ]
-            v['reason'] = 'feedback'
-            v['feedbacktype'] = 'abuse'
-          end
-          v['status']    ||= Sisimai::SMTP::Status.find(v['diagnosis']) || ''
-          v['replycode'] ||= Sisimai::SMTP::Reply.find(v['diagnosis'])  || ''
-
-          # Generate pseudo message/rfc822 part
-          rfc822head = {
-            'from'       => Sisimai::Address.undisclosed('s'),
-            'message-id' => v['sg_message_id'],
-          }
-        else
-          #   {
-          #       "status": "4.0.0",
-          #       "created": "2011-09-16 22:02:19",
-          #       "reason": "Unable to resolve MX host sendgrid.ne",
-          #       "email": "esting@sendgrid.ne"
-          #   },
-          dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
-          v = dscontents[-1]
-
-          v['recipient'] = argvs['email']
-          v['date'] = argvs['created'] || ''
-
-          statuscode = argvs['status']  || ''
-          diagnostic = Sisimai::String.sweep(argvs['reason']) || ''
-
-          if statuscode =~ /\A[245]\d\d\z/
-            # "status": "550"
-            v['replycode'] = statuscode
-
-          elsif statuscode =~ /\A[245][.]\d[.]\d+\z/
-            # "status": "5.1.1"
-            v['status'] = statuscode
-          end
-
-          v['status']    ||= Sisimai::SMTP::Status.find(diagnostic) || ''
-          v['replycode'] ||= Sisimai::SMTP::Reply.find(diagnostic)  || ''
-          v['diagnosis']   = argvs['reason'] || ''
-          v['agent']       = self.smtpagent
-
-          # Generate pseudo message/rfc822 part
-          rfc822head = {
-            'from' => Sisimai::Address.undisclosed('s'),
-            'date' => v['date'],
-          }
-        end
-        return { 'ds' => dscontents, 'rfc822' => rfc822head }
-      end
-
+      def description; return 'SendGrid: https://sendgrid.com/'; end
     end
   end
 end