sisimai 5.2.0-java → 5.3.0-java

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (16) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/rake-test.yml +1 -1
  3. data/ChangeLog.md +22 -0
  4. data/README-JA.md +7 -7
  5. data/README.md +21 -21
  6. data/lib/sisimai/fact.rb +10 -0
  7. data/lib/sisimai/order.rb +12 -11
  8. data/lib/sisimai/reason/notaccept.rb +1 -1
  9. data/lib/sisimai/rhost/cloudflare.rb +31 -0
  10. data/lib/sisimai/rhost/nttdocomo.rb +8 -2
  11. data/lib/sisimai/rhost.rb +1 -0
  12. data/lib/sisimai/smtp/reply.rb +30 -7
  13. data/lib/sisimai/smtp/status.rb +10 -1
  14. data/lib/sisimai/version.rb +1 -1
  15. data/set-of-emails/maildir/bsd/rhost-cloudflare-01.eml +75 -0
  16. metadata +9 -10
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 32fdac2e9b7d740fe9728f93aeb8f29a3cfd2767e68b79b227224b8f59805304
4
- data.tar.gz: 4dcb51497d0e00e7096777211a0248174c68c261e25a759e72d970589d2f361a
3
+ metadata.gz: 29756003d212276947b7b49d29a10fcf47230ed82d76dce258a446e4e4aaafa9
4
+ data.tar.gz: d4dd4f6f77820a1e78f4862518e4f25c4017727ef619dd3c36b938cde77207b4
5
5
  SHA512:
6
- metadata.gz: 4836a5d5341e4745124303f6c6ae313ffe5d503eb1df738f3e5e49d3fa9ec59f400523518be03e3153756f7c2c1c414957aa272ce2ebf39a124e3338104f8b05
7
- data.tar.gz: fb348123a77dbb11ded64c2d6b6f9d24be4ec243d82eed84516671055d47474fb8900aa6109d3022b9ebb39a6f5c90b88167afac71442cef4079ca603f53d91f
6
+ metadata.gz: 88875b98d81bbb2367254e516ce4b6ee48a78d706d857bcc913235cf2f1d45c5c2cc528ecb34d162656ccf5757abf1c54beb69bf790170bc7dc246025caddd4b
7
+ data.tar.gz: e6441418d25648f4bed4eb90cb9688fb321f76c1e929997e29450dae168e2e983825d2b404c3d74f865f761fbba21aac0172dd379fa54a488c61f4e7293edb5b
data/.github/workflows/rake-test.yml CHANGED
@@ -11,7 +11,7 @@ jobs:
11
11
  strategy:
12
12
  fail-fast: false
13
13
  matrix:
14
- cruby: ["2.4", "3.3"]
14
+ cruby: ["2.4", "3.3", "3.4"]
15
15
  steps:
16
16
  - name: Checkout the repository(CRuby)
17
17
  uses: actions/checkout@v4
data/ChangeLog.md CHANGED
@@ -3,6 +3,28 @@ RELEASE NOTES for Ruby version of Sisimai
3
3
  - releases: "https://github.com/sisimai/rb-sisimai/releases"
4
4
  - download: "https://rubygems.org/gems/sisimai"
5
5
 
6
+ v5.3.0
7
+ ---------------------------------------------------------------------------------------------------
8
+ - release: "Sat, 29 Mar 2025 06:04:41 +0900 (JST)"
9
+ - version: "5.3.0"
10
+ - changes:
11
+ - Collateral update due to the Go version of Sisimai's broken module path fix.
12
+ - Sisimai works on Ruby 3.4
13
+ - SMTP reply code improvements
14
+ - Update the list of SMTP reply codes in `Sisimai::SMTP::Reply`
15
+ - Implement `Sisimai::SMTP::Reply.associatedwith`
16
+ - Implement `Sisimai::SMTP::Status.is_explicit`
17
+
18
+ v5.2.1
19
+ ---------------------------------------------------------------------------------------------------
20
+ - release: "Wed, 12 Mar 2025 06:50:25 +0900 (JST)"
21
+ - version: "5.2.1"
22
+ - changes:
23
+ - Implement `Sisimai::Rhost::Cloudflare` #336 #337
24
+ - #333 NTT DOCOMO (Major Japanese mobile carrier) no longer returns a bounce mail due to domain
25
+ rejection or similar email settings, but instead were being delivered to the spam folder after
26
+ March 13th. #334
27
+
6
28
  v5.2.0
7
29
  ---------------------------------------------------------------------------------------------------
8
30
  - release: "5.2.0"
data/README-JA.md CHANGED
@@ -1,6 +1,6 @@
1
1
  ![](https://libsisimai.org/static/images/logo/sisimai-x01.png)
2
2
  [![License](https://img.shields.io/badge/license-BSD%202--Clause-orange.svg)](https://github.com/sisimai/rb-sisimai/blob/master/LICENSE)
3
- [![Ruby](https://img.shields.io/badge/ruby-v2.4.0--v3.3.0-red.svg)](https://www.ruby-lang.org/)
3
+ [![Ruby](https://img.shields.io/badge/ruby-v2.4.0--v3.4.0-red.svg)](https://www.ruby-lang.org/)
4
4
  [![Gem Version](https://badge.fury.io/rb/sisimai.svg)](https://badge.fury.io/rb/sisimai)
5
5
  [![codecov](https://codecov.io/github/sisimai/rb-sisimai/graph/badge.svg?token=YGkyluNWiZ)](https://codecov.io/github/sisimai/rb-sisimai)
6
6
 
@@ -65,14 +65,14 @@ Sisimai(シシマイ)は複雑で多種多様なバウンスメールを解析
65
65
  The key features of Sisimai
66
66
  ---------------------------------------------------------------------------------------------------
67
67
  * __バウンスメールを構造化したデータに変換__
68
- * 以下24項目の情報を含むデータ構造[^2]
68
+ * 以下26項目の情報を含むデータ構造[^2]
69
69
  * __基本的情報__: `timestamp`, `origin`
70
70
  * __発信者情報__: `addresser`, `senderdomain`,
71
71
  * __受信者情報__: `recipient`, `destination`, `alias`
72
- * __配信の情報__: `action`, `replycode`,`action`, `replycode`, `deliverystatus`
72
+ * __配信の情報__: `action`, `replycode`, `deliverystatus`, `command`
73
73
  * __エラー情報__: `reason`, `diagnosticcode`, `diagnostictype`, `feedbacktype`, `hardbounce`
74
74
  * __メール情報__: `subject`, `messageid`, `listid`,
75
- * __その他情報__: `smtpagent`, `timezoneoffset`, `lhost`, `rhost`, `token`, `catch`
75
+ * __その他情報__: `decodedby`, `timezoneoffset`, `lhost`, `rhost`, `token`, `catch`
76
76
  * __出力可能な形式__
77
77
  * Ruby (Hash, Array)
78
78
  * JSON
@@ -319,8 +319,8 @@ Output example
319
319
  "catch": null,
320
320
  "addresser": "michitsuna@example.jp",
321
321
  "alias": "nekochan@example.co.jp",
322
- "smtpagent": "Postfix",
323
- "smtpcommand": "DATA",
322
+ "decodedby": "Postfix",
323
+ "command": "DATA",
324
324
  "senderdomain": "example.jp",
325
325
  "listid": "",
326
326
  "action": "failed",
@@ -362,7 +362,7 @@ Sisimai 5.0.0から**Ruby 2.4以上**が必要になります。
362
362
  | ソースコードの行数 | 10,800 行 | 9,860 行 |
363
363
  | テストフレームワーク | rspec | minitest |
364
364
  | テスト件数(spec/またはtest/ディレクトリ) | 311,000 件 | 410,000 件 |
365
- | 1秒間に解析できるバウンスメール数[^4] | 290 通 | 305 通 |
365
+ | 1秒間に解析できるバウンスメール数[^4] | 620 通 | 620 通 |
366
366
  | ライセンス | 2条項BSD | 2条項BSD |
367
367
  | 開発会社による商用サポート | 提供中 | 提供中 |
368
368
 
data/README.md CHANGED
@@ -1,6 +1,6 @@
1
1
  ![](https://libsisimai.org/static/images/logo/sisimai-x01.png)
2
2
  [![License](https://img.shields.io/badge/license-BSD%202--Clause-orange.svg)](https://github.com/sisimai/rb-sisimai/blob/master/LICENSE)
3
- [![Ruby](https://img.shields.io/badge/ruby-v2.4.0--v3.3.0-red.svg)](https://www.ruby-lang.org/)
3
+ [![Ruby](https://img.shields.io/badge/ruby-v2.4.0--v3.4.0-red.svg)](https://www.ruby-lang.org/)
4
4
  [![Gem Version](https://badge.fury.io/rb/sisimai.svg)](https://badge.fury.io/rb/sisimai)
5
5
  [![codecov](https://codecov.io/github/sisimai/rb-sisimai/graph/badge.svg?token=YGkyluNWiZ)](https://codecov.io/github/sisimai/rb-sisimai)
6
6
 
@@ -25,7 +25,7 @@
25
25
  > such as PHP, Python, Go, and Rust. By obtaining the analysis results, it is very useful for understanding
26
26
  > the bounce occurrence status.
27
27
 
28
- - [**README-JA(日本語)**](README-JA.md)
28
+ - [**README-JA(日本�**](README-JA.md)
29
29
  - [What is Sisimai](#what-is-sisimai)
30
30
  - [The key features of sisimai](#the-key-features-of-sisimai)
31
31
  - [Command line demo](#command-line-demo)
@@ -67,14 +67,14 @@ Perl version of Sisimai at [github.com/sisimai/p5-sisimai](https://github.com/si
67
67
  The key features of Sisimai
68
68
  ---------------------------------------------------------------------------------------------------
69
69
  * __Decode email bounces to structured data__
70
- * Sisimai provides detailed insights into bounce emails by extracting 24 key data points.[^2]
70
+ * Sisimai provides detailed insights into bounce emails by extracting 26 key data points.[^2]
71
71
  * __Essential information__: `timestamp`, `origin`
72
72
  * __Sender information__: `addresser`, `senderdomain`,
73
73
  * __Recipient information__: `recipient`, `destination`, `alias`
74
- * __Delivery information__: `action`, `replycode`,`action`, `replycode`, `deliverystatus`
75
- * __Bounce details__: `reason`, `diagnosticcode`, `diagnostictype`, `feedbacktype`, `hardbounce`
74
+ * __Delivery information__: `action`, `replycode`, `deliverystatus`, `command`
75
+ * __Bounce details__: `reason`, `diagnosticcode`, `diagnostictype`, `feedbacktype`, `feedbackid`, `hardbounce`
76
76
  * __Message details__: `subject`, `messageid`, `listid`,
77
- * __Additional information__: `smtpagent`, `timezoneoffset`, `lhost`, `rhost`, `token`, `catch`
77
+ * __Additional information__: `decodedby`, `timezoneoffset`, `lhost`, `rhost`, `token`, `catch`
78
78
  * Output formats
79
79
  * Ruby (Hash, Array)
80
80
  * JSON
@@ -85,9 +85,9 @@ The key features of Sisimai
85
85
  * `gem install`
86
86
  * `git clone && make`
87
87
  * __High Precision of Analysis__
88
- * Support [73 MTAs/MDAs/ESPs](https://libsisimai.org/en/engine/)
88
+ * Support [59 MTAs/MDAs/ESPs](https://libsisimai.org/en/engine/)
89
89
  * Support Feedback Loop Message(ARF)
90
- * Can detect [34 bounce reasons](https://libsisimai.org/en/reason/)
90
+ * Can detect [36 bounce reasons](https://libsisimai.org/en/reason/)
91
91
 
92
92
  [^2]: The callback function allows you to add your own data under the `catch` accessor.
93
93
 
@@ -114,10 +114,10 @@ Install
114
114
  ### From RubyGems
115
115
  ```shell
116
116
  $ sudo gem install sisimai
117
- Fetching: sisimai-5.2.0.gem (100%)
118
- Successfully installed sisimai-5.2.0
119
- Parsing documentation for sisimai-5.2.0
120
- Installing ri documentation for sisimai-5.2.0
117
+ Fetching: sisimai-5.2.1.gem (100%)
118
+ Successfully installed sisimai-5.2.1
119
+ Parsing documentation for sisimai-5.2.1
120
+ Installing ri documentation for sisimai-5.2.1
121
121
  Done installing documentation for sisimai after 6 seconds
122
122
  1 gem installed
123
123
  ```
@@ -145,13 +145,13 @@ if [ -d "/usr/local/jr" ]; then \
145
145
  ...
146
146
  3 gems installed
147
147
  /opt/local/bin/rake install
148
- sisimai 5.2.0 built to pkg/sisimai-5.2.0.gem.
149
- sisimai (5.2.0) installed.
148
+ sisimai 5.2.1 built to pkg/sisimai-5.2.1.gem.
149
+ sisimai (5.2.1) installed.
150
150
  if [ -d "/usr/local/jr" ]; then \
151
151
  PATH="/usr/local/jr/bin:$PATH" /usr/local/jr/bin/rake install; \
152
152
  fi
153
- sisimai 5.2.0 built to pkg/sisimai-5.2.0-java.gem.
154
- sisimai (5.2.0) installed.
153
+ sisimai 5.2.1 built to pkg/sisimai-5.2.1-java.gem.
154
+ sisimai (5.2.1) installed.
155
155
  ```
156
156
 
157
157
  Usage
@@ -318,8 +318,8 @@ Output example
318
318
  "catch": null,
319
319
  "addresser": "michitsuna@example.jp",
320
320
  "alias": "nekochan@example.co.jp",
321
- "smtpagent": "Postfix",
322
- "smtpcommand": "DATA",
321
+ "decodedby": "Postfix",
322
+ "command": "DATA",
323
323
  "senderdomain": "example.jp",
324
324
  "listid": "",
325
325
  "action": "failed",
@@ -355,13 +355,13 @@ Beginning with v5.0.0, Sisimai requires **Ruby 2.4.0 or later.**
355
355
  | System requirements (CRuby) | 2.1 - 3.3.0 | **2.4** or later |
356
356
  | System requirements (JRuby) | 9.0.4.0 - 9.1.17.0 | **9.2** or later |
357
357
  | Callback feature for the original email file | N/A | Available[^3] |
358
- | The number of MTA/ESP modules | 68 | 58 |
358
+ | The number of MTA/ESP modules | 68 | 59 |
359
359
  | The number of detectable bounce reasons | 29 | 36 |
360
360
  | Dependencies (Except Ruby Standard Gems) | 1 gem | 1 gem |
361
361
  | Source lines of code | 10,300 lines | 9,800 lines |
362
362
  | Test frameworks | rspec | minitest |
363
363
  | The number of tests in spec/ or test/ directory | 311,000 tests | 410,000 tests |
364
- | The number of bounce emails decoded/sec (CRuby)[^4] | 290 emails | 305 emails |
364
+ | The number of bounce emails decoded/sec (CRuby)[^4] | 620 emails | 620 emails |
365
365
  | License | 2 Clause BSD | 2 Caluse BSD |
366
366
  | Commercial support | Available | Available |
367
367
 
@@ -450,7 +450,7 @@ Related Sites
450
450
 
451
451
  See also
452
452
  ---------------------------------------------------------------------------------------------------
453
- * [README-JA.md - README.md in Japanese(日本語)](https://github.com/sisimai/rb-sisimai/blob/master/README-JA.md)
453
+ * [README-JA.md - README.md in Japanese(日本�](https://github.com/sisimai/rb-sisimai/blob/master/README-JA.md)
454
454
  * [RFC3463 - Enhanced Mail System Status Codes](https://tools.ietf.org/html/rfc3463)
455
455
  * [RFC3464 - An Extensible Message Format for Delivery Status Notifications](https://tools.ietf.org/html/rfc3464)
456
456
  * [RFC3834 - Recommendations for Automatic Responses to Electronic Mail](https://tools.ietf.org/html/rfc3834)
data/lib/sisimai/fact.rb CHANGED
@@ -473,6 +473,16 @@ module Sisimai
473
473
  thing["action"] = "delayed" if thing["action"].empty? && thing["reason"] == "expired"
474
474
  thing["action"] = "failed" if thing["action"].empty? && cx[0] == "4" || cx[0] == "5"
475
475
 
476
+ if thing["replycode"].size > 0
477
+ # Fill empty values: ["SMTP Command", "DSN", "Reason"]
478
+ cv = Sisimai::SMTP::Reply.associatedwith(thing["replycode"])
479
+ if cv.size > 0
480
+ thing["command"] = cv[0] if cv[0] != "" && thing["command"].empty?
481
+ thing["deliverystatus"] = cv[1] if cv[1] != "" && Sisimai::SMTP::Status.is_explicit(thing["deliverystatus"]) == false
482
+ thing["reason"] = cv[2] if cv[2] != "" && Sisimai::Reason.is_explicit(thing["reason"]) == false
483
+ end
484
+ end
485
+
476
486
  # Feedback-ID: 1.us-west-2.QHuyeCQrGtIIMGKQfVdUhP9hCQR2LglVOrRamBc+Prk=:AmazonSES
477
487
  thing["feedbackid"] = rfc822data["feedback-id"] || ""
478
488
 
data/lib/sisimai/order.rb CHANGED
@@ -11,38 +11,39 @@ module Sisimai
11
11
  'Sisimai::Lhost::Sendmail',
12
12
  'Sisimai::Lhost::Exchange2007',
13
13
  'Sisimai::Lhost::Exchange2003',
14
- 'Sisimai::Lhost::AmazonSES',
15
14
  'Sisimai::Lhost::InterScanMSS',
16
15
  'Sisimai::Lhost::KDDI',
16
+ 'Sisimai::Lhost::FML',
17
17
  'Sisimai::Lhost::Verizon',
18
+ 'Sisimai::Lhost::AmazonSES',
18
19
  'Sisimai::Lhost::ApacheJames',
19
20
  'Sisimai::Lhost::X2',
20
- 'Sisimai::Lhost::FML',
21
21
  ].freeze
22
22
 
23
23
  # Fallback list: The following MTA/ESP modules is not listed OrderE0
24
24
  OrderE1 = [
25
25
  'Sisimai::Lhost::Postfix',
26
26
  'Sisimai::Lhost::OpenSMTPD',
27
- 'Sisimai::Lhost::Courier',
28
27
  'Sisimai::Lhost::Qmail',
28
+ 'Sisimai::Lhost::Courier',
29
29
  'Sisimai::Lhost::MessagingServer',
30
- 'Sisimai::Lhost::MailMarshalSMTP',
31
30
  'Sisimai::Lhost::GoogleWorkspace',
32
- 'Sisimai::Lhost::Domino',
33
- 'Sisimai::Lhost::Notes',
34
31
  'Sisimai::Lhost::Gmail',
35
- 'Sisimai::Lhost::Zoho',
36
32
  'Sisimai::Lhost::GMX',
37
- 'Sisimai::Lhost::GoogleGroups',
38
- 'Sisimai::Lhost::MailFoundry',
39
- 'Sisimai::Lhost::V5sendmail',
33
+ 'Sisimai::Lhost::Zoho',
34
+ 'Sisimai::Lhost::Domino',
35
+ 'Sisimai::Lhost::Notes',
40
36
  'Sisimai::Lhost::IMailServer',
41
- 'Sisimai::Lhost::MFILTER',
42
37
  'Sisimai::Lhost::Activehunter',
38
+ 'Sisimai::Lhost::MFILTER',
39
+ 'Sisimai::Lhost::MailFoundry',
40
+ 'Sisimai::Lhost::GoogleGroups',
41
+ 'Sisimai::Lhost::MailMarshalSMTP',
42
+ 'Sisimai::Lhost::V5sendmail',
43
43
  'Sisimai::Lhost::EZweb',
44
44
  'Sisimai::Lhost::Biglobe',
45
45
  'Sisimai::Lhost::EinsUndEins',
46
+ 'Sisimai::Lhost::DragonFly',
46
47
  'Sisimai::Lhost::X1',
47
48
  'Sisimai::Lhost::X3',
48
49
  'Sisimai::Lhost::X6',
data/lib/sisimai/reason/notaccept.rb CHANGED
@@ -43,7 +43,7 @@ module Sisimai
43
43
  return true if argvs['reason'] == 'notaccept'
44
44
 
45
45
  # SMTP Reply Code is 554 or 556
46
- return true if [521, 554, 556].index(argvs['replycode'].to_i)
46
+ return true if [521, 556].index(argvs['replycode'].to_i)
47
47
  return false if argvs['command'] != 'MAIL'
48
48
  return match(argvs['diagnosticcode'].downcase)
49
49
  end
data/lib/sisimai/rhost/cloudflare.rb ADDED
@@ -0,0 +1,31 @@
1
+ module Sisimai
2
+ module Rhost
3
+ # Sisimai::Rhost detects the bounce reason from the content of Sisimai::Fact object as an argument
4
+ # of find() method when the value of "rhost" of the object is "*.mx.cloudflare.net".
5
+ # This class is called only from Sisimai::Fact class.
6
+ module Cloudflare
7
+ class << self
8
+ MessagesOf = {
9
+ "blocked" => ["found on one or more DNSBLs"],
10
+ "systemerror" => ["Upstream error"],
11
+ }.freeze
12
+
13
+ # Detect bounce reason from Cloudflare Email Routing
14
+ # @param [Sisimai::Fact] argvs Decoded email object
15
+ # @return [String] The bounce reason for Cloudflare
16
+ # @since v5.2.1
17
+ # @see https://developers.cloudflare.com/email-routing/postmaster/
18
+ def find(argvs)
19
+ return "" if argvs["diagnosticcode"].empty?
20
+ MessagesOf.each_key do |e|
21
+ # Try to match the error message with message patterns defined in $MessagesOf
22
+ return e if MessagesOf[e].any? { |a| argvs["diagnosticcode"].include?(a) }
23
+ end
24
+ return ""
25
+ end
26
+
27
+ end
28
+ end
29
+ end
30
+ end
31
+
data/lib/sisimai/rhost/nttdocomo.rb CHANGED
@@ -7,8 +7,9 @@ module Sisimai
7
7
  class << self
8
8
  MessagesOf = {
9
9
  'mailboxfull' => ['552 too much mail data'],
10
- 'toomanyconn' => ['552 too many recipients'],
11
10
  'syntaxerror' => ['503 bad sequence of commands', '504 command parameter not implemented'],
11
+ 'toomanyconn' => ['552 too many recipients'],
12
+ 'userunknown' => ['550 unknown user'],
12
13
  }.freeze
13
14
 
14
15
  # Detect bounce reason from NTT DOCOMO
@@ -51,7 +52,12 @@ module Sisimai
51
52
  else
52
53
  # The value of "Diagnostic-Code:" field is not empty
53
54
  MessagesOf.each_key do |e|
54
- # Try to match the error message with message patterns defined in "MessagesOf"
55
+ # - The key name is a bounce reason name
56
+ # - https://github.com/sisimai/go-sisimai/issues/64
57
+ # - After March 12, 2025, if an error message contains "550 Unknown user", the
58
+ # bounce reason will be definitively "userunknown". This is because NTT DOCOMO
59
+ # no longer rejects emails via SMTP for domain-specific rejection or specified
60
+ # reception filters.
55
61
  next unless MessagesOf[e].any? { |a| esmtperror.include?(a) }
56
62
  reasontext = e
57
63
  break
data/lib/sisimai/rhost.rb CHANGED
@@ -7,6 +7,7 @@ module Sisimai
7
7
  RhostClass = {
8
8
  "Aol" => [".mail.aol.com", ".mx.aol.com"],
9
9
  "Apple" => [".mail.icloud.com", ".apple.com", ".me.com"],
10
+ "Cloudflare" => [".mx.cloudflare.net"],
10
11
  "Cox" => ["cox.net"],
11
12
  "Facebook" => [".facebook.com"],
12
13
  "FrancePTT" => [".laposte.net", ".orange.fr", ".wanadoo.fr"],
data/lib/sisimai/smtp/reply.rb CHANGED
@@ -58,8 +58,11 @@ module Sisimai
58
58
  # 251 User not local; will forward to <forward-path> (See Section 3.4)
59
59
  # 252 Cannot VRFY user, but will accept message and attempt delivery (See Section 3.5.3)
60
60
  # 253 OK, <n> pending messages for node <domain> started (See RFC1985)
61
+ # 334 A server challenge is sent as a 334 reply with the text part containing the [BASE64]
62
+ # encoded string supplied by the SASL mechanism. This challenge MUST NOT contain any
63
+ # text other than the BASE64 encoded challenge. (RFC4954)
61
64
  # 354 Start mail input; end with <CRLF>.<CRLF>
62
- '211', '214', '220', '221', '235', '250', '251', '252', '253', '354'
65
+ '211', '214', '220', '221', '235', '250', '251', '252', '253', '334', '354'
63
66
  ].freeze
64
67
  ReplyCode4 = [
65
68
  # 421 <domain> Service not available, closing transmission channel (This may be a reply
@@ -86,7 +89,6 @@ module Sisimai
86
89
  # 502 Command not implemented (see Section 4.2.4)
87
90
  # 503 Bad sequence of commands
88
91
  # 504 Command parameter not implemented
89
- # 520 Please use the correct QHLO ID (See https://datatracker.ietf.org/doc/id/draft-fanf-smtp-quickstart-01.txt)
90
92
  # 521 Host does not accept mail (See RFC7504)
91
93
  # 523 Encryption Needed (See RFC5248)
92
94
  # 524 (See RFC5248)
@@ -104,11 +106,27 @@ module Sisimai
104
106
  # 554 Transaction failed (Or, in the case of a connection-opening response, "No SMTP service here")
105
107
  # 555 MAIL FROM/RCPT TO parameters not recognized or not implemented
106
108
  # 556 Domain does not accept mail (See RFC7504)
107
- # 557 draft-moore-email-addrquery-01
108
- '550', '552', '553', '551', '521', '525', '502', '520', '523', '524', '530', '533', '534',
109
- '535', '538', '551', '555', '556', '554', '557', '500', '501', '502', '503', '504',
109
+ "550", "552", "553", "551", "521", "525", "523", "524", "530", "533", "534", "535", "538",
110
+ "555", "556", "554", "500", "501", "502", "503", "504",
110
111
  ].freeze
111
112
  CodeOfSMTP = { '2' => ReplyCode2, '4' => ReplyCode4, '5' => ReplyCode5 }.freeze
113
+ Associated = {
114
+ "422" => ["AUTH", "4.7.12", "securityerror"], # RFC5238
115
+ "432" => ["AUTH", "4.7.12", "securityerror"], # RFC4954, RFC5321
116
+ "500" => ["", "", "syntaxerror"], # RFC5321
117
+ "501" => ["", "", "syntaxerror"], # RFC5321
118
+ "502" => ["", "", "syntaxerror"], # RFC5321
119
+ "503" => ["", "", "syntaxerror"], # RFC5321
120
+ "504" => ["", "", "syntaxerror"], # RFC5321
121
+ "521" => ["CONN", "", "notaccept"], # RFC7504
122
+ "523" => ["AUTH", "", "securityerror"], # RFC5248
123
+ "524" => ["AUTH", "", "securityerror"], # RFC5248
124
+ "525" => ["AUTH", "", "securityerror"], # RFC5248
125
+ "534" => ["AUTH", "5.7.9", "securityerror"], # RFC4954, RFC5248
126
+ "535" => ["AUTH", "5.7.8", "securityerror"], # RFC4954, RFC5248
127
+ "538" => ["AUTH", "5.7.11", "securityerror"], # RFC4954, RFC5248
128
+ "556" => ["RCPT", "", "notaccept"], # RFC7504
129
+ }.freeze
112
130
 
113
131
  # Check whether a reply code is a valid code or not
114
132
  # @param [String] argv1 Reply Code(DSN)
@@ -122,7 +140,7 @@ module Sisimai
122
140
  first = (reply / 100).to_i
123
141
 
124
142
  return false if reply < 211
125
- return false if reply > 557
143
+ return false if reply > 556
126
144
  return false if reply % 100 > 59
127
145
 
128
146
  if first == 2
@@ -135,7 +153,7 @@ module Sisimai
135
153
 
136
154
  if first == 3
137
155
  # 3yz
138
- return false unless reply == 354
156
+ return false unless reply == 334 || reply == 354
139
157
  return true
140
158
  end
141
159
 
@@ -182,6 +200,11 @@ module Sisimai
182
200
  return esmtpreply
183
201
  end
184
202
 
203
+ # associatedwith returns a slice associated with the SMTP reply code of the argument
204
+ # @param [String] argv1 SMTP reply code like 550
205
+ # @return [Array] ["SMTP Command", "DSN", "Reason"]
206
+ # @since v5.2.2
207
+ def associatedwith(argv1 = ''); return Associated[argv1] || []; end
185
208
  end
186
209
  end
187
210
  end
data/lib/sisimai/smtp/status.rb CHANGED
@@ -735,7 +735,7 @@ module Sisimai
735
735
  else
736
736
  ['5.', '4.', '2.']
737
737
  end
738
- esmtperror = ' ' + argv1 + ' '
738
+ esmtperror = ' ' + argv1 + ' ' # Why 3 space characters? see https://github.com/sisimai/p5-sisimai/issues/574
739
739
  lookingfor = []
740
740
 
741
741
  Sisimai::RFC791.find(esmtperror).each do |e|
@@ -892,6 +892,15 @@ module Sisimai
892
892
  return statuscode
893
893
  end
894
894
 
895
+ # is_explicit() returns 0 when the argument is empty or is an internal code
896
+ # @param string argv1 Status code
897
+ # @return bool false: The delivery status code is not explicit
898
+ def is_explicit(argv1 = '')
899
+ return false if argv1.nil?
900
+ return false if argv1.empty?
901
+ return false if argv1.size == 7 && argv1.start_with?("5.0.9", "4.0.9")
902
+ return true
903
+ end
895
904
  end
896
905
  end
897
906
  end
data/lib/sisimai/version.rb CHANGED
@@ -1,4 +1,4 @@
1
1
  # Define the version number of Sisimai
2
2
  module Sisimai
3
- VERSION = '5.2.0'.freeze
3
+ VERSION = '5.3.0'.freeze
4
4
  end
data/set-of-emails/maildir/bsd/rhost-cloudflare-01.eml ADDED
@@ -0,0 +1,75 @@
1
+ Return-Path: <>
2
+ Received: from relay.mx.example.jp (unknown [192.0.2.21])
3
+ by sisimai.mx.example.jp (Postfix) with ESMTPS id m6SrZSzVjhzC3KjV
4
+ for <neko@mx.example.jp>; Tue, 2 Jul 2024 23:34:45 +0900 (JST)
5
+ Date: Tue, 2 Jul 2024 23:34:45 +0900 (JST)
6
+ From: MAILER-DAEMON@relay.mx.example.jp (Mail Delivery System)
7
+ To: neko@mx.example.jp
8
+ Message-Id: <qQYlj9jhzdzY6WHr@relay.mx.example.jp>
9
+ Subject: Undelivered Mail Returned to Sender
10
+ Auto-Submitted: auto-replied
11
+ MIME-Version: 1.0
12
+ Content-Type: multipart/report; report-type=delivery-status;
13
+ boundary="yKvJXwrDt6zP1H5n.1316187218/relay.mx.example.jp"
14
+
15
+ This is a MIME-encapsulated message.
16
+
17
+ --yKvJXwrDt6zP1H5n.1316187218/relay.mx.example.jp
18
+ Content-Description: Notification
19
+ Content-Type: text/plain; charset=us-ascii
20
+
21
+ This is the mail system at host relay.mx.example.jp.
22
+
23
+ I'm sorry to have to inform you that your message could not
24
+ be delivered to one or more recipients. It's attached below.
25
+
26
+ For further assistance, please send mail to postmaster.
27
+
28
+ If you do so, please include this problem report. You can
29
+ delete your own text from the attached returned message.
30
+
31
+ The mail system
32
+
33
+ <kijitora-neko@example.com>: host route3.mx.cloudflare.net[162.159.205.25]
34
+ said: 421 4.3.0 Upstream error, please check
35
+ https://developers.cloudflare.com/email-routing/postmaster for possible
36
+ reasons why. RsrUEMk60942 (in reply to end of DATA command)
37
+
38
+ --yKvJXwrDt6zP1H5n.1316187218/relay.mx.example.jp
39
+ Content-Description: Delivery report
40
+ Content-Type: message/delivery-status
41
+
42
+ Reporting-MTA: dns; relay.mx.example.jp
43
+ X-Postfix-Queue-ID: yKvJXwrDt6zP1H5n
44
+ X-Postfix-Sender: rfc822; neko@mx.example.jp
45
+ Arrival-Date: Tue, 2 Jul 2024 23:34:45 +0900 (JST)
46
+
47
+ Final-Recipient: rfc822; kijitora-neko@example.com
48
+ Original-Recipient: rfc822;kijitora-neko@example.com
49
+ Action: failed
50
+ Status: 4.3.0
51
+ Remote-MTA: dns; route3.mx.cloudflare.net
52
+ Diagnostic-Code: smtp; 421 4.3.0 Upstream error, please check
53
+ https://developers.cloudflare.com/email-routing/postmaster for possible
54
+ reasons why. RsrUEMk60942
55
+
56
+ --yKvJXwrDt6zP1H5n.1316187218/relay.mx.example.jp
57
+ Content-Description: Undelivered Message
58
+ Content-Type: message/rfc822
59
+
60
+ Return-Path: <neko@mx.example.jp>
61
+ Received: from local-mail-hub-1.example.jp (unknown [192.0.2.253])
62
+ by relay.mx.example.jp (Postfix) with ESMTP id yKvJXwrDt6zP1H5n
63
+ for <kijitora-neko@example.com>; Tue, 2 Jul 2024 23:34:45 +0900 (JST)
64
+ From: <neko@mx.example.jp>
65
+ Date: Tue, 02 Jul 2024 23:34:45 +0900
66
+ Message-Id: <QtF9aH-aSDIzG-WP@mx.example.jp>
67
+ To: <kijitora-neko@example.com>
68
+ Subject: Nyaaaaaan
69
+ MIME-Version: 1.0
70
+ Content-Type: text/plain; charset=us-ascii
71
+
72
+ Nyaan?
73
+
74
+ --yKvJXwrDt6zP1H5n.1316187218/relay.mx.example.jp--
75
+
metadata CHANGED
@@ -1,22 +1,21 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: sisimai
3
3
  version: !ruby/object:Gem::Version
4
- version: 5.2.0
4
+ version: 5.3.0
5
5
  platform: java
6
6
  authors:
7
7
  - azumakuniyuki
8
- autorequire:
9
8
  bindir: exe
10
9
  cert_chain: []
11
- date: 2025-02-25 00:00:00.000000000 Z
10
+ date: 2025-03-28 00:00:00.000000000 Z
12
11
  dependencies:
13
12
  - !ruby/object:Gem::Dependency
13
+ name: bundler
14
14
  requirement: !ruby/object:Gem::Requirement
15
15
  requirements:
16
16
  - - ">="
17
17
  - !ruby/object:Gem::Version
18
18
  version: '1.8'
19
- name: bundler
20
19
  type: :development
21
20
  prerelease: false
22
21
  version_requirements: !ruby/object:Gem::Requirement
@@ -25,12 +24,12 @@ dependencies:
25
24
  - !ruby/object:Gem::Version
26
25
  version: '1.8'
27
26
  - !ruby/object:Gem::Dependency
27
+ name: rake
28
28
  requirement: !ruby/object:Gem::Requirement
29
29
  requirements:
30
30
  - - ">="
31
31
  - !ruby/object:Gem::Version
32
32
  version: '10.0'
33
- name: rake
34
33
  type: :development
35
34
  prerelease: false
36
35
  version_requirements: !ruby/object:Gem::Requirement
@@ -39,12 +38,12 @@ dependencies:
39
38
  - !ruby/object:Gem::Version
40
39
  version: '10.0'
41
40
  - !ruby/object:Gem::Dependency
41
+ name: minitest
42
42
  requirement: !ruby/object:Gem::Requirement
43
43
  requirements:
44
44
  - - ">="
45
45
  - !ruby/object:Gem::Version
46
46
  version: '5.0'
47
- name: minitest
48
47
  type: :development
49
48
  prerelease: false
50
49
  version_requirements: !ruby/object:Gem::Requirement
@@ -53,6 +52,7 @@ dependencies:
53
52
  - !ruby/object:Gem::Version
54
53
  version: '5.0'
55
54
  - !ruby/object:Gem::Dependency
55
+ name: jrjackson
56
56
  requirement: !ruby/object:Gem::Requirement
57
57
  requirements:
58
58
  - - "~>"
@@ -61,7 +61,6 @@ dependencies:
61
61
  - - ">="
62
62
  - !ruby/object:Gem::Version
63
63
  version: 0.3.8
64
- name: jrjackson
65
64
  type: :runtime
66
65
  prerelease: false
67
66
  version_requirements: !ruby/object:Gem::Requirement
@@ -200,6 +199,7 @@ files:
200
199
  - lib/sisimai/rhost.rb
201
200
  - lib/sisimai/rhost/aol.rb
202
201
  - lib/sisimai/rhost/apple.rb
202
+ - lib/sisimai/rhost/cloudflare.rb
203
203
  - lib/sisimai/rhost/cox.rb
204
204
  - lib/sisimai/rhost/facebook.rb
205
205
  - lib/sisimai/rhost/franceptt.rb
@@ -767,6 +767,7 @@ files:
767
767
  - set-of-emails/maildir/bsd/rhost-apple-02.eml
768
768
  - set-of-emails/maildir/bsd/rhost-apple-03.eml
769
769
  - set-of-emails/maildir/bsd/rhost-apple-04.eml
770
+ - set-of-emails/maildir/bsd/rhost-cloudflare-01.eml
770
771
  - set-of-emails/maildir/bsd/rhost-cox-01.eml
771
772
  - set-of-emails/maildir/bsd/rhost-facebook-03.eml
772
773
  - set-of-emails/maildir/bsd/rhost-facebook-04.eml
@@ -1021,7 +1022,6 @@ homepage: https://libsisimai.org/
1021
1022
  licenses:
1022
1023
  - BSD-2-Clause
1023
1024
  metadata: {}
1024
- post_install_message:
1025
1025
  rdoc_options: []
1026
1026
  require_paths:
1027
1027
  - lib
@@ -1036,8 +1036,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
1036
1036
  - !ruby/object:Gem::Version
1037
1037
  version: '0'
1038
1038
  requirements: []
1039
- rubygems_version: 3.3.26
1040
- signing_key:
1039
+ rubygems_version: 3.6.3
1041
1040
  specification_version: 4
1042
1041
  summary: Mail Analyzing Interface
1043
1042
  test_files: []