From 9472456ea04dadb5a8f5544ea6e5e669d66b2b79 Mon Sep 17 00:00:00 2001
From: mdecimus <mauro@stalw.art>
Date: Wed, 14 Feb 2024 14:38:04 +0100
Subject: [PATCH] v0.6.0

---
 .github/ISSUE_TEMPLATE/bug_report.yml      |   1 +
 .github/ISSUE_TEMPLATE/feature_request.yml |   2 +-
 CHANGELOG.md                               |  16 ++++++++++++++++
 UPGRADING.md                               |   8 ++++++++
 crates/smtp/src/core/eval.rs               |   2 ++
 crates/smtp/src/reporting/mod.rs           |   1 -
 resources/config.zip                       | Bin 171400 -> 171355 bytes
 resources/config/smtp/queue.toml           |   4 ----
 resources/config/smtp/report.toml          |   2 --
 9 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index ce3f939d5..c8a18730a 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -31,6 +31,7 @@ body:
       label: Version
       description: What version of our software are you running?
       options:
+        - v0.6.x
         - v0.5.x
         - v0.4.x
         - v0.3.x or lower
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index 63ea268bc..3c96598ba 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -23,7 +23,7 @@ body:
       label: Is your feature request related to a problem?
       description: Write a clear and concise description of what the problem is.
       placeholder: Tell us what the problem is!
-      value: "I'm always frustrated when..."
+      value: "I'm having a problem with..."
   - type: checkboxes
     id: terms
     attributes:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 61362e9ba..fa6495303 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,22 @@
 
 All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [0.6.0] - 2024-02-14
+
+This version introduces breaking changes in the configuration file. Please read the [UPGRADING.md](UPGRADING.md) file for more information on how to upgrade from previous versions.
+
+## Added
+- Distributed and fault-tolerant SMTP message queues.
+- Distributed rate-limiting and fail2ban.
+- Expressions in configuration files.
+
+### Changed
+
+### Fixed
+- Do not include `STATUS` in IMAP `NOOP` responses (#234).
+- Allow multiple SMTP `HELO` commands.
+- Redirect OAuth using a `301` instead of a `307` code.
+
 ## [0.5.3] - 2024-01-14
 
 Please read the [UPGRADING.md](UPGRADING.md) file for more information on how to upgrade from previous versions.
diff --git a/UPGRADING.md b/UPGRADING.md
index 270d50c61..af46e8515 100644
--- a/UPGRADING.md
+++ b/UPGRADING.md
@@ -1,3 +1,11 @@
+Upgrading from `v0.5.3` to `v0.6.0`
+-----------------------------------
+
+- In order to support [expressions](https://stalw.art/docs/configuration/expressions/overview), version `0.6.0` introduces multiple breaking changes in the SMTP server configuration file. It is recommended to download the new SMTP configuration files from the [repository](https://github.com/stalwartlabs/mail-server/tree/main/resources/config/smtp), make any necessary changes and replace the old files under `INSTALL_DIR/etc/smtp` with the new ones.
+- Message queues are now distributed and stored in the backend specified by the `storage.data` and `storage.blob` settings. Make sure to flush your SMTP message queue before upgrading to `0.6.0` to avoid losing any outgoing messages pending delivery.
+- Replace the binary with the new version.
+- Restart the service.
+
 Upgrading from `v0.5.2` to `v0.5.3`
 -----------------------------------
 
diff --git a/crates/smtp/src/core/eval.rs b/crates/smtp/src/core/eval.rs
index 1b90750a2..f1d6bca60 100644
--- a/crates/smtp/src/core/eval.rs
+++ b/crates/smtp/src/core/eval.rs
@@ -47,8 +47,10 @@ pub const VARIABLES_MAP: &[(&str, u32)] = &[
 
 pub const FUNCTIONS_MAP: &[(&str, u32, u32)] = &[
     ("is_local_domain", F_IS_LOCAL_DOMAIN, 2),
+    ("is_local_address", F_IS_LOCAL_ADDRESS, 2),
     ("key_get", F_KEY_GET, 2),
     ("key_exists", F_KEY_EXISTS, 2),
+    ("dns_query", F_DNS_QUERY, 2),
 ];
 
 impl SMTP {
diff --git a/crates/smtp/src/reporting/mod.rs b/crates/smtp/src/reporting/mod.rs
index b8a194a1c..cc834850a 100644
--- a/crates/smtp/src/reporting/mod.rs
+++ b/crates/smtp/src/reporting/mod.rs
@@ -152,7 +152,6 @@ impl SMTP {
             #[cfg(not(feature = "test_mode"))]
             {
                 use rand::Rng;
-                use std::time::Duration;
 
                 let delivery_time = rand::thread_rng().gen_range(0u64..10800u64);
                 for domain in &mut message.domains {
diff --git a/resources/config.zip b/resources/config.zip
index a79ac6fbef7cd08b8e9cca2161ca24660db3dbb0..df6620eef5eee1abc87208e1f6fdc32b1ce4dd4f 100644
GIT binary patch
delta 3829
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

delta 3796
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
QAV)DUrE9r}Y)sVu0nyJ$g8%>k

diff --git a/resources/config/smtp/queue.toml b/resources/config/smtp/queue.toml
index 84e6f0d61..79f0f4d0d 100644
--- a/resources/config/smtp/queue.toml
+++ b/resources/config/smtp/queue.toml
@@ -2,10 +2,6 @@
 # SMTP server queue configuration
 #############################################
 
-[queue]
-path = "%{BASE_PATH}%/queue"
-hash = 64
-
 [queue.schedule]
 retry = "[2m, 5m, 10m, 15m, 30m, 1h, 2h]"
 notify = "[1d, 3d]"
diff --git a/resources/config/smtp/report.toml b/resources/config/smtp/report.toml
index 34c001cad..21fc16e37 100644
--- a/resources/config/smtp/report.toml
+++ b/resources/config/smtp/report.toml
@@ -3,8 +3,6 @@
 #############################################
 
 [report]
-path = "%{BASE_PATH}%/reports"
-hash = 64
 #submitter = "%{HOST}%"
 
 [report.analysis]