From: Vsevolod Stakhov <vsevolod@rspamd.com>
Date: Tue, 2 Dec 2025 14:52:18 +0000 (+0000)
Subject: [Fix] Enable aliases plugin by default to restore plus-addressing
X-Git-Tag: 3.14.2~43
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=829c3126c876f16c5948b12ac884548bdfd36b10;p=thirdparty%2Frspamd.git

[Fix] Enable aliases plugin by default to restore plus-addressing

Fixes #5768: Settings lookup was broken for subaddressed recipients
(e.g., user+folder@example.com) because the aliases plugin was
disabled by default after it was moved from rules/misc.lua in 3.14.

This restores the pre-3.14 behavior where plus-tags are stripped
and virtual recipients are created for settings matching.
---

diff --git a/conf/modules.d/aliases.conf b/conf/modules.d/aliases.conf
index dceb76d2ae..037173b5f7 100644
--- a/conf/modules.d/aliases.conf
+++ b/conf/modules.d/aliases.conf
@@ -8,17 +8,13 @@
 # - Local domain detection
 # - Message classification (inbound/outbound/internal)
 # - Service-specific rules (Gmail, plus-aliases)
-# - Forwarding detection (moved from rules/forwarding.lua for correct ordering)
-#
-# IMPORTANT: This module includes forwarding detection functionality.
-# If you enable this module, you should DISABLE rules/forwarding.lua to avoid
-# duplicate symbol registration.
+# - Forwarding detection
 #
 # Documentation: https://rspamd.com/doc/modules/aliases.html
 
 aliases {
-  # Enable/disable the module
-  #enabled = true;
+  # Enable/disable the module (enabled by default since 3.14.2)
+  # enabled = true;
 
   # System aliases (Unix /etc/aliases format)
   # Can be:
diff --git a/rules/forwarding.lua b/rules/forwarding.lua
index 9bcca5ced5..880386ba48 100644
--- a/rules/forwarding.lua
+++ b/rules/forwarding.lua
@@ -19,17 +19,7 @@ limitations under the License.
 -- All forwarding detection functionality has been integrated into the aliases
 -- plugin to ensure correct execution order (prefilter stage before classification).
 --
--- Symbols now registered by aliases plugin:
+-- Symbols now registered by aliases plugin (enabled by default since 3.14.2):
 --   FWD_GOOGLE, FWD_YANDEX, FWD_MAILRU
 --   FWD_SRS, FWD_SIEVE, FWD_CPANEL
 --   FORWARDED
---
--- To use forwarding detection, enable the aliases plugin:
---
---   # local.d/aliases.conf
---   aliases {
---     enabled = true;
---     local_domains = ["your-domain.com"];
---   }
---
--- See: ALIASES_FORWARDING_MIGRATION.md for migration details
diff --git a/src/plugins/lua/aliases.lua b/src/plugins/lua/aliases.lua
index c65e72962b..30a537850c 100644
--- a/src/plugins/lua/aliases.lua
+++ b/src/plugins/lua/aliases.lua
@@ -247,7 +247,7 @@ end
 
 -- Configuration
 local settings = {
-  enabled = false,
+  enabled = true,
 
   --Backend configurations
   system_aliases = nil,