sisimai 4.25.0-java → 4.25.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7aa5cc01306c3b0f700213220f61eb69664fbbe3
-  data.tar.gz: 605434fbe0db77535056d60f02fbe09437bd30c7
+  metadata.gz: 6db6c4e44ac509561c439034227dabc3cd6f1c9d
+  data.tar.gz: 66edf604fc32a44ba203ccd6963635f4d5b1bd5d
 SHA512:
-  metadata.gz: b4cad32a42fc61d64af6b20e59e0219e5e43877b1e902e5be98c4e09f3cc9a42441a8023a7e4db588133f47a6e9a2daa7a0216e10bda0b6589290de6c25f6a4e
-  data.tar.gz: 34cb8665b9892423a33dc0ba86ed31e7dd5fb3d0b136bd66cdc98e7ce12cb7b641453dec532f7cf6ec3941995a98dc309bf7f12886be049a32242c7713101b50
+  metadata.gz: b88676a692f29455c0791dd5197c265a7cef4f453355e574df57587c3893a525ca5c57d428185575c156691b19041c98a6559b84e470116f9f35e2ff2b6f07b7
+  data.tar.gz: 4af2ab72159e755035bda03dc5ce9d21ce0f96e9e1eb993d3d4d4420f2c14207b088e30db68649e18b3e87e307d2d4e8a05431f3d2e4549510194cba4c170395

data/ChangeLog.md

@@ -3,6 +3,26 @@ RELEASE NOTES for Ruby version of Sisimai
 - releases: "https://github.com/sisimai/rb-Sisimai/releases"
 - download: "https://rubygems.org/gems/sisimai"
 
+v4.25.1
+--------------------------------------------------------------------------------
+- release: "4.25.1"
+- version: ""Tue, 23 Jul 2019 10:00:00 +0900 (JST)
+- changes:
+  - Check the format of the value of `Message-Id` header for detecting a bounce
+    mail from Exim or not.
+  - Call `Sisimai::Rhost::FrancePTT` module when the value of `rhost` includes
+    `.wanadoo.fr`.
+  - Fix code at `Sisimai::Message::Email.takeapart` method to decode a Subject
+    header of the original message.
+  - #147 Update error messages for Low Reputation Error from Gmail.
+  - Parser code to read bounce mails from m-FILTER at `Sisimai::Message::Email`
+    has been improved.
+  - Status 5.4.1 from Exchange Online is classified into "rejected" reason.
+  - Callback method specified at `Sisimai::Message.new()` with `hook` is called
+    just before calling `scan()` method of each `Sisimai::Bite::Email` module.
+  - Code improvement in `Sisimai::Bite::Email::Sendmail` for getting error mes-
+    sages returned from Google.
+
 v4.25.0
 --------------------------------------------------------------------------------
 - release: "Tue,  9 Apr 2019 11:22:22 +0900 (JST)"

data/README-JA.md

@@ -80,10 +80,10 @@ Install
 
 ```shell
 $ sudo gem install sisimai
-Fetching: sisimai-4.25.0.gem (100%)
-Successfully installed sisimai-4.25.0
-Parsing documentation for sisimai-4.25.0
-Installing ri documentation for sisimai-4.25.0
+Fetching: sisimai-4.25.1.gem (100%)
+Successfully installed sisimai-4.25.1
+Parsing documentation for sisimai-4.25.1
+Installing ri documentation for sisimai-4.25.1
 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.25.0 built to pkg/sisimai-4.25.0.gem.
-sisimai (4.25.0) installed.
+sisimai 4.25.1 built to pkg/sisimai-4.25.1.gem.
+sisimai (4.25.1) installed.
 ```
 
 Usage
@@ -245,9 +245,9 @@ Differences between Ruby version and Perl version
 | インストール方法                            | gem install    | cpanm, cpm    |
 | 依存モジュール数(コアモジュールを除く)      | 1モジュール    | 2モジュール   |
 | LOC:ソースコードの行数                      | 11700行        | 8200行        |
-| テスト件数(spec/,t/,xt/ディレクトリ)        | 224000件       | 242000件      |
+| テスト件数(spec/,t/,xt/ディレクトリ)        | 225000件       | 242000件      |
 | ライセンス                                  | 二条項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.4p301

data/README.md

@@ -85,10 +85,10 @@ Install
 
 ```shell
 $ sudo gem install sisimai
-Fetching: sisimai-4.25.0.gem (100%)
-Successfully installed sisimai-4.25.0
-Parsing documentation for sisimai-4.25.0
-Installing ri documentation for sisimai-4.25.0
+Fetching: sisimai-4.25.1.gem (100%)
+Successfully installed sisimai-4.25.1
+Parsing documentation for sisimai-4.25.1
+Installing ri documentation for sisimai-4.25.1
 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.25.0 built to pkg/sisimai-4.25.0.gem.
-sisimai (4.25.0) installed.
+sisimai 4.25.1 built to pkg/sisimai-4.25.1.gem.
+sisimai (4.25.1) installed.
 ```
 
 Usage
@@ -249,9 +249,9 @@ and bounceHammer are available at
 | How to install                              | gem install    | cpanm, cpm    |
 | Dependencies (Except core modules)          | 1 module       | 2 modules     |
 | LOC:Source lines of code                    | 11700 lines    | 8200 lines    |
-| The number of tests(spec/,t/,xt/) directory | 224000 tests   | 242000 tests  |
+| The number of tests(spec/,t/,xt/) directory | 225000 tests   | 242000 tests  |
 | License                                     | BSD 2-Clause   | BSD 2-Clause  |
-| Support Contract provided by Developer      | Coming soon    | Available     |
+| Support Contract provided by Developer      | Available      | 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.4p301

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

@@ -139,10 +139,13 @@ module Sisimai::Bite::Email
       #                                   part or nil if it failed to parse or
       #                                   the arguments are missing
       def scan(mhead, mbody)
-        # :'message-id' => %r/\A[<]\w+[-]\w+[-]\w+[@].+\z/,
-        return nil if     mhead['from'] =~ /[@].+[.]mail[.]ru[>]?/
-        return nil unless mhead['from'].start_with?('Mail Delivery System')
-        return nil unless mhead['subject'] =~ %r{(?:
+        return nil if mhead['from'] =~ /[@].+[.]mail[.]ru[>]?/
+
+        # Message-Id: <E1P1YNN-0003AD-Ga@example.org>
+        match  = 0
+        match += 1 if mhead['from'].start_with?('Mail Delivery System')
+        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[ ]+
           |Delivery[ ]Status[ ]Notification
@@ -151,6 +154,7 @@ module Sisimai::Bite::Email
           |error[(]s[)][ ]in[ ]forwarding[ ]or[ ]filtering
           )
         }x
+        return nil if match < 2
 
         require 'sisimai/rfc1894'
         fieldtable = Sisimai::RFC1894.FIELDTABLE

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

@@ -56,7 +56,7 @@ module Sisimai::Bite::Email
         readcursor = 0      # (Integer) Points the current cursor position
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
         commandtxt = ''     # (String) SMTP Command name begin with the string '>>>'
-        esmtpreply = ''     # (String) Reply from remote server on SMTP session
+        esmtpreply = []     # (Array) Reply from remote server on SMTP session
         sessionerr = false  # (Boolean) Flag, "true" if it is SMTP session error
         anotherset = {}     # Another error information
         v = nil
@@ -147,7 +147,7 @@ module Sisimai::Bite::Email
 
                 elsif cv = e.match(/\A[<]{3}[ ]+(.+)\z/)
                   # <<< Response
-                  esmtpreply = cv[1]
+                  esmtpreply << cv[1] unless esmtpreply.index(cv[1])
                 else
                   # Detect SMTP session error or connection error
                   next if sessionerr
@@ -213,6 +213,11 @@ module Sisimai::Bite::Email
             e['diagnosis'] = anotherset['diagnosis'] unless e['diagnosis']
             e['diagnosis'] = anotherset['diagnosis'] if e['diagnosis'] =~ /\A\d+\z/
           end
+          unless esmtpreply.empty?
+            # Replace the error message in "diagnosis" with the ESMTP Reply
+            r = esmtpreply.join(' ')
+            e['diagnosis'] = r if r.size > e['diagnosis'].to_s.size
+          end
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
 
           if anotherset['status']

data/lib/sisimai/data.rb

@@ -288,10 +288,10 @@ 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'].gsub!(re, ' ')
-            p['diagnosticdoee'] = Sisimai::String.sweep(p['diagnosticcode'])
+            p['diagnosticcode'] = Sisimai::String.sweep(p['diagnosticcode'].gsub(re, ' '))
           end
         end
+
         p['diagnostictype'] ||= 'X-UNIX' if p['reason'] == 'mailererror'
         p['diagnostictype'] ||= 'SMTP' unless %w[feedback vacation].include?(p['reason'])
 

data/lib/sisimai/message/email.rb

@@ -263,7 +263,7 @@ module Sisimai
 
         # 1. Scrub to avoid "invalid byte sequence in UTF-8" exception (#82)
         # 2. Convert from string to hash reference
-        heads = heads.scrub('?').gsub(/^[>]+[ ]/m, '')
+        heads = heads.scrub('?').gsub(/^[>]+[ ]/m, '').gsub(/=[ ]+=/, "=\n =")
 
         previousfn = '' # Previous field name
         asciiarmor = {} # Header names which has MIME encoded value
@@ -358,21 +358,6 @@ module Sisimai
         mailheader['subject']      ||= ''
         mailheader['content-type'] ||= ''
 
-        if hookmethod.is_a? Proc
-          # Call the hook method
-          begin
-            p = {
-              'datasrc' => 'email',
-              'headers' => mailheader,
-              'message' => bodystring,
-              'bounces' => nil
-            }
-            havecaught = hookmethod.call(p)
-          rescue StandardError => ce
-            warn ' ***warning: Something is wrong in hook method :' << ce.to_s
-          end
-        end
-
         # Decode BASE64 Encoded message body, rewrite.
         mesgformat = (mailheader['content-type'] || '').downcase
         ctencoding = (mailheader['content-transfer-encoding'] || '').downcase
@@ -413,6 +398,23 @@ module Sisimai
           mailheader['subject'] = Sisimai::MIME.mimedecode(mailheader['subject'].split(/[ ]/))
           mailheader['subject'].scrub!('?')
         end
+        bodystring = bodystring.scrub('?').delete("\r")
+
+        if hookmethod.is_a? Proc
+          # Call the hook method
+          begin
+            p = {
+              'datasrc' => 'email',
+              'headers' => mailheader,
+              'message' => bodystring,
+              'bounces' => nil
+            }
+            havecaught = hookmethod.call(p)
+          rescue StandardError => ce
+            warn ' ***warning: Something is wrong in hook method :' << ce.to_s
+          end
+        end
+
         bodystring << EndOfEmail
         haveloaded = {}
         scannedset = nil

data/lib/sisimai/reason/policyviolation.rb

@@ -8,15 +8,16 @@ module Sisimai
     # security policies, or multiple addresses exist in the From: header, Sisimai
     # will set "policyviolation".
     #
-    #   Action: failed
-    #   Status: 5.7.9
-    #   Remote-MTA: DNS; mx.example.co.jp
-    #   Diagnostic-Code: SMTP; 554 5.7.9 Header error
+    #   Status: 5.7.0
+    #   Remote-MTA: DNS; gmail-smtp-in.l.google.com
+    #   Diagnostic-Code: SMTP; 552-5.7.0 Our system detected an illegal attachment on your message. Please
+    #   Last-Attempt-Date: Tue, 28 Apr 2009 11:02:45 +0900 (JST)
     #
     module PolicyViolation
       # Imported from p5-Sisimail/lib/Sisimai/Reason/PolicyViolation.pm
       class << self
         Index = [
+          'an illegal attachment on your message',
           'because the recipient is not accepting mail with ',    # AOL Phoenix
           'closed mailing list',
           'denied by policy',
@@ -32,6 +33,7 @@ module Sisimai
           'rejected for policy reasons',
           'protocol violation',
           'the email address used to send your message is not subscribed to this group',
+          'this message was blocked because its content presents a potential',
           'you have exceeded the allowable number of posts without solving a captcha',
           'you have exceeded the the allowable number of posts without solving a captcha',
         ]

data/lib/sisimai/reason/rejected.rb

@@ -44,6 +44,7 @@ module Sisimai
           'message rejected: email address is not verified',
           'mx records for ',
           'null sender is not allowed',
+          'recipient addresses rejected : access denied',
           'recipient not accepted. (batv: no tag',
           'returned mail not accepted here',
           'rfc 1035 violation: recursive cname records for',

data/lib/sisimai/reason/securityerror.rb

@@ -11,7 +11,7 @@ module Sisimai
     # of email bounce if the value of Status: field in a bounce email is "5.7.*".
     #
     #   Action: failed
-    #   Status: 5.7.0
+    #   Status: 5.7.1
     #   Remote-MTA: DNS; gmail-smtp-in.l.google.com
     #   Diagnostic-Code: SMTP; 552-5.7.0 Our system detected an illegal attachment on your message. Please
     #   Last-Attempt-Date: Tue, 28 Apr 2009 11:02:45 +0900 (JST)

data/lib/sisimai/reason/suspend.rb

@@ -20,6 +20,7 @@ module Sisimai
           'recipient rejected: temporarily inactive',
           'recipient suspend the service',
           'this account has been disabled or discontinued',
+          'this mailbox is disabled',
           'user suspended',   # http://mail.163.com/help/help_spam_16.htm
           'vdelivermail: account is locked email bounced',
         ]

data/lib/sisimai/rhost.rb

@@ -8,12 +8,14 @@ module Sisimai
       # Imported from p5-Sisimail/lib/Sisimai/Rhost.pm
       RhostClass = {
         'aspmx.l.google.com'          => 'GoogleApps',
+        'gmail-smtp-in.l.google.com'  => 'GoogleApps',
         '.prod.outlook.com'           => 'ExchangeOnline',
         '.protection.outlook.com'     => 'ExchangeOnline',
         'smtp.secureserver.net'       => 'GoDaddy',
         'mailstore1.secureserver.net' => 'GoDaddy',
         'laposte.net'                 => 'FrancePTT',
         'orange.fr'                   => 'FrancePTT',
+        'wanadoo.fr'                  => 'FrancePTT',
         'lsean.ezweb.ne.jp'           => 'KDDI',
         'msmx.au.com'                 => 'KDDI',
         '.qq.com'                     => 'TencentQQ',

data/lib/sisimai/rhost/exchangeonline.rb

@@ -25,7 +25,7 @@ module Sisimai
           '5.3.3'  => [{ reason: 'systemfull',  string: 'Unrecognized command' }],
           '5.3.4'  => [{ reason: 'mesgtoobig',  string: 'Message too big for system' }],
           '5.3.5'  => [{ reason: 'systemerror', string: 'System incorrectly configured' }],
-          '5.4.1'  => [{ reason: 'userunknown', string: 'Recipient address rejected: Access denied' }],
+          '5.4.1'  => [{ reason: 'rejected',    string: 'Recipient address rejected: Access denied' }],
           '5.4.14' => [{ reason: 'networkerror',string: 'Hop count exceeded' }],
           '5.5.2'  => [{ reason: 'syntaxerror', string: 'Send hello first' }],
           '5.5.3'  => [{ reason: 'syntaxerror', string: 'Too many recipients' }],

data/lib/sisimai/rhost/googleapps.rb

@@ -28,9 +28,7 @@ module Sisimai
           'X.5.0' => [{ reason: 'syntaxerror', string: ['SMTP protocol violation'] }],
           'X.5.1' => [
             { reason: 'securityerror', string: ['Authentication Required.'] },
-            {
-              reason: 'syntaxerror',
-              string: [
+            { reason: 'syntaxerror',   string: [
                 'STARTTLS may not be repeated',
                 'Too many unrecognized commands, goodbye.',
                 'Unimplemented command.',
@@ -38,16 +36,15 @@ module Sisimai
                 'EHLO/HELO first.',
                 'MAIL first.',
                 'RCPT first.',
-              ],
-            },
+            ]},
           ],
           'X.5.2' => [
             { reason: 'securityerror', string: ['Cannot Decode response.'] },   # 2FA related error, maybe.
             { reason: 'syntaxerror',   string: ['Syntax error.'] },
           ],
           'X.5.3' => [
-            { reason: 'mailboxfull',    string: ['Domain policy size per transaction exceeded,'] },
-            { reason: 'policyviolation',string: ['Your message has too many recipients.'] },
+            { reason: 'mailboxfull',     string: ['Domain policy size per transaction exceeded,'] },
+            { reason: 'policyviolation', string: ['Your message has too many recipients.'] },
           ],
           'X.5.4' => [{ reason: 'syntaxerror', string: ['Optional Argument not permitted for that AUTH mode.'] }],
           'X.6.0' => [
@@ -55,53 +52,47 @@ module Sisimai
             { reason: 'networkerror', string: ['Message exceeded 50 hops'] }
           ],
           'X.7.0' => [
-            {
-              reason: 'blocked',
-              string: [
+            { reason: 'blocked',  string: [
                 'IP not in whitelist for RCPT domain, closing connection.',
-                'Our system has detected an unusual rate of unsolicited mail originating from your IP address.',
-              ],
-            },
-            {
-              reason: 'expired',
-              string: [
+                'unusual rate of unsolicited mail originating from your IP address.',
+            ]},
+            { reason: 'expired',  string: [
                 'Temporary System Problem. Try again later.',
                 'Try again later, closing connection.',
-              ],
-            },
-            {
-              reason: 'securityerror',
-              string: [
+            ]},
+            { reason: 'securityerror', string: [
                 'TLS required for RCPT domain, closing connection.',
                 'No identity changes permitted.',
                 'Must issue a STARTTLS command first.',
                 'Too Many Unauthenticated commands.',
-              ],
-            },
+            ]},
+            { reason: 'policyviolation', string: [
+                'an illegal attachment on your message',
+                'This message was blocked because its content presents a potential',
+            ]},
             { reason: 'systemerror', string: ['Cannot authenticate due to temporary system problem.'] },
             { reason: 'norelaying',  string: ['Mail relay denied.'] },
             { reason: 'rejected',    string: ['Mail Sending denied.'] },
           ],
           'X.7.1' => [
-            { reason: 'mailboxfull', string: ['Email quota exceeded.'] },
-            {
-              reason: 'securityerror',
-              string: [
+            { reason: 'mailboxfull',   string: ['Email quota exceeded.'] },
+            { reason: 'securityerror', string: [
                 'Application-specific password required.',
                 'Please log in with your web browser and then try again.',
                 'Username and Password not accepted.',
-              ],
-            },
-            {
-              reason: 'blocked',
-              string: [
-                'Our system has detected an unusual rate of unsolicited mail originating from your IP address.',
+            ]},
+            { reason: 'blocked', string: [
+                'The IP address sending this message does not have a PTR record setup.',
                 "The IP you're using to send mail is not authorized to send email directly to our servers.",
-              ],
-            },
-            { reason: 'spamdetected',   string: ['Our system has detected that this message is likely unsolicited mail.'] },
-            { reason: 'policyviolation',string: ['The user or domain that you are sending to (or from) has a policy'] },
-            { reason: 'rejected',       string: ['Unauthenticated email is not accepted from this domain.'] },
+                'this message is likely suspicious due to the very low reputation of the sending IP address',
+                'unusual rate of unsolicited mail originating from your IP address.',
+            ]},
+            { reason: 'spamdetected',   string: ['this message is likely unsolicited mail.'] },
+            { reason: 'policyviolation',string: [
+                'Messages with multiple addresses in From: header are not accepted.',
+                'The user or domain that you are sending to (or from) has a policy',
+            ]},
+            { reason: 'rejected', string: ['Unauthenticated email is not accepted from this domain.'] },
           ],
           'X.7.4' => [{ reason: 'syntaxerror', string: ['Unrecognized Authentication Type.'] }],
         }.freeze

data/lib/sisimai/string.rb

@@ -53,8 +53,7 @@ module Sisimai
       def sweep(argv1)
         return argv1 unless argv1.is_a?(::String)
         argv1 = argv1.chomp.squeeze(' ').delete("\t").strip
-        argv1.sub!(/ [-]{2,}[^ \t].+\z/, '')
-
+        argv1 = argv1.sub(/ [-]{2,}[^ \t].+\z/, '')
         return argv1
       end
 

data/lib/sisimai/version.rb

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