sisimai 5.1.0 → 5.2.0

data/lib/sisimai/lda.rb

@@ -0,0 +1,98 @@
+module Sisimai
+  # Sisimai::LDA - Error message decoder for LDA
+  module LDA
+    class << self
+      LocalAgent = {
+        # Each error message should be a lower-cased string
+        # dovecot/src/deliver/deliver.c
+        # 11: #define DEFAULT_MAIL_REJECTION_HUMAN_REASON \
+        # 12: "Your message to <%t> was automatically rejected:%n%r"
+        "dovecot"    => ["Your message to <", "> was automatically rejected:"],
+        "mail.local" => ["mail.local: "],
+        "procmail"   => ["procmail: ", "/procmail "],
+        "maildrop"   => ["maildrop: "],
+        "vpopmail"   => ["vdelivermail: "],
+        "vmailmgr"   => ["vdeliver: "],
+      }.freeze
+
+      MessagesOf = {
+        # Each error message should be a lower-cased string
+        "dovecot" => {
+          # dovecot/src/deliver/mail-send.c:94
+          "mailboxfull" => [
+            "not enough disk space",
+            "quota exceeded",   # Dovecot 1.2 dovecot/src/plugins/quota/quota.c
+            "quota exceeded (mailbox for user is full)",    # dovecot/src/plugins/quota/quota.c
+          ],
+          "userunknown" => ["mailbox doesn't exist: "],
+        },
+        "mail.local" => {
+          "mailboxfull" => [
+            "disc quota exceeded",
+            "mailbox full or quota exceeded",
+          ],
+          "systemerror" => ["temporary file write error"],
+          "userunknown" => [
+            ": invalid mailbox path",
+            ": unknown user:",
+            ": user missing home directory",
+            ": user unknown",
+          ],
+        },
+        "procmail" => {
+          "mailboxfull" => ["quota exceeded while writing", "user over quota"],
+          "systemerror" => ["service unavailable"],
+          "systemfull"  => ["no space left to finish writing"],
+        },
+        "maildrop" => {
+          "userunknown" => ["cannot find system user", "invalid user specified."],
+          "mailboxfull" => ["maildir over quota."],
+        },
+        "vpopmail" => {
+          "filtered"    => ["user does not exist, but will deliver to "],
+          "mailboxfull" => ["domain is over quota", "user is over quota"],
+          "suspend"     => ["account is locked email bounced"],
+          "userunknown" => ["sorry, no mailbox here by that name."],
+        },
+        "vmailmgr" => {
+          "mailboxfull" => ["delivery failed due to system quota violation"],
+          "userunknown" => [
+            "invalid or unknown base user or domain",
+            "invalid or unknown virtual user",
+            "user name does not refer to a virtual user",
+          ],
+        },
+      }.freeze
+
+      # @abstract Decodes the message body and return the LDA name, the reason, and the error message
+      # @param  [Sisimai::Fact] argvs Decoded email object
+      # @return [String]        Bounce reason
+      def find(argvs)
+        return nil if argvs.nil?
+        return ""  if argvs["diagnosticcode"].empty?
+        return ""  if argvs["command"] != "" && argvs["command"] != "DATA"
+
+        deliversby = ""   # [String] Local Delivery Agent name
+        reasontext = ""   # [String] Error reason
+        issuedcode = argvs["diagnosticcode"].downcase
+
+        LocalAgent.each_key do |e|
+          # Find a lcoal delivery agent name from the entire message body
+          next unless LocalAgent[e].any? { |a| issuedcode.include?(a) }
+          deliversby = e; break
+        end
+        return "" if deliversby.empty?
+
+        MessagesOf[deliversby].each_key do |e|
+          # The key is a bounce reason name
+          next unless MessagesOf[deliversby][e].any? { |a| issuedcode.include?(a) }
+          reasontext = e; break
+        end
+
+        reasontext = "mailererror" if reasontext.empty?
+        return reasontext
+      end
+    end
+  end
+end
+

data/lib/sisimai/lhost/activehunter.rb

@@ -48,7 +48,7 @@ module Sisimai::Lhost
 
           if e.start_with?('>>> ') && e.index('@') > 1
             # >>> kijitora@example.org <kijitora@example.org>
-            if v['recipient']
+            if v["recipient"] != ""
               # There are multiple recipient addresses in the message body.
               dscontents << Sisimai::Lhost.DELIVERYSTATUS
               v = dscontents[-1]

data/lib/sisimai/lhost/amazonses.rb

@@ -2,16 +2,57 @@ module Sisimai::Lhost
   # Sisimai::Lhost::AmazonSES decodes a bounce email which created by Amazon Simple Email Service
   # https://aws.amazon.com/ses/. Methods in the module are called from only Sisimai::Message.
   module AmazonSES
+    # ---------------------------------------------------------------------------------------------
+    # "notificationType": "Bounce"
+    # https://docs.aws.amazon.com/ses/latest/dg/notification-contents.html#bounce-object
+    #
+    # Bounce types
+    #   The bounce object contains a bounce type of Undetermined, Permanent, or Transient. The
+    #   Permanent and Transient bounce types can also contain one of several bounce subtypes.
+    #
+    #   When you receive a bounce notification with a bounce type of Transient, you might be
+    #   able to send email to that recipient in the future if the issue that caused the message
+    #   to bounce is resolved.
+    #
+    #   When you receive a bounce notification with a bounce type of Permanent, it's unlikely
+    #   that you'll be able to send email to that recipient in the future. For this reason, you
+    #   should immediately remove the recipient whose address produced the bounce from your
+    #   mailing lists.
+    #
+    # "bounceType"/"bounceSubType" "Desription"
+    # Undetermined/Undetermined -- The bounce message didn't contain enough information for
+    #                              Amazon SES to determine the reason for the bounce.
+    #
+    # Permanent/General ---------- When you receive this type of bounce notification, you should
+    #                              immediately remove the recipient's email address from your
+    #                              mailing list.
+    # Permanent/NoEmail ---------- It was not possible to retrieve the recipient email address
+    #                              from the bounce message.
+    # Permanent/Suppressed ------- The recipient's email address is on the Amazon SES suppression
+    #                              list because it has a recent history of producing hard bounces.
+    # Permanent/OnAccountSuppressionList
+    #                              Amazon SES has suppressed sending to this address because it
+    #                              is on the account-level suppression list.
+    # 
+    # Transient/General ---------- You might be able to send a message to the same recipient
+    #                              in the future if the issue that caused the message to bounce
+    #                              is resolved.
+    # Transient/MailboxFull ------ the recipient's inbox was full.
+    # Transient/MessageTooLarge -- message you sent was too large
+    # Transient/ContentRejected -- message you sent contains content that the provider doesn't allow
+    # Transient/AttachmentRejected the message contained an unacceptable attachment
     class << self
       require 'sisimai/lhost'
 
-      # https://aws.amazon.com/ses/
-      Indicators = Sisimai::Lhost.INDICATORS
-      Boundaries = ['Content-Type: message/rfc822'].freeze
-      StartingOf = {
-        message: ['The following message to <', 'An error occurred while trying to deliver the mail'],
+      ReasonPair = {
+        "Supressed"                => "suppressed",
+        "OnAccountSuppressionList" => "suppressed",
+        "General"                  => "onhold",
+        "MailboxFull"              => "mailboxfull",
+        "MessageTooLarge"          => "mesgtoobig",
+        "ContentRejected"          => "contenterror",
+        "AttachmentRejected"       => "securityerror",
       }.freeze
-      MessagesOf = { 'expired' => ['Delivery expired'] }.freeze
 
       # @abstract Decodes the bounce message from Amazon SES
       # @param  [Hash] mhead    Message headers of a bounce email
@@ -19,317 +60,160 @@ module Sisimai::Lhost
       # @return [Hash]          Bounce data list and message/rfc822 part
       # @return [Nil]           it failed to decode or the arguments are missing
       def inquire(mhead, mbody)
-        dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
-        recipients = 0  # (Integer) The number of 'Final-Recipient' header
-
-        if mbody.start_with?('{')
-          # The message body is JSON string
-          return nil unless mhead['x-amz-sns-message-id']
-          return nil if     mhead['x-amz-sns-message-id'].empty?
-
-          # https://docs.aws.amazon.com/en_us/ses/latest/DeveloperGuide/notification-contents.html
-          bouncetype = {
-            'Permanent' => { 'General' => '', 'NoEmail' => '', 'Suppressed' => '' },
-            'Transient' => {
-              'General'            => '',
-              'MailboxFull'        => 'mailboxfull',
-              'MessageTooLarge'    => 'mesgtoobig',
-              'ContentRejected'    => '',
-              'AttachmentRejected' => '',
-            },
-          }.freeze
-          jsonstring = ''
-          sespayload = nil
-          foldedline = false
-          bodyslices = mbody.split("\n")
-
-          while e = bodyslices.shift do
-            # Find JSON string from the message body
-            next if e.empty?
-            break if e == '--'
-
-            # The line starts with " ", continued from !\n.
-            e.lstrip! if foldedline
-            foldedline = false
-
-            if e.end_with?('!')
-              # ... long long line ...![\n]
-              e.chomp!('!')
-              foldedline = true
-            end
-            jsonstring << e
-          end
-
-          begin
-            if RUBY_PLATFORM.start_with?('java')
-              # java-based ruby environment like JRuby.
-              require 'jrjackson'
-              jsonobject = JrJackson::Json.load(jsonstring)
-
-              # 'Message' => '{"notificationType":"Bounce",...
-              sespayload = JrJackson::Json.load(jsonobject['Message']) if jsonobject['Message']
-            else
-              # Matz' Ruby Implementation
-              require 'oj'
-              jsonobject = Oj.load(jsonstring)
-
-              # 'Message' => '{"notificationType":"Bounce",...
-              sespayload = Oj.load(jsonobject['Message']) if jsonobject['Message']
-            end
-            sespayload ||= jsonobject
-
-          rescue StandardError => ce
-            # Something wrong in decoding JSON
-            warn ' ***warning: Failed to decode JSON: ' << ce.to_s
-            return nil
+        return nil if mbody.include?("{") == false
+        return nil if mhead.has_key?("x-amz-sns-message-id") == false
+        return nil if mhead["x-amz-sns-message-id"].empty?
+
+        proceedsto = false
+        sespayload = mbody
+        while true
+          # Remote the following string begins with "--"
+          # --
+          # If you wish to stop receiving notifications from this topic, please click or visit the link below to unsubscribe:
+          # https://sns.us-west-2.amazonaws.com/unsubscribe.html?SubscriptionArn=arn:aws:sns:us-west-2:1...
+          p1 = mbody.index("\n\n--\n")
+          sespayload = mbody[0, p1] if p1
+          sespayload = sespayload.gsub("!\n ", "")
+          p2 = sespayload.index('"Message"')
+
+          if p2
+            # The JSON included in the email is a format like the following:
+            # {
+            #  "Type" : "Notification",
+            #  "MessageId" : "02f86d9b-eecf-573d-b47d-3d1850750c30",
+            #  "TopicArn" : "arn:aws:sns:us-west-2:123456789012:SES-EJ-B",
+            #  "Message" : "{\"notificationType\"...
+            sespayload = sespayload.gsub("\\", "")
+            p3 = sespayload.index("{", p2 + 9)
+            p4 = sespayload.index("\n", p2 + 9)
+            sespayload = sespayload[p3, p4 - p3]
+            sespayload = sespayload.chop if sespayload[-1, 1] == ","
+            sespayload = sespayload.chop if sespayload[-1, 1] == '"'
           end
 
-          rfc822head = {}   # (Hash) Check flags for headers in RFC822 part
-          labeltable = {
-            'Bounce'    => 'bouncedRecipients',
-            'Complaint' => 'complainedRecipients',
-          }
-          p = sespayload
-          v = nil
-
-          if %w[Bounce Complaint].index(p['notificationType'])
-            # { "notificationType":"Bounce", "bounce": { "bounceType":"Permanent",...
-            o = p[p['notificationType'].downcase].dup
-            r = o[labeltable[p['notificationType']]] || []
-
-            while e = r.shift do
-              # 'bouncedRecipients' => [ { 'emailAddress' => 'bounce@si...' }, ... ]
-              # 'complainedRecipients' => [ { 'emailAddress' => 'complaint@si...' }, ... ]
-              next unless Sisimai::Address.is_emailaddress(e['emailAddress'])
-
-              v = dscontents[-1]
-              if v['recipient']
-                # There are multiple recipient addresses in the message body.
-                dscontents << Sisimai::Lhost.DELIVERYSTATUS
-                v = dscontents[-1]
-              end
-              recipients += 1
-              v['recipient'] = e['emailAddress']
-
-              if p['notificationType'] == 'Bounce'
-                # 'bouncedRecipients => [ {
-                #   'emailAddress' => 'bounce@simulator.amazonses.com',
-                #   'action' => 'failed',
-                #   'status' => '5.1.1',
-                #   'diagnosticCode' => 'smtp; 550 5.1.1 user unknown'
-                # }, ... ]
-                v['action'] = e['action']
-                v['status'] = e['status']
-
-                if p0 = e['diagnosticCode'].index(';') || -1; p0 > 3
-                  # Diagnostic-Code: SMTP; 550 5.1.1 <userunknown@example.jp>... User Unknown
-                  v['spec']      = e['diagnosticCode'][0, p0].upcase
-                  v['diagnosis'] = e['diagnosticCode'][p0 + 2, e['diagnosticCode'].size]
-                else
-                  v['diagnosis'] = e['diagnosticCode']
-                end
-
-                # 'reportingMTA' => 'dsn; a27-23.smtp-out.us-west-2.amazonses.com',
-                p0 = o['reportingMTA'].index('dsn; ')
-                v['lhost'] = Sisimai::String.sweep(o['reportingMTA'][p0 + 5, o['reportingMTA'].size]) if p0
-
-                if bouncetype[o['bounceType']] && bouncetype[o['bounceType']][o['bounceSubType']]
-                  # 'bounce' => {
-                  #   'bounceType'    => 'Permanent',
-                  #   'bounceSubType' => 'General'
-                  # },
-                  v['reason'] = bouncetype[o['bounceType']][o['bounceSubType']]
-                end
-              else
-                # 'complainedRecipients' => [ {
-                #   'emailAddress' => 'complaint@simulator.amazonses.com' }, ... ],
-                v['reason'] = 'feedback'
-                v['feedbacktype'] = o['complaintFeedbackType'] || ''
-              end
-
-              v['date'] = o['timestamp'] || p['mail']['timestamp']
-              v['date'].sub!(/[.]\d+Z\z/, '')
-            end
-          elsif p['notificationType'] == 'Delivery'
-            # { "notificationType":"Delivery", "delivery": { ...
-            o = p['delivery'].dup
-            r = o['recipients'] || []
-
-            while e = r.shift do
-              # 'delivery' => {
-              #   'timestamp' => '2016-11-23T12:01:03.512Z',
-              #   'processingTimeMillis' => 3982,
-              #   'reportingMTA' => 'a27-29.smtp-out.us-west-2.amazonses.com',
-              #   'recipients' => [
-              #     'success@simulator.amazonses.com'
-              #   ],
-              #   'smtpResponse' => '250 2.6.0 Message received'
-              # },
-              next unless Sisimai::Address.is_emailaddress(e)
-
-              v = dscontents[-1]
-              if v['recipient']
-                # There are multiple recipient addresses in the message body.
-                dscontents << Sisimai::Lhost.DELIVERYSTATUS
-                v = dscontents[-1]
-              end
-              recipients += 1
-              v['recipient'] = e
-              v['lhost']     = o['reportingMTA'] || ''
-              v['diagnosis'] = o['smtpResponse'] || ''
-              v['status']    = Sisimai::SMTP::Status.find(v['diagnosis']) || ''
-              v['reason']    = 'delivered'
-              v['action']    = 'delivered'
-
-              v['date'] = o['timestamp'] || p['mail']['timestamp']
-              v['date'].sub!(/[.]\d+Z\z/, '')
-            end
+          break if sespayload.include?("notificationType") == false
+          break if sespayload.start_with?("{")             == false
+          break if sespayload.end_with?("}")               == false
+          proceedsto = true; break
+        end
+        return nil if proceedsto == false
+
+        jsonobject = nil
+        begin
+          if RUBY_PLATFORM.start_with?("java")
+            # java-based ruby environment like JRuby.
+            require "jrjackson"
+            jsonobject = JrJackson::Json.load(sespayload)
           else
-            # The value of "notificationType" is not any of "Bounce", "Complaint", or "Delivery".
-            return nil
+            # Matz' Ruby Implementation
+            require "oj"
+            jsonobject = Oj.load(sespayload)
           end
-          return nil unless recipients > 0
-
-          if p['mail']['headers']
-            # "headersTruncated":false,
-            # "headers":[ { ...
-            p['mail']['headers'].each do |e|
-              # 'headers' => [ { 'name' => 'From', 'value' => 'neko@nyaan.jp' }, ... ],
-              next unless %w[From To Subject Message-ID Date].index(e['name'])
-              rfc822head[e['name'].downcase] = e['value']
+        rescue StandardError => ce
+          # Something wrong in decoding JSON
+          warn ' ***warning: Failed to decode JSON: ' << ce.to_s
+          return nil
+        end
+        return nil if jsonobject.has_key?("notificationType") == false
+
+        require "sisimai/string"
+        require "sisimai/rfc1123"
+        require "sisimai/smtp/reply"
+        require "sisimai/smtp/status"
+        require "sisimai/smtp/command"
+        dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
+        recipients = 0  # (Integer) The number of 'Final-Recipient' header
+        whatnotify = jsonobject["notificationType"][0, 1] || ""
+        v          = dscontents[-1]
+
+        if whatnotify == "B"
+          # "notificationType":"Bounce"
+          p = jsonobject["bounce"]
+          r = p["bounceType"] == "Permanent" ? "5" : "4"
+
+          p["bouncedRecipients"].each do |e|
+            # {"emailAddress":"neko@example.jp", "action":"failed", "status":"5.1.1", "diagnosticCode": "..."}
+            if v["recipient"] != ""
+              # There are multiple recipient addresses in the message body.
+              dscontents << Sisimai::Lhost.DELIVERYSTATUS
+              v = dscontents[-1]
             end
+            v["recipient"] = e["emailAddress"]
+            v["diagnosis"] = Sisimai::String.sweep(e["diagnosticCode"])
+            v["command"]   = Sisimai::SMTP::Command.find(v["diagnosis"])
+            v["action"]    = e["action"]
+            v["status"]    = Sisimai::SMTP::Status.find(v["diagnosis"], r)
+            v["replycode"] = Sisimai::SMTP::Reply.find(v["diagnosis"], v["status"])
+            v["date"]      = p["timestamp"]
+            v["lhost"]     = Sisimai::RFC1123.find(p["reportingMTA"])
+            recipients += 1
           end
 
-          unless rfc822head['message-id']
-            # Try to get the value of "Message-Id".
-            if p['mail']['messageId']
-              # 'messageId' => '01010157e48f9b9b-891e9a0e-9c9d-4773-9bfe-608f2ef4756d-000000'
-              rfc822head['message-id'] = p['mail']['messageId']
-            end
+          ReasonPair.each_key do |f|
+            #  Try to find the bounce reason by "bounceSubType"
+            next unless ReasonPair[f] == p["bounceSubType"]
+            v["reason"] = f; break
           end
-          return { 'ds' => dscontents, 'rfc822' => rfc822head }
 
-        else
-          # The message body is an email
-          # :from    => %r/\AMAILER-DAEMON[@]email[-]bounces[.]amazonses[.]com\z/,
-          # :subject => %r/\ADelivery Status Notification [(]Failure[)]\z/,
-          return nil if mhead['x-mailer'].to_s.start_with?('Amazon WorkMail')
-
-          # X-SenderID: Sendmail Sender-ID Filter v1.0.0 nijo.example.jp p7V3i843003008
-          # X-Original-To: 000001321defbd2a-788e31c8-2be1-422f-a8d4-cf7765cc9ed7-000000@email-bounces.amazonses.com
-          # X-AWS-Outgoing: 199.255.192.156
-          # X-SES-Outgoing: 2016.10.12-54.240.27.6
-          match  = 0
-          match += 1 if mhead['x-aws-outgoing']
-          match += 1 if mhead['x-ses-outgoing']
-          return nil unless match > 0
-
-          require 'sisimai/rfc1894'
-          fieldtable = Sisimai::RFC1894.FIELDTABLE
-          permessage = {}     # (Hash) Store values of each Per-Message field
-
-          emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
-          bodyslices = emailparts[0].split("\n")
-          readslices = ['']
-          readcursor = 0      # (Integer) Points the current cursor position
-          v = nil
-
-          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.start_with?(StartingOf[:message][0], StartingOf[:message][1])
-                readcursor |= Indicators[:deliverystatus]
-                next
-              end
-            end
-            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)
+        elsif whatnotify == "C"
+          # "notificationType":"Complaint"
+          p = jsonobject["complaint"]
+          p["complainedRecipients"].each do |e|
+            # {"emailAddress":"neko@example.jp"}
+            if v["recipient"] != ""
+              # There are multiple recipient addresses in the message body.
+              dscontents << Sisimai::Lhost.DELIVERYSTATUS
               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
-                  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]
-                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
-                # Other DSN fields defined in RFC3464
-                next unless fieldtable[o[0]]
-                v[fieldtable[o[0]]] = o[2]
-
-                next unless f
-                permessage[fieldtable[o[0]]] = o[2]
-              end
-            else
-              # Continued line of the value of Diagnostic-Code field
-              next unless readslices[-2].start_with?('Diagnostic-Code:')
-              next unless e.start_with?(' ')
-              v['diagnosis'] << ' ' << e
-              readslices[-1] = 'Diagnostic-Code: ' << e
-            end
-          end
-
-          if recipients == 0 && mbody =~ /notificationType/
-            # Try to decode with Sisimai::Lhost::AmazonSES module
-            j = Sisimai::Lhost::AmazonSES.json(mhead, mbody)
-
-            if j['ds'].is_a? Array
-              # Update dscontents
-              dscontents = j['ds']
-              recipients = j['ds'].size
             end
+            v["recipient"]    = e["emailAddress"]
+            v["reason"]       = "feedback"
+            v["feedbacktype"] = p["complaintFeedbackType"]
+            v["date"]         = p["timestamp"]
+            v["diagnosis"]    = sprintf('"feedbackid":"%s", "useragent":"%s"}', p["feedbackId"], p["userAgent"])
+            recipients += 1
           end
-          return nil unless recipients > 0
 
-          dscontents.each do |e|
-            # Set default values if each value is empty.
-            permessage.each_key { |a| e[a] ||= permessage[a] || '' }
-
-            e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'].to_s.tr("\n", ' '))
-            if e['status'].to_s.end_with?('.0.0', '.1.0')
-              # Get other D.S.N. value from the error message
-              # 5.1.0 - Unknown address error 550-'5.7.1 ...
-              errormessage = e['diagnosis']
-              p1 = e['diagnosis'].index("-'");  p1 = e['diagnosis'].index('-"')  unless p1
-              p2 = e['diagnosis'].rindex("' "); p2 = e['diagnosis'].rindex('" ') unless p2
-              errormessage = e['diagnosis'][p1 + 2, p2 - p1 - 2] if p1 && p2
-              e['status'] = Sisimai::SMTP::Status.find(errormessage) || e['status']
-            end
-            e['replycode'] ||= Sisimai::SMTP::Reply.find(e['diagnosis'], e['status'])
-
-            MessagesOf.each_key do |r|
-              # Verify each regular expression of session errors
-              next unless MessagesOf[r].any? { |a| e['diagnosis'].include?(a) }
-              e['reason'] = r
-              break
+        elsif whatnotify == "D"
+          # "notificationType":"Delivery"
+          p = jsonobject["delivery"]
+          p["recipients"].each do |e|
+            # {"recipients":["neko@example.jp"]}
+            if v["recipient"] != ""
+              # There are multiple recipient addresses in the message body.
+              dscontents << Sisimai::Lhost.DELIVERYSTATUS
+              v = dscontents[-1]
             end
+            v["recipient"] = e
+            v["reason"]    = "delivered"
+            v["action"]    = "delivered"
+            v["date"]      = p["timestamp"]
+            v["lhost"]     = Sisimai::RFC1123.find(p["reportingMTA"])
+            v["diagnosis"] = Sisimai::String.sweep(p["smtpResponse"])
+            v["command"]   = Sisimai::SMTP::Command.find(v["diagnosis"])
+            v["status"]    = Sisimai::SMTP::Status.find(v["diagnosis"], "2")
+            v["replycode"] = Sisimai::SMTP::Reply.find(v["diagnosis"], "2")
+            recipients += 1
           end
 
-          return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
-        end # END of the decoder for the email message
-
+        else
+          # Unknown "notificationType" value
+          warn sprintf(" ***warning: There is no notificationType field or unknown type of notificationType field")
+          return nil
+        end
+        return nil if recipients == 0
+
+        # Date::Time.strptime() cannot parse "2016-11-25T01:49:01.000Z" format
+        dscontents.each { |e| e["date"] = e["date"].sub("T", " ").sub(/[.]\d{3}Z/, "") }
+
+        cv = ""
+        jsonobject["mail"]["headers"].each do |e|
+          cv << sprintf("%s: %s\n", e["name"], e["value"])
+        end
+        %w[date subject].each do |e|
+          next if jsonobject["mail"]["commonHeaders"].has_key?(e) == false
+          cv << sprintf("%s: %s\n", e.capitalize, jsonobject["mail"]["commonHeaders"][e])
+        end
+        return { "ds" => dscontents, "rfc822" => cv }
       end
       def description; return 'Amazon SES(Sending): https://aws.amazon.com/ses/'; end
     end