sisimai 4.20.1 → 4.20.2

data/lib/sisimai/reason/rejected.rb

@@ -42,6 +42,7 @@ module Sisimai
             |error:[ ]no[ ]third-party[ ]dsns               # SpamWall - block empty sender
             |fully[ ]qualified[ ]email[ ]address[ ]required # McAfee
             |invalid[ ]domain,[ ]see[ ][<]url:.+[>]
+            |Message[ ]rejected:[ ]Email[ ]address[ ]is[ ]not[ ]verified
             |mx[ ]records[ ]for[ ].+[ ]violate[ ]section[ ].+
             |name[ ]service[ ]error[ ]for[ ]    # Malformed MX RR or host not found
             |Null[ ]Sender[ ]is[ ]not[ ]allowed

data/lib/sisimai/reason/securityerror.rb

@@ -27,8 +27,12 @@ module Sisimai
         def match(argv1)
           return nil unless argv1
           regex = %r{(?>
-             authentication[ ](?:
-               failed;[ ]server[ ].+[ ]said:  # Postfix
+             Account[ ]not[ ]subscribed[ ]to[ ]SES
+            |authentication[ ](?:
+               Credentials Invalid
+              |failure
+              |failed;[ ]server[ ].+[ ]said:  # Postfix
+              |required
               |turned[ ]on[ ]in[ ]your[ ]email[ ]client
               )
             |\d+[ ]denied[ ]\[[a-z]+\][ ].+[(]Mode:[ ].+[)]
@@ -49,6 +53,7 @@ module Sisimai
             |sorry,[ ]you[ ]don'?t[ ]authenticate[ ]or[ ]the[ ]domain[ ]isn'?t[ ]in[ ]my[ ]list[ ]of[ ]allowed[ ]rcpthosts
             |the[ ]message[ ]was[ ]rejected[ ]because[ ]it[ ]contains[ ]prohibited[ ]virus[ ]or[ ]spam[ ]content
             |TLS[ ]required[ ]but[ ]not[ ]supported # SendGrid
+            |User[ ].+[ ]is[ ]not[ ]authorized[ ]to[ ]perform[ ]ses:SendRawEmail[ ]on[ ]resource
             |you[ ]are[ ]not[ ]authorized[ ]to[ ]send[ ]mail,[ ]authentication[ ]is[ ]required
             |You[ ]have[ ]exceeded[ ]the[ ]the[ ]allowable[ ]number[ ]of[ ]posts[ ]without[ ]solving[ ]a[ ]captcha
             |verification[ ]failure

data/lib/sisimai/reason/toomanyconn.rb

@@ -27,6 +27,10 @@ module Sisimai
              All[ ]available[ ]IPs[ ]are[ ]at[ ]maximum[ ]connection[ ]limit    # SendGrid
             |connection[ ]rate[ ]limit[ ]exceeded
             |no[ ]IPs[ ]available[ ][-][ ].+[ ]exceeds[ ]per[-]domain[ ]connection[ ]limit[ ]for
+            |Throttling[ ]failure:[ ](?:
+               Daily[ ]message[ ]quota[ ]exceeded
+              |Maximum[ ]sending[ ]rate[ ]exceeded
+              )
             |Too[ ]many[ ](?:
                connections
               |connections[ ]from[ ]your[ ]host[.]    # Microsoft

data/lib/sisimai/rfc3464.rb

@@ -62,7 +62,7 @@ module Sisimai
       def scan(mhead, mbody)
         return nil unless mhead
         return nil unless mbody
-        return nil if mhead.keys.size == 0
+        return nil if mhead.keys.size.zero?
         return nil if mbody.empty?
 
         require 'sisimai/mda'
@@ -88,7 +88,7 @@ module Sisimai
           havepassed << e
           p = havepassed[-2]
 
-          if readcursor == 0
+          if readcursor.zero?
             # Beginning of the bounce message or delivery status part
             if e =~ Re1[:begin]
               readcursor |= Indicators[:deliverystatus]
@@ -395,7 +395,7 @@ module Sisimai
             break if e =~ Re1[:rfc822]
             break if e =~ re_stop
 
-            next if e.size == 0
+            next if e.size.zero?
             next if e =~ re_skip
             next if e =~ /\A[*]/
 

data/lib/sisimai/rfc3834.rb

@@ -52,8 +52,8 @@ module Sisimai
       def scan(mhead, mbody)
         return nil unless mhead
         return nil unless mbody
-        return nil if mhead.keys.size == 0
-        return nil if mbody.size == 0
+        return nil if mhead.keys.size.zero?
+        return nil if mbody.size.zero?
 
         leave = 0
         match = 0

data/lib/sisimai/rfc5322.rb

@@ -112,7 +112,7 @@ module Sisimai
           |\A(?:mailer-daemon|postmaster)\z
           |[ ]?mailer-daemon[ ]
           )
-        /xi;
+        /xi
         return true if email =~ re
         return false
       end
@@ -175,7 +175,7 @@ module Sisimai
             break
           end
 
-          if hostname.length == 0
+          if hostname.length.zero?
             # 2. Use IP address as a remote host name
             addrlist.each do |e|
               # Skip if the address is a private address
@@ -216,10 +216,10 @@ module Sisimai
             lhs = cv[1].downcase
             previousfn = ''
             next unless HeaderIndex.key?(lhs)
-  
+
             previousfn  = lhs
             rfc822part += e + "\n"
-  
+
           elsif e =~ /\A[ \t]+/
             # Continued line from the previous line
             next if rfc822next[previousfn]

data/lib/sisimai/rhost.rb

@@ -47,7 +47,6 @@ module Sisimai
 
         remotehost = argvs.rhost.downcase
         rhostclass = ''
-        reasontext = ''
         modulename = ''
 
         RhostClass.each_key do |e|

data/lib/sisimai/rhost/exchangeonline.rb

@@ -29,8 +29,8 @@ module Sisimai
           ],
           %r/\A4[.]4[.]2\z/ => [
             {
-                :reason => 'blocked',
-                :regexp => %r/Connection dropped/,
+              :reason => 'blocked',
+              :regexp => %r/Connection dropped/,
             },
           ],
           %r/\A4[.]7[.]26\z/ => [

data/lib/sisimai/smtp.rb

@@ -9,10 +9,10 @@ module Sisimai
       # @return   [Hash] SMTP command regular expressions
       def command
         return {
-            :helo => %r/\b(?:HELO|EHLO)\b/,
-            :mail => %r/\bMAIL F(?:ROM|rom)\b/,
-            :rcpt => %r/\bRCPT T[Oo]\b/,
-            :data => %r/\bDATA\b/,
+          :helo => %r/\b(?:HELO|EHLO)\b/,
+          :mail => %r/\bMAIL F(?:ROM|rom)\b/,
+          :rcpt => %r/\bRCPT T[Oo]\b/,
+          :data => %r/\bDATA\b/,
         }
       end
 

data/lib/sisimai/smtp/error.rb

@@ -9,13 +9,13 @@ module Sisimai
         require 'sisimai/smtp/status'
 
         SoftOrHard = {
-          :soft => [
-            'blocked', 'contenterror', 'exceedlimit', 'expired', 'filtered',
-            'mailboxfull', 'mailererror', 'mesgtoobig', 'networkerror', 'norelaying',
-            'rejected', 'securityerror', 'spamdetected', 'suspend', 'syntaxerror',
-            'systemerror', 'systemfull', 'toomanyconn',
-          ],
-          :hard => ['hasmoved', 'hostunknown', 'userunknown']
+          :soft => %w|
+            blocked contenterror exceedlimit expired filtered mailboxfull
+            mailererror mesgtoobig networkerror norelaying rejected suspend
+            securityerror spamdetected syntaxerror systemerror systemfull
+            toomanyconn
+          |,
+          :hard => %w|hasmoved hostunknown userunknown|
         }
 
         # Permanent error or not
@@ -28,10 +28,7 @@ module Sisimai
           return nil unless argv1
           return nil unless argv1.size > 0
 
-          statuscode = nil
-          classvalue = nil
           getchecked = nil
-
           statuscode = Sisimai::SMTP::Status.find(argv1)
           statuscode = Sisimai::SMTP::Reply.find(argv1) if statuscode.empty?
           classvalue = statuscode[0, 1].to_i
@@ -81,8 +78,6 @@ module Sisimai
           return '' if argv1.empty?
 
           getchecked = nil
-          statuscode = nil
-          classvalue = nil
           softorhard = nil
 
           if argv1 =~ /\A(?:delivered|feedback|vacation)\z/

data/lib/sisimai/smtp/reply.rb

@@ -75,7 +75,7 @@ module Sisimai
             (?:\d|[01]?\d\d|2[0-4]\d|25[0-5])[.]
             (?:\d|[01]?\d\d|2[0-4]\d|25[0-5])[.]
             (?:\d|[01]?\d\d|2[0-4]\d|25[0-5])
-          \b}x;
+          \b}x
 
           if argv1 =~ ip4re
             # Convert found IPv4 addresses to '***.***.***.***' to avoid that

data/lib/sisimai/string.rb

@@ -81,13 +81,13 @@ module Sisimai
           plain = plain.gsub(%r|<a\s+href\s*=\s*['"](https?://.+?)['"].*?>(.*?)</a>|i, '[\2](\1)')
           plain = plain.gsub(%r|<a\s+href\s*=\s*["']mailto:([^\s]+?)["']>(.*?)</a>|i, '[\2](mailto:\1)')
 
-          plain = plain.gsub(/<[^<@>]+?>\s*/,' ') # Delete HTML tags except <neko@example.jp>
-          plain = plain.gsub(/&lt;/, '<')         # Convert to left angle brackets
-          plain = plain.gsub(/&gt;/, '>')         # Convert to right angle brackets
-          plain = plain.gsub(/&amp;/, '&')        # Convert to "&"
-          plain = plain.gsub(/&quot;/, '"')       # Convert to '"'
-          plain = plain.gsub(/&apos;/, "'")       # Convert to "'"
-          plain = plain.gsub(/&nbsp;/, ' ')       # Convert to ' '
+          plain = plain.gsub(/<[^<@>]+?>\s*/, ' ')  # Delete HTML tags except <neko@example.jp>
+          plain = plain.gsub(/&lt;/, '<')           # Convert to left angle brackets
+          plain = plain.gsub(/&gt;/, '>')           # Convert to right angle brackets
+          plain = plain.gsub(/&amp;/, '&')          # Convert to "&"
+          plain = plain.gsub(/&quot;/, '"')         # Convert to '"'
+          plain = plain.gsub(/&apos;/, "'")         # Convert to "'"
+          plain = plain.gsub(/&nbsp;/, ' ')         # Convert to ' '
 
           if argv1.size > plain.size
             plain  = plain.squeeze(' ')

data/lib/sisimai/version.rb

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

data/set-of-emails/maildir/bsd/rfc3834-06.eml

@@ -0,0 +1,56 @@
+Return-Path: <>
+Received: from mta.example.org ([192.0.2.1])
+ by inbound-smtp.us-east-1.amazonaws.com with SMTP id pseudo-smtp-session-id-string
+ for bounces+example.org@example.net.br;
+ Fri, 10 Feb 2017 19:14:33 +0000 (UTC)
+X-SES-Spam-Verdict: PASS
+X-SES-Virus-Verdict: PASS
+Received-SPF: none (spfCheck: [192.0.2.22] is neither permitted nor denied by domain of example.org) client-ip=[192.0.2.12]; envelope-from=postmaster@example.com.br; helo=example.com.br;
+Authentication-Results: amazonses.com;
+ spf=none (spfCheck: [192.0.2.12] is neither permitted nor denied by domain of example.com.br) client-ip=[192.0.2.221]; envelope-from=postmaster@example.com.br; helo=example.com.br;
+X-SES-RECEIPT:
+X-SES-DKIM-SIGNATURE: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple;
+	s=6gbrjpgwjskckoa6a5zn6fwqkn67xbtw; d=amazonses.com; t=1486754116;
+	h=X-SES-RECEIPT:Date:From:To:Message-ID:Subject:MIME-Version:Content-Type;
+	bh=0bYTWVAQOGTZY45Q929yxHVJoEggqClgGJJtcyDttRA=;
+	b=RFkTDfEJ8ugYYu823Qu40RfHxykHFb9xOjWWyQhMvRmtPrRPbgIvt/ozSO7i7A2y
+	/RK+3BLlbCeca8Onv7U7FZouOfe34TViXGTlv9KthLHndvFtv8XgbwmYfdlUSPyNJB6
+	bpU1A2ppoitWThG89fUd+1akanBfw0/deRA0I7T8=
+Received: from localhost (localhost [127.0.0.1])
+	by example.com.br (Postfix) with ESMTP id 2D4F15228F6
+	for <bounces+example.org@example.net.br>; Fri, 10 Feb 2017 17:15:17 -0200 (BRST)
+Received: from example.com.br ([127.0.0.1])
+	by localhost (example.com.br [127.0.0.1]) (amavisd-new, port 10032)
+	with ESMTP id R3_QsTphIcaa
+	for <bounces+example@example.net.br>;
+	Fri, 10 Feb 2017 17:15:17 -0200 (BRST)
+Received: from localhost (localhost [127.0.0.1])
+	by example.com.br (Postfix) with ESMTP id 05A90522911
+	for <bounces+example@example.net.br>; Fri, 10 Feb 2017 17:15:17 -0200 (BRST)
+X-Virus-Scanned: amavisd-new at example.com.br
+Received: from example.com.br ([127.0.0.1])
+	by localhost (example.com.br [127.0.0.1]) (amavisd-new, port 10026)
+	with ESMTP id CsEmah0fuPMu
+	for <bounces+example@example.net.br>;
+	Fri, 10 Feb 2017 17:15:16 -0200 (BRST)
+Received: from example.com.br (example.com.br [10.0.0.56])
+	by example.com.br (Postfix) with ESMTP id D473C5228F6
+	for <bounces+example.org@example.net.br>; Fri, 10 Feb 2017 17:15:16 -0200 (BRST)
+Date: Fri, 10 Feb 2017 17:15:16 -0200 (BRST)
+From: Kijitora <kijitora@example.org>
+To: 
+	bounces+example.org@example.net.br
+Message-ID: <1257668210.10263839.1486754116408.JavaMail.zimbra@example.com.br>
+In-Reply-To: <20170210191426.1wKDapP798yQEJKMGjlLVAmNMYzWOBbq@example.net.br>
+Subject: =?utf-8?Q?Re:_EXAMPLE?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf-8
+Content-Transfer-Encoding: quoted-printable
+Auto-Submitted: auto-replied (zimbra; vacation)
+Precedence: bulk
+X-Mailer: Zimbra 8.6.0_GA_1153
+Thread-Topic:
+Thread-Index:
+
+Estarei ausente do dia 08/02 at=C3=A9 o dia 12/03
+favor encaminhar email para kijitora e example.org

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sisimai
 version: !ruby/object:Gem::Version
-  version: 4.20.1
+  version: 4.20.2
 platform: ruby
 authors:
 - azumakuniyuki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-31 00:00:00.000000000 Z
+date: 2017-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -97,6 +97,7 @@ files:
 - appveyor.yml
 - bin/console
 - bin/setup
+- fig/sisimai-architecture.png
 - lib/sisimai.rb
 - lib/sisimai/address.rb
 - lib/sisimai/arf.rb
@@ -576,6 +577,7 @@ files:
 - set-of-emails/maildir/bsd/rfc3834-03.eml
 - set-of-emails/maildir/bsd/rfc3834-04.eml
 - set-of-emails/maildir/bsd/rfc3834-05.eml
+- set-of-emails/maildir/bsd/rfc3834-06.eml
 - set-of-emails/maildir/bsd/rhost-exchange-online-01.eml
 - set-of-emails/maildir/bsd/rhost-google-apps-01.eml
 - set-of-emails/maildir/dos/arf-01.eml
@@ -757,7 +759,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Mail Analyzing Interface