sisimai 4.16.0 → 4.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82738ed0361880b40c6cea5b67f0214a54d21c6a
-  data.tar.gz: fb585810f00aa5bcf2a1df3efeebabfbbdfe25c3
+  metadata.gz: 7f8417def53786b484d3142cc70aab3ef509f4dd
+  data.tar.gz: da9f64d09e10a477b98ac366d2fb814f346ed1db
 SHA512:
-  metadata.gz: 2118f34578542ec270941872781cd2db5880d946448046e6b8872d7d4c20321586e4216595f2f7612669725f47c68800e0de1481f7de489e8fc5cabd5a75b75c
-  data.tar.gz: ec163cac4184853b36ac22e205ec26e4075b4b061dec396291779e7230c273aa350a1188863a888adf26a5116d95f5c68daf45e6918aef54aa4ed60422926301
+  metadata.gz: 8cff802da78f62b22f8d79fde792abcf63d805f3bdcba0896cad87223526f0203c7117be7d1d903e0897b5965e283a0c74a2bda6b32c9c27b783c057922451df
+  data.tar.gz: 6718be8fd7fd8c46ca9829fbe02108d7631207ca065b6042d5dc05fab9b4c2a0d320bf8d972332064aac33b1560f36170b28f7e594ca2b24b5adc43b6732392c

data/.rubocop.yml

@@ -15,6 +15,9 @@ Lint/AssignmentInCondition:
 Metrics/AbcSize:
   Max: 30
 
+Metrics/BlockNesting:
+  Max: 4
+
 Metrics/CyclomaticComplexity:
   Enabled: false
 

data/ANALYTICAL-PRECISION

@@ -25,8 +25,8 @@ MTA::X2 .................    0/0069  0.0000  Unknown MTA #2
 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/0010  0.0000  Digital Arts m-FILTER
-MTA::qmail ..............   51/0078  0.6538  qmail
+MTA::mFILTER ............    0/0009  0.0000  Digital Arts m-FILTER
+MTA::qmail ..............   52/0078  0.6667  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 ........    0/0007  0.0000  BIGLOBE: http://www.biglobe.ne.jp
@@ -36,11 +36,11 @@ 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::AmazonWorkMail .    6/0010  0.6000  Amazon WorkMail: https://aws.amazon.com/workmail/
+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
 MSP::US::Facebook .......    3/0003  1.0000  Facebook: https://www.facebook.com
-MSP::US::Google .........    0/0058  0.0000  Google Gmail: https://mail.google.com
+MSP::US::Google .........    0/0061  0.0000  Google Gmail: https://mail.google.com
 MSP::US::Office365 ......    6/0007  0.8571  Microsoft Office 365: http://office.microsoft.com/
 MSP::US::Outlook ........   19/0021  0.9048  Microsoft Outlook.com: https://www.outlook.com/
 MSP::US::ReceivingSES ...    0/0007  0.0000  Amazon SES(Receiving): http://aws.amazon.com/ses/
@@ -49,8 +49,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 .................  130/0273  0.4762  Fallback Module for MTAs
+RFC3464 .................  131/0274  0.4781  Fallback Module for MTAs
 RFC3834 .................    0/0004  0.0000  Detector for auto replied message
 -------------------------------------------------------------------------------
- bounceHammer 2.7.13p3    1025/2125  0.4824
- Sisimai 4.16.0           2125/2125  1.0000
+ bounceHammer 2.7.13p3    1029/2130  0.4831
+ Sisimai 4.17.0           2130/2130  1.0000

data/Changes

@@ -1,5 +1,20 @@
 Revision history for Ruby version of Sisimai
 
+4.17.0  Wed, 16 Mar 2016 12:22:44 +0900 (JST)
+    - Implement new reason "syntaxerror". Sisimai will set "syntaxerror" to the
+      raeson when the value of "replycode" begins with "50" such as 502, 503,
+      or 504. Imported from https://github.com/sisimai/p5-Sisimai/pull/170.
+    - Implement description() method at each class in sisimai/reason/*.rb and
+      Sisimai.reason method for getting the list of reasons Sisimai can detect
+      and its description: issue #48.
+    - Remove unused method Sisimai::Reason->match, issue #49.
+    - Some methods of Sisimai::Address allow "postmaster", and "mailer-daemon"
+      ( without a domain part ) as an email address.
+    - Sisimai::RFC5322.is_mailerdaemon() method returns true when the argument
+      includes "postmaster".
+    - Merge pull-request #51, new method Sisimai::RFC5322.weedout() and code
+      improvements in all the MTA/MSP modules.
+
 4.16.0  Thu, 18 Feb 2016 13:49:01 +0900 (JST)
     - Implement new reason "delivered". Sisimai set "delivered" to the reason
       when the value of Status: field in a bounce message begins with "2". This

data/Makefile

@@ -44,7 +44,7 @@ install-from-local:
 
 release:
 	$(RAKE) release
-	if [ test -d "$(JRUBY)" ]; then \
+	if [ -d "$(JRUBY)" ]; then \
 		PATH="$$PATH:$(JRUBY)/bin" $(JRUBY)/bin/rake release; \
 	fi
 

data/README.md

@@ -29,7 +29,7 @@ Key Features | 主な特徴的機能
   * Support 21 known MTAs and 5 unknown MTAs | 26種類のMTAに対応
   * Support 21 major MSPs(Mail Service Providers) | 21種類の著名なMSPに対応
   * Support Feedback Loop Message(ARF) | Feedback Loopにも対応
-  * Can detect 26 error reasons | 26種類のエラー理由を検出
+  * Can detect 27 error reasons | 27種類のエラー理由を検出
 
 Setting Up Sisimai | シシマイを使う準備
 =======================================
@@ -149,36 +149,36 @@ Differences between Perl version and Ruby version | Perl版との違い
 The following table show the differences between Perl version of Sisimai
 and Ruby version of Sisimai.
 
-| Features                                       | Ruby version  | Perl version |
-|------------------------------------------------|---------------|--------------|
-| System requirements                            | Ruby 2.1-2.3  | Perl 5.10 -  |
-|                                                | JRuby 9.0.4.0-|              |
-| Analytical precision ratio(2000 emails)[1]     | 1.00          | 1.00         |
-| The speed of parsing email(1000 emails)        | 3.81s         | 2.50s        |
-| How to install                                 | gem install   | cpanm        |
-| Dependencies (Except core modules)             | 1 modules     | 2 modules    |
-| LOC:Source lines of code                       | 11700 lines   | 9100 lines   |
-| The number of tests in t/, xt/ directory       | 92400 tests   | 166700 tests |
-| License                                        | BSD 2-Clause  | BSD 2-Clause |
-| Support Contract provided by Developer         | Coming soon   | Available    |
+| Features                                    | Ruby version   | Perl version  |
+|---------------------------------------------|----------------|---------------|
+| System requirements                         | Ruby 2.1-2.3   | Perl 5.10 -   |
+|                                             | JRuby 9.0.4.0- |               |
+| 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                    | 11000 lines    | 8000 lines    |
+| The number of tests in t/, xt/ directory    | 94300 tests    | 170000 tests  |
+| License                                     | BSD 2-Clause   | BSD 2-Clause  |
+| Support Contract provided by Developer      | Coming soon    | Available     |
 
 1. See ./ANALYTICAL-PRECISION
 
 公開中のPerl版Sisimai(p5-Sisimai)とRuby版Sisimai(rb-Sisimai)は下記のような違いが
 あります。
 
-| 機能                                           | Ruby version  | Perl version|
-|------------------------------------------------|---------------|-------------|
-| 動作環境                                       | Ruby 2.1-2.3  | Perl 5.10 - |
-|                                                | JRuby 9.0.4.0-|             |
-| 解析精度の割合(2000通のメール)[1]              | 1.00          | 1.00        |
-| メール解析速度(1000通のメール)                 | 3.81秒        | 2.50秒      |
-| インストール方法                               | gem install   | cpanm       |
-| 依存モジュール数(コアモジュールを除く)         | 1モジュール   | 2モジュール |
-| LOC:ソースコードの行数                         | 11700行       | 9100行      |
-| テスト件数(t/,xt/ディレクトリ)                 | 92400件       | 166700件    |
-| ライセンス                                     | 二条項BSD     | 二条項BSD   |
-| 開発会社によるサポート契約                     | 準備中        | 提供中      |
+| 機能                                        | Ruby version   | Perl version  |
+|---------------------------------------------|----------------|---------------|
+| 動作環境                                    | Ruby 2.1-2.3   | Perl 5.10 -   |
+|                                             | JRuby 9.0.4.0- |               |
+| 解析精度の割合(2000通のメール)[1]           | 1.00           | 1.00          |
+| メール解析速度(1000通のメール)              | 3.30秒         | 2.33秒        |
+| インストール方法                            | gem install    | cpanm         |
+| 依存モジュール数(コアモジュールを除く)      | 1モジュール    | 2モジュール   |
+| LOC:ソースコードの行数                      | 11000行        | 8000行        |
+| テスト件数(t/,xt/ディレクトリ)              | 94300件        | 170000件      |
+| ライセンス                                  | 二条項BSD      | 二条項BSD     |
+| 開発会社によるサポート契約                  | 準備中         | 提供中        |
 
 1. ./ANALYTICAL-PRECISIONを参照
 
@@ -246,7 +246,7 @@ details about these modules are available at
 
 Bounce Reason List | バウンス理由の一覧
 ----------------------------------------
-Sisimai can detect the following 26 bounce reasons. More details about reasons
+Sisimai can detect the following 27 bounce reasons. More details about reasons
 are available at [Sisimai | Bounce Reason List](http://libsisimai.org/reason)
 page.
 
@@ -254,7 +254,7 @@ page.
 |----------------|----------------------------------------|----------------------------------|
 | Blocked        | Blocked due to client IP address       | IPアドレスによる拒否             |
 | ContentError   | Invalid format email                   | 不正な形式のメール               |
-| Delivered      | Successfully delivered (> v4.16.0)     | 正常に配信された
+| Delivered[1]   | Successfully delivered (> v4.16.0)     | 正常に配信された(> v4.16.0)      |
 | ExceedLimit    | Message size exceeded the limit(5.2.3) | メールサイズの超過               |
 | Expired        | Delivery time expired                  | 配送時間切れ                     |
 | Feedback       | Bounced for a complaint of the message | 元メールへの苦情によるバウンス   |
@@ -272,6 +272,7 @@ page.
 | SecurityError  | Virus detected or authentication error | ウィルスの検出または認証失敗     |
 | SpamDetected   | Detected a message as spam             | メールはスパムとして判定された   |
 | Suspend        | Recipient's account is suspended       | 宛先アカウントは一時的に停止中   |
+| SyntaxError    | syntax error in SMTP (> v4.17.0)       | SMTPの文法エラー(> v4.17.0)      |
 | SystemError    | Some error on the destination host     | 宛先サーバでのOSレベルのエラー   |
 | SystemFull     | Disk full on the destination host      | 宛先サーバのディスクが一杯       |
 | TooManyConn    | Connection rate limit exceeded         | 接続制限数を超過した             |
@@ -279,7 +280,8 @@ page.
 | Undefined      | Could not decide the error reason      | バウンスした理由は特定出来ず     |
 | Vacation       | Auto replied message                   | 自動応答メッセージ               |
 
-Sisimaiは上記のエラー26種を検出します。
+Sisimaiは上記のエラー27種を検出します。
+1. This reason is not included by default | このバウンス理由は標準では解析結果に含まれません
 
 
 Parsed data structure | 解析後のデータ構造

data/lib/sisimai.rb

@@ -90,6 +90,25 @@ module Sisimai
       return table
     end
 
-  end
+    # Reason list Sisimai can detect
+    # @return   [Hash]     Reason list table
+    def reason
+      require 'sisimai/reason'
+      table = {}
+      names = Sisimai::Reason.index
+
+      # These reasons are not included in the results of Sisimai::Reason.index
+      names.concat(%w|Delivered Feedback Undefined Vacation|)
 
+      names.each do |e|
+        # Call .description() method of Sisimai::Reason::*
+        r = 'Sisimai::Reason::' + e
+        require r.gsub('::', '/').downcase
+        table[r.to_sym] = Module.const_get(r).send(:description)
+      end
+
+      return table
+    end
+  end
 end
+

data/lib/sisimai/address.rb

@@ -5,18 +5,17 @@ module Sisimai
     require 'sisimai/rfc5322'
 
     # Return pseudo recipient or sender address
-    # @param    [String] argv1  Address type: 'r' or 's'
+    # @param    [Symbol] argv1  Address type: :r or :s
     # @return   [String, Nil]   Pseudo recipient address or sender address or
-    #                           Undef when the $argv1 is neither 'r' nor 's'
+    #                           Undef when the $argv1 is neither :r nor :s
     def self.undisclosed(argv1)
       return nil unless argv1
-      return nil unless %w|r s|.index(argv1)
+      return nil unless %w|r s|.index(argv1.to_s)
 
-      local = argv1 == 'r' ? 'recipient' : 'sender'
+      local = argv1 == :r ? 'recipient' : 'sender'
       return sprintf('undisclosed-%s-in-headers@dummy-domain.invalid', local)
     end
 
-
     # Email address parser
     # @param    [Array] argvs   List of strings including email address
     # @return   [Array, Nil]    Email address list or Undef when there is no
@@ -30,7 +29,10 @@ module Sisimai
         #   1. The element must include '@'.
         #   2. The element must not include character except from 0x20 to 0x7e.
         next unless e
-        next unless e =~ /[@]/
+        unless e =~ /[@]/
+          # Allow if the argument is MAILER-DAEMON
+          next unless Sisimai::RFC5322.is_mailerdaemon(e)
+        end
         next if e =~ /[^\x20-\x7e]/
 
         v = Sisimai::Address.s3s4(e)
@@ -78,7 +80,10 @@ module Sisimai
       else
         token.each do |e|
           e.chomp
-          next unless e =~ /\A[<]?.+[@][-.0-9A-Za-z]+[.]?[A-Za-z]{2,}[>]?\z/
+          unless e =~ /\A[<]?.+[@][-.0-9A-Za-z]+[.]?[A-Za-z]{2,}[>]?\z/
+            # Check whether the element is mailer-daemon or not
+            next unless Sisimai::RFC5322.is_mailerdaemon(e)
+          end
           addrs << e
         end
       end
@@ -162,7 +167,6 @@ module Sisimai
         # Remove MIME-Encoded comment part
         lpart = lpart.sub(/\A=[?].+[?]b[?].+[?]=/, '')
         lpart = lpart.delete(%q|`'"<>|) unless lpart =~ /\A["].+["]\z/
-
         aflag = false
         addr0 = sprintf('%s@%s', lpart, dpart)
         addr1 = Sisimai::Address.expand_verp(addr0)
@@ -197,7 +201,22 @@ module Sisimai
         @verp  ||= ''
 
       else
-        return nil
+        # The argument does not include "@"
+        return nil unless Sisimai::RFC5322.is_mailerdaemon(email)
+        @alias ||= ''
+        @verp  ||= ''
+        @host  ||= ''
+
+        if cv = email.match(/[<]([^ ]+)[>]/)
+          # Mail Delivery Subsystem <MAILER-DAEMON>
+          @user = cv[1]
+          @address = cv[1]
+        else
+          return nil if email =~ /[ ]/
+          # The argument does not include " "
+          @user = email
+          @address = email
+        end
       end
     end
 

data/lib/sisimai/arf.rb

@@ -86,7 +86,7 @@ module Sisimai
         return nil unless self.is_arf(mhead)
 
         require 'sisimai/address'
-        dscontents = []; dscontents << Sisimai::MTA.DELIVERYSTATUS
+        dscontents = [Sisimai::MTA.DELIVERYSTATUS]
         hasdivided = mbody.split("\n")
         rfc822part = ''   # (String) message/rfc822-headers part
         previousfn = ''   # (String) Previous field name
@@ -94,16 +94,16 @@ module Sisimai
         recipients = 0    # (Integer) The number of 'Final-Recipient' header
         rcptintext = ''   # (String) Recipient address in the message body
         commondata = {
-          'diagnosis' => '',  # Error message
-          'from'      => '',  # Original-Mail-From:
-          'rhost'     => '',  # Reporting-MTA:
+          :diagnosis => '',  # Error message
+          :from      => '',  # Original-Mail-From:
+          :rhost     => '',  # Reporting-MTA:
         }
         arfheaders = {
-          'feedbacktype' => nil,   # FeedBack-Type:
-          'rhost'        => nil,   # Source-IP:
-          'agent'        => nil,   # User-Agent:
-          'date'         => nil,   # Arrival-Date:
-          'authres'      => nil,   # Authentication-Results:
+          :feedbacktype => nil,   # FeedBack-Type:
+          :rhost        => nil,   # Source-IP:
+          :agent        => nil,   # User-Agent:
+          :date         => nil,   # Arrival-Date:
+          :authres      => nil,   # Authentication-Results:
         }
         v = nil
 
@@ -131,7 +131,7 @@ module Sisimai
           if readcursor == 0
             # Beginning of the bounce message or delivery status part
             if e =~ Re1[:begin]
-              readcursor |= Indicators[:'deliverystatus']
+              readcursor |= Indicators[:deliverystatus]
               next
             end
           end
@@ -154,13 +154,13 @@ module Sisimai
               # The "X-HmXmrOriginalRecipient" header appears only once so
               # we take this opportunity to hard-code ARF headers missing in
               # Microsoft's implementation.
-              arfheaders['feedbacktype'] = 'abuse'
-              arfheaders['agent'] = 'Microsoft Junk Mail Reporting Program'
+              arfheaders[:feedbacktype] = 'abuse'
+              arfheaders[:agent] = 'Microsoft Junk Mail Reporting Program'
 
             elsif cv = e.match(/\AFrom:[ ]*(.+)\z/)
               # Microsoft ARF: original sender.
-              if commondata['from'].empty?
-                commondata['from'] = Sisimai::Address.s3s4(cv[1])
+              if commondata[:from].empty?
+                commondata[:from] = Sisimai::Address.s3s4(cv[1])
               end
 
             elsif cv = e.match(/\A([-0-9A-Za-z]+?)[:][ ]*(.+)\z/)
@@ -184,7 +184,7 @@ module Sisimai
 
           else
             # Before "message/rfc822"
-            next unless readcursor & Indicators[:'deliverystatus'] > 0
+            next unless readcursor & Indicators[:deliverystatus] > 0
             next unless e.size > 0
 
             # Feedback-Type: abuse
@@ -197,7 +197,7 @@ module Sisimai
             v = dscontents[-1]
 
             if cv = e.match(/\AOriginal-Rcpt-To:[ ]+[<]?(.+)[>]?\z/) ||
-               cv = e.match(/\ARedacted-Address:[ ]([^ ].+[@])\z/)
+                    e.match(/\ARedacted-Address:[ ]([^ ].+[@])\z/)
               # Original-Rcpt-To header field is optional and may appear any
               # number of times as appropriate:
               # Original-Rcpt-To: <user@example.com>
@@ -213,7 +213,7 @@ module Sisimai
             elsif cv = e.match(/\AFeedback-Type:[ ]*([^ ]+)\z/)
               # The header field MUST appear exactly once.
               # Feedback-Type: abuse
-              arfheaders['feedbacktype'] = cv[1]
+              arfheaders[:feedbacktype] = cv[1]
 
             elsif cv = e.match(/\AAuthentication-Results:[ ]*(.+)\z/)
               # "Authentication-Results" indicates the result of one or more
@@ -221,35 +221,35 @@ module Sisimai
               #
               # Authentication-Results: mail.example.com;
               #   spf=fail smtp.mail=somespammer@example.com
-              arfheaders['authres'] = cv[1]
+              arfheaders[:authres] = cv[1]
 
             elsif cv = e.match(/\AUser-Agent:[ ]*(.+)\z/)
               # The header field MUST appear exactly once.
               # User-Agent: SomeGenerator/1.0
-              arfheaders['agent'] = cv[1]
+              arfheaders[:agent] = cv[1]
 
             elsif cv = e.match(/\A(?:Received|Arrival)-Date:[ ]*(.+)\z/)
               # Arrival-Date header is optional and MUST NOT appear more than
               # once.
               # Received-Date: Thu, 29 Apr 2010 00:00:00 JST
               # Arrival-Date: Thu, 29 Apr 2010 00:00:00 +0000
-              arfheaders['date'] = cv[1]
+              arfheaders[:date] = cv[1]
 
             elsif cv = e.match(/\AReporting-MTA:[ ]*dns;[ ]*(.+)\z/)
               # The header is optional and MUST NOT appear more than once.
               # Reporting-MTA: dns; mx.example.jp
-              commondata['rhost'] = cv[1]
+              commondata[:rhost] = cv[1]
 
             elsif cv = e.match(/\ASource-IP:[ ]*(.+)\z/)
               # The header is optional and MUST NOT appear more than once.
               # Source-IP: 192.0.2.45
-              arfheaders['rhost'] = cv[1]
+              arfheaders[:rhost] = cv[1]
 
             elsif cv = e.match(/\AOriginal-Mail-From:[ ]*(.+)\z/)
               # the header is optional and MUST NOT appear more than once.
               # Original-Mail-From: <somespammer@example.net>
-              if commondata['from'].empty?
-                commondata['from'] = Sisimai::Address.s3s4(cv[1])
+              if commondata[:from].empty?
+                commondata[:from] = Sisimai::Address.s3s4(cv[1])
               end
 
             elsif e =~ Re1[:begin]
@@ -257,37 +257,37 @@ module Sisimai
               #   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
+              commondata[:diagnosis] = e
             end
           end
         end
 
-        if arfheaders['feedbacktype'] == 'auth-failure' && arfheaders['authres']
+        if arfheaders[:feedbacktype] == 'auth-failure' && arfheaders[:authres]
           # Append the value of Authentication-Results header
-          commondata['diagnosis'] += ' ' + arfheaders['authres']
+          commondata[:diagnosis] += ' ' + arfheaders[:authres]
         end
 
         if recipients == 0
           # Insert pseudo recipient address when there is no valid recipient
           # address in the message.
-          dscontents[-1]['recipient'] = Sisimai::Address.undisclosed('r')
+          dscontents[-1]['recipient'] = Sisimai::Address.undisclosed(:r)
           recipients = 1
         end
 
         unless rfc822part =~ /\bFrom: [^ ]+[@][^ ]+\b/
           # There is no "From:" header in the original message
-          if commondata['from'].size > 0
+          if commondata[:from].size > 0
             # Append the value of "Original-Mail-From" value as a sender address.
-            rfc822part += sprintf("From: %s\n", commondata['from'])
+            rfc822part += sprintf("From: %s\n", commondata[:from])
           end
         end
 
         if cv = mhead['subject'].match(/complaint about message from (\d{1,3}[.]\d{1,3}[.]\d{1,3}[.]\d{1,3})/)
           # Microsoft ARF: remote host address.
-          arfheaders['rhost'] = cv[1]
-          commondata['diagnosis'] = sprintf(
+          arfheaders[:rhost] = cv[1]
+          commondata[:diagnosis] = sprintf(
             'This is a Microsoft email abuse report for an email message received from IP %s on %s',
-            arfheaders['rhost'], mhead['date'])
+            arfheaders[:rhost], mhead['date'])
         end
 
         dscontents.map do |e|
@@ -295,18 +295,18 @@ module Sisimai
             # AOL = http://forums.cpanel.net/f43/aol-brutal-work-71473.html
             e['recipient'] = Sisimai::Address.s3s4(rcptintext)
           end
-          arfheaders.each_key { |a| e[a] ||= arfheaders[a] || '' }
+          arfheaders.each_key { |a| e[a.to_s] ||= arfheaders[a] || '' }
           e.delete('authres')
 
           e['softbounce'] = -1
-          e['diagnosis']  = commondata['diagnosis'] unless e['diagnosis']
+          e['diagnosis']  = commondata[:diagnosis] unless e['diagnosis']
           e['date']       = mhead['date'] if e['date'].empty?
 
           if e['rhost'].empty?
             # Get the remote IP address from the message body
-            if commondata['rhost'].size > 0
+            if commondata[:rhost].size > 0
               # The value of "Reporting-MTA" header
-              e['rhost'] = commondata['rhost']
+              e['rhost'] = commondata[:rhost]
 
             elsif cv = e['diagnosis'].match(/\breceived from IP address ([^ ]+)/)
               # This is an email abuse report for an email message received
@@ -315,15 +315,6 @@ module Sisimai
             end
           end
 
-          if mhead['received'].size > 0
-            # Get localhost and remote host name from Received header.
-            r0 = mhead['received']
-            %w|lhost rhost|.each { |a| e[a] ||= '' }
-            e['lhost'] = Sisimai::RFC5322.received(r0[0]).shift if e['lhost'].empty?
-            e['rhost'] = Sisimai::RFC5322.received(r0[-1]).pop  if e['rhost'].empty?
-          end
-
-          e['spec']    = 'SMTP'
           e['action']  = 'failed'
           e['reason']  = 'feedback'
           e['command'] = ''