sisimai 4.22.6 → 4.22.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f474a88a9ef59f779cf832e375d61550c6ab465
-  data.tar.gz: 4f2d1449c46743c27df6152674990b1850bfc720
+  metadata.gz: 1e01dd134b0c8f9d55656ad506db438535c823b3
+  data.tar.gz: c0128b71dbe0e35ede76cbb36a05d2d361ea92fe
 SHA512:
-  metadata.gz: 5212f8bec31ad552b1b7d58d7891dd68058b0efaaa3464816208db9e15cfb1aba06b1d3f001eda389cddf8107c0773a45ebb6e3c2726904244cfe64041eb5d22
-  data.tar.gz: e379acf7cf9b7a5d1afe2aa57ca69ed14605e28a5e41365c938b3fe7f8013517032b5d89ca926f58400cfd99e595f35c9f47b85a42fc471e7a7983658e17add0
+  metadata.gz: a04b755a4f2bba636f2032f2f2f1c8b1f05a29e788a97b4497f62344e77019228f67bead30b01146642b064564f8cf60d060d0ebca04da1980ea266678e04707
+  data.tar.gz: 771e73f4af59f9e64cc8a2b44605092dfe611819ad7559cabf583fa048c928fea545be6f9a942952fc10f38927aabd62ab4c706067e85f6e8164556336b5fd7d

data/ANALYTICAL-PRECISION

@@ -3,59 +3,59 @@
 --------------------------------------------------------------------------------
 Email::Activehunter .....    0/0014  0.0000  TransWARE Active!hunter
 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::AmazonWorkMail ...    9/0013  0.6923  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::Bigfoot ..........    3/0003  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/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::EZweb ............  131/0124  1.0000  au EZweb: http://www.au.kddi.com/mobile/
+Email::EinsUndEins ......    0/0004  0.0000  1&1: http://www.1and1.de
 Email::Exchange2003 .....    1/0051  0.0196  Microsoft Exchange Server 2003
-Email::Exchange2007 .....    6/0009  0.6667  Microsoft Exchange Server 2007
-Email::Exim .............  226/0285  0.7930  Exim
+Email::Exchange2007 .....    6/0008  0.7500  Microsoft Exchange Server 2007
+Email::Exim .............  226/0282  0.8014  Exim
 Email::FML ..............    0/0004  0.0000  fml mailing list server/manager
-Email::Facebook .........    3/0003  1.0000  Facebook: https://www.facebook.com
+Email::Facebook .........    5/0005  1.0000  Facebook: https://www.facebook.com
 Email::GMX ..............    0/0010  0.0000  GMX: http://www.gmx.net
-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/0023  0.0000  IPSWITCH IMail Server
-Email::InterScanMSS .....    0/0009  0.0000  Trend Micro InterScan Messaging Security Suite
+Email::GSuite ...........   18/0018  1.0000  G Suite: https://gsuite.google.com/
+Email::Google ...........   59/0061  0.9672  Google Gmail: https://mail.google.com
+Email::IMailServer ......    0/0022  0.0000  IPSWITCH IMail Server
+Email::InterScanMSS .....    0/0008  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::MailMarshalSMTP ..    0/0004  0.0000  Trustwave Secure Email Gateway
+Email::MailRu ...........    4/0022  0.1818  @mail.ru: https://mail.ru
 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::MessageLabs ......    5/0005  1.0000  Symantec.cloud http://www.messagelabs.com
+Email::MessagingServer ..   28/0031  0.9032  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::Office365 ........   14/0017  0.8235  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 ..........  203/0222  0.9144  Postfix
+Email::Outlook ..........   20/0022  0.9091  Microsoft Outlook.com: https://www.outlook.com/
+Email::Postfix ..........  211/0227  0.9295  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 .........  338/0262  1.0000  V8Sendmail: /usr/sbin/sendmail
+Email::Sendmail .........  346/0271  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::X2 ...............    0/0068  0.0000  Unknown MTA #2
 Email::X3 ...............    0/0012  0.0000  Unknown MTA #3
-Email::X4 ...............    0/0030  0.0000  Unknown MTA #4 qmail clones
+Email::X4 ...............    0/0028  0.0000  Unknown MTA #4 qmail clones
 Email::X5 ...............    3/0003  1.0000  Unknown MTA #5
-Email::Yahoo ............    0/0010  0.0000  Yahoo! MAIL: https://www.yahoo.com
+Email::Yahoo ............    0/0021  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 ............   55/0085  0.6471  qmail
+Email::qmail ............   55/0084  0.6548  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 .................  145/0296  0.4899  Fallback Module for MTAs
+ARF .....................    8/0037  0.2162  Abuse Feedback Reporting Format
+RFC3464 .................  148/0289  0.5121  Fallback Module for MTAs
 RFC3834 .................    0/0012  0.0000  Detector for auto replied message
 --------------------------------------------------------------------------------
- bounceHammer 2.7.13p3    1401/2437  0.5749
- Sisimai 4.22.3           2437/2437  1.0000
+ bounceHammer 2.7.13p3    1447/2466  0.5868
+ Sisimai v4.22.6          2466/2466  1.0000

data/Benchmarks.mk

@@ -17,22 +17,29 @@ EMAILROOTDIR := set-of-emails
 PUBLICEMAILS := $(EMAILROOTDIR)/maildir/bsd
 DOSFORMATSET := $(EMAILROOTDIR)/maildir/dos
 MACFORMATSET := $(EMAILROOTDIR)/maildir/mac
-SPEEDTESTDIR := $(PUBLICEMAILS)
+PRIVATEMAILS := $(EMAILROOTDIR)/private
+SPEEDTESTDIR := tmp/emails-for-speed-test
 
 COMMANDARGVS := -I./lib -rsisimai
 TOBEEXECUTED := 'Sisimai.make($$*.shift, delivered: true)' $(PUBLICMAILS)
-HOWMANYMAILS := $(PERL) $(COMMANDARGVS) -le 'puts Sisimai.make($$*.shift, delivered: true).size' 
+HOWMANYMAILS := $(RUBY) $(COMMANDARGVS) -le 'puts Sisimai.make($$*.shift, delivered: true).size' 
 
 # -----------------------------------------------------------------------------
 .PHONY: clean
 
-speed-test:
+emails-for-speed-test:
+	@ rm -fr ./$(SPEEDTESTDIR)
+	@ $(MKDIR) $(SPEEDTESTDIR)
+	@ $(CP) -Rp $(PUBLICEMAILS)/*.eml $(SPEEDTESTDIR)/
+	@ test -d $(PRIVATEMAILS) && find $(PRIVATEMAILS) -type f -name '*.eml' -exec $(CP) -Rp {} $(SPEEDTESTDIR)/ \; || true
+
+speed-test: emails-for-speed-test
 	@ echo `$(HOWMANYMAILS) $(SPEEDTESTDIR)` emails in $(SPEEDTESTDIR)
 	@ echo -------------------------------------------------------------------
 	@ uptime
 	@ echo -------------------------------------------------------------------
 	@ n=1; while [ "$$n" -le "10" ]; do \
-		/usr/bin/time $(PERL) $(COMMANDARGVS) -e $(TOBEEXECUTED) $(SPEEDTESTDIR) > /dev/null; \
+		time $(RUBY) $(COMMANDARGVS) -e $(TOBEEXECUTED) $(SPEEDTESTDIR) > /dev/null; \
 		sleep 2; \
 		n=`expr $$n + 1`; \
 	done
@@ -52,3 +59,4 @@ loc:
 
 clean:
 	find . -type f -name 'profiling-*' -ctime +1 -delete
+	rm -r $(SPEEDTESTDIR)

data/ChangeLog.md

@@ -3,6 +3,20 @@ RELEASE NOTES for Ruby version of Sisimai
 - releases: "https://github.com/sisimai/rb-Sisimai/releases"
 - download: "https://rubygems.org/gems/sisimai"
 
+v4.22.7
+--------------------------------------------------------------------------------
+- release: "Mon, 16 Jul 2018 13:02:54 +0900 (JST)"
+- version: "4.22.7"
+- changes:
+  - Register D.S.N. "4.4.312" and "5.4.312" on Office 365 as "networkerror".
+  - Fix error message pattern in Sisimai::Reason::SecurityError.
+  - Fix code to get the original Message-Id field which continued to the next
+    line. Thanks to Andreas Mock.
+  - Update error message pattern in Sisimai::Reason::SpamDetected.
+  - Add 15 sample emails for Postfix, Outlook and others.
+  - Add 3 sample emails for Sisimai::RFC3464.
+  - Add 2 sample vacation emails for Sisimai::RFC3834.
+
 v4.22.6
 --------------------------------------------------------------------------------
 - release: "Wed, 23 May 2018 20:00:00 +0900 (JST)"

data/Developers.mk

@@ -15,24 +15,24 @@ LS    := ls -1
 CP    := cp
 RM    := rm -f
 
-BH_LATESTVER := 2.7.13p3
+THELASTBHVER := 2.7.13p3
 BOUNCEHAMMER := /usr/local/bouncehammer
 MBOXPARSERV0 := $(BOUNCEHAMMER)/bin/mailboxparser -T
 PERL5SISIMAI := p5-Sisimai
 PRECISIONTAB := ANALYTICAL-PRECISION
-PARSERLOGDIR := var/log
+PARSERLOGDIR := tmp/parser-logs
 MAILCLASSDIR := lib/$(NAME)/Bite/Email
 JSONCLASSDIR := lib/$(NAME)/Bite/JSON
 MTARELATIVES := ARF rfc3464 rfc3834
 
 BENCHMARKDIR := tmp/benchmark
-BENCHMARKSET := tmp/sample
-SPEEDTESTDIR := tmp/emails-for-speed-test
+PRECISIONDIR := tmp/emails-for-precision
+COMPARINGDIR := tmp/emails-for-comparing
 
 PARSERSCRIPT := $(RUBY) sbin/emparser --delivered
 RELEASEVERMP := $(RUBY) -rsisimai
 DEVELOPVERMP := $(RUBY) -I./lib -rsisimai
-HOWMANYMAILS := $(DEVELOPVERMP) -e 'print Sisimai.make($$*.shift, delivered: true).size' $(SPEEDTESTDIR)
+HOWMANYMAILS := $(DEVELOPVERMP) -e 'print Sisimai.make($$*.shift, delivered: true).size' $(COMPARINGDIR)
 
 BENCHMARKEMP := sbin/mp
 
@@ -44,7 +44,9 @@ MACFORMATSET := $(SET_OF_EMAIL)/maildir/mac
 
 INDEX_LENGTH := 24
 DESCR_LENGTH := 50
-BH_CAN_PARSE := Courier Exim OpenSMTPD Postfix qmail Sendmail EZweb KDDI Facebook Google Verizon
+BH_CAN_PARSE := AmazonSES AmazonWorkMail Aol Bigfoot Biglobe Courier EZweb Exim \
+				Facebook GSuite Google KDDI MessageLabs MessagingServer Office365 \
+				Postfix SendGrid Sendmail Verizon X5 Yandex qmail
 
 # -----------------------------------------------------------------------------
 .PHONY: clean
@@ -58,46 +60,46 @@ precision-table:
 		-e 's/Email::qmail/Email::Qmail/g' \
 		-e 's/Email::mFILTER/Email::MFILTER/g' > $(PRECISIONTAB)
 
-update-sample-emails:
+update-other-format-emails:
 	for v in `find $(PUBLICEMAILS) -name '*-01.eml' -type f`; do \
 		f="`basename $$v`" ;\
 		nkf -Lw $$v > $(DOSFORMATSET)/$$f ;\
 		nkf -Lm $$v > $(MACFORMATSET)/$$f ;\
 	done
 
-sample:
+emails-for-precision:
 	for v in `$(LS) ./$(MAILCLASSDIR)/*.rb | grep -v userdefined`; do \
 		MTA=`echo $$v | cut -d/ -f6 | tr '[A-Z]' '[a-z]' | sed 's/.rb//g'` ;\
-		$(MKDIR) $(BENCHMARKSET)/email-$$MTA ;\
-		$(CP) $(PUBLICEMAILS)/email-$$MTA-*.eml $(BENCHMARKSET)/email-$$MTA/ ;\
-		$(CP) $(PRIVATEMAILS)/email-$$MTA/* $(BENCHMARKSET)/email-$$MTA/ ;\
+		$(MKDIR) $(PRECISIONDIR)/email-$$MTA ;\
+		$(CP) $(PUBLICEMAILS)/email-$$MTA-*.eml $(PRECISIONDIR)/email-$$MTA/ ;\
+		$(CP) $(PRIVATEMAILS)/email-$$MTA/* $(PRECISIONDIR)/email-$$MTA/ ;\
 	done
 	for v in arf rfc3464 rfc3834; do \
-		$(MKDIR) $(BENCHMARKSET)/$$v ;\
-		$(CP) $(PUBLICEMAILS)/$$v*.eml $(BENCHMARKSET)/$$v/ ;\
-		$(CP) $(PRIVATEMAILS)/$$v/* $(BENCHMARKSET)/$$v/ ;\
+		$(MKDIR) $(PRECISIONDIR)/$$v ;\
+		$(CP) $(PUBLICEMAILS)/$$v*.eml $(PRECISIONDIR)/$$v/ ;\
+		$(CP) $(PRIVATEMAILS)/$$v/* $(PRECISIONDIR)/$$v/ ;\
 	done
 
-samples-for-speedtest:
-	@ rm -fr ./$(SPEEDTESTDIR)
-	@ $(MKDIR) $(SPEEDTESTDIR)
+emails-for-comparing:
+	@ rm -fr ./$(COMPARINGDIR)
+	@ $(MKDIR) $(COMPARINGDIR)
 	@ for v in $(BH_CAN_PARSE); do \
-		$(CP) $(PUBLICEMAILS)/email-`echo $$v | tr '[A-Z]' '[a-z]'`-*.eml $(SPEEDTESTDIR)/; \
-		test -d $(PRIVATEEMAILS) && $(CP) $(PRIVATEMAILS)/email-`echo $$v | tr '[A-Z]' '[a-z]'`/*.eml $(SPEEDTESTDIR)/; \
+		$(CP) $(PUBLICEMAILS)/email-`echo $$v | tr '[A-Z]' '[a-z]'`-*.eml $(COMPARINGDIR)/; \
+		test -d $(PRIVATEEMAILS) && $(CP) $(PRIVATEMAILS)/email-`echo $$v | tr '[A-Z]' '[a-z]'`/*.eml $(COMPARINGDIR)/; \
 	done
 
-velocity-measurement: samples-for-speedtest
+comparison: emails-for-comparing
 	@ echo -------------------------------------------------------------------
-	@ echo `$(HOWMANYMAILS)` emails in $(SPEEDTESTDIR)
+	@ echo `$(HOWMANYMAILS)` emails in $(COMPARINGDIR)
 	@ echo -n 'Calculating the velocity of parsing 1000 mails: multiply by '
 	@ echo "scale=6; 1000 / `$(HOWMANYMAILS)`" | bc
 	@ echo -------------------------------------------------------------------
 	@ uptime
 	@ echo -------------------------------------------------------------------
 	@ if [ -x "$(BOUNCEHAMMER)/bin/mailboxparser" ]; then \
-		echo bounceHammer $(BH_LATESTVER); \
+		echo bounceHammer $(THELASTBHVER); \
 		n=1; while [ $$n -le 5 ]; do \
-			/usr/bin/time $(MBOXPARSERV0) -Fjson $(SPEEDTESTDIR) > /dev/null ;\
+			/usr/bin/time $(MBOXPARSERV0) -Fjson $(COMPARINGDIR) > /dev/null ;\
 			sleep 1; \
 			n=`expr $$n + 1`; \
 		done; \
@@ -105,25 +107,21 @@ velocity-measurement: samples-for-speedtest
 	fi
 	@ echo 'Sisimai' `$(RELEASEVERMP) -e 'puts Sisimai.version'` $(RELEASEVERMP)
 	@ n=1; while [ $$n -le 5 ]; do \
-		/usr/bin/time $(RELEASEVERMP) -e 'Sisimai.make($$*.shift, deliverd: true)' $(SPEEDTESTDIR) > /dev/null ;\
+		/usr/bin/time $(RELEASEVERMP) -e 'Sisimai.make($$*.shift, deliverd: true)' $(COMPARINGDIR) > /dev/null ;\
 		sleep 1; \
 		n=`expr $$n + 1`; \
 	done
 	@ echo -------------------------------------------------------------------
 	@ echo 'Sisimai' `$(DEVELOPVERMP) -e 'puts Sisimai.version'` $(DEVELOPVERMP)
 	@ n=1; while [ $$n -le 5 ]; do \
-		/usr/bin/time $(DEVELOPVERMP) -e 'Sisimai.make($$*.shift, deliverd: true)' $(SPEEDTESTDIR) > /dev/null ;\
+		/usr/bin/time $(DEVELOPVERMP) -e 'Sisimai.make($$*.shift, deliverd: true)' $(COMPARINGDIR) > /dev/null ;\
 		sleep 1; \
 		n=`expr $$n + 1`; \
 	done
 	@ echo -------------------------------------------------------------------
 
-benchmark-mbox: sample
-	$(MKDIR) -p $(BENCHMARKDIR)
-	$(CP) `find $(BENCHMARKSET) -type f` $(BENCHMARKDIR)/
-
 clean:
-	$(RM) -r ./$(BENCHMARKSET)
+	$(RM) -r ./$(PRECISIONDIR)
 	$(RM) -r ./$(BENCHMARKDIR)
 	$(RM) -f tmp/subject-list tmp/senders-list
 

data/README-JA.md

@@ -236,15 +236,16 @@ Differences between Ruby version and Perl version
 | 動作環境                                    | Ruby 2.1 - 2.5 | Perl 5.10 -   |
 |                                             | JRuby 9.0.4.0- |               |
 | 解析精度の割合(2000通のメール)[1]           | 1.00           | 1.00          |
-| メール解析速度(1000通のメール)              | 5.05秒         | 1.95秒        |
+| メール解析速度(1000通のメール)              | 3.75秒[2]      | 1.70秒        |
 | インストール方法                            | gem install    | cpanm, cpm    |
 | 依存モジュール数(コアモジュールを除く)      | 1モジュール    | 2モジュール   |
 | LOC:ソースコードの行数                      | 12000行        | 8600行        |
-| テスト件数(spec/,t/,xt/ディレクトリ)        | 212000件       | 229000件      |
+| テスト件数(spec/,t/,xt/ディレクトリ)        | 217000件       | 235000件      |
 | ライセンス                                  | 二条項BSD      | 二条項BSD     |
 | 開発会社によるサポート契約                  | 準備中         | 提供中        |
 
 1. [./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.4
 
 Other spec of Sisimai
 -------------------------------------------------------------------------------

data/README.md

@@ -240,15 +240,16 @@ and bounceHammer are available at
 | System requirements                         | Ruby 2.1 - 2.5 | 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)     | 5.05s          | 1.95s         |
+| The speed of parsing email(1000 emails)     | 3.75s[2]       | 1.70s         |
 | How to install                              | gem install    | cpanm, cpm    |
 | Dependencies (Except core modules)          | 1 module       | 2 modules     |
 | LOC:Source lines of code                    | 12000 lines    | 8600 lines    |
-| The number of tests(spec/,t/,xt/) directory | 212000 tests   | 229000 tests  |
+| The number of tests(spec/,t/,xt/) directory | 217000 tests   | 235000 tests  |
 | License                                     | BSD 2-Clause   | BSD 2-Clause  |
 | Support Contract provided by Developer      | Coming soon    | Available     |
 
 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.4
 
 Other specification of Sisimai
 -------------------------------------------------------------------------------

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

@@ -68,7 +68,7 @@ module Sisimai::Bite::Email
         return nil unless mbody
 
         return nil unless mhead['from'] =~ /[<]?mailer-daemon[@].*mail[.]ru[>]?/i
-        return nil unless mhead['message-id'].end_with?('.mail.ru>')
+        return nil unless mhead['message-id'].end_with?('.mail.ru>', 'smailru.net>')
         return nil unless mhead['subject'] =~ %r{(?:
            Mail[ ]delivery[ ]failed(:[ ]returning[ ]message[ ]to[ ]sender)?
           |Warning:[ ]message[ ].+[ ]delayed[ ]+

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

@@ -23,10 +23,14 @@ module Sisimai::Bite::Email
       StatusList = {
         # https://support.office.com/en-us/article/Email-non-delivery-reports-in-Office-365-51daa6b9-2e35-49c4-a0c9-df85bf8533c3
         %r/\A4[.]4[.]7\z/        => 'expired',
+        %r/\A4[.]4[.]312\z/      => 'networkerror',
+        %r/\A4[.]4[.]316\z/      => 'expired',
         %r/\A4[.]7[.]26\z/       => 'securityerror',
         %r/\A4[.]7[.][56]\d\d\z/ => 'blocked',
         %r/\A4[.]7[.]8[5-9]\d\z/ => 'blocked',
         %r/\A5[.]4[.]1\z/        => 'norelaying',
+        %r/\A5[.]4[.]312\z/      => 'networkerror',
+        %r/\A5[.]4[.]316\z/      => 'expired',
         %r/\A5[.]4[.]6\z/        => 'networkerror',
         %r/\A5[.]6[.]11\z/       => 'contenterror',
         %r/\A5[.]7[.]1\z/        => 'rejected',

data/lib/sisimai/reason/blocked.rb

@@ -23,8 +23,10 @@ module Sisimai
             |access[ ]from[ ]ip[ ]address[ ].+[ ]blocked
             |all[ ]mail[ ]servers[ ]must[ ]have[ ]a[ ]ptr[ ]record[ ]with[ ]a[ ]valid[ ]reverse[ ]dns[ ]entry
             |bad[ ]sender[ ]ip[ ]address
+            |banned[ ]sending[ ]ip  # Office365
             |blacklisted[ ]by
             |(?:blocked|refused)[ ]-[ ]see[ ]https?://
+            |blocked[ ]using[ ]
             |can[']t[ ]determine[ ]purported[ ]responsible[ ]address
             |cannot[ ](?:
                find[ ]your[ ]hostname

data/lib/sisimai/reason/expired.rb

@@ -27,10 +27,12 @@ module Sisimai
             'has been delayed',
             'it has not been collected after',
             'message expired after sitting in queue for',
+            'message expired, connection refulsed',
             'message timed out',
             'retry time not reached for any host after a long failure period',
             'server did not respond',
             'this message has been in the queue too long',
+            'unable to deliver message after multiple retries',
             'was not reachable within the allowed queue period',
             'your message could not be delivered for more than',
           ]

data/lib/sisimai/reason/securityerror.rb

@@ -48,6 +48,9 @@ module Sisimai
               my[ ]list[ ]of[ ]allowed[ ]rcpthosts
             |tls[ ]required[ ]but[ ]not[ ]supported # SendGrid:the recipient mailserver does not support TLS or have a valid certificate
             |user[ ].+[ ]is[ ]not[ ]authorized[ ]to[ ]perform[ ]ses:sendrawemail[ ]on[ ]resource
+            |tls[ ]required[ ]but[ ]not[ ]supported # SendGrid:the recipient mailserver does not support TLS or have a valid certificate
+            |unauthenticated[ ]senders[ ]not[ ]allowed
+            |user[ ].+[ ]is[ ]not[ ]authorized[ ]to[ ]perform[ ]ses:sendrawemail[ ]on[ ]resource
             |you[ ]are[ ]not[ ]authorized[ ]to[ ]send[ ]mail,[ ]authentication[ ]is[ ]required
             |verification[ ]failure
             )

data/lib/sisimai/reason/spamdetected.rb

@@ -81,7 +81,7 @@ module Sisimai
             |rejected(?:
                :[ ]spamassassin[ ]score[ ]
               |[ ]by[ ].+[ ][(]spam[)]
-              |[ ]due[ ]to[ ]spam[ ]content
+              |[ ]due[ ]to[ ]spam[ ](?:classification|content)
               )
             |rejecting[ ]banned[ ]content
             |related[ ]to[ ]content[ ]with[ ]spam[-]like[ ]characteristics

data/lib/sisimai/rfc5322.rb

@@ -206,7 +206,7 @@ module Sisimai
 
         while e = argv1.shift do
           # After "message/rfc822"
-          if cv = e.match(/\A([-0-9A-Za-z]+?)[:][ ]*.+\z/)
+          if cv = e.match(/\A([-0-9A-Za-z]+?)[:][ ]*.*\z/)
             # Get required headers
             lhs = cv[1].downcase
             previousfn = ''

data/lib/sisimai/version.rb

@@ -1,4 +1,4 @@
 # Define the version number of Sisimai
 module Sisimai
-  VERSION = '4.22.6'.freeze
+  VERSION = '4.22.7'.freeze
 end

data/set-of-emails/maildir/bsd/email-amazonses-14.eml

@@ -0,0 +1,58 @@
+X-Apparently-To: kijitora@example.com; Thu, 29 Apr 2017 23:34:45 +0000
+Return-Path: <>
+Received-SPF: none (domain of p12-22.smtp-out.amazonses.com does not designate permitted sender hosts)
+X-Originating-IP: [192.0.2.225]
+Authentication-Results: mx1224.biz.mail.sg1.yahoo.com  from=amazonses.com; domainkeys=neutral (no sig);  from=amazonses.com; dkim=neutral (no sig)
+Received: from 127.0.0.1  (EHLO p12-22.smtp-out.amazonses.com) (192.0.2.225)
+  by mx1224.biz.mail.sg1.yahoo.com with SMTPS; Thu, 29 Apr 2017 23:34:45 +0000
+From: MAILER-DAEMON@amazonses.com
+To: kijitora@example.com
+Message-ID: <00000000ffffeeff-a0001200-eeee-f009-c00d-2222feff0000-000000@email.amazonses.com>
+Subject: Delivery Status Notification (Failure)
+MIME-Version: 1.0
+Content-Type: multipart/report; 
+	boundary="----=_Part_000020_000000013.15000000000"; 
+	report-type=delivery-status
+Date: Thu, 29 Apr 2017 23:34:45 +0000
+X-SES-Outgoing: 2017.04.29-192.0.2.225
+Content-Length: 4401
+
+------=_Part_000020_000000013.15000000000
+Content-Type: text/plain; charset=us-ascii
+Content-Transfer-Encoding: 7bit
+Content-Description: Notification
+
+An error occurred while trying to deliver the mail to the following recipients:
+sironeko@neko.example.org
+------=_Part_000020_000000013.15000000000
+Content-Type: message/delivery-status
+Content-Transfer-Encoding: 7bit
+Content-Description: Delivery Status Notification
+
+Reporting-MTA: dsn; a8-95.smtp-out.amazonses.com
+
+Action: failed
+Final-Recipient: rfc822; sironeko@neko.example.org
+Diagnostic-Code: smtp; 554 5.7.1 <a8-95.smtp-out.amazonses.com[203.0.113.22]>: Client host rejected: blocked using mail.neko.example.org; Please see http://mail.neko.example.org/rbl/?ip=203.0.113.22 to send.
+Status: 5.7.1
+
+
+------=_Part_000020_000000013.15000000000
+Content-Type: message/rfc822
+Content-Description: Undelivered Message
+
+From: "Neko Nyaan" <kijitora@example.com>
+To: sironeko@neko.example.org
+Subject: Nyaan
+Date: Thu, 29 Apr 2017 23:34:45 +0000
+MIME-Version: 1.0
+Message-ID: <ffffffffffffffff-00000000-2222-2222-2222-111111111111-ffffff@email.amazonses.com>
+Reply-To: kijitora@example.com
+Content-Type: multipart/alternative;
+	boundary="--=_NextPart_FF00FFFF_FF00FFEE_B0FF00EE.EEEE00EE"
+X-SES-Outgoing: 2017.04.29-203.0.113.22
+
+Nyaan
+
+------=_Part_000020_000000013.15000000000--
+