sisimai 4.18.1 → 4.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05d5dfaa42ebfce199971de5fdfb142f919808e2
-  data.tar.gz: 6a717982fc25ecd357cc4b72a5d4f400b9e05c9a
+  metadata.gz: 86487325ab861bea9bb3cb7a20682bde85aafb3c
+  data.tar.gz: 57a722c34477947dcf2d899c4b5ff3a3bcf76bc1
 SHA512:
-  metadata.gz: 994d8b5dbce9175cca99fb3e47c5c467103a1dd0e36fe0f2e7754f4c44ebb6061171e3dfcb002874ccda24f8cdbb28e1033da4f123bea19c60d147ddf06ea72b
-  data.tar.gz: df977c81396ae06119e05995a76a9a5e9d8e3fbaadff0102ec1a5c9274f9e5d64866f62b7caabb5684bb6dbc691a425a023206c79915f179112c87767797ae0f
+  metadata.gz: f0f428825f76e9746aacfe0db95eab9f9540cb85ebda8557a13794178c6932f9ebd578a7d13948c1a3d4f859fd77bcd36ffef9e00e89e3ca98cc3369f8409180
+  data.tar.gz: 632fb856aac2a29bfd99ba5a7db435d3c33fb6ed0b2b7259c6c299ef0c050eef42ef702e986a903c83ff77f92e7d76c2b2c6b3268c5fb97cf22bd458912d51f3

data/ANALYTICAL-PRECISION

@@ -6,7 +6,7 @@ MTA::ApacheJames ........    0/0006  0.0000  Java Apache Mail Enterprise Server
 MTA::Courier ............   14/0016  0.8750  Courier MTA
 MTA::Domino .............    6/0015  0.4000  IBM Domino Server
 MTA::Exchange2003 .......    1/0051  0.0196  Microsoft Exchange Server 2003
-MTA::Exchange2007 .......    4/0006  0.6667  Microsoft Exchange Server 2007
+MTA::Exchange2007 .......    5/0007  0.7143  Microsoft Exchange Server 2007
 MTA::Exim ...............  144/0174  0.8276  Exim
 MTA::IMailServer ........    0/0045  0.0000  IPSWITCH IMail Server
 MTA::InterScanMSS .......    0/0009  0.0000  Trend Micro InterScan Messaging Security Suite
@@ -17,8 +17,8 @@ MTA::McAfee .............    0/0010  0.0000  McAfee Email Appliance
 MTA::MessagingServer ....   19/0022  0.8636  Oracle Communications Messaging Server
 MTA::Notes ..............    0/0012  0.0000  Lotus Notes
 MTA::OpenSMTPD ..........    5/0023  0.2174  OpenSMTPD
-MTA::Postfix ............  165/0183  0.9016  Postfix
-MTA::Sendmail ...........  330/0252  1.0000  V8Sendmail: /usr/sbin/sendmail
+MTA::Postfix ............  171/0189  0.9048  Postfix
+MTA::Sendmail ...........  331/0253  1.0000  V8Sendmail: /usr/sbin/sendmail
 MTA::SurfControl ........    6/0008  0.7500  WebSense SurfControl
 MTA::V5sendmail .........    0/0386  0.0000  Sendmail version 5
 MTA::X1 .................    0/0007  0.0000  Unknown MTA #1
@@ -27,7 +27,7 @@ MTA::X3 .................    0/0012  0.0000  Unknown MTA #3
 MTA::X4 .................    0/0029  0.0000  Unknown MTA #4 qmail clones
 MTA::X5 .................    3/0003  1.0000  Unknown MTA #5
 MTA::mFILTER ............    0/0009  0.0000  Digital Arts m-FILTER
-MTA::qmail ..............   52/0078  0.6667  qmail
+MTA::qmail ..............   52/0082  0.6341  qmail
 MSP::DE::EinsUndEins ....    0/0003  0.0000  1&1: http://www.1and1.de
 MSP::DE::GMX ............    0/0010  0.0000  GMX: http://www.gmx.net
 MSP::JP::Biglobe ........    5/0007  0.7143  BIGLOBE: http://www.biglobe.ne.jp
@@ -36,7 +36,7 @@ MSP::JP::KDDI ...........    6/0006  1.0000  au by KDDI: http://www.au.kddi.com
 MSP::RU::MailRu .........    4/0014  0.2857  @mail.ru: https://mail.ru
 MSP::RU::Yandex .........    4/0007  0.5714  Yandex.Mail: http://www.yandex.ru
 MSP::UK::MessageLabs ....    2/0002  1.0000  Symantec.cloud http://www.messagelabs.com
-MSP::US::AmazonSES ......   18/0018  1.0000  Amazon SES(Sending): http://aws.amazon.com/ses/
+MSP::US::AmazonSES ......   22/0022  1.0000  Amazon SES(Sending): http://aws.amazon.com/ses/
 MSP::US::AmazonWorkMail .    8/0012  0.6667  Amazon WorkMail: https://aws.amazon.com/workmail/
 MSP::US::Aol ............   18/0021  0.8571  Aol Mail: http://www.aol.com
 MSP::US::Bigfoot ........    2/0002  1.0000  Bigfoot: http://www.bigfoot.com
@@ -50,8 +50,8 @@ MSP::US::Verizon ........    3/0003  1.0000  Verizon Wireless: http://www.verizo
 MSP::US::Yahoo ..........    0/0009  0.0000  Yahoo! MAIL: https://www.yahoo.com
 MSP::US::Zoho ...........    0/0011  0.0000  Zoho Mail: https://www.zoho.com
 ARF .....................    9/0050  0.1800  Abuse Feedback Reporting Format
-RFC3464 .................  135/0276  0.4891  Fallback Module for MTAs
-RFC3834 .................    0/0004  0.0000  Detector for auto replied message
+RFC3464 .................  136/0277  0.4910  Fallback Module for MTAs
+RFC3834 .................    0/0006  0.0000  Detector for auto replied message
 -------------------------------------------------------------------------------
- bounceHammer 2.7.13p3    1188/2159  0.5503
- Sisimai 4.18.1           2159/2159  1.0000
+ bounceHammer 2.7.13p3    1201/2178  0.5514
+ Sisimai 4.19.0           2178/2178  1.0000

data/Changes

@@ -1,5 +1,13 @@
 Revision history for Ruby version of Sisimai
 
+4.19.0  Tue, 18 Oct 2016 14:19:10 +0900 (JST)
+    - Implement a callback feature at Sisimai.make and Sisimai.dump methods.
+      More imformation about the feature are available at the following pages:
+      - http://libsisimai.org/en/usage#callback
+      - http://libsisimai.org/ja/usage#callback
+    - Implement Sisimai.match() method: issue #52.
+    - Minor bug fix in Sisimai::MSP::US::AmazonSES.scan() method.
+
 4.18.1  Sun, 11 Sep 2016 20:05:20 +0900 (JST)
     - Fix bug in Sisimai::Mail::STDIN.read() method reported at issue #61.
       Thanks to @yaegassy.

data/README-JA.md

@@ -127,6 +127,35 @@ puts Sisimai.dump('/path/to/mbox', delivered: true)
 [{"recipient": "kijitora@example.jp", "addresser": "shironeko@1jo.example.org", "feedbacktype": "", "action": "failed", "subject": "Nyaaaaan", "smtpcommand": "DATA", "diagnosticcode": "550 Unknown user kijitora@example.jp", "listid": "", "destination": "example.jp", "smtpagent": "Courier", "lhost": "1jo.example.org", "deliverystatus": "5.0.0", "timestamp": 1291954879, "messageid": "201012100421.oBA4LJFU042012@1jo.example.org", "diagnostictype": "SMTP", "timezoneoffset": "+0900", "reason": "filtered", "token": "ce999a4c869e3f5e4d8a77b2e310b23960fb32ab", "alias": "", "senderdomain": "1jo.example.org", "rhost": "mfsmax.example.jp"}, {"diagnostictype": "SMTP", "timezoneoffset": "+0900", "reason": "userunknown", "timestamp": 1381900535, "messageid": "E1C50F1B-1C83-4820-BC36-AC6FBFBE8568@example.org", "token": "9fe754876e9133aae5d20f0fd8dd7f05b4e9d9f0", "alias": "", "senderdomain": "example.org", "rhost": "mx.bouncehammer.jp", "action": "failed", "addresser": "kijitora@example.org", "recipient": "userunknown@bouncehammer.jp", "feedbacktype": "", "smtpcommand": "DATA", "subject": "バウンスメールのテスト(日本語)", "destination": "bouncehammer.jp", "listid": "", "diagnosticcode": "550 5.1.1 <userunknown@bouncehammer.jp>... User Unknown", "deliverystatus": "5.1.1", "lhost": "p0000-ipbfpfx00kyoto.kyoto.example.co.jp", "smtpagent": "Sendmail"}]
 ```
 
+コールバック機能
+----------------
+Sisimai 4.19.0から、`Sisimai.make()`と`Sisimai.dump()`にLamda(Procオブジェクト)
+を引数`hook`に指定できるようになりました。`hook`に指定したコードによって処理さ
+れた結果は`Sisimai::Data.catch`メソッドで得ることができます。
+
+```ruby
+#! /usr/bin/env ruby
+require 'sisimai'
+callbackto = lambda do |v|
+  r = { 'x-mailer' => '' }
+
+  if cv = v['message'].match(/^X-Mailer:\s*(.+)$/)
+    r['x-mailer'] = cv[1]
+  end
+  return r
+end
+
+data = Sisimai.make('/path/to/mbox', hook: callbackto)
+json = Sisimai.dump('/path/to/mbox', hook: callbackto)
+
+puts data[0].catch['x-mailer']      # Apple Mail (2.1283)
+```
+
+コールバック機能のより詳細な使い方は
+[Sisimai | 解析方法 - コールバック機能](http://libsisimai.org/ja/usage/#callback)
+をご覧ください。
+
+
 ワンライナーで
 --------------
 
@@ -148,8 +177,8 @@ Perl版Sisimaiとの違い
 | メール解析速度(1000通のメール)              | 3.30秒         | 2.33秒        |
 | インストール方法                            | gem install    | cpanm         |
 | 依存モジュール数(コアモジュールを除く)      | 1モジュール    | 2モジュール   |
-| LOC:ソースコードの行数                      | 11600行        | 8500行        |
-| テスト件数(spec/,t/,xt/ディレクトリ)        | 97000件        | 177000件      |
+| LOC:ソースコードの行数                      | 11700行        | 8600行        |
+| テスト件数(spec/,t/,xt/ディレクトリ)        | 103800件       | 184100件      |
 | ライセンス                                  | 二条項BSD      | 二条項BSD     |
 | 開発会社によるサポート契約                  | 準備中         | 提供中        |
 

data/README.md

@@ -126,6 +126,35 @@ puts Sisimai.dump('/path/to/mbox', delivered: true)
 [{"recipient": "kijitora@example.jp", "addresser": "shironeko@1jo.example.org", "feedbacktype": "", "action": "failed", "subject": "Nyaaaaan", "smtpcommand": "DATA", "diagnosticcode": "550 Unknown user kijitora@example.jp", "listid": "", "destination": "example.jp", "smtpagent": "Courier", "lhost": "1jo.example.org", "deliverystatus": "5.0.0", "timestamp": 1291954879, "messageid": "201012100421.oBA4LJFU042012@1jo.example.org", "diagnostictype": "SMTP", "timezoneoffset": "+0900", "reason": "filtered", "token": "ce999a4c869e3f5e4d8a77b2e310b23960fb32ab", "alias": "", "senderdomain": "1jo.example.org", "rhost": "mfsmax.example.jp"}, {"diagnostictype": "SMTP", "timezoneoffset": "+0900", "reason": "userunknown", "timestamp": 1381900535, "messageid": "E1C50F1B-1C83-4820-BC36-AC6FBFBE8568@example.org", "token": "9fe754876e9133aae5d20f0fd8dd7f05b4e9d9f0", "alias": "", "senderdomain": "example.org", "rhost": "mx.bouncehammer.jp", "action": "failed", "addresser": "kijitora@example.org", "recipient": "userunknown@bouncehammer.jp", "feedbacktype": "", "smtpcommand": "DATA", "subject": "バウンスメールのテスト(日本語)", "destination": "bouncehammer.jp", "listid": "", "diagnosticcode": "550 5.1.1 <userunknown@bouncehammer.jp>... User Unknown", "deliverystatus": "5.1.1", "lhost": "p0000-ipbfpfx00kyoto.kyoto.example.co.jp", "smtpagent": "Sendmail"}]
 ```
 
+Callback Feature
+----------------
+Beginning with Sisimai 4.19.0, `make()` and `dump()` methods of Sisimai accept
+a Lambda (Proc object) in `hook` argument for setting a callback method and
+getting the results generated by the method via `Sisimai::Data.catch` method.
+
+```ruby
+#! /usr/bin/env ruby
+require 'sisimai'
+callbackto = lambda do |v|
+  r = { 'x-mailer' => '' }
+
+  if cv = v['message'].match(/^X-Mailer:\s*(.+)$/)
+    r['x-mailer'] = cv[1]
+  end
+  return r
+end
+
+data = Sisimai.make('/path/to/mbox', hook: callbackto)
+json = Sisimai.dump('/path/to/mbox', hook: callbackto)
+
+puts data[0].catch['x-mailer']      # Apple Mail (2.1283)
+```
+
+More information about the callback feature is available at
+[Sisimai | How To Parse - Callback](http://libsisimai.org/en/usage/#callback)
+Page.
+
+
 One-Liner
 ---------
 
@@ -147,9 +176,9 @@ and bounceHammer are available at
 | Analytical precision ratio(2000 emails)[1]  | 1.00           | 1.00          |
 | The speed of parsing email(1000 emails)     | 3.30s          | 2.33s         |
 | How to install                              | gem install    | cpanm         |
-| Dependencies (Except core modules)          | 1 modules      | 2 modules     |
-| LOC:Source lines of code                    | 11600 lines    | 8500 lines    |
-| The number of tests(spec/,t/,xt/) directory | 97000 tests    | 177000 tests  |
+| Dependencies (Except core modules)          | 1 module       | 2 modules     |
+| LOC:Source lines of code                    | 11750 lines    | 8600 lines    |
+| The number of tests(spec/,t/,xt/) directory | 103800 tests   | 184100 tests  |
 | License                                     | BSD 2-Clause   | BSD 2-Clause  |
 | Support Contract provided by Developer      | Coming soon    | Available     |
 

data/lib/sisimai.rb

@@ -16,6 +16,7 @@ module Sisimai
     # @param         [String] path       Path to mbox or Maildir/
     # @param         [Hash]  argvs       Parser options(delivered=false)
     # @options argvs [Boolean] delivered true: Include "delivered" reason
+    # @options argvs [Lambda]  hook      Lambda object to be called back
     # @return        [Array]             Parsed objects
     # @return        [nil]               nil if the argument was wrong or an empty array
     def make(path, **argvs)
@@ -24,17 +25,19 @@ module Sisimai
       require 'sisimai/mail'
       mail = Sisimai::Mail.new(path)
       list = []
-      opts = argvs[:delivered] || false
 
       return nil unless mail
       require 'sisimai/data'
       require 'sisimai/message'
 
+      methodargv = { :delivered => argvs[:delivered] || false }
+      hookmethod = argvs[:hook] || nil
+
       while r = mail.read do
         # Read and parse each mail file
-        mesg = Sisimai::Message.new(data: r)
+        mesg = Sisimai::Message.new(data: r, hook: hookmethod)
         next if mesg.void
-        data = Sisimai::Data.make(data: mesg, delivered: opts)
+        data = Sisimai::Data.make(data: mesg, delivered: methodargv)
         next unless data
         list.concat(data) if data.size > 0
       end
@@ -47,18 +50,19 @@ module Sisimai
     # @param         [String] path       Path to mbox or Maildir/
     # @param         [Hash] argvs        Parser options
     # @options argvs [Integer] delivered true: Include "delivered" reason
+    # @options argvs [Lambda]  hook      Lambda object to be called back
     # @return        [String]            Parsed data as JSON text
     def dump(path, **argvs)
       return nil unless path
 
-      parseddata = Sisimai.make(path, argvs) || []
+      nyaan = Sisimai.make(path, argvs) || []
       if RUBY_PLATFORM =~ /java/
         # java-based ruby environment like JRuby.
         require 'jrjackson'
-        jsonstring = JrJackson::Json.dump(parseddata)
+        jsonstring = JrJackson::Json.dump(nyaan)
       else
         require 'oj'
-        jsonstring = Oj.dump(parseddata, :mode => :compat)
+        jsonstring = Oj.dump(nyaan, :mode => :compat)
       end
       return jsonstring
     end
@@ -104,11 +108,20 @@ module Sisimai
         # Call .description() method of Sisimai::Reason::*
         r = 'Sisimai::Reason::' + e
         require r.gsub('::', '/').downcase
-        table[r.to_sym] = Module.const_get(r).send(:description)
+        table[e.to_sym] = Module.const_get(r).send(:description)
       end
 
       return table
     end
+
+    # Try to match with message patterns
+    # @param    [String]    Error message text
+    # @return   [String]    Reason text
+    def match(argvs = '')
+      return nil if argvs.empty?
+      require 'sisimai/reason'
+      return Sisimai::Reason.match(argvs)
+    end
   end
 end
 

data/lib/sisimai/data.rb

@@ -14,6 +14,7 @@ module Sisimai
     require 'sisimai/datetime'
 
     @@rwaccessors = [
+      :catch,           # [?] Results generated by hook method
       :token,           # [String] Message token/MD5 Hex digest value
       :lhost,           # [String] local host name/Local MTA
       :rhost,           # [String] Remote host name/Remote MTA
@@ -83,6 +84,7 @@ module Sisimai
       @timezoneoffset = argvs['timezoneoffset'] || '+0000'
       @lhost          = argvs['lhost']          || ''
       @rhost          = argvs['rhost']          || ''
+      @catch          = argvs['catch']          || nil
       @reason         = argvs['reason']         || ''
       @listid         = argvs['listid']         || ''
       @subject        = argvs['subject']        || ''
@@ -148,6 +150,7 @@ module Sisimai
         o = nil # Sisimai::Data Object
         r = nil # Reason text
         p = {
+          'catch'          => messageobj.catch  || nil,
           'lhost'          => e['lhost']        || '',
           'rhost'          => e['rhost']        || '',
           'alias'          => e['alias']        || '',

data/lib/sisimai/message.rb

@@ -17,6 +17,7 @@ module Sisimai
       :header,  # [Hash]   Header part of a email
       :ds,      # [Array]  Parsed data by Sisimai::MTA::*
       :rfc822,  # [Hash]   Header part of the original message
+      :catch,   # [?]      The results returned by hook method
     ]
     @@rwaccessors.each { |e| attr_accessor e }
 
@@ -41,7 +42,10 @@ module Sisimai
     # Constructor of Sisimai::Message
     # @param         [String] data      Email text data
     # @param         [Hash] argvs       Module to be loaded
-    # @options argvs [String] data      Entire email message
+    # @options argvs [String] :data     Entire email message
+    # @options argvs [Array]  :load     User defined MTA module list
+    # @options argvs [Array]  :order    The order of MTA modules
+    # @options argvs [Code]   :hook     Reference to callback method
     # @return        [Sisimai::Message] Structured email data or Undef if each
     #                                   value of the arguments are missing
     def initialize(data: '', **argvs)
@@ -50,9 +54,9 @@ module Sisimai
       email = data
       email = email.scrub('?')
       email = email.gsub("\r\n", "\n")
-      methodargv = { 'data' => email }
+      methodargv = { 'data' => email, 'hook' => argvs[:hook] || nil }
 
-      [:'load', :'order'].each do |e|
+      [:load, :order].each do |e|
         # Order of MTA, MSP modules
         next unless argvs.key?(e)
         next unless argvs[e].is_a? Array
@@ -68,6 +72,7 @@ module Sisimai
       @header = parameters['header']
       @ds     = parameters['ds']
       @rfc822 = parameters['rfc822']
+      @catch  = parameters['catch'] || nil
     end
 
     # Check whether the object has valid content or not
@@ -80,11 +85,22 @@ module Sisimai
     # Make data structure from the email message(a body part and headers)
     # @param         [Hash] argvs   Email data
     # @options argvs [String] data  Entire email message
+    # @options argvs [Array]  load  User defined MTA module list
+    # @options argvs [Array]  order The order of MTA modules
+    # @options argvs [Code]   hook  Reference to callback method
     # @return        [Hash]         Resolved data structure
     def self.make(argvs)
       email = argvs['data']
 
       processing = { 'from' => '', 'header' => {}, 'rfc822' => '', 'ds' => [] }
+      hookmethod = argvs['hook'] || nil
+      processing = {
+        'from'   => '',  # From_ line
+        'header' => {},  # Email header
+        'rfc822' => '',  # Original message part
+        'ds'     => [],  # Parsed data, Delivery Status
+        'catch'  => nil, # Data parsed by callback method
+      }
       mtamodules = []
       extheaders = ExtHeaders
       tobeloaded = []
@@ -124,11 +140,11 @@ module Sisimai
         tobeloaded << e
       end
 
-      # 0. Split email data to headers and a body part.
+      # 1. Split email data to headers and a body part.
       aftersplit = Sisimai::Message.divideup(email)
       return nil if aftersplit.empty?
 
-      # 1. Convert email headers from text to hash reference
+      # 2. Convert email headers from text to hash reference
       headerargv['extheaders'] = extheaders
       headerargv['tryonfirst'] = []
       processing['from']   = aftersplit['from']
@@ -141,6 +157,7 @@ module Sisimai
 
       # 4. Rewrite message body for detecting the bounce reason
       methodargv = {
+        'hook' => hookmethod,
         'mail' => processing,
         'body' => aftersplit['body'],
         'tryonfirst' => headerargv['tryonfirst'],
@@ -150,7 +167,8 @@ module Sisimai
 
       return nil unless bouncedata
       return nil if bouncedata.empty?
-      processing['ds'] = bouncedata['ds']
+      processing['ds']    = bouncedata['ds']
+      processing['catch'] = bouncedata['catch']
 
       # 5. Rewrite headers of the original message in the body part
       rfc822part = bouncedata['rfc822']
@@ -396,6 +414,8 @@ module Sisimai
     def self.parse(argvs)
       mesgentity = argvs['mail']
       bodystring = argvs['body']
+      hookmethod = argvs['hook'] || nil
+      havacaught = nil
       tryonfirst = argvs['tryonfirst'] || []
       tobeloaded = argvs['tobeloaded'] || []
       mailheader = mesgentity['header']
@@ -450,6 +470,17 @@ module Sisimai
         end
       end
 
+      # Call the hook method
+      if hookmethod.is_a? Proc
+        # Execute hook method
+        begin
+          p = { 'headers' => mailheader, 'message' => bodystring }
+          havecaught = hookmethod.call(p)
+        rescue StandardError => ce
+          warn sprintf(" ***warning: Something is wrong in hook method :%s", ce.to_s)
+        end
+      end
+
       # EXPAND_FORWARDED_MESSAGE:
       # Check whether or not the message is a bounce mail.
       # Pre-Process email body if it is a forwarded bounce message.
@@ -537,6 +568,8 @@ module Sisimai
           break
         end
       end
+
+      scannedset['catch'] = havecaught if scannedset
       return scannedset
     end
 

data/lib/sisimai/mime.rb

@@ -29,17 +29,17 @@ module Sisimai
         return false unless argv1
 
         argv1 = argv1.delete('"')
-        parts = []
+        piece = []
         isnot = false
 
         if argv1 =~ /[ ]/
           # Multiple MIME-Encoded strings in a line
-          parts = argv1.split(' ')
+          piece = argv1.split(' ')
         else
-          parts << argv1
+          piece << argv1
         end
 
-        parts.each do |e|
+        piece.each do |e|
           # Check all the string in the array
           next if e =~ /[ \t]*=[?][-_0-9A-Za-z]+[?][BbQq][?].+[?]=?[ \t]*\z/
           isnot = true
@@ -224,7 +224,7 @@ module Sisimai
         return nil unless argv1
         value = ''
 
-        if cv = argv1.match(/\bboundary=([^ ]+)/)
+        if cv = argv1.match(/\bboundary=([^ ]+)/i)
           # Content-Type: multipart/mixed; boundary=Apple-Mail-5--931376066
           # Content-Type: multipart/report; report-type=delivery-status;
           #    boundary="n6H9lKZh014511.1247824040/mx.example.jp"

data/lib/sisimai/msp/us/amazonses.rb

@@ -10,12 +10,17 @@ module Sisimai
         require 'sisimai/rfc5322'
 
         # http://aws.amazon.com/ses/
+        ReE = { :'x-mailer' => %r/Amazon[ ]WorkMail/ }
         Re0 = {
           :from    => %r/\AMAILER-DAEMON[@]email[-]bounces[.]amazonses[.]com\z/,
           :subject => %r/\ADelivery Status Notification [(]Failure[)]\z/,
         }
         Re1 = {
-          :begin   => %r/\AThe following message to [<]/,
+          :begin   => %r/\A(?:
+               The[ ]following[ ]message[ ]to[ ][<]
+              |An[ ]error[ ]occurred[ ]while[ ]trying[ ]to[ ]deliver[ ]the[ ]mail[ ]
+              )
+          /x,
           :rfc822  => %r|\Acontent-type: message/rfc822\z|,
           :endof   => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
         }
@@ -30,7 +35,8 @@ module Sisimai
         # 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
-        def headerlist;  return ['X-AWS-Outgoing']; end
+        # X-SES-Outgoing: 2016.10.12-54.240.27.6
+        def headerlist;  return ['X-AWS-Outgoing', 'X-SES-Outgoing']; end
         def pattern;     return Re0; end
 
         # Parse bounce messages from Amazon SES
@@ -47,7 +53,14 @@ module Sisimai
         def scan(mhead, mbody)
           return nil unless mhead
           return nil unless mbody
-          return nil unless mhead['x-aws-outgoing']
+
+          match = 0
+          xmail = mhead['x-mailer'] || ''
+
+          return nil if mhead['x-mailer'] =~ ReE[:'x-mailer']
+          match += 1 if mhead['x-aws-outgoing']
+          match += 1 if mhead['x-ses-outgoing']
+          return nil if match == 0
 
           dscontents = [Sisimai::MSP.DELIVERYSTATUS]
           hasdivided = mbody.split("\n")
@@ -168,7 +181,7 @@ module Sisimai
                 #
                 # Reporting-MTA: dns; a192-79.smtp-out.amazonses.com
                 #
-                if cv = e.match(/\A[Rr]eporting-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
+                if cv = e.match(/\A[Rr]eporting-MTA:[ ]*[DNSdns]+;[ ]*(.+)\z/)
                   # Reporting-MTA: dns; mx.example.jp
                   next if connheader['lhost'].size > 0
                   connheader['lhost'] = cv[1].downcase