sisimai 4.25.5-java → 4.25.11-java

data/README.md

@@ -1,9 +1,9 @@
 ![](https://libsisimai.org/static/images/logo/sisimai-x01.png)
 
-[![License](https://img.shields.io/badge/license-BSD%202--Clause-orange.svg)](https://github.com/sisimai/rb-Sisimai/blob/master/LICENSE)
-[![Coverage Status](https://img.shields.io/coveralls/sisimai/rb-Sisimai.svg)](https://coveralls.io/r/sisimai/rb-Sisimai)
-[![Build Status](https://travis-ci.org/sisimai/rb-Sisimai.svg?branch=master)](https://travis-ci.org/sisimai/rb-Sisimai) 
-[![Codacy Badge](https://api.codacy.com/project/badge/grade/38340177e6284a65be69c0c7c3dc2b58)](https://www.codacy.com/app/azumakuniyuki/rb-Sisimai)
+[![License](https://img.shields.io/badge/license-BSD%202--Clause-orange.svg)](https://github.com/sisimai/rb-sisimai/blob/master/LICENSE)
+[![Coverage Status](https://img.shields.io/coveralls/sisimai/rb-sisimai.svg)](https://coveralls.io/r/sisimai/rb-sisimai)
+[![Build Status](https://travis-ci.org/sisimai/rb-sisimai.svg?branch=master)](https://travis-ci.org/sisimai/rb-sisimai) 
+[![Codacy Badge](https://api.codacy.com/project/badge/grade/38340177e6284a65be69c0c7c3dc2b58)](https://www.codacy.com/app/azumakuniyuki/rb-sisimai)
 [![Ruby](https://img.shields.io/badge/ruby-v2.1.0--v2.6.0-red.svg)](https://www.ruby-lang.org/)
 [![Gem Version](https://badge.fury.io/rb/sisimai.svg)](https://badge.fury.io/rb/sisimai)
 
@@ -39,7 +39,7 @@ What is Sisimai
 ===============================================================================
 Sisimai is a Ruby library for analyzing RFC5322 bounce emails and generating
 structured data from parsed results. The Ruby version of Sisimai is ported from
-the Perl version of Sisimai at [github.com/sisimai/p5-Sisimai](https://github.com/sisimai/p5-Sisimai/).
+the Perl version of Sisimai at [github.com/sisimai/p5-sisimai](https://github.com/sisimai/p5-sisimai/).
 
 ![](https://libsisimai.org/static/images/figure/sisimai-overview-1.png)
 
@@ -52,15 +52,14 @@ Key Features
   * git clone & make
 * __High Precision of Analysis__
   * 2 times higher than bounceHammer
-  * Support 24 known MTAs and 5 unknown MTAs
-  * Support 22 major MSPs(Mail Service Providers)
+  * Support 68 MTAs/MDAs/ESPs
   * Support Feedback Loop Message(ARF)
   * Can detect 29 error reasons
 
 Command line demo
 -------------------------------------------------------------------------------
 The following screen shows a demonstration of Sisimai at the command line using
-Ruby(rb-Sisimai) and Perl(p5-Sisimai) version of Sisimai.
+Ruby(rb-sisimai) and Perl(p5-sisimai) version of Sisimai.
 ![](https://libsisimai.org/static/images/demo/sisimai-dump-01.gif)
 
 Setting Up Sisimai
@@ -95,8 +94,8 @@ Done installing documentation for sisimai after 6 seconds
 
 ```shell
 $ cd /usr/local/src
-$ git clone https://github.com/sisimai/rb-Sisimai.git
-$ cd ./rb-Sisimai
+$ git clone https://github.com/sisimai/rb-sisimai.git
+$ cd ./rb-sisimai
 $ sudo make depend install-from-local
 gem install bundle rake rspec coveralls
 ...
@@ -112,7 +111,9 @@ Usage
 Basic usage
 -------------------------------------------------------------------------------
 `make()` method provides feature for getting parsed data from bounced email 
-messages like following.
+messages like following. Beginning with v4.25.6, new accessor `origin` which
+keeps the path to email file as a data source is available.
+
 
 ```ruby
 #! /usr/bin/env ruby
@@ -140,6 +141,7 @@ if v.is_a? Array
     puts e.deliverystatus       # 5.1.1
     puts e.replycode            # 550
     puts e.reason               # userunknown
+    puts e.origin               # /var/spool/bounce/Maildir/new/1740074341.eml
 
     h = e.damn                  # Convert to HASH
     j = e.dump('json')          # Convert to JSON string
@@ -180,9 +182,8 @@ callbackto = lambda do |v|
   return r
 end
 
-list = ['X-Mailer']
-data = Sisimai.make('/path/to/mbox', hook: callbackto, field: list)
-json = Sisimai.dump('/path/to/mbox', hook: callbackto, field: list)
+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)
 ```
@@ -203,7 +204,7 @@ Output example
 ![](https://libsisimai.org/static/images/demo/sisimai-dump-02.gif)
 
 ```json
-[{"action": "failed", "subject": "Nyaan", "catch": null, "token": "08acf78323edc7923a783c04749dd547ab45c433", "alias": "", "messageid": "201806090556.w595u8GZ093276@neko.example.jp", "listid": "", "smtpcommand": "MAIL", "smtpagent": "Email::Sendmail", "lhost": "localhost", "timezoneoffset": "+0900", "feedbacktype": "", "senderdomain": "neko.example.jp", "diagnostictype": "SMTP", "softbounce": 1, "deliverystatus": "5.0.0", "addresser": "kijitora@neko.example.jp", "diagnosticcode": "550 Unauthenticated senders not allowed", "timestamp": 1528523769, "destination": "example.com", "recipient": "sironeko@example.com", "reason": "securityerror", "replycode": "550", "rhost": "neko.example.jp"}]
+[{"catch":{"x-mailer":"","return-path":"<shironeko@mx.example.co.jp>"},"token":"cf17945938502bd876603a375f0e9517c921bbab","lhost":"localhost","rhost":"mx-s.neko.example.jp","alias":"","listid":"","reason":"hasmoved","action":"failed","origin":"set-of-emails/maildir/bsd/lhost-sendmail-22.eml","subject":"Nyaaaan","messageid":"0000000011111.fff0000000003@mx.example.co.jp","replycode":"","smtpagent":"Sendmail","softbounce":0,"smtpcommand":"DATA","destination":"example.net","senderdomain":"example.co.jp","feedbacktype":"","diagnosticcode":"450 busy - please try later 551 not our customer 503 need RCPT command [data]","diagnostictype":"SMTP","deliverystatus":"5.1.6","timezoneoffset":"+0900","addresser":"shironeko@example.co.jp","recipient":"kijitora@example.net","timestamp":1397054085}]
 ```
 
 Sisimai Specification
@@ -224,12 +225,12 @@ and bounceHammer are available at
 | The speed of parsing email(1000 emails)     | 2.22s[2]       | 1.35s         |
 | How to install                              | gem install    | cpanm, cpm    |
 | Dependencies (Except core modules)          | 1 module       | 2 modules     |
-| LOC:Source lines of code                    | 10300 lines    | 7100 lines    |
-| The number of tests(spec/,t/,xt/) directory | 230000 tests   | 250000 tests  |
+| LOC:Source lines of code                    | 10300 lines    | 10500 lines   |
+| The number of tests(spec/,t/,xt/) directory | 236000 tests   | 265000 tests  |
 | License                                     | BSD 2-Clause   | BSD 2-Clause  |
 | Support Contract provided by Developer      | Available      | Available     |
 
-1. See [./ANALYTICAL-PRECISION](https://github.com/sisimai/rb-Sisimai/blob/master/ANALYTICAL-PRECISION)
+1. See [./ANALYTICAL-PRECISION](https://github.com/sisimai/rb-sisimai/blob/master/ANALYTICAL-PRECISION)
 2. Xeon E5-2640 2.5GHz x 2 cores | 5000 bogomips | 1GB RAM | Ruby 2.3.4p301
 
 Other specification of Sisimai
@@ -243,7 +244,7 @@ Contributing
 
 Bug report
 -------------------------------------------------------------------------------
-Please use the [issue tracker](https://github.com/sisimai/rb-Sisimai/issues)
+Please use the [issue tracker](https://github.com/sisimai/rb-sisimai/issues)
 to report any bugs.
 
 Emails could not be parsed
@@ -262,14 +263,14 @@ Related Sites
 * __libSISIMAI.ORG__ | [Sisimai | The successor to bounceHammer, Library to parse bounce mails](https://libsisimai.org/)
 * __Sisimai Blog__ | [blog.libsisimai.org](http://blog.libsisimai.org/)
 * __Facebook Page__ | [facebook.com/libsisimai](https://www.facebook.com/libsisimai/)
-* __GitHub__ | [github.com/sisimai/rb-Sisimai](https://github.com/sisimai/rb-Sisimai)
+* __GitHub__ | [github.com/sisimai/rb-sisimai](https://github.com/sisimai/rb-sisimai)
 * __RubyGems.org__ | [rubygems.org/gems/sisimai](https://rubygems.org/gems/sisimai)
-* __Perl verson__ | [Perl version of Sisimai](https://github.com/sisimai/p5-Sisimai)
+* __Perl verson__ | [Perl version of Sisimai](https://github.com/sisimai/p5-sisimai)
 * __Fixtures__ | [set-of-emails - Sample emails for "make test"](https://github.com/sisimai/set-of-emails)
 
 See also
 -------------------------------------------------------------------------------
-* [README-JA.md - README.md in Japanese(日本語)](https://github.com/sisimai/rb-Sisimai/blob/master/README-JA.md)
+* [README-JA.md - README.md in Japanese(日本語)](https://github.com/sisimai/rb-sisimai/blob/master/README-JA.md)
 * [RFC3463 - Enhanced Mail System Status Codes](https://tools.ietf.org/html/rfc3463)
 * [RFC3464 - An Extensible Message Format for Delivery Status Notifications](https://tools.ietf.org/html/rfc3464)
 * [RFC3834 - Recommendations for Automatic Responses to Electronic Mail](https://tools.ietf.org/html/rfc3834)

data/Repository.mk

@@ -1,4 +1,4 @@
-# rb-Sisimai/Repository.mk
+# rb-sisimai/Repository.mk
 #  ____                      _ _                               _    
 # |  _ \ ___ _ __   ___  ___(_) |_ ___  _ __ _   _   _ __ ___ | | __
 # | |_) / _ \ '_ \ / _ \/ __| | __/ _ \| '__| | | | | '_ ` _ \| |/ /

data/lib/sisimai.rb

@@ -1,10 +1,9 @@
-require 'sisimai/version'
-
 # Sisimai is the system formerly known as bounceHammer 4, is a Ruby module for
 # analyzing bounce mails and generate structured data in a JSON format (YAML is
 # also available if "YAML" module is installed on your system) from parsed bounce
 # messages. Sisimai is a coined word: Sisi (the number 4 is pronounced "Si" in
 # Japanese) and MAI (acronym of "Mail Analyzing Interface").
+require 'sisimai/version'
 module Sisimai
   # Imported from p5-Sisimail/lib/Sisimai.pm
   class << self
@@ -19,29 +18,24 @@ module Sisimai
     # @param         [Hash]   argv1      Parser options(delivered=false)
     # @options argv1 [Boolean] delivered true: Include "delivered" reason
     # @options argv1 [Lambda]  hook      Lambda object to be called back
-    # @options argv1 [Array]   field     Email header name to be captured
     # @return        [Array]             Parsed objects
     # @return        [nil]               nil if the argument was wrong or an empty array
     def make(argv0, **argv1)
       return nil unless argv0
-
-      field = argv1[:field] || []
-      raise ' ***error: "field" accepts an array only' unless field.is_a? Array
-
       require 'sisimai/data'
       require 'sisimai/message'
       require 'sisimai/mail'
 
       list = []
       return nil unless mail = Sisimai::Mail.new(argv0)
-      while r = mail.read do
-        # Read and parse each mail file
-        methodargv = { data: r, hook: argv1[:hook], field: field }
-        mesg = Sisimai::Message.new(methodargv)
+      while r = mail.data.read do
+        # Read and parse each email file
+        methodargv = { data: r, hook: argv1[:hook] }
+        mesg = Sisimai::Message.new(**methodargv)
         next if mesg.void
 
-        methodargv = { data: mesg, delivered: argv1[:delivered] }
-        next unless data = Sisimai::Data.make(methodargv)
+        methodargv = { data: mesg, delivered: argv1[:delivered], origin: mail.data.path }
+        next unless data = Sisimai::Data.make(**methodargv)
         list += data unless data.empty?
       end
 
@@ -60,7 +54,7 @@ module Sisimai
     def dump(argv0, **argv1)
       return nil unless argv0
 
-      nyaan = Sisimai.make(argv0, argv1) || []
+      nyaan = Sisimai.make(argv0, **argv1) || []
       if RUBY_PLATFORM.start_with?('java')
         # java-based ruby environment like JRuby.
         require 'jrjackson'

data/lib/sisimai/address.rb

@@ -240,7 +240,7 @@ module Sisimai
 
         # Remove angle brackets, other brackets, and quotations: []<>{}'`
         # except a domain part is an IP address like neko@[192.0.2.222]
-        e[:address] = e[:address].sub(/\A[\[<{('`]/, '').sub(/['`>})]\z/, '')
+        e[:address] = e[:address].sub(/\A[\[<{('`]/, '').sub(/[.'`>});]\z/, '')
         e[:address].chomp!(']') unless e[:address] =~ /[@]\[[0-9A-Za-z:\.]+\]\z/
         e[:address] = e[:address].sub(/\A["]/, '').chomp('"') unless e[:address] =~ /\A["].+["][@]/
 
@@ -321,13 +321,16 @@ module Sisimai
       addrs = Sisimai::Address.find(argv1)
       return nil unless addrs
       return nil if addrs.empty?
+
       thing = addrs.shift
+      heads = ['<']
+      tails = ['>', ',', '.', ';']
 
       if cv = thing[:address].match(/\A([^\s]+)[@]([^@]+)\z/) ||
               thing[:address].match(/\A(["].+?["])[@]([^@]+)\z/)
         # Get the local part and the domain part from the email address
-        lpart = cv[1]
-        dpart = cv[2]
+        lpart = cv[1]; heads.each { |e| lpart.gsub!(/\A#{e}/, '') if lpart.start_with?(e) }
+        dpart = cv[2]; tails.each { |e| dpart.gsub!(/#{e}\z/, '') if dpart.end_with?(e)   }        
         email = Sisimai::Address.expand_verp(thing[:address])
         aname = nil
 

data/lib/sisimai/arf.rb

@@ -14,28 +14,31 @@ module Sisimai
       # OpenDMARC 1.3.0 uses:  This is an authentication failure report for an email message received from IP
       # Abusix ARF uses        this is an autogenerated email abuse complaint regarding your network.
       Indicators = Sisimai::Lhost.INDICATORS
-      StartingOf = { rfc822: ['Content-Type: message/rfc822', 'Content-Type: text/rfc822-headers'] }.freeze
+      StartingOf = {
+        rfc822: ['Content-Type: message/rfc822', 'Content-Type: text/rfc822-headers'],
+        report: ['Content-Type: message/feedback-report'],
+      }.freeze
       MarkingsOf = {
         message: %r{\A(?>
-           [Tt]his[ ]is[ ].+[ ]email[ ]abuse[ ]report
-          |[Tt]his[ ]is[ ](?:
-             an[ ]autogenerated[ ]email[ ]abuse[ ]complaint
-            |an?[ ].+[ ]report[ ]for
-            |a[ ].+[ ]authentication[ -]failure[ ]report[ ]for
-            )
+          [Tt]his[ ]is[ ]a[ ][^ ]+[ ](?:email[ ])?[Aa]buse[ ][Rr]eport
+         |[Tt]his[ ]is[ ]an[ ]email[ ]abuse[ ]report
+         |[Tt]his[ ]is[ ](?:
+            a[ ][^ ]+[ ]authentication[ -]failure[ ]report
+           |an[ ]authentication[ -]failure[ ]report
+           |an[ ]autogenerated[ ]email[ ]abuse[ ]complaint
+           |an?[ ][^ ]+[ ]report[ ]for
+           )
           )
         }x,
       }.freeze
+      ReportFrom = /(?:staff[@]hotmail[.]com|complaints[@]email-abuse[.]amazonses[.]com)\z/.freeze
       LongFields = Sisimai::RFC5322.LONGFIELDS
       RFC822Head = Sisimai::RFC5322.HEADERFIELDS
 
       def description; return 'Abuse Feedback Reporting Format'; end
-      def smtpagent;   return 'FeedBack-Loop'; end
-      def headerlist;  return []; end
 
       # Email is a Feedback-Loop message or not
-      # @param    [Hash] heads    Email header including "Content-Type", "From",
-      #                           and "Subject" field
+      # @param    [Hash] heads    Email header including "Content-Type", "From", and "Subject" field
       # @return   [True,False]    true: Feedback Loop
       #                           false: is not Feedback loop
       def is_arf(heads)
@@ -49,13 +52,8 @@ module Sisimai
         elsif heads['content-type'].start_with?('multipart/mixed')
           # Microsoft (Hotmail, MSN, Live, Outlook) uses its own report format.
           # Amazon SES Complaints bounces
-          hfrom = Sisimai::Address.s3s4(heads['from'])
-          mfrom = %r{(?:
-             staff[@]hotmail[.]com
-            |complaints[@]email-abuse[.]amazonses[.]com
-            )\z
-          }x
-          if hfrom =~ mfrom && heads['subject'].include?('complaint about message from ')
+          p = Sisimai::Address.s3s4(heads['from'])
+          if p =~ ReportFrom && heads['subject'].include?('complaint about message from ')
             # From: staff@hotmail.com
             # From: complaints@email-abuse.amazonses.com
             # Subject: complaint about message from 192.0.2.1
@@ -66,16 +64,10 @@ module Sisimai
       end
 
       # Detect an error for Feedback Loop
-      # @param         [Hash] mhead       Message headers of a bounce email
-      # @options mhead [String] from      From header
-      # @options mhead [String] date      Date header
-      # @options mhead [String] subject   Subject header
-      # @options mhead [Array]  received  Received headers
-      # @options mhead [String] others    Other required headers
-      # @param         [String] mbody     Message body of a bounce email
-      # @return        [Hash, Nil]        Bounce data list and message/rfc822 part
-      #                                   or nil if it failed to parse or the
-      #                                   arguments are missing
+      # @param  [Hash] mhead    Message headers of a bounce email
+      # @param  [String] mbody  Message body of a bounce email
+      # @return [Hash]          Bounce data list and message/rfc822 part
+      # @return [Nil]           it failed to parse or the arguments are missing
       def make(mhead, mbody)
         return nil unless self.is_arf(mhead)
 
@@ -121,12 +113,17 @@ module Sisimai
         #      this specification is set to "1".
         #
         while e = bodyslices.shift do
+          # This is an email abuse report for an email message with the
+          #   message-id of 0000-000000000000000000000000000000000@mx
+          #   received from IP address 192.0.2.1 on
+          #   Thu, 29 Apr 2010 00:00:00 +0900 (JST)
+          if e =~ MarkingsOf[:message]
+            commondata['diagnosis'] = e if commondata['diagnosis'].empty?
+          end
+
           if readcursor == 0
             # Beginning of the bounce message or message/delivery-status part
-            if e =~ MarkingsOf[:message]
-              readcursor |= Indicators[:deliverystatus]
-              next
-            end
+            readcursor |= Indicators[:deliverystatus] if e.start_with?(StartingOf[:report][0])
           end
 
           if (readcursor & Indicators[:'message-rfc822']) == 0
@@ -153,11 +150,18 @@ module Sisimai
             elsif cv = e.match(/\AFrom:[ ]*(.+)\z/)
               # Microsoft ARF: original sender.
               commondata['from'] = Sisimai::Address.s3s4(cv[1]) if commondata['from'].empty?
+              previousfn = 'from'
 
             elsif e.start_with?(' ', "\t")
               # Continued line from the previous line
-              rfc822part << e + "\n" if LongFields[previousfn]
-              next unless e.empty?
+              if previousfn == 'from'
+                # Multiple lines at "From:" field
+                commondata['from'] << e
+                next
+              else
+                rfc822part << e + "\n" if LongFields[previousfn]
+                next unless e.empty?
+              end
               rcptintext << e if previousfn == 'to'
 
             else
@@ -174,7 +178,7 @@ module Sisimai
               rcptintext  = rhs if lhs == 'to'
             end
           else
-            # message/delivery-status part
+            # message/feedback-report part
             next unless readcursor & Indicators[:deliverystatus] > 0
             next if e.empty?
 
@@ -231,7 +235,7 @@ module Sisimai
               # Reporting-MTA: dns; mx.example.jp
               commondata['rhost'] = cv[1]
 
-            elsif cv = e.match(/\ASource-IP:[ ]*(.+)\z/)
+            elsif cv = e.match(/\ASource-I[Pp]:[ ]*(.+)\z/)
               # The header is optional and MUST NOT appear more than once.
               # Source-IP: 192.0.2.45
               arfheaders['rhost'] = cv[1]
@@ -241,12 +245,6 @@ module Sisimai
               # Original-Mail-From: <somespammer@example.net>
               commondata['from'] = Sisimai::Address.s3s4(cv[1]) if commondata['from'].empty?
 
-            elsif e =~ MarkingsOf[:message]
-              # This is an email abuse report for an email message with the
-              #   message-id of 0000-000000000000000000000000000000000@mx
-              #   received from IP address 192.0.2.1 on
-              #   Thu, 29 Apr 2010 00:00:00 +0900 (JST)
-              commondata['diagnosis'] = e
             end
           end
         end
@@ -292,9 +290,10 @@ module Sisimai
 
           e['softbounce'] = -1
           e['diagnosis']  = commondata['diagnosis'] unless e['diagnosis']
+          e['diagnosis']  = Sisimai::String.sweep(e['diagnosis'])
           e['date']       = mhead['date'] if e['date'].empty?
           e['reason']     = 'feedback'
-          e['agent']      = self.smtpagent if e['agent'].empty?
+          e['agent']      = 'Feedback-Loop'
           %w[command action status alias].each { |a| e[a] = '' }
 
           # Get the remote IP address from the message body
@@ -308,7 +307,6 @@ module Sisimai
             # from IP address 24.64.1.1 on Thu, 29 Apr 2010 00:00:00 +0000
             e['rhost'] = cv[1]
           end
-
         end
         return { 'ds' => dscontents, 'rfc822' => rfc822part }
       end

data/lib/sisimai/data.rb

@@ -8,6 +8,7 @@ module Sisimai
     require 'sisimai/rhost'
     require 'sisimai/time'
     require 'sisimai/datetime'
+    require 'sisimai/smtp/error'
 
     @@rwaccessors = [
       :catch,           # [?] Results generated by hook method
@@ -18,6 +19,7 @@ module Sisimai
       :listid,          # [String] List-Id header of each ML
       :reason,          # [String] Bounce reason
       :action,          # [String] The value of Action: header
+      :origin,          # [String] Email path as a data source
       :subject,         # [String] UTF-8 Subject text
       :timestamp,       # [Sisimai::Time] Date: header in the original message
       :addresser,       # [Sisimai::Address] From address
@@ -37,10 +39,8 @@ module Sisimai
     ]
     attr_accessor(*@@rwaccessors)
 
-    EndOfEmail = Sisimai::String.EOM
     RetryIndex = Sisimai::Reason.retry
     RFC822Head = Sisimai::RFC5322.HEADERFIELDS(:all)
-    AddrHeader = { addresser: RFC822Head[:addresser], recipient: RFC822Head[:recipient] }.freeze
 
     # Constructor of Sisimai::Data
     # @param    [Hash] argvs    Data
@@ -77,6 +77,7 @@ module Sisimai
       @smtpcommand    = argvs['smtpcommand']    || ''
       @feedbacktype   = argvs['feedbacktype']   || ''
       @action         = argvs['action']         || ''
+      @origin         = argvs['origin']         || ''
       @replycode      = argvs['replycode']      || ''
       @replycode      = Sisimai::SMTP::Reply.find(argvs['diagnosticcode']).to_s if @replycode.empty?
       @softbounce     = argvs['softbounce']     || ''
@@ -94,35 +95,11 @@ module Sisimai
 
       messageobj = data
       rfc822data = messageobj.rfc822
-      fieldorder = { :recipient => [], :addresser => [] }
       objectlist = []
-      givenorder = argvs[:order] || {}
       delivered1 = argvs[:delivered] || false
 
       return nil unless messageobj.ds
       return nil unless messageobj.rfc822
-      require 'sisimai/smtp'
-
-      # Decide the order of email headers: user specified or system default.
-      if givenorder.is_a?(Hash) && !givenorder.empty?
-        # If the order of headers for searching is specified, use the order
-        # for detecting an email address.
-        fieldorder.each_key do |e|
-          # The order should be "Array Reference".
-          next unless givenorder[e]
-          next unless givenorder[e].is_a? Array
-          next if givenorder[e].empty?
-          fieldorder[e] += givenorder[e]
-        end
-      end
-
-      fieldorder.each_key do |e|
-        # If the order is empty, use default order.
-        next unless fieldorder[e].empty?
-
-        # Load default order of each accessor.
-        fieldorder[e] = AddrHeader[e]
-      end
 
       eachobject = messageobj.ds.dup
       while e = eachobject.shift do
@@ -151,7 +128,7 @@ module Sisimai
 
         # EMAIL_ADDRESS:
         # Detect email address from message/rfc822 part
-        fieldorder[:addresser].each do |f|
+        RFC822Head[:addresser].each do |f|
           # Check each header in message/rfc822 part
           next unless rfc822data[f]
           next if rfc822data[f].empty?
@@ -257,8 +234,6 @@ module Sisimai
 
         # CHECK_DELIVERY_STATUS_VALUE:
         # Cleanup the value of "Diagnostic-Code:" header
-        p['diagnosticcode'].sub!(/[ \t.]+#{EndOfEmail}/, '')
-
         unless p['diagnosticcode'].empty?
           # Count the number of D.S.N. and SMTP Reply Code
           vs = Sisimai::SMTP::Status.find(p['diagnosticcode'])
@@ -296,6 +271,7 @@ module Sisimai
 
         # Check the value of SMTP command
         p['smtpcommand'] = '' unless %w[EHLO HELO MAIL RCPT DATA QUIT].include?(p['smtpcommand'])
+        p['origin'] = argvs[:origin]  # Set the path to the original email
 
         if p['action'].empty?
           # Check the value of "action"
@@ -313,10 +289,13 @@ module Sisimai
 
         if o.reason.empty? || RetryIndex[o.reason]
           # Decide the reason of email bounce
-          r = ''
-          r = Sisimai::Rhost.get(o) if Sisimai::Rhost.match(o.rhost) # Remote host dependent error
-          r = Sisimai::Reason.get(o) if r.empty?
-          r = 'undefined' if r.empty?
+          r = ''; r = Sisimai::Rhost.get(o) if Sisimai::Rhost.match(o.rhost)
+          if r.empty?
+            # Failed to detect a bounce reason by the value of "rhost"
+            r = Sisimai::Rhost.get(o, o.destination) if Sisimai::Rhost.match(o.destination)
+            r = Sisimai::Reason.get(o) if r.empty?
+            r = 'undefined' if r.empty?
+          end
           o.reason = r
         end