sisimai 4.17.0 → 4.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f8417def53786b484d3142cc70aab3ef509f4dd
-  data.tar.gz: da9f64d09e10a477b98ac366d2fb814f346ed1db
+  metadata.gz: a42edca9932389c588b9cbc2208c8531a7722e65
+  data.tar.gz: 62273ce1977ea42bf91e1069aadd1d3a07ba6ae3
 SHA512:
-  metadata.gz: 8cff802da78f62b22f8d79fde792abcf63d805f3bdcba0896cad87223526f0203c7117be7d1d903e0897b5965e283a0c74a2bda6b32c9c27b783c057922451df
-  data.tar.gz: 6718be8fd7fd8c46ca9829fbe02108d7631207ca065b6042d5dc05fab9b4c2a0d320bf8d972332064aac33b1560f36170b28f7e594ca2b24b5adc43b6732392c
+  metadata.gz: 4ce829b47122fd9cd02bf950f7ec9d6566b87b61d09c4bd3744d69831972fcbb242a460cea5648f8efe7c7ddd18370c0615540284089d4767eb65e3487a3bb0d
+  data.tar.gz: bcede47e3c589b2ec43254bda629f4524d95f6131264ce6684eab47729f5a5f00abc37764c6fca84b42edbdcd2fbeb40e91d05ec51acb28e867d1d6523d72041

data/Changes

@@ -1,5 +1,12 @@
 Revision history for Ruby version of Sisimai
 
+4.17.1  Wed, 30 Mar 2016 14:00:22 +0900 (JST)
+    - Ported codes from https://github.com/sisimai/p5-Sisimai/pull/180 to fix
+      issue https://github.com/sisimai/p5-Sisimai/issues/179 a variable in lib/
+      sisimai/mta/exim.rb is not quoted before passing to %r// operator.
+    - Fixed serious bug in Sisimai::Mail::Maildir#read method reported at issue
+      #55 and #56 by pull-request #57. Thanks to @taku1201.
+
 4.17.0  Wed, 16 Mar 2016 12:22:44 +0900 (JST)
     - Implement new reason "syntaxerror". Sisimai will set "syntaxerror" to the
       raeson when the value of "replycode" begins with "50" such as 502, 503,

data/lib/sisimai/mail/maildir.rb

@@ -12,7 +12,7 @@ module Sisimai
         :path,    # [String] Path to each file
         :file,    # [String] Each file name of a mail in the Maildir/
         :inodes,  # [Array]  i-node List of files in the Maildir/
-        :offset,  # [Integer]  Offset position for seeking
+        :count,   # [Integer] The number of file has read
         :handle,  # [IO::Dir] Directory handle
       ]
       @@roaccessors.each { |e| attr_reader   e }
@@ -30,15 +30,15 @@ module Sisimai
         @size   = Dir.entries(argv1).size
         @dir    = argv1
         @file   = nil
-        @offset = 0
         @inodes = {}
+        @count  = 0
         @handle = Dir.open(argv1)
       end
 
       # Maildir reader, works as a iterator.
       # @return       [String] Contents of file in Maildir/
       def read
-        return nil unless self.offset < self.size
+        return nil unless self.count < self.size
 
         seekhandle = self.handle
         readbuffer = ''
@@ -46,7 +46,6 @@ module Sisimai
         begin
           while r = seekhandle.read do
             # Read each file in the directory
-            self.offset = seekhandle.pos
             next if r == '.' || r == '..'
 
             emailindir = sprintf('%s/%s', self.dir, r)
@@ -70,7 +69,8 @@ module Sisimai
             break
           end
 
-          seekhandle.close unless self.offset < self.size
+          self.count += 1
+          seekhandle.close unless self.count < self.size
         end
 
         return readbuffer

data/lib/sisimai/mta/exim.rb

@@ -63,6 +63,7 @@ module Sisimai
             |The[ ].+[ ]router[ ]encountered[ ]the[ ]following[ ]error[(]s[)]:
             )
            }x,
+          :deliverystatus => %r|\AContent-type: message/delivery-status|,
           :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
         }
 
@@ -165,6 +166,9 @@ module Sisimai
           recipients = 0      # (Integer) The number of 'Final-Recipient' header
           localhost0 = ''     # (String) Local MTA
           boundary00 = ''     # (String) Boundary string
+          havepassed = {
+            :deliverystatus => 0
+          }
           v = nil
 
           if mhead['content-type']
@@ -280,8 +284,12 @@ module Sisimai
 
                     else
                       # Error message ?
-                      v['alterrors'] ||= ''
-                      v['alterrors']  += e + ' ' if e =~ /\A[ ]+/
+                      if havepassed[:deliverystatus] == 0
+                        # Content-type: message/delivery-status
+                        havepassed[:deliverystatus] = 1 if e =~ Re1[:deliverystatus]
+                        v['alterrors'] ||= ''
+                        v['alterrors']  += e + ' ' if e =~ /\A[ ]+/
+                      end
                     end
                   else
                     if dscontents.size == recipients
@@ -368,7 +376,7 @@ module Sisimai
                 e['diagnosis'] = dscontents[0]['diagnosis'] || ''
                 e['spec']    ||= dscontents[0]['spec']
 
-                if dscontents[0]['alterrors']
+                if dscontents[0]['alterrors'] && dscontents[0]['alterrors'].size > 0
                   # The value of "alterrors" is also copied
                   e['alterrors'] = dscontents[0]['alterrors']
                 end
@@ -377,7 +385,10 @@ module Sisimai
 
             if e['alterrors'] && e['alterrors'].size > 0
               # Copy alternative error message
-              e['diagnosis'] ||= e['alterrors']
+              if e['diagnosis'].nil? || e['diagnosis'].empty?
+                e['diagnosis'] ||= e['alterrors']
+              end
+
               if e['diagnosis'] =~ /\A[-]+/ || e['diagnosis'] =~ /__\z/
                 # Override the value of diagnostic code message
                 e['diagnosis'] = e['alterrors'] if e['alterrors'].size > 0

data/lib/sisimai/reason/blocked.rb

@@ -56,6 +56,7 @@ module Sisimai
                that[ ]domain[ ]isn'?t[ ]in[ ]my[ ]list[ ]of[ ]allowed[ ]rcpthosts
               |your[ ]remotehost[ ]looks[ ]suspiciously[ ]like[ ]spammer
               )
+            |SPF[ ]record
             |the[ ](?:email|domain|ip).+[ ]is[ ]blacklisted
             |unresolvable[ ]relay[ ]host[ ]name
             |your[ ](?:

data/lib/sisimai/version.rb

@@ -1,4 +1,4 @@
 # Define the version number of Sisimai
 module Sisimai
-  VERSION = '4.17.0'
+  VERSION = '4.17.1'
 end

data/set-of-emails/maildir/bsd/exim-29.eml

@@ -0,0 +1,58 @@
+From MAILER-DAEMON Tue Mar 02 09:44:33 1999
+Received: from EXIMUSER by example.co.jp with local (Exim 4.00)
+	id FFFFFF-222222-00
+	for lmn@example.co.jp; Tue, 2 Mar 1999 09:44:33 +0000
+X-Failed-Recipients: kijitora@example.co.jp
+Auto-Submitted: auto-replied
+From: Mail Delivery System <Mailer-Daemon@example.co.jp>
+To: lmn@example.co.jp
+Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
+MIME-Version: 1.0
+Subject: Mail delivery failed
+Message-Id: <EFFFFFF-222222-00@example.co.jp>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: text/plain; charset=us-ascii
+
+This message was created automatically by mail delivery software.
+
+A message sent by
+
+  <shironeko@example.org>
+
+could not be delivered to one or more of its recipients. The following
+address(es) failed:
+
+  kijitora@example.co.jp
+  host 192.0.2.22 [192.0.2.22]
+    SMTP error from remote mail server after MAIL FROM:<shironeko@example.org>:
+    550 Bad SPF records for [example.org:192.0.2.2], see http://spf.pobox.com/
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/delivery-status
+
+Reporting-MTA: dns; example.co.jp
+
+Action: failed
+Final-Recipient: rfc822;kijitora@example.co.jp
+Status: 5.0.0
+Remote-MTA: dns; 192.0.2.22
+Diagnostic-Code: smtp; 550 Bad SPF records for
+    [example.org:192.0.2.2], see http://spf.pobox.com/
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/rfc822
+
+Return-path: <shironeko@example.org>
+Received: from CALLER by example.co.jp with local (Exim 4.00)
+	(envelope-from <shironeko@example.org>)
+	id EEEEEE-222222-00; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <EEEEEEE-222222-00@example.co.jp>
+From: shironeko@example.org
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+Nyaaan
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sisimai
 version: !ruby/object:Gem::Version
-  version: 4.17.0
+  version: 4.17.1
 platform: ruby
 authors:
 - azumakuniyuki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-16 00:00:00.000000000 Z
+date: 2016-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -268,6 +268,7 @@ files:
 - set-of-emails/maildir/bsd/exim-26.eml
 - set-of-emails/maildir/bsd/exim-27.eml
 - set-of-emails/maildir/bsd/exim-28.eml
+- set-of-emails/maildir/bsd/exim-29.eml
 - set-of-emails/maildir/bsd/google-apps-01.eml
 - set-of-emails/maildir/bsd/imailserver-01.eml
 - set-of-emails/maildir/bsd/imailserver-02.eml
@@ -687,9 +688,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.2
 signing_key: 
 specification_version: 4
 summary: Mail Analyzing Interface
 test_files: []
-has_rdoc: