sisimai 4.22.2-java → 4.22.3-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1dab6ed38f3996aa3ec0ac5fce3f2a3b1c3b00b5
-  data.tar.gz: b7ea7dc6821f9a2eb698bbf6a2ff6182fed24fe5
+  metadata.gz: fa167d561a6db258e6a2c99edee1d8f9486911b4
+  data.tar.gz: e98e6e71ff82cbd971dc5937ccecfd95dd651a0d
 SHA512:
-  metadata.gz: be9ab193bcbc5e513742d5d471e800f3143e8eb2f160be791e8dd1736fe05c56f3e8d46e01745dd0039cc855b01ee332c533ccf03fe578650068d677562277ff
-  data.tar.gz: 9313b4d6d445d2606555bdc0575eeb6894af2684e8753d2ad2f1f1303c71a9af1ff5e59165c413595ef0dd0550dc1391f62550ca93560099b2b22feb189a8a6d
+  metadata.gz: 1734abd35586c113cd6fc3737c98a37767e7eab9827a3b07517bce298c723ab88b5085159a303054f55f815b79c7da7e8d5bfd592311617addf7179b1bfcb14b
+  data.tar.gz: e6ecc8759f527fa0d3370d6146b1302a3434f09bdfeb2d7fdd98666c9b95770d7120301d518e2508f60a2f519645472fe798c3574fa94a6f49c1af6a6c5dc227

data/ANALYTICAL-PRECISION

@@ -2,59 +2,60 @@
  MTA MODULE NAME          CAN PARSE   RATIO   NOTES
 --------------------------------------------------------------------------------
 Email::Activehunter .....    0/0014  0.0000  TransWARE Active!hunter
-Email::AmazonSES ........   22/0031  0.7097  Amazon SES(Sending): http://aws.amazon.com/ses/
+Email::AmazonSES ........   31/0040  0.7750  Amazon SES(Sending): http://aws.amazon.com/ses/
 Email::AmazonWorkMail ...    8/0012  0.6667  Amazon WorkMail: https://aws.amazon.com/workmail/
 Email::Aol ..............   20/0023  0.8696  Aol Mail: http://www.aol.com
 Email::ApacheJames ......    0/0006  0.0000  Java Apache Mail Enterprise Server
 Email::Bigfoot ..........    2/0002  1.0000  Bigfoot: http://www.bigfoot.com
 Email::Biglobe ..........    5/0007  0.7143  BIGLOBE: http://www.biglobe.ne.jp
 Email::Courier ..........   14/0016  0.8750  Courier MTA
-Email::Domino ...........    6/0015  0.4000  IBM Domino Server
-Email::EZweb ............  130/0125  1.0000  au EZweb: http://www.au.kddi.com/mobile/
+Email::Domino ...........    6/0016  0.3750  IBM Domino Server
+Email::EZweb ............  130/0123  1.0000  au EZweb: http://www.au.kddi.com/mobile/
 Email::EinsUndEins ......    0/0003  0.0000  1&1: http://www.1and1.de
 Email::Exchange2003 .....    1/0051  0.0196  Microsoft Exchange Server 2003
-Email::Exchange2007 .....    6/0007  0.8571  Microsoft Exchange Server 2007
-Email::Exim .............  146/0176  0.8295  Exim
+Email::Exchange2007 .....    6/0009  0.6667  Microsoft Exchange Server 2007
+Email::Exim .............  226/0285  0.7930  Exim
+Email::FML ..............    0/0004  0.0000  fml mailing list server/manager
 Email::Facebook .........    3/0003  1.0000  Facebook: https://www.facebook.com
 Email::GMX ..............    0/0010  0.0000  GMX: http://www.gmx.net
-Email::GSuite ...........    9/0009  1.0000  G Suite: https://gsuite.google.com/
+Email::GSuite ...........   10/0010  1.0000  G Suite: https://gsuite.google.com/
 Email::Google ...........   58/0062  0.9355  Google Gmail: https://mail.google.com
-Email::IMailServer ......    0/0045  0.0000  IPSWITCH IMail Server
+Email::IMailServer ......    0/0023  0.0000  IPSWITCH IMail Server
 Email::InterScanMSS .....    0/0009  0.0000  Trend Micro InterScan Messaging Security Suite
 Email::KDDI .............    6/0006  1.0000  au by KDDI: http://www.au.kddi.com
 Email::MXLogic ..........    0/0014  0.0000  McAfee SaaS
 Email::MailFoundry ......    0/0007  0.0000  MailFoundry
 Email::MailMarshalSMTP ..    0/0003  0.0000  Trustwave Secure Email Gateway
 Email::MailRu ...........    4/0016  0.2500  @mail.ru: https://mail.ru
-Email::McAfee ...........    0/0010  0.0000  McAfee Email Appliance
-Email::MessageLabs ......    2/0002  1.0000  Symantec.cloud http://www.messagelabs.com
-Email::MessagingServer ..   19/0022  0.8636  Oracle Communications Messaging Server
-Email::Notes ............    0/0012  0.0000  Lotus Notes
-Email::Office365 ........    8/0011  0.7273  Microsoft Office 365: http://office.microsoft.com/
+Email::McAfee ...........    0/0011  0.0000  McAfee Email Appliance
+Email::MessageLabs ......    4/0004  1.0000  Symantec.cloud http://www.messagelabs.com
+Email::MessagingServer ..   20/0023  0.8696  Oracle Communications Messaging Server
+Email::Notes ............    0/0013  0.0000  Lotus Notes
+Email::Office365 ........   10/0013  0.7692  Microsoft Office 365: http://office.microsoft.com/
 Email::OpenSMTPD ........    6/0024  0.2500  OpenSMTPD
 Email::Outlook ..........   19/0021  0.9048  Microsoft Outlook.com: https://www.outlook.com/
-Email::Postfix ..........  175/0193  0.9067  Postfix
+Email::Postfix ..........  203/0222  0.9144  Postfix
 Email::ReceivingSES .....    0/0007  0.0000  Amazon SES(Receiving): http://aws.amazon.com/ses/
 Email::SendGrid .........    7/0012  0.5833  SendGrid: http://sendgrid.com/
-Email::Sendmail .........  334/0257  1.0000  V8Sendmail: /usr/sbin/sendmail
+Email::Sendmail .........  338/0262  1.0000  V8Sendmail: /usr/sbin/sendmail
 Email::SurfControl ......    6/0008  0.7500  WebSense SurfControl
 Email::V5sendmail .......    0/0386  0.0000  Sendmail version 5
 Email::Verizon ..........    4/0004  1.0000  Verizon Wireless: http://www.verizonwireless.com
 Email::X1 ...............    0/0007  0.0000  Unknown MTA #1
 Email::X2 ...............    0/0069  0.0000  Unknown MTA #2
 Email::X3 ...............    0/0012  0.0000  Unknown MTA #3
-Email::X4 ...............    0/0029  0.0000  Unknown MTA #4 qmail clones
+Email::X4 ...............    0/0030  0.0000  Unknown MTA #4 qmail clones
 Email::X5 ...............    3/0003  1.0000  Unknown MTA #5
-Email::Yahoo ............    0/0009  0.0000  Yahoo! MAIL: https://www.yahoo.com
+Email::Yahoo ............    0/0010  0.0000  Yahoo! MAIL: https://www.yahoo.com
 Email::Yandex ...........    4/0007  0.5714  Yandex.Mail: http://www.yandex.ru
 Email::Zoho .............    0/0011  0.0000  Zoho Mail: https://www.zoho.com
-Email::MFILTER ..........    0/0009  0.0000  Digital Arts m-FILTER
-Email::Qmail ............   53/0082  0.6463  qmail
-JSON::AmazonSES .........   22/0031  0.7097  Amazon SES(JSON): http://aws.amazon.com/ses/
+Email::mFILTER ..........    0/0009  0.0000  Digital Arts m-FILTER
+Email::qmail ............   55/0085  0.6471  qmail
+JSON::AmazonSES .........   31/0040  0.7750  Amazon SES(JSON): http://aws.amazon.com/ses/
 JSON::SendGrid ..........    7/0012  0.5833  SendGrid(JSON): http://sendgrid.com/
 ARF .....................    9/0050  0.1800  Abuse Feedback Reporting Format
-RFC3464 .................  136/0280  0.4857  Fallback Module for MTAs
-RFC3834 .................    0/0007  0.0000  Detector for auto replied message
+RFC3464 .................  145/0296  0.4899  Fallback Module for MTAs
+RFC3834 .................    0/0012  0.0000  Detector for auto replied message
 --------------------------------------------------------------------------------
- bounceHammer 2.7.13p3    1254/2259  0.5551
- Sisimai 4.22.0           2259/2259  1.0000
+ bounceHammer 2.7.13p3    1401/2437  0.5749
+ Sisimai 4.22.3           2437/2437  1.0000

data/ChangeLog.md

@@ -3,14 +3,51 @@ RELEASE NOTES for Ruby version of Sisimai
 - releases: "https://github.com/sisimai/rb-Sisimai/releases"
 - download: "https://rubygems.org/gems/sisimai"
 
+v4.22.3
+--------------------------------------------------------------------------------
+- release: "Tue, 26 Dec 2017 09:22:22 +0900 (JST)"
+- version: "4.22.3"
+- changes:
+  - Issue #88: Fix codes in Sisimai.DateTime.parse() for setting numeric values
+    using sprintf(). Thanks to @phuong1492.
+  - Import Pull-Request sisimai/p5-Sisimai#239, add error message patterns for
+    laposte.net and orange.fr.
+  - Import Pull-Req sisimai/p5-Sisimai#244 to follow up sisimai/p5-Sisimai#239.
+    More support for Orange and La Poste.
+  - Import Pull-Request sisimai/p5-Sisimai#245, update error message patterns
+    of SFR and Free.fr.
+  - Import Pull-Request sisimai/p5-Sisimai#246, large scale updates for Exim
+    and error message patterns.
+  - Merge Pull-Request #93 from @subuta to fix issue #92. Sisimai.make() method
+    passes ActiveSupport::HashWithIndifferentAccess object with `input: "json"`
+    parameter. Thanks to @subuta.
+  - Import Pull-Request sisimai/p5-Sisimai#247, Add 100+ error message patterns
+    into the following reason classes: Blocked, Expired, Filtered, HostUnknown,
+    PolicyViolation, MailboxFull, NetworkError, NoRelaying, Rejected, Suspend,
+    SpamDetected, SystemError, TooManyConn, and UserUnknown.
+  - Fix bug in a regular expression object for concatenating error messages in
+    Sisimai::Bite::Email::Exim.
+  - Fix a wrong regular expression for detecting a recipient address and error
+    messages in Sisiamai::Bite::Email::IMailServer.
+  - Import Pull-Request sisimai/p5-Sisimai#247: Improved code at Sisimai::Data
+    to remove string like "550-5.1.1" from an error message for to be matched
+    exactly with regular expressions defined in each class of Sisimai::Reason.
+  - Fixed issue #91, Import and convert error messages and reasons table from
+    Sisimai::Bite::Email::Exchange2007 into Sisimai::Rhost::ExchangeOnline for
+    detecting an error reason. Thanks to @joaoscotto.
+  - Fix code to avoid an error with "invalid byte sequence in UTF-8" reported
+    at https://heartbeats.jp/hbblog/2017/12/sisimai.html .
+  - Implement Sisimai::Bite::Email::FML to parse bounce mails generated by fml
+    mailing list server/manager. Thanks to @ttkzw.
+
 v4.22.2
 --------------------------------------------------------------------------------
 - release: "Fri, 13 Oct 2017 11:59:53 +0900 (JST)"
-- version: "v4.22.2"
+- version: "4.22.2"
 - changes:
   - Apply Pull-Request #84 (issue #83) for setting the value of `softorhard` in 
     `Sisimai::SMTP::Error.soft_or_hard` method. Thanks to @lunatyq.
-  - Fix a wrong value assingment, and code for Performance/StartWith reported
+  - Fix a wrong value assignment, and code for Performance/StartWith reported
     from Rubocop in Sisimai::Bite::Email::GSuite.
   - Update codes about Lint/AssignmentInCondition, Style/Next, Style/EmptyElse,
     Style/UselessAssignment, and others reported from Rubocop.

data/README-JA.md

@@ -54,7 +54,7 @@ Key features
   * git clone & make
 * __高い解析精度__
   * 解析精度はbounceHammerの2倍
-  * 27種類のMTAに対応
+  * 28種類のMTAに対応
   * 22種類の著名なMSPに対応
   * 2種類の著名なメール配信クラウドに対応(JSON)
   * Feedback Loopにも対応
@@ -80,10 +80,10 @@ Install
 
 ```shell
 $ sudo gem install sisimai
-Fetching: sisimai-4.22.0.gem (100%)
-Successfully installed sisimai-4.22.0
-Parsing documentation for sisimai-4.22.0
-Installing ri documentation for sisimai-4.22.0
+Fetching: sisimai-4.22.2.gem (100%)
+Successfully installed sisimai-4.22.2
+Parsing documentation for sisimai-4.22.2
+Installing ri documentation for sisimai-4.22.2
 Done installing documentation for sisimai after 6 seconds
 1 gem installed
 ```
@@ -99,8 +99,8 @@ gem install bundle rake rspec coveralls
 ...
 4 gems installed
 bundle exec rake install
-sisimai 4.22.0 built to pkg/sisimai-4.22.0.gem.
-sisimai (4.22.0) installed.
+sisimai 4.22.2 built to pkg/sisimai-4.22.2.gem.
+sisimai (4.22.2) installed.
 ```
 
 Usage
@@ -236,11 +236,11 @@ Differences between Ruby version and Perl version
 | 動作環境                                    | Ruby 2.1 - 2.4 | Perl 5.10 -   |
 |                                             | JRuby 9.0.4.0- |               |
 | 解析精度の割合(2000通のメール)[1]           | 1.00           | 1.00          |
-| メール解析速度(1000通のメール)              | 3.30秒         | 2.33秒        |
+| メール解析速度(1000通のメール)              | 6.70秒         | 2.10秒        |
 | インストール方法                            | gem install    | cpanm, cpm    |
 | 依存モジュール数(コアモジュールを除く)      | 1モジュール    | 2モジュール   |
-| LOC:ソースコードの行数                      | 12600行        | 9400行        |
-| テスト件数(spec/,t/,xt/ディレクトリ)        | 197300件       | 205200件      |
+| LOC:ソースコードの行数                      | 13000行        | 9800行        |
+| テスト件数(spec/,t/,xt/ディレクトリ)        | 213000件       | 230000件      |
 | ライセンス                                  | 二条項BSD      | 二条項BSD     |
 | 開発会社によるサポート契約                  | 準備中         | 提供中        |
 

data/README.md

@@ -53,7 +53,7 @@ Key Features
   * git clone & make
 * __High Precision of Analysis__
   * 2 times higher than bounceHammer
-  * Support 22 known MTAs and 5 unknown MTAs
+  * Support 23 known MTAs and 5 unknown MTAs
   * Support 22 major MSPs(Mail Service Providers)
   * Support 2 major Cloud Email Delivery Services(JSON format)
   * Support Feedback Loop Message(ARF)
@@ -85,10 +85,10 @@ Install
 
 ```shell
 $ sudo gem install sisimai
-Fetching: sisimai-4.22.0.gem (100%)
-Successfully installed sisimai-4.22.0
-Parsing documentation for sisimai-4.22.0
-Installing ri documentation for sisimai-4.22.0
+Fetching: sisimai-4.22.2.gem (100%)
+Successfully installed sisimai-4.22.2
+Parsing documentation for sisimai-4.22.2
+Installing ri documentation for sisimai-4.22.2
 Done installing documentation for sisimai after 6 seconds
 1 gem installed
 ```
@@ -104,8 +104,8 @@ gem install bundle rake rspec coveralls
 ...
 4 gems installed
 bundle exec rake install
-sisimai 4.22.0 built to pkg/sisimai-4.22.0.gem.
-sisimai (4.22.0) installed.
+sisimai 4.22.2 built to pkg/sisimai-4.22.2.gem.
+sisimai (4.22.2) installed.
 ```
 
 Usage
@@ -240,11 +240,11 @@ and bounceHammer are available at
 | System requirements                         | Ruby 2.1 - 2.4 | 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         |
+| The speed of parsing email(1000 emails)     | 6.70s          | 2.10s         |
 | How to install                              | gem install    | cpanm, cpm    |
 | Dependencies (Except core modules)          | 1 module       | 2 modules     |
-| LOC:Source lines of code                    | 12600 lines    | 9400 lines    |
-| The number of tests(spec/,t/,xt/) directory | 197300 tests   | 205200 tests  |
+| LOC:Source lines of code                    | 13000 lines    | 9800 lines    |
+| The number of tests(spec/,t/,xt/) directory | 213000 tests   | 230000 tests  |
 | License                                     | BSD 2-Clause   | BSD 2-Clause  |
 | Support Contract provided by Developer      | Coming soon    | Available     |
 

data/lib/sisimai.rb

@@ -78,7 +78,6 @@ module Sisimai
         if type == 'Array'
           # [ {...}, {...}, ... ]
           argv0.each do |e|
-            next unless e.class.to_s == 'Hash'
             list << e
           end
         else

data/lib/sisimai/bite/email.rb

@@ -28,7 +28,7 @@ module Sisimai
             GMX Bigfoot Facebook Zoho EinsUndEins MessageLabs EZweb KDDI Biglobe
             ApacheJames McAfee MXLogic MailFoundry IMailServer
             MFILTER Activehunter InterScanMSS SurfControl MailMarshalSMTP
-            X1 X2 X3 X4 X5 V5sendmail
+            X1 X2 X3 X4 X5 V5sendmail FML
           |
         end
 

data/lib/sisimai/bite/email/amazonses.rb

@@ -209,6 +209,7 @@ module Sisimai::Bite::Email
           # Set default values if each value is empty.
           connheader.each_key { |a| e[a] ||= connheader[a] || '' }
 
+          e['agent']       = self.smtpagent
           e['diagnosis'] ||= ''
           e['diagnosis']   = e['diagnosis'].gsub(/\\n/, ' ')
           e['diagnosis']   = Sisimai::String.sweep(e['diagnosis'])
@@ -233,8 +234,6 @@ module Sisimai::Bite::Email
             break
           end
 
-          e['reason'] ||= Sisimai::SMTP::Status.name(e['status'])
-          e['agent']    = self.smtpagent
         end
 
         rfc822part = Sisimai::RFC5322.weedout(rfc822list)

data/lib/sisimai/bite/email/exim.rb

@@ -50,13 +50,14 @@ module Sisimai::Bite::Email
         :alias  => %r/\A([ ]+an[ ]undisclosed[ ]address)\z/,
         :frozen => %r/\AMessage .+ (?:has been frozen|was frozen on arrival)/,
         :rfc822 => %r{\A(?:
-             [-]+[ ]This[ ]is[ ]a[ ]copy[ ]of[ ]the[ ]message.+headers[.][ ][-]+
+             [-]+[ ]This[ ]is[ ]a[ ]copy[ ]of[ ](?:the|your)[ ]message.+headers[.][ ][-]+
             |Content-Type:[ ]*message/rfc822
             )\z
           }x,
         :begin  => %r{\A(?>
            This[ ]message[ ]was[ ]created[ ]automatically[ ]by[ ]mail[ ]delivery[ ]software[.]
           |A[ ]message[ ]that[ ]you[ ]sent[ ]was[ ]rejected[ ]by[ ]the[ ]local[ ]scanning[ ]code
+          |A[ ]message[ ]that[ ]you[ ]sent[ ]contained[ ]one[ ]or[ ]more[ ]recipient[ ]addresses[ ]
           |Message[ ].+[ ](?:has[ ]been[ ]frozen|was[ ]frozen[ ]on[ ]arrival)
           |The[ ].+[ ]router[ ]encountered[ ]the[ ]following[ ]error[(]s[)]:
           )
@@ -100,6 +101,17 @@ module Sisimai::Bite::Email
           |no[ ]host[ ]found[ ]for[ ]existing[ ]SMTP[ ]connection
           )
         }x,
+        # parser.c:666| *errorptr = string_sprintf("%s (expected word or \"<\")", *errorptr);
+        # parser.c:701| if(bracket_count++ > 5) FAILED(US"angle-brackets nested too deep");
+        # parser.c:738| FAILED(US"domain missing in source-routed address");
+        # parser.c:747| : string_sprintf("malformed address: %.32s may not follow %.*s",
+        syntaxerror: %r{(?:
+           angle-brackets[ ]nested[ ]too[ ]deep
+          |expected[ ]word[ ]or[ ]["]<["]
+          |domain[ ]missing[ ]in[ ]source-routed[ ]address
+          |malformed[ ]address:
+          )
+        }x,
         # deliver.c:5614|  addr->message = US"delivery to file forbidden";
         # deliver.c:5624|  addr->message = US"delivery to pipe forbidden";
         # transports/pipe.c:1156|  addr->user_message = US"local delivery failed";
@@ -219,19 +231,38 @@ module Sisimai::Bite::Email
             #    host neko.example.jp [192.0.2.222]: 550 5.1.1 <kijitora@example.jp>... User Unknown
             v = dscontents[-1]
 
-            if cv = e.match(/\A[ ][ ]+([^ \t]+[@][^ \t]+[.][a-zA-Z]+)(:.+)?\z/) || e.match(Re1[:alias])
+            if cv = e.match(/\A[ \t]{2}([^ \t]+[@][^ \t]+[.]?[a-zA-Z]+)(:.+)?\z/) ||
+                    e.match(/\A[ \t]{2}[^ \t]+[@][^ \t]+[.][a-zA-Z]+[ ]<(.+?[@].+?)>:.+\z/) ||
+                    e.match(Re1[:alias])
               #   kijitora@example.jp
               #   sabineko@example.jp: forced freeze
+              #   mikeneko@example.jp <nekochan@example.org>: ...
               #
               # deliver.c:4549|  printed = US"an undisclosed address";
               #   an undisclosed address
               #     (generated from kijitora@example.jp)
+              r = cv[1]
+
               if v['recipient']
                 # There are multiple recipient addresses in the message body.
                 dscontents << Sisimai::Bite.DELIVERYSTATUS
                 v = dscontents[-1]
               end
-              v['recipient'] = cv[1]
+              # v['recipient'] = cv[1]
+
+              if cv = e.match(/\A[ \t]+[^ \t]+[@][^ \t]+[.][a-zA-Z]+[ ]<(.+?[@].+?)>:.+\z/)
+                # parser.c:743| while (bracket_count-- > 0) if (*s++ != '>')
+                # parser.c:744|   {
+                # parser.c:745|   *errorptr = s[-1] == 0
+                # parser.c:746|     ? US"'>' missing at end of address"
+                # parser.c:747|     : string_sprintf("malformed address: %.32s may not follow %.*s",
+                # parser.c:748|     s-1, (int)(s - US mailbox - 1), mailbox);
+                # parser.c:749|   goto PARSE_FAILED;
+                # parser.c:750|   }
+                r = cv[1]
+                v['diagnosis'] = e
+              end
+              v['recipient'] = r
               recipients += 1
 
             elsif cv = e.match(/\A[ ]+[(]generated[ ]from[ ](.+)[)]\z/) ||
@@ -295,9 +326,16 @@ module Sisimai::Bite::Email
                   else
                     # Error message when email address above does not include '@'
                     # and domain part.
-                    next unless e =~ /\A[ ]{4}/
-                    v['alterrors'] ||= ''
-                    v['alterrors']  += e + ' '
+                    if e =~ %r<\A[ ]+pipe[ ]to[ ][|]/.+>
+                      # pipe to |/path/to/prog ...
+                      #   generated by kijitora@example.com
+                      v['diagnosis'] = e
+                    else
+                      next unless e =~ /\A[ ]{4}/
+                      v['alterrors'] ||= ''
+                      v['alterrors']  += e + ' '
+                    end
+
                   end
                 end
               end
@@ -384,7 +422,7 @@ module Sisimai::Bite::Email
           if e['alterrors'] && e['alterrors'].size > 0
             # Copy alternative error message
             if e['diagnosis'].nil? || e['diagnosis'].empty?
-              e['diagnosis'] ||= e['alterrors']
+              e['diagnosis'] = e['alterrors']
             end
 
             if e['diagnosis'] =~ /\A[-]+/ || e['diagnosis'].end_with?('__')
@@ -395,7 +433,7 @@ module Sisimai::Bite::Email
               # Check the both value and try to match
               if e['diagnosis'].size < e['alterrors'].size
                 # Check the value of alterrors
-                rxdiagnosis = %r/#{e['diagnosis']}/i
+                rxdiagnosis = %r/e['diagnosis']/i
                 if e['alterrors'] =~ rxdiagnosis
                   # Override the value of diagnostic code message because
                   # the value of alterrors includes the value of diagnosis.

data/lib/sisimai/bite/email/fml.rb

@@ -0,0 +1,170 @@
+module Sisimai::Bite::Email
+  # Sisimai::Bite::Email::FML parses a bounce email which created by fml.
+  # Methods in the module are called from only Sisimai::Message.
+  module FML
+    class << self
+      # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/FML.pm
+      require 'sisimai/bite/email'
+
+      Re0 = {
+        :'from'       => %r/.+[-]admin[@].+/, 
+        :'message-id' => %r/\A[<]\d+[.]FML.+[@].+[>]\z/,
+      }.freeze
+      Re1 = {
+        :rfc822  => %r/\AOriginal[ ]mail[ ]as[ ]follows:\z/,
+        :endof   => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
+      }.freeze
+      ErrorTitle = {
+        :rejected => %r{(?>
+           (?:Ignored[ ])*NOT[ ]MEMBER[ ]article[ ]from[ ]
+          |reject[ ]mail[ ](?:.+:|from)[ ],
+          |Spam[ ]mail[ ]from[ ]a[ ]spammer[ ]is[ ]rejected
+          |You[ ].+[ ]are[ ]not[ ]member
+          )
+        }x,
+        :systemerror => %r{(?:
+           fml[ ]system[ ]error[ ]message
+          |Loop[ ]Alert:[ ]
+          |Loop[ ]Back[ ]Warning:[ ]
+          |WARNING:[ ]UNIX[ ]FROM[ ]Loop
+          )
+        }x,
+        :securityerror => %r/Security[ ]Alert/,
+      }.freeze
+      ErrorTable = {
+        :rejected => %r{(?>
+          (?:Ignored[ ])*NOT[ ]MEMBER[ ]article[ ]from[ ]
+          |reject[ ](?:
+             mail[ ]from[ ].+[@].+
+            |since[ ].+[ ]header[ ]may[ ]cause[ ]mail[ ]loop
+            |spammers:
+            )
+          |You[ ]are[ ]not[ ]a[ ]member[ ]of[ ]this[ ]mailing[ ]list
+          )
+        }x,
+        :systemerror => %r{(?:
+           Duplicated[ ]Message-ID
+          |fml[ ].+[ ]has[ ]detected[ ]a[ ]loop[ ]condition[ ]so[ ]that
+          |Loop[ ]Back[ ]Warning:
+          )
+        }x,
+        :securityerror => %r/Security[ ]alert:/,
+      }.freeze
+      Indicators = Sisimai::Bite::Email.INDICATORS
+
+      def description; return 'fml mailing list server/manager'; end
+      def smtpagent;   return Sisimai::Bite.smtpagent(self); end
+      def headerlist;  return ['X-MLServer']; end
+      def pattern;     return Re0; end
+
+      # Parse bounce messages from fml mailling list server/manager
+      # @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
+      def scan(mhead, mbody)
+        return nil unless mhead
+        return nil unless mbody
+        return nil unless mhead['x-mlserver']
+        return nil unless mhead['from'] =~ Re0[:from]
+        return nil unless mhead['message-id'] =~ Re0[:'message-id']
+
+        dscontents = [Sisimai::Bite.DELIVERYSTATUS]
+        hasdivided = mbody.split("\n")
+        rfc822list = []     # (Array) Each line in message/rfc822 part string
+        blanklines = 0      # (Integer) The number of blank lines
+        readcursor = 0      # (Integer) Points the current cursor position
+        recipients = 0      # (Integer) The number of 'Final-Recipient' header
+        v = nil
+
+        readcursor |= Indicators[:deliverystatus]
+        hasdivided.each do |e|
+          if (readcursor & Indicators[:'message-rfc822']).zero?
+            # Beginning of the original message part
+            if e =~ Re1[:rfc822]
+              readcursor |= Indicators[:'message-rfc822']
+              next
+            end
+          end
+
+          if readcursor & Indicators[:'message-rfc822'] > 0
+            # After "Original mail as follows:" line
+            #
+            #    From owner-2ndml@example.com  Mon Nov 20 18:10:11 2017
+            #    Return-Path: <owner-2ndml@example.com>
+            #    ...
+            #
+            if e.empty?
+              blanklines += 1
+              break if blanklines > 1
+              next
+            end
+            e = e.sub(/\A[ ]{3}/, '')
+            rfc822list << e
+          else
+            # Before "message/rfc822"
+            next if (readcursor & Indicators[:deliverystatus]).zero?
+            next if e.empty?
+
+            # Duplicated Message-ID in <2ndml@example.com>.
+            # Original mail as follows:
+            v = dscontents[-1]
+
+            if cv = e.match(/[<]([^ ]+?[@][^ ]+?)[>][.]\z/)
+              # Duplicated Message-ID in <2ndml@example.com>.
+              if v['recipient']
+                # There are multiple recipient addresses in the message body.
+                dscontents << Sisimai::Bite.DELIVERYSTATUS
+                v = dscontents[-1]
+              end
+              v['recipient'] = cv[1]
+              v['diagnosis'] = e
+              recipients += 1
+            else
+              # If you know the general guide of this list, please send mail with
+              # the mail body 
+              v['diagnosis'] ||= ''
+              v['diagnosis']  += e
+            end
+          end
+        end
+        return nil if recipients.zero?
+        require 'sisimai/string'
+
+        dscontents.map do |e|
+          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
+          e['agent']     = self.smtpagent
+          e.each_key { |a| e[a] ||= '' }
+
+          ErrorTable.each_key do |f|
+            # Try to match with error messages defined in ErrorTable
+            next unless e['diagnosis'] =~ ErrorTable[f]
+            e['reason'] = f.to_s
+            break
+          end
+
+          unless e['reason']
+            # Error messages in the message body did not matched
+            ErrorTitle.each_key do |f|
+              # Try to match with the Subject string
+              next unless mhead['subject'] =~ ErrorTitle[f]
+              e['reason'] = f.to_s
+              break
+            end
+          end
+        end
+
+        rfc822part = Sisimai::RFC5322.weedout(rfc822list)
+        return { 'ds' => dscontents, 'rfc822' => rfc822part }
+      end
+
+    end
+  end
+end
+