From 53f0222f308b3e844c158fc0e603d10361da3c63 Mon Sep 17 00:00:00 2001
From: mdecimus <mauro@stalw.art>
Date: Wed, 14 Feb 2024 15:44:35 +0100
Subject: [PATCH] Updated directory expressions

---
 UPGRADING.md                             |   1 +
 crates/utils/src/config/listener.rs      |   2 +-
 resources/config.zip                     | Bin 171355 -> 171507 bytes
 resources/config/directory/internal.toml |   6 ++++--
 resources/config/directory/ldap.toml     |   6 ++++--
 resources/config/directory/memory.toml   |   6 ++++--
 resources/config/directory/sql.toml      |   6 ++++--
 7 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/UPGRADING.md b/UPGRADING.md
index af46e8515..11f2fdb53 100644
--- a/UPGRADING.md
+++ b/UPGRADING.md
@@ -2,6 +2,7 @@ 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.
+- If you are using custom subaddressing of catch-all rules, you'll need to replace these rules with expressions. Check out the updated [syntax](https://stalw.art/docs/directory/addresses).
 - 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.
diff --git a/crates/utils/src/config/listener.rs b/crates/utils/src/config/listener.rs
index d2494653a..0de922420 100644
--- a/crates/utils/src/config/listener.rs
+++ b/crates/utils/src/config/listener.rs
@@ -389,7 +389,7 @@ impl ParseValue for ServerProtocol {
             Ok(Self::Jmap)
         } else if value.eq_ignore_ascii_case("imap") {
             Ok(Self::Imap)
-        } else if value.eq_ignore_ascii_case("http") {
+        } else if value.eq_ignore_ascii_case("http") | value.eq_ignore_ascii_case("https") {
             Ok(Self::Http)
         } else if value.eq_ignore_ascii_case("managesieve") {
             Ok(Self::ManageSieve)
diff --git a/resources/config.zip b/resources/config.zip
index df6620eef5eee1abc87208e1f6fdc32b1ce4dd4f..c134fc48049da6fad420ced6aa928600de4b6717 100644
GIT binary patch
delta 3306
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
DcIZCI

delta 2973
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
LON&N-mymx0v8~}%

diff --git a/resources/config/directory/internal.toml b/resources/config/directory/internal.toml
index 36e605318..7cbbe7a33 100644
--- a/resources/config/directory/internal.toml
+++ b/resources/config/directory/internal.toml
@@ -9,9 +9,11 @@ disable = true
 
 [directory."internal".options]
 catch-all = true
-#catch-all = { map = "(.+)@(.+)$", to = "info@${2}" }
+#catch-all = [ { if = "matches('(.+)@(.+)$', address)", then = "'info@' + $2" },
+#              { else = false } ]
 subaddressing = true
-#subaddressing = { map = "^([^.]+)\.([^.]+)@(.+)$", to = "${2}@${3}" }
+#subaddressing = [ { if = "matches('^([^.]+)\.([^.]+)@(.+)$', address)", then = "$2 + '@' + $3" }, 
+#                  { else = false } ]
 
 [directory."internal".cache]
 entries = 500
diff --git a/resources/config/directory/ldap.toml b/resources/config/directory/ldap.toml
index 11ea58942..85dd75ae7 100644
--- a/resources/config/directory/ldap.toml
+++ b/resources/config/directory/ldap.toml
@@ -27,9 +27,11 @@ ttl = {positive = '1h', negative = '10m'}
 
 [directory."ldap".options]
 catch-all = true
-#catch-all = { map = "(.+)@(.+)$", to = "info@${2}" }
+#catch-all = [ { if = "matches('(.+)@(.+)$', address)", then = "'info@' + $2" },
+#              { else = false } ]
 subaddressing = true
-#subaddressing = { map = "^([^.]+)\.([^.]+)@(.+)$", to = "${2}@${3}" }
+#subaddressing = [ { if = "matches('^([^.]+)\.([^.]+)@(.+)$', address)", then = "$2 + '@' + $3" }, 
+#                  { else = false } ]
 
 [directory."ldap".pool]
 max-connections = 10
diff --git a/resources/config/directory/memory.toml b/resources/config/directory/memory.toml
index 8b90c768b..ea13bc58e 100644
--- a/resources/config/directory/memory.toml
+++ b/resources/config/directory/memory.toml
@@ -8,9 +8,11 @@ disable = true
 
 [directory."memory".options]
 catch-all = true
-#catch-all = { map = "(.+)@(.+)$", to = "info@${2}" }
+#catch-all = [ { if = "matches('(.+)@(.+)$', address)", then = "'info@' + $2" },
+#              { else = false } ]
 subaddressing = true
-#subaddressing = { map = "^([^.]+)\.([^.]+)@(.+)$", to = "${2}@${3}" }
+#subaddressing = [ { if = "matches('^([^.]+)\.([^.]+)@(.+)$', address)", then = "$2 + '@' + $3" }, 
+#                  { else = false } ]
 
 [[directory."memory".principals]]
 name = "admin"
diff --git a/resources/config/directory/sql.toml b/resources/config/directory/sql.toml
index ffd4ebc20..25941deed 100644
--- a/resources/config/directory/sql.toml
+++ b/resources/config/directory/sql.toml
@@ -9,9 +9,11 @@ disable = true
 
 [directory."sql".options]
 catch-all = true
-#catch-all = { map = "(.+)@(.+)$", to = "info@${2}" }
+#catch-all = [ { if = "matches('(.+)@(.+)$', address)", then = "'info@' + $2" },
+#              { else = false } ]
 subaddressing = true
-#subaddressing = { map = "^([^.]+)\.([^.]+)@(.+)$", to = "${2}@${3}" }
+#subaddressing = [ { if = "matches('^([^.]+)\.([^.]+)@(.+)$', address)", then = "$2 + '@' + $3" }, 
+#                  { else = false } ]
 
 [directory."sql".cache]
 entries = 500