sisimai 4.25.8-java → 4.25.12-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8cee2450b0dba6e217c1299b6447fbbdfd3b4ca1
-  data.tar.gz: 0cdc13c9a29e3a849e38e6a920544d50d8c5ed19
+  metadata.gz: a30f26224fd5f01bc47011cd109bde99e359ab61
+  data.tar.gz: '087d06b9df4337e9ff960880f81792490e0945c6'
 SHA512:
-  metadata.gz: 625b75a13713cafa417891ee1ae219a95477c58af1292d582e424a2f424691ed72e1a34b1a2be11a9567d54b6004d44dcbb507ae681b92a01e15fc27b5c95086
-  data.tar.gz: e882e9b2a34af8c49867e3b3a8ca1ff8808d633ec3b3512ce914fffe6062bbe37f57d4800d5102c998a9ead3f87e0950a6b9ab6a87af6b0fb80ca343847601f1
+  metadata.gz: e3e3b29f89c3c9c5f381fc53686dd6f0b3759466e9bed222929fee1b3486f99e620ea5d5f79dd45baa0214a242122d257c855aa409cd63e740a8cc28092dfd3f
+  data.tar.gz: cc4ceb9eb690cca2feb35294c89dd67d951fce32ffd867d25681977ed201dad469c73e4e56bfc7e05710f16a31451aa3f553794d003af7133a015436b2a97b6e

data/.travis.yml

@@ -2,11 +2,12 @@ language: ruby
 rvm:
   # See http://rubies.travis-ci.org for Precompiled Ruby Versions
   - 2.1.1
-  - 2.2.4
+  - 2.2.10
 # - 2.3.0
-# - 2.4.0
+  - 2.4.9
 # - 2.5.0
-  - 2.6.0
+  - 2.6.6
+  - 2.7.0
 # - jruby-9.0.5.0
 # - jruby-9.1.9.0
 before_install:

data/ANALYTICAL-PRECISION

@@ -61,4 +61,4 @@ RFC3464 ..........  151/0322  0.4689  Fallback Module for MTAs
 RFC3834 ..........    0/0014  0.0000  Detector for auto replied message
 --------------------------------------------------------------------------------
  bounceHammer      1523/2635  0.5779
- Sisimai 4.25.6    2635/2635  1.0000
+ Sisimai 4.25.8    2635/2635  1.0000

data/ChangeLog.md

@@ -3,6 +3,71 @@ RELEASE NOTES for Ruby version of Sisimai
 - releases: "https://github.com/sisimai/rb-sisimai/releases"
 - download: "https://rubygems.org/gems/sisimai"
 
+v4.25.12
+--------------------------------------------------------------------------------
+- release: "Mon, 22 Nov 2021 12:22:22 +0900 (JST)"
+- version: "4.25.12"
+- changes:
+  - Fix 2 encoding related errors:
+    - Fix an error with message `incompatible character encodings:ASCII-8BIT and
+      UTF-8` reported at issue #223. Thanks to @chahn
+    - Fix an error with message `invalid byte sequence in UTF-8 (ArgumentError)`
+      reported at issue #224. Thanks to @chahn
+    - Add `rfc3464-41.eml` and `rfc3464-42.eml` provided by @chahn
+    - Add a new error code of La Poste at `Sisimai::Rhost::FrancePTT` module and
+      a new sample email `rhost-franceptt-12.eml` into `set-of-emails` directory
+      imported from sisimai/p5-sisimai#441.
+    - Remove all the HTML elements from the value of `diagnosticcode`.
+  - Fix serious bugs:
+    - Both of the values of `deliverystatus` and `replycode` detected from the
+      message body did not use at `Sisimai::Lhost::Exim`.
+    - `true` method strictly checks the value of `smtpcommand` at some classes
+      in `Sisimai/Reason`. For example, when a detected reason is `spamdetected`
+      and `virusdetected` the value of `smtpcommand` should be `DATA` or an SMTP
+      command to be sent after `DATA`.
+
+v4.25.11
+--------------------------------------------------------------------------------
+- release: "Mon, 22 Feb 2021 21:15:22 +0900 (JST)"
+- version: "4.25.11"
+- changes:
+  - Fix typo in `Sisimai::RFC3464`
+  - Import some commits from Sisimai version 5 preview #
+    - Improved code for getting an email address in `Sisimai::Address`
+    - Improved code for checking the day of month value, for converting a full
+      month name and a full day of the week at `Sisimai::DateTime`
+    - Improvement code for picking text blocks of message/rfc822 part in RFC5322
+    - Add 60+ error message patterns
+    - Improved code for encodings in `Sisimai::Lhost::Domino`, `Sisimai::String`
+
+v4.25.10
+--------------------------------------------------------------------------------
+- release: "Tue, 22 Dec 2020 13:22:22 +0900 (JST)"
+- version: "4.25.10"
+- changes:
+  - #187 Remove the following old methods (marked as obsolete from v4.25.6)
+    - `Sisimai::Mail.close` (automatically closes at the EOF)
+    - `Sisimai::Mail.type` (use `Sisimai::Mail.kind` instead)
+    - `Sisimai::Mail.mail.*` (use `Sisimai::Mail.data.*` instead)
+  - `Sisimai::Lhost::Exim` and `Sisimai::Lhost::X3` improvement
+  - #205 Code improvement for `Source-IP` field on `Sisimai::ARF`
+  - #207 Updates for DMARC and SPF related errors
+    - The value of `reason` rejected due to DMARC policy is `policyviolation`
+    - The value of `reason` rejected due to no SPF record is `rejected`
+    - Add some sample emails related to above into set-of-emails/
+
+v4.25.9
+--------------------------------------------------------------------------------
+- release: "Sat,  3 Oct 2020 22:00:00 +0900 (JST)"
+- version: ""
+- changes:
+  - Suppress warning messages on Ruby 2.7. Thanks to @koic
+    - Suppress keyword argument warnings in Ruby 2.7 #200
+    - Suppress a Ruby warning for `Object#=~` and bug fix to match patterns #201
+  - #203 Replace `.+` with `[^ ]` on some large regular expressions for serious 
+    performance reason.
+  - #204 Suport Null MX (RFC7505) on Sendmail sisimai/set-of-emails#4
+
 v4.25.8
 --------------------------------------------------------------------------------
 - release: "Fri, 17 Jul 2020 11:59:49 +0900 (JST)"

data/README-JA.md

@@ -53,7 +53,7 @@ Key features
   * git clone & make
 * __高い解析精度__
   * 解析精度はbounceHammerの2倍
-  * 66種類のMTA/MDA/ESPに対応
+  * 68種類のMTA/MDA/ESPに対応
   * Feedback Loopにも対応
   * 29種類のエラー理由を検出
 
@@ -220,8 +220,8 @@ Differences between Ruby version and Perl version
 | メール解析速度(1000通のメール)              | 2.22秒[2]      | 1.35秒        |
 | インストール方法                            | gem install    | cpanm, cpm    |
 | 依存モジュール数(コアモジュールを除く)      | 1モジュール    | 2モジュール   |
-| LOC:ソースコードの行数                      | 10200行        | 10400行       |
-| テスト件数(spec/,t/,xt/ディレクトリ)        | 236000件       | 266000件      |
+| LOC:ソースコードの行数                      | 10400行        | 10500行       |
+| テスト件数(spec/,t/,xt/ディレクトリ)        | 241000件       | 270000件      |
 | ライセンス                                  | 二条項BSD      | 二条項BSD     |
 | 開発会社によるサポート契約                  | 提供中         | 提供中        |
 

data/README.md

@@ -52,7 +52,7 @@ Key Features
   * git clone & make
 * __High Precision of Analysis__
   * 2 times higher than bounceHammer
-  * Support 66 MTAs/MDAs/ESPs
+  * Support 68 MTAs/MDAs/ESPs
   * Support Feedback Loop Message(ARF)
   * Can detect 29 error reasons
 
@@ -225,8 +225,8 @@ 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                    | 10200 lines    | 10400 lines   |
-| The number of tests(spec/,t/,xt/) directory | 236000 tests   | 266000 tests  |
+| LOC:Source lines of code                    | 10400 lines    | 10500 lines   |
+| The number of tests(spec/,t/,xt/) directory | 241000 tests   | 270000 tests  |
 | License                                     | BSD 2-Clause   | BSD 2-Clause  |
 | Support Contract provided by Developer      | Available      | Available     |
 
@@ -283,7 +283,7 @@ Author
 
 Copyright
 ===============================================================================
-Copyright (C) 2015-2020 azumakuniyuki, All Rights Reserved.
+Copyright (C) 2015-2021 azumakuniyuki, All Rights Reserved.
 
 License
 ===============================================================================

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,15 +14,20 @@ 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
@@ -33,8 +38,7 @@ module Sisimai
       def description; return 'Abuse Feedback Reporting Format'; 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)
@@ -109,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
@@ -169,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?
 
@@ -226,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]
@@ -236,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
@@ -287,6 +290,7 @@ 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']      = 'Feedback-Loop'

data/lib/sisimai/data.rb

@@ -262,10 +262,16 @@ module Sisimai
             # 550-5.7.1 likely unsolicited mail. To reduce the amount of spam sent to Gmail,
             # 550-5.7.1 this message has been blocked. Please visit
             # 550 5.7.1 https://support.google.com/mail/answer/188131 for more information.
-            p['diagnosticcode'] = Sisimai::String.sweep(p['diagnosticcode'].gsub(re, ' '))
+            p['diagnosticcode'] = p['diagnosticcode'].gsub(re, ' ')
+            p['diagnosticcode'] = Sisimai::String.sweep(p['diagnosticcode'].sub(%r|<html>.+</html>|i, ''))
           end
         end
 
+        if Sisimai::String.is_8bit(p['diagnosticcode'])
+          # To avoid incompatible character encodings: ASCII-8BIT and UTF-8 (Encoding::CompatibilityError
+          p['diagnosticcode'] = p['diagnosticcode'].force_encoding('UTF-8').scrub('?')
+        end
+
         p['diagnostictype'] ||= 'X-UNIX' if p['reason'] == 'mailererror'
         p['diagnostictype'] ||= 'SMTP' unless %w[feedback vacation].include?(p['reason'])
 

data/lib/sisimai/datetime.rb

@@ -207,24 +207,24 @@ module Sisimai
       end
 
       # Month name list
-      # @param    [Integer] argv1  Require full name or not
+      # @param    [Boolean] argv1  Require full name or not
       # @return   [Array, String]  Month name list or month name
       # @example  Get the names of each month
-      #   monthname()  #=> [ 'Jan', 'Feb', ... ]
-      #   monthname(1) #=> [ 'January', 'February', 'March', ... ]
-      def monthname(argv1 = 0)
-        value = argv1 > 0 ? :full : :abbr
+      #   monthname()     #=> [ 'Jan', 'Feb', ... ]
+      #   monthname(true) #=> [ 'January', 'February', 'March', ... ]
+      def monthname(argv1 = false)
+        value = argv1 ? :full : :abbr
         return MonthName[value]
       end
 
       # List of day of week
-      # @param    [Integer] argv1 Require full name
+      # @param    [Boolean] argv1 Require full name
       # @return   [Array, String] List of day of week or day of week
       # @example  Get the names of each day of week
-      #   dayofweek()  #=> [ 'Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat' ]
-      #   dayofweek(1) #=> [ 'Sunday', 'Monday', 'Tuesday', ... ]
-      def dayofweek(argv1 = 0)
-        value = argv1 > 0 ? :full : :abbr
+      #   dayofweek()     #=> [ 'Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat' ]
+      #   dayofweek(true) #=> [ 'Sunday', 'Monday', 'Tuesday', ... ]
+      def dayofweek(argv1 = false)
+        value = argv1 ? :full : :abbr
         return DayOfWeek[value]
       end
 
@@ -257,9 +257,10 @@ module Sisimai
 
         while p = timetokens.shift do
           # Parse each piece of time
-          if p =~ /\A[A-Z][a-z]{2}[,]?\z/
+          if p =~ /\A[A-Z][a-z]{2,}[,]?\z/
             # Day of week or Day of week; Thu, Apr, ...
-            p.chop if p.size == 4 # Thu, -> Thu
+            p.gsub!(/,\z/, '') if p.end_with?(',')  # "Thu," => "Thu"
+            p = p[0,3] if p.size > 3
 
             if DayOfWeek[:abbr].include?(p)
               # Day of week; Mon, Thu, Sun,...
@@ -273,7 +274,7 @@ module Sisimai
             # Year or Day; 2005, 31, 04,  1, ...
             if p.to_i > 31
               # The piece is the value of an year
-              v[:Y] = p
+              v[:Y] = p.to_i
             else
               # The piece is the value of a day
               if v[:d]
@@ -441,7 +442,7 @@ module Sisimai
       # @example  Get timezone offset string of specified seconds
       #   second2tz(12345)    #=> '+0325'
       def second2tz(argv1)
-        return '+0000' unless argv1.is_a?(Number)
+        return '+0000' unless argv1.is_a?(::Integer)
         return nil if argv1.abs > TZ_OFFSET  # UTC+14 + 1(DST?)
 
         digit = { :operator => '+' }

data/lib/sisimai/lhost/amazonses.rb

@@ -182,7 +182,7 @@ module Sisimai::Lhost
               v['status']    = Sisimai::SMTP::Status.find(v['diagnosis']) || ''
               v['replycode'] = Sisimai::SMTP::Reply.find(v['diagnosis'])  || ''
               v['reason']    = 'delivered'
-              v['action']    = 'deliverable'
+              v['action']    = 'delivered'
 
               v['date'] = o['timestamp'] || p['mail']['timestamp']
               v['date'].sub!(/[.]\d+Z\z/, '')

data/lib/sisimai/lhost/domino.rb

@@ -7,12 +7,13 @@ module Sisimai::Lhost
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      ReBackbone = %r|^Content-Type:[ ]message/delivery-status|.freeze
+      ReBackbone = %r|^Content-Type:[ ]message/rfc822|.freeze
       StartingOf = { message: ['Your message'] }.freeze
       MessagesOf = {
         'userunknown' => [
           'not listed in Domino Directory',
           'not listed in public Name & Address Book',
+          "dans l'annuaire Domino", # TODO: "non répertorié dans l'annuaire Domino",
           'Domino ディレクトリには見つかりません',
         ],
         'filtered' => ['Cannot route mail to user'],
@@ -25,7 +26,11 @@ module Sisimai::Lhost
       # @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 mhead['subject'].start_with?('DELIVERY FAILURE:')
+        return nil unless mhead['subject'].start_with?('DELIVERY FAILURE:', 'DELIVERY_FAILURE:')
+
+        require 'sisimai/rfc1894'
+        fieldtable = Sisimai::RFC1894.FIELDTABLE
+        permessage = {}     # (Hash) Store values of each Per-Message field
 
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
         emailsteak = Sisimai::RFC5322.fillet(mbody, ReBackbone)
@@ -87,6 +92,24 @@ module Sisimai::Lhost
             elsif cv = e.match(/\A[ ][ ]Subject: (.+)\z/)
               #   Subject: Nyaa
               subjecttxt = cv[1]
+
+            elsif f = Sisimai::RFC1894.match(e)
+              # There are some fields defined in RFC3464, try to match 
+              o = Sisimai::RFC1894.field(e) || next
+              next if o[-1] == 'addr'
+
+              if o[-1] == 'code'
+                # Diagnostic-Code: SMTP; 550 5.1.1 <userunknown@example.jp>... User Unknown
+                v['spec']      = o[1] if v['spec'].to_s.empty?
+                v['diagnosis'] = o[2] if v['diagnosis'].to_s.empty?
+              else
+                # Other DSN fields defined in RFC3464
+                next unless fieldtable[o[0]]
+                v[fieldtable[o[0]]] = o[2]
+
+                next unless f == 1
+                permessage[fieldtable[o[0]]] = o[2]
+              end
             end
           end
         end
@@ -95,12 +118,14 @@ module Sisimai::Lhost
         dscontents.each do |e|
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
           e['recipient'] = Sisimai::Address.s3s4(e['recipient'])
+          e['lhost']   ||= permessage['rhost']
+          permessage.each_key { |a| e[a] ||= permessage[a] || '' }
 
           MessagesOf.each_key do |r|
             # Check each regular expression of Domino error messages
             next unless MessagesOf[r].any? { |a| e['diagnosis'].include?(a) }
-            e['reason'] = r
-            e['status'] = Sisimai::SMTP::Status.code(r.to_s, false) || ''
+            e['reason']   = r
+            e['status'] ||= Sisimai::SMTP::Status.code(r.to_s, false) || ''
             break
           end
         end

data/lib/sisimai/lhost/einsundeins.rb

@@ -52,7 +52,7 @@ module Sisimai::Lhost
           # http://postmaster.1and1.com/en/error-messages?ip=%1s
           v = dscontents[-1]
 
-          if cv = e.match(/\A([^ ]+[@][^ ]+)\z/)
+          if cv = e.match(/\A([^ ]+[@][^ ]+?)[:]?\z/)
             # general@example.eu
             if v['recipient']
               # There are multiple recipient addresses in the message body.

data/lib/sisimai/lhost/exchange2007.rb

@@ -24,7 +24,7 @@ module Sisimai::Lhost
         error:   %r/ ((?:RESOLVER|QUEUE)[.][A-Za-z]+(?:[.]\w+)?);/,
         rhost:   %r{\A(?:
            Generating[ ]server            # en-US
-          |Serveur[ ]de[ ]g.+ration[ ]    # fr-FR/Serveur de génération
+          |Serveur[ ]de[ ]g[^ ]+ration[ ] # fr-FR/Serveur de génération
           |Server[ ]di[ ]generazione      # it-CH
           ):[ ]?(.*)
         }x,

data/lib/sisimai/lhost/exim.rb

@@ -12,7 +12,7 @@ module Sisimai::Lhost
       # deliver.c:6425|          else fprintf(f,
       # deliver.c:6426|"------ This is a copy of the message's headers. ------\n");
       ReBackbone = %r{^(?:
-         [-]+[ ]This[ ]is[ ]a[ ]copy[ ]of[ ](?:the|your)[ ]message.+?headers[.][ ][-]+
+         [-]+[ ]This[ ]is[ ]a[ ]copy[ ]of[ ](?:the|your)[ ]message,[ ]including[ ]all[ ]the[ ]headers[.][ ][-]+
         |Content-Type:[ ]*message/rfc822\n(?:[\s\t]+.*?\n\n)?
         )
       }x.freeze
@@ -36,13 +36,14 @@ module Sisimai::Lhost
         # deliver.c:6305|"address(es) failed:\n", sender_address);
         # deliver.c:6306|          }
         alias:   %r/\A([ ]+an undisclosed address)\z/,
-        frozen:  %r/\AMessage .+ (?:has been frozen|was frozen on arrival)/,
+        frozen:  %r/\AMessage [^ ]+ (?:has been frozen|was frozen on arrival)/,
         message: %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[)]:
+          |A[ ]message[ ]that[ ]you[ ]sent[ ]could[ ]not[ ]be[ ]delivered[ ]to[ ]all[ ]of[ ]its[ ]recipients
+          |Message[ ][^ ]+[ ](?:has[ ]been[ ]frozen|was[ ]frozen[ ]on[ ]arrival)
+          |The[ ][^ ]+[ ]router[ ]encountered[ ]the[ ]following[ ]error[(]s[)]:
           )
          }x,
       }.freeze
@@ -134,7 +135,7 @@ module Sisimai::Lhost
         match += 1 if mhead['message-id'].to_s =~ %r/\A[<]\w{7}[-]\w{6}[-]\w{2}[@]/
         match += 1 if mhead['subject'] =~ %r{(?:
            Mail[ ]delivery[ ]failed(:[ ]returning[ ]message[ ]to[ ]sender)?
-          |Warning:[ ]message[ ].+[ ]delayed[ ]+
+          |Warning:[ ]message[ ][^ ]+[ ]delayed[ ]+
           |Delivery[ ]Status[ ]Notification
           |Mail[ ]failure
           |Message[ ]frozen
@@ -264,7 +265,10 @@ module Sisimai::Lhost
                   # Content-type: message/delivery-status
                   nextcursor = 1 if e.start_with?(StartingOf[:deliverystatus][0])
                   v['alterrors'] ||= ''
-                  v['alterrors'] << e + ' ' if e.start_with?(' ')
+                  if e.start_with?("\s", "\t")
+                    e.sub!(/\A[\s\t]+/, '')
+                    v['alterrors'] << e + ' ' unless v['alterrors'].include?(e)
+                  end
                 end
               else
                 if dscontents.size == recipients
@@ -275,7 +279,7 @@ module Sisimai::Lhost
                 else
                   # Error message when email address above does not include '@'
                   # and domain part.
-                  if e =~ %r<\A[ ]+pipe[ ]to[ ][|]/.+>
+                  if e =~ %r<\A[ ]+pipe[ ]to[ ][|]/[^ ]+>
                     # pipe to |/path/to/prog ...
                     #   generated by kijitora@example.com
                     v['diagnosis'] = e
@@ -374,7 +378,7 @@ module Sisimai::Lhost
                 rxdiagnosis = %r/e['diagnosis']/i
                 # Override the value of diagnostic code message because
                 # the value of alterrors includes the value of diagnosis.
-                e['diagnosis'] = e['alterrors'] if e['alterrors'] =~ rxdiagnosis
+                e['diagnosis'] = e['alterrors'] if e['alterrors'].downcase.include?(e['diagnosis'].downcase)
               end
             end
             e.delete('alterrors')
@@ -436,8 +440,8 @@ module Sisimai::Lhost
           #   Diagnostic-Code: smtp; 450 TEMPERROR: retry timeout exceeded
           # The value of "Status:" indicates permanent error but the value
           # of SMTP reply code in Diagnostic-Code: field is "TEMPERROR"!!!!
-          sv = Sisimai::SMTP::Status.find(e['diagnosis'])
-          rv = Sisimai::SMTP::Reply.find(e['diagnosis'])
+          sv = e['status']    || Sisimai::SMTP::Status.find(e['diagnosis'])
+          rv = e['replycode'] || Sisimai::SMTP::Reply.find(e['diagnosis'])
           s1 = 0  # First character of Status as integer
           r1 = 0  # First character of SMTP reply code as integer
 

data/lib/sisimai/lhost/ezweb.rb

@@ -125,7 +125,7 @@ module Sisimai::Lhost
               v['command'] = cv[1]
             else
               # Check error message
-              if rxmessages.any? { |a| e =~ a }
+              if rxmessages.any? { |messages| messages.any? { |message| e =~ message } }
                 # Check with regular expressions of each error
                 v['diagnosis'] ||= ''
                 v['diagnosis'] << ' ' << e

data/lib/sisimai/lhost/gsuite.rb

@@ -82,6 +82,11 @@ module Sisimai::Lhost
               next unless fieldtable[o[0]]
               v[fieldtable[o[0]]] = o[2]
 
+              if fieldtable[o[0]] == 'lhost'
+                # Do not set an email address as a hostname in "lhost" value
+                v['lhost'] = '' if v['lhost'].include?('@')
+              end
+
               next unless f == 1
               permessage[fieldtable[o[0]]] = o[2]
             end

data/lib/sisimai/lhost/imailserver.rb

@@ -71,7 +71,7 @@ module Sisimai::Lhost
               dscontents << Sisimai::Lhost.DELIVERYSTATUS
               v = dscontents[-1]
             end
-            v['recipient'] = cv[1]
+            v['recipient'] = Sisimai::Address.s3s4(cv[1])
             recipients += 1
           else
             # Other error message text

data/lib/sisimai/lhost/mailfoundry.rb

@@ -9,7 +9,7 @@ module Sisimai::Lhost
       Indicators = Sisimai::Lhost.INDICATORS
       ReBackbone = %r|^Content-Type:[ ]message/rfc822|.freeze
       StartingOf = {
-        message: ['This is a MIME encoded message'],
+        message: ['Unable to deliver message to:'],
         error:   ['Delivery failed for the following reason:'],
       }.freeze
 
@@ -34,8 +34,7 @@ module Sisimai::Lhost
           # to the previous line of the beginning of the original message.
           if readcursor == 0
             # Beginning of the bounce message or delivery status part
-            readcursor |= Indicators[:deliverystatus] if e == StartingOf[:message][0]
-            next
+            readcursor |= Indicators[:deliverystatus] if e.start_with?(StartingOf[:message][0])
           end
           next if (readcursor & Indicators[:deliverystatus]) == 0
           next if e.empty?
@@ -44,7 +43,7 @@ module Sisimai::Lhost
           # Delivery failed for the following reason:
           # Server mx22.example.org[192.0.2.222] failed with: 550 <kijitora@example.org> No such user here
           #
-          # This has been a permanent failure.  No further delivery attempts will be made.
+          # This has been a permanent failure. No further delivery attempts will be made.
           v = dscontents[-1]
 
           if cv = e.match(/\AUnable to deliver message to: [<]([^ ]+[@][^ ]+)[>]\z/)

data/lib/sisimai/lhost/mailmarshalsmtp.rb

@@ -32,10 +32,10 @@ module Sisimai::Lhost
         regularexp = nil
         v = nil
 
-        boundary00 = Sisimai::MIME.boundary(mhead['content-type']) || ''
+        boundary00 = Sisimai::MIME.boundary(mhead['content-type'], 1) || ''
         regularexp = if boundary00.size > 0
                        # Convert to regular expression
-                       Regexp.new('\A' << Regexp.escape('--' << boundary00 << '--') << '\z')
+                       Regexp.new('\A' << Regexp.escape(boundary00) << '\z')
                      else
                        regularexp = %r/\A[ \t]*[+]+[ \t]*\z/
                      end

data/lib/sisimai/lhost/mxlogic.rb

@@ -85,7 +85,7 @@ module Sisimai::Lhost
         match += 1 if mhead['from'].start_with?('Mail Delivery System')
         match += 1 if mhead['subject'] =~ %r{(?:
              Mail[ ]delivery[ ]failed(:[ ]returning[ ]message[ ]to[ ]sender)?
-            |Warning:[ ]message[ ].+[ ]delayed[ ]+
+            |Warning:[ ]message[ ][^ ]+[ ]delayed[ ]+
             |Delivery[ ]Status[ ]Notification
             )
         }x

data/lib/sisimai/lhost/notes.rb

@@ -14,7 +14,7 @@ module Sisimai::Lhost
           'User not listed in public Name & Address Book',
           'ディレクトリのリストにありません',
         ],
-        networkerror: ['Message has exceeded maximum hop count'],
+        'networkerror' => ['Message has exceeded maximum hop count'],
       }.freeze
 
       # Parse bounce messages from Lotus Notes