sisimai 4.25.5-java → 4.25.11-java

data/lib/sisimai/datetime.rb

@@ -43,7 +43,7 @@ module Sisimai
         abbr: %w[Sun Mon Tue Wed Thu Fri Sat],
       }.freeze
 
-      TimeZoneAbbr = {
+      TimeZones = {
         # http://en.wikipedia.org/wiki/List_of_time_zone_abbreviations
         #'ACDT' => '+1030', # Australian Central Daylight Time  UTC+10:30
         #'ACST' => '+0930', # Australian Central Standard Time  UTC+09:30
@@ -207,24 +207,24 @@ module Sisimai
       end
 
       # Month name list
-      # @param    [Integer] argv1  Require full name or not
+      # @param    [Boolean] argv1  Require full name or not
       # @return   [Array, String]  Month name list or month name
       # @example  Get the names of each month
-      #   monthname()  #=> [ 'Jan', 'Feb', ... ]
-      #   monthname(1) #=> [ 'January', 'February', 'March', ... ]
-      def monthname(argv1 = 0)
-        value = argv1 > 0 ? :full : :abbr
+      #   monthname()     #=> [ 'Jan', 'Feb', ... ]
+      #   monthname(true) #=> [ 'January', 'February', 'March', ... ]
+      def monthname(argv1 = false)
+        value = argv1 ? :full : :abbr
         return MonthName[value]
       end
 
       # List of day of week
-      # @param    [Integer] argv1 Require full name
+      # @param    [Boolean] argv1 Require full name
       # @return   [Array, String] List of day of week or day of week
       # @example  Get the names of each day of week
-      #   dayofweek()  #=> [ 'Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat' ]
-      #   dayofweek(1) #=> [ 'Sunday', 'Monday', 'Tuesday', ... ]
-      def dayofweek(argv1 = 0)
-        value = argv1 > 0 ? :full : :abbr
+      #   dayofweek()     #=> [ 'Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat' ]
+      #   dayofweek(true) #=> [ 'Sunday', 'Monday', 'Tuesday', ... ]
+      def dayofweek(argv1 = false)
+        value = argv1 ? :full : :abbr
         return DayOfWeek[value]
       end
 
@@ -257,9 +257,10 @@ module Sisimai
 
         while p = timetokens.shift do
           # Parse each piece of time
-          if p =~ /\A[A-Z][a-z]{2}[,]?\z/
+          if p =~ /\A[A-Z][a-z]{2,}[,]?\z/
             # Day of week or Day of week; Thu, Apr, ...
-            p.chop if p.size == 4 # Thu, -> Thu
+            p.gsub!(/,\z/, '') if p.end_with?(',')  # "Thu," => "Thu"
+            p = p[0,3] if p.size > 3
 
             if DayOfWeek[:abbr].include?(p)
               # Day of week; Mon, Thu, Sun,...
@@ -273,7 +274,7 @@ module Sisimai
             # Year or Day; 2005, 31, 04,  1, ...
             if p.to_i > 31
               # The piece is the value of an year
-              v[:Y] = p
+              v[:Y] = p.to_i
             else
               # The piece is the value of a day
               if v[:d]
@@ -399,7 +400,7 @@ module Sisimai
       #   abbr2tz('JST')  #=> '+0900'
       def abbr2tz(argv1)
         return nil unless argv1.is_a?(::String)
-        return TimeZoneAbbr[argv1]
+        return TimeZones[argv1]
       end
 
       # Convert to second
@@ -428,7 +429,7 @@ module Sisimai
           return ztime
 
         elsif argv1 =~ /\A[A-Za-z]+\z/
-          return tz2second(TimeZoneAbbr[argv1])
+          return tz2second(TimeZones[argv1])
         else
           return nil
         end
@@ -441,7 +442,7 @@ module Sisimai
       # @example  Get timezone offset string of specified seconds
       #   second2tz(12345)    #=> '+0325'
       def second2tz(argv1)
-        return '+0000' unless argv1.is_a?(Number)
+        return '+0000' unless argv1.is_a?(::Integer)
         return nil if argv1.abs > TZ_OFFSET  # UTC+14 + 1(DST?)
 
         digit = { :operator => '+' }

data/lib/sisimai/lhost.rb

@@ -38,49 +38,41 @@ module Sisimai
         }
       end
 
-      def smtpagent(v = '')
-        return v.to_s.sub(/\ASisimai::Lhost::/, 'Email::')
-      end
-      def description; return ''; end
-      def headerlist;  return []; end
-      def removedat;   return 'v4.25.5'; end # This method will be removed at the future release of Sisimai
-
       # @abstract MTA list
       # @return   [Array] MTA list with order
       def index
         return %w[
-          Sendmail Postfix Qmail Exim Courier OpenSMTPD Office365 Outlook
-          Exchange2007 Exchange2003 Yahoo GSuite Aol SendGrid AmazonSES MailRu
-          Yandex MessagingServer Domino Notes ReceivingSES AmazonWorkMail Verizon
-          GMX Bigfoot Facebook Zoho EinsUndEins MessageLabs EZweb KDDI Biglobe
-          Amavis ApacheJames McAfee MXLogic MailFoundry IMailServer
-          MFILTER Activehunter InterScanMSS SurfControl MailMarshalSMTP
-          X1 X2 X3 X4 X5 V5sendmail FML Google]
+          Activehunter Amavis AmazonSES AmazonWorkMail Aol ApacheJames Barracuda Bigfoot
+          Biglobe Courier Domino EZweb EinsUndEins Exchange2003 Exchange2007 Exim FML
+          Facebook GMX GSuite GoogleGroups Gmail IMailServer InterScanMSS KDDI MXLogic
+          MailFoundry MailMarshalSMTP MailRu McAfee MessageLabs MessagingServer Notes
+          Office365 OpenSMTPD Outlook Postfix PowerMTA ReceivingSES SendGrid Sendmail
+          SurfControl V5sendmail Verizon X1 X2 X3 X4 X5 X6 Yahoo Yandex Zoho MFILTER
+          Qmail
+        ]
       end
 
-      # @abstract MTA list which have one or more extra headers
-      # @return   [Array] MTA list (have extra headers)
-      def heads
-        return %w[
-          Exim Office365 Outlook Exchange2007 Exchange2003 GSuite SendGrid
-          AmazonSES ReceivingSES AmazonWorkMail Aol GMX MailRu MessageLabs Yahoo
-          Yandex Zoho EinsUndEins MXLogic McAfee MFILTER EZweb Activehunter IMailServer
-          SurfControl FML Google
-        ]
+      # @abstract Returns Sisimai::Lhost::* module path table
+      # @return [Hash] Module path table
+      # @since  v4.25.6
+      def path
+        index = Sisimai::Lhost.index
+        table = {
+          'Sisimai::ARF'     => 'sisimai/arf',
+          'Sisimai::RFC3464' => 'sisimai/rfc3464',
+          'Sisimai::RFC3834' => 'sisimai/rfc3834',
+        }
+        index.each { |e| table['Sisimai::Lhost::' << e] = 'sisimai/lhost/' << e.downcase }
+        return table
       end
 
       # @abstract Parse bounce messages
-      # @param         [Hash] mhead       Message header 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; return nil; end
+      def description; return ''; end
     end
   end
 end

data/lib/sisimai/lhost/activehunter.rb

@@ -11,21 +11,11 @@ module Sisimai::Lhost
       ReBackbone = %r|^Content-type:[ ]message/rfc822|.freeze
       StartingOf = { message: ['  ----- The following addresses had permanent fatal errors -----'] }.freeze
 
-      def description; return 'TransWARE Active!hunter'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      def headerlist;  return %w[x-ahmailid]; end
-
       # Parse bounce messages from TransWARE Active!hunter
-      # @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/\A"MAILER-DAEMON"/,
         # :subject => %r/FAILURE NOTICE :/,
@@ -78,15 +68,10 @@ module Sisimai::Lhost
         return nil unless recipients > 0
 
         require 'sisimai/string'
-        dscontents.each do |e|
-          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
-          e['agent']     = self.smtpagent
-          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 'TransWARE Active!hunter'; end
     end
   end
 end

data/lib/sisimai/lhost/amavis.rb

@@ -8,25 +8,73 @@ module Sisimai::Lhost
 
       Indicators = Sisimai::Lhost.INDICATORS
       ReBackbone = %r|^Content-Type:[ ]text/rfc822-headers|.freeze
-      StartingOf = {
-        message: ['The message '],
-        rfc822:  ['Content-Type: text/rfc822-headers'],
+      StartingOf = { message: ['The message '] }.freeze
+      MessagesOf = {
+        # amavisd-new-2.11.1/amavisd:1840|%smtp_reason_by_ccat = (
+        # amavisd-new-2.11.1/amavisd:1840|  # currently only used for blocked messages only, status 5xx
+        # amavisd-new-2.11.1/amavisd:1840|  # a multiline message will produce a valid multiline SMTP response
+        # amavisd-new-2.11.1/amavisd:1840|  CC_VIRUS,       'id=%n - INFECTED: %V',
+        # amavisd-new-2.11.1/amavisd:1840|  CC_BANNED,      'id=%n - BANNED: %F',
+        # amavisd-new-2.11.1/amavisd:1840|  CC_UNCHECKED.',1', 'id=%n - UNCHECKED: encrypted',
+        # amavisd-new-2.11.1/amavisd:1840|  CC_UNCHECKED.',2', 'id=%n - UNCHECKED: over limits',
+        # amavisd-new-2.11.1/amavisd:1840|  CC_UNCHECKED,      'id=%n - UNCHECKED',
+        # amavisd-new-2.11.1/amavisd:1840|  CC_SPAM,        'id=%n - spam',
+        # amavisd-new-2.11.1/amavisd:1840|  CC_SPAMMY.',1', 'id=%n - spammy (tag3)',
+        # amavisd-new-2.11.1/amavisd:1840|  CC_SPAMMY,      'id=%n - spammy',
+        # amavisd-new-2.11.1/amavisd:1840|  CC_BADH.',1',   'id=%n - BAD HEADER: MIME error',
+        # amavisd-new-2.11.1/amavisd:1840|  CC_BADH.',2',   'id=%n - BAD HEADER: nonencoded 8-bit character',
+        # amavisd-new-2.11.1/amavisd:1840|  CC_BADH.',3',   'id=%n - BAD HEADER: contains invalid control character',
+        # amavisd-new-2.11.1/amavisd:1840|  CC_BADH.',4',   'id=%n - BAD HEADER: line made up entirely of whitespace',
+        # amavisd-new-2.11.1/amavisd:1840|  CC_BADH.',5',   'id=%n - BAD HEADER: line longer than RFC 5322 limit',
+        # amavisd-new-2.11.1/amavisd:1840|  CC_BADH.',6',   'id=%n - BAD HEADER: syntax error',
+        # amavisd-new-2.11.1/amavisd:1840|  CC_BADH.',7',   'id=%n - BAD HEADER: missing required header field',
+        # amavisd-new-2.11.1/amavisd:1840|  CC_BADH.',8',   'id=%n - BAD HEADER: duplicate header field',
+        # amavisd-new-2.11.1/amavisd:1840|  CC_BADH,        'id=%n - BAD HEADER',
+        # amavisd-new-2.11.1/amavisd:1840|  CC_OVERSIZED,   'id=%n - Message size exceeds recipient\'s size limit',
+        # amavisd-new-2.11.1/amavisd:1840|  CC_MTA.',1',    'id=%n - Temporary MTA failure on relaying',
+        # amavisd-new-2.11.1/amavisd:1840|  CC_MTA.',2',    'id=%n - Rejected by next-hop MTA on relaying',
+        # amavisd-new-2.11.1/amavisd:1840|  CC_MTA,         'id=%n - Unable to relay message back to MTA',
+        # amavisd-new-2.11.1/amavisd:1840|  CC_CLEAN,       'id=%n - CLEAN',
+        # amavisd-new-2.11.1/amavisd:1840|  CC_CATCHALL,    'id=%n - OTHER',  # should not happen
+        # ...
+        # amavisd-new-2.11.1/amavisd:15289|my $status = setting_by_given_contents_category(
+        # amavisd-new-2.11.1/amavisd:15289|  $blocking_ccat,
+        # amavisd-new-2.11.1/amavisd:15289|  { CC_VIRUS,       "554 5.7.0",
+        # amavisd-new-2.11.1/amavisd:15289|    CC_BANNED,      "554 5.7.0",
+        # amavisd-new-2.11.1/amavisd:15289|    CC_UNCHECKED,   "554 5.7.0",
+        # amavisd-new-2.11.1/amavisd:15289|    CC_SPAM,        "554 5.7.0",
+        # amavisd-new-2.11.1/amavisd:15289|    CC_SPAMMY,      "554 5.7.0",
+        # amavisd-new-2.11.1/amavisd:15289|    CC_BADH.",2",   "554 5.6.3",  # nonencoded 8-bit character
+        # amavisd-new-2.11.1/amavisd:15289|    CC_BADH,        "554 5.6.0",
+        # amavisd-new-2.11.1/amavisd:15289|    CC_OVERSIZED,   "552 5.3.4",
+        # amavisd-new-2.11.1/amavisd:15289|    CC_MTA,         "550 5.3.5",
+        # amavisd-new-2.11.1/amavisd:15289|    CC_CATCHALL,    "554 5.7.0",
+        # amavisd-new-2.11.1/amavisd:15289|  });
+        # ...
+        # amavisd-new-2.11.1/amavisd:15332|my $response = sprintf("%s %s%s%s", $status,
+        # amavisd-new-2.11.1/amavisd:15333|  ($final_destiny == D_PASS     ? "Ok" :
+        # amavisd-new-2.11.1/amavisd:15334|   $final_destiny == D_DISCARD  ? "Ok, discarded" :
+        # amavisd-new-2.11.1/amavisd:15335|   $final_destiny == D_REJECT   ? "Reject" :
+        # amavisd-new-2.11.1/amavisd:15336|   $final_destiny == D_BOUNCE   ? "Bounce" :
+        # amavisd-new-2.11.1/amavisd:15337|   $final_destiny == D_TEMPFAIL ? "Temporary failure" :
+        # amavisd-new-2.11.1/amavisd:15338|                                  "Not ok ($final_destiny)" ),
+        'spamdetected'  => [' - spam'],
+        'virusdetected' => [' - infected'],
+        'contenterror'  => [' - bad header:'],
+        'exceedlimit'   => [' - message size exceeds recipient'],
+        'systemerror'   => [
+            ' - temporary mta failure on relaying',
+            ' - rejected by next-hop mta on relaying',
+            ' - unable to relay message back to mta',
+        ],
       }.freeze
 
-      def description; return 'amavisd-new: https://www.amavis.org/'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-
       # Parse bounce messages from amavisd-new
-      # @param         [Hash] mhead       Message headers of a bounce email
-      # @options mhead [String] from      From header
-      # @options mhead [String] date      Date header
-      # @options mhead [String] subject   Subject header
-      # @options mhead [Array]  received  Received headers
-      # @options mhead [String] others    Other required headers
-      # @param         [String] mbody     Message body of a bounce email
-      # @return        [Hash, Nil]        Bounce data list and message/rfc822
-      #                                   part or nil if it failed to parse or
-      #                                   the arguments are missing
+      # @param  [Hash] mhead    Message headers of a bounce email
+      # @param  [String] mbody  Message body of a bounce email
+      # @return [Hash]          Bounce data list and message/rfc822 part
+      # @return [Nil]           it failed to parse or the arguments are missing
+      # @since v4.25.0
       def make(mhead, mbody)
         # From: "Content-filter at neko1.example.jp" <postmaster@neko1.example.jp>
         # Subject: Undeliverable mail, MTA-BLOCKED
@@ -94,14 +142,24 @@ module Sisimai::Lhost
         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", ' '))
-          e['agent'] = self.smtpagent
+          q = e['diagnosis'].downcase
+          catch :DETECT_REASON do
+            MessagesOf.each_key do |p|
+              # Try to detect an error reason
+              MessagesOf[p].each do |r|
+                # Try to find an error message including lower-cased string
+                # defined in MessagesOf constant
+                next unless q.include?(r)
+                e['reason'] = p
+                throw :DETECT_REASON
+              end
+            end
+          end
         end
-
         return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'amavisd-new: https://www.amavis.org/'; end
     end
   end
 end

data/lib/sisimai/lhost/amazonses.rb

@@ -15,26 +15,11 @@ module Sisimai::Lhost
       }.freeze
       MessagesOf = { 'expired' => ['Delivery expired'] }.freeze
 
-      def description; return 'Amazon SES(Sending): https://aws.amazon.com/ses/'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-
-      # 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
-      def headerlist;  return %w[x-aws-outgoing x-ses-outgoing x-amz-sns-message-id]; end
-
       # Parse bounce messages from Amazon SES
-      # @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)
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
         recipients = 0  # (Integer) The number of 'Final-Recipient' header
@@ -64,7 +49,6 @@ module Sisimai::Lhost
             # Find JSON string from the message body
             next if e.empty?
             break if e == '--'
-            break if e == '__END_OF_EMAIL_MESSAGE__'
 
             # The line starts with " ", continued from !\n.
             e.lstrip! if foldedline
@@ -198,7 +182,7 @@ module Sisimai::Lhost
               v['status']    = Sisimai::SMTP::Status.find(v['diagnosis']) || ''
               v['replycode'] = Sisimai::SMTP::Reply.find(v['diagnosis'])  || ''
               v['reason']    = 'delivered'
-              v['action']    = 'deliverable'
+              v['action']    = 'delivered'
 
               v['date'] = o['timestamp'] || p['mail']['timestamp']
               v['date'].sub!(/[.]\d+Z\z/, '')
@@ -210,7 +194,6 @@ module Sisimai::Lhost
           end
           return nil unless recipients > 0
 
-          dscontents.each { |e| e['agent'] = self.smtpagent }
           if p['mail']['headers']
             # "headersTruncated":false,
             # "headers":[ { ...
@@ -236,6 +219,10 @@ module Sisimai::Lhost
           # :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']
@@ -325,9 +312,7 @@ module Sisimai::Lhost
             e['lhost'] ||= permessage['rhost']
             permessage.each_key { |a| e[a] ||= permessage[a] || '' }
 
-            e['agent'] = self.smtpagent
             e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'].to_s.tr("\n", ' '))
-
             if e['status'].to_s.start_with?('5.0.0', '5.1.0', '4.0.0', '4.1.0')
               # Get other D.S.N. value from the error message
               errormessage = e['diagnosis']
@@ -350,7 +335,8 @@ module Sisimai::Lhost
           return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
         end # END of a parser for email message
 
-      end # END of def make()
+      end
+      def description; return 'Amazon SES(Sending): https://aws.amazon.com/ses/'; end
     end
   end
 end

data/lib/sisimai/lhost/amazonworkmail.rb

@@ -11,29 +11,15 @@ module Sisimai::Lhost
       ReBackbone = %r|^content-type:[ ]message/rfc822|.freeze
       StartingOf = { message: ['Technical report:'] }.freeze
 
-      def description; return 'Amazon WorkMail: https://aws.amazon.com/workmail/'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-
-      # X-Mailer: Amazon WorkMail
-      # X-Original-Mailer: Amazon WorkMail
-      # X-Ses-Outgoing: 2016.01.14-54.240.27.159
-      def headerlist;  return %w[x-ses-outgoing x-original-mailer]; end
-
       # Parse bounce messages from Amazon WorkMail
-      # @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/Delivery[_ ]Status[_ ]Notification[_ ].+Failure/,
-        # :'received' => %r/.+[.]smtp-out[.].+[.]amazonses[.]com\b/,
-        # :'x-mailer' => %r/\AAmazon WorkMail\z/,
+        # X-Mailer: Amazon WorkMail
+        # X-Original-Mailer: Amazon WorkMail
+        # X-Ses-Outgoing: 2016.01.14-54.240.27.159
         match = 0
         xmail = mhead['x-original-mailer'] || mhead['x-mailer'] || ''
 
@@ -133,14 +119,12 @@ module Sisimai::Lhost
             # <421 4.4.2 Connection timed out>
             e['replycode'] = cv[1]
           end
-
           e['reason'] ||= Sisimai::SMTP::Status.name(e['status']) || ''
-          e['agent']    = self.smtpagent
         end
 
         return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'Amazon WorkMail: https://aws.amazon.com/workmail/'; end
     end
   end
 end