[Test] Add functional tests for settings merge

9 Robot Framework tests covering:
- No settings baseline (all symbols fire)
- Settings-ID enables symbol subset via bitsets
- Coexistence: Settings-ID + inline action override
- Coexistence: Settings-ID + inline score override
- Inline symbols_enabled filtering
- Weak dep: disabled dep doesn't cascade to dependent
- Hard dep: disabled dep cascades to dependent
- Prefilter deps: SETTINGS_APPLY runs after SETTINGS_CHECK
- Coexistence: settings-ID groups + inline action override

diff --git a/test/functional/cases/109_settings_merge.robot b/test/functional/cases/109_settings_merge.robot
new file mode 100644 (file)
index 0000000..f8d6e92
--- /dev/null
+++ b/test/functional/cases/109_settings_merge.robot
@@ -0,0 +1,80 @@
+*** Settings ***
+Suite Setup     Rspamd Setup
+Suite Teardown  Rspamd Teardown
+Library         ${RSPAMD_TESTDIR}/lib/rspamd.py
+Resource        ${RSPAMD_TESTDIR}/lib/rspamd.robot
+Variables       ${RSPAMD_TESTDIR}/lib/vars.py
+
+*** Variables ***
+${CONFIG}               ${RSPAMD_TESTDIR}/configs/settings_merge.conf
+${MESSAGE}              ${RSPAMD_TESTDIR}/messages/spam_message.eml
+${RSPAMD_LUA_SCRIPT}    ${RSPAMD_TESTDIR}/lua/settings_merge.lua
+${RSPAMD_SCOPE}         Suite
+${RSPAMD_URL_TLD}       ${RSPAMD_TESTDIR}/../lua/unit/test_tld.dat
+
+*** Test Cases ***
+# Basic: no settings, all symbols fire
+NO SETTINGS - ALL SYMBOLS
+  Scan File  ${MESSAGE}
+  Expect Symbol  MERGE_TEST_BASIC
+  Expect Symbol  MERGE_HARD_DEP
+  Expect Symbol  MERGE_WEAK_DEP
+  Expect Symbol  MERGE_GROUP_SYM
+  Expect Symbol  MERGE_GROUP_SYM2
+  Expect Symbol  MERGE_PRE
+
+# Settings-ID enables only specific symbols via precomputed bitsets
+SETTINGS ID - ENABLE SUBSET
+  Scan File  ${MESSAGE}  Settings-Id=merge_profile
+  Expect Symbol  MERGE_TEST_BASIC
+  Expect Symbol  MERGE_HARD_DEP
+  Expect Symbol  MERGE_WEAK_DEP
+  Do Not Expect Symbol  MERGE_GROUP_SYM
+  Do Not Expect Symbol  MERGE_GROUP_SYM2
+
+# Coexistence: Settings-ID controls symbol set, inline Settings overrides actions
+COEXISTENCE - SETTINGS ID AND INLINE ACTIONS
+  Scan File  ${MESSAGE}  Settings-Id=merge_profile  Settings={actions {reject = 999.0}}
+  Expect Symbol  MERGE_TEST_BASIC
+  Expect Symbol  MERGE_HARD_DEP
+  Do Not Expect Symbol  MERGE_GROUP_SYM
+  Expect Required Score  999
+
+# Coexistence: Settings-ID controls symbols, inline Settings overrides scores
+COEXISTENCE - SETTINGS ID AND INLINE SCORES
+  Scan File  ${MESSAGE}  Settings-Id=merge_profile  Settings={MERGE_TEST_BASIC = 7.77}
+  Expect Symbol With Score  MERGE_TEST_BASIC  7.77
+
+# Inline Settings with symbols_enabled
+INLINE SETTINGS - SYMBOLS ENABLED
+  Scan File  ${MESSAGE}  Settings={symbols_enabled = ["MERGE_TEST_BASIC", "MERGE_GROUP_SYM"]}
+  Expect Symbol  MERGE_TEST_BASIC
+  Expect Symbol  MERGE_GROUP_SYM
+  Do Not Expect Symbol  MERGE_WEAK_DEP
+  Do Not Expect Symbol  MERGE_HARD_DEP
+  Do Not Expect Symbol  MERGE_GROUP_SYM2
+
+# Weak dependency: disable MERGE_TEST_BASIC, weak dependent MERGE_WEAK_DEP still runs
+WEAK DEP - DISABLE DEP SYMBOL
+  Scan File  ${MESSAGE}  Settings={symbols_disabled = ["MERGE_TEST_BASIC"]}
+  Do Not Expect Symbol  MERGE_TEST_BASIC
+  Expect Symbol  MERGE_WEAK_DEP
+
+# Hard dependency: disable MERGE_TEST_BASIC, hard dependent MERGE_HARD_DEP cascade-disabled
+HARD DEP - CASCADE DISABLE
+  Scan File  ${MESSAGE}  Settings={symbols_disabled = ["MERGE_TEST_BASIC"]}
+  Do Not Expect Symbol  MERGE_TEST_BASIC
+  Do Not Expect Symbol  MERGE_HARD_DEP
+
+# Prefilter deps: SETTINGS_APPLY depends on SETTINGS_CHECK, both run correctly
+PREFILTER DEPS WORK
+  Scan File  ${MESSAGE}  Settings={symbols_enabled = ["MERGE_PRE"]}
+  Expect Symbol  MERGE_PRE
+  Do Not Expect Symbol  MERGE_TEST_BASIC
+
+# Settings-ID with inline settings providing group disable override
+COEXISTENCE - GROUP SYMBOLS WITH INLINE
+  Scan File  ${MESSAGE}  Settings-Id=merge_group_ctl  Settings={actions {reject = 500.0}}
+  Expect Symbol  MERGE_GROUP_SYM
+  Expect Symbol  MERGE_GROUP_SYM2
+  Expect Required Score  500

diff --git a/test/functional/configs/settings_merge.conf b/test/functional/configs/settings_merge.conf
new file mode 100644 (file)
index 0000000..56a0edb
--- /dev/null
+++ b/test/functional/configs/settings_merge.conf
@@ -0,0 +1,32 @@
+.include(duplicate=append,priority=0) "{= env.TESTDIR =}/configs/plugins.conf"
+
+lua = "{= env.LUA_SCRIPT =}";
+
+settings {
+  # Named setting with symbols_enabled for coexistence test
+  merge_profile {
+    id = "merge_profile";
+    apply {
+      symbols_enabled = ["MERGE_TEST_BASIC", "MERGE_HARD_DEP", "MERGE_WEAK_DEP"];
+    }
+  }
+
+  # Named setting with group controls
+  merge_group_ctl {
+    id = "merge_group_ctl";
+    apply {
+      symbols_enabled = ["MERGE_GROUP_SYM", "MERGE_GROUP_SYM2", "MERGE_TEST_BASIC"];
+    }
+  }
+
+  # Rule that matches by IP and provides action override
+  ip_rule {
+    ip = "7.7.7.7";
+    apply {
+      actions {
+        reject = 100.0;
+        greylist = 50.0;
+      }
+    }
+  }
+}

diff --git a/test/functional/lua/settings_merge.lua b/test/functional/lua/settings_merge.lua
new file mode 100644 (file)
index 0000000..bb3d2de
--- /dev/null
+++ b/test/functional/lua/settings_merge.lua
@@ -0,0 +1,66 @@
+-- Test symbols for settings merge functional tests
+
+-- Basic symbol that always fires
+rspamd_config:register_symbol({
+  name = 'MERGE_TEST_BASIC',
+  score = 1.0,
+  group = 'merge_test',
+  callback = function()
+    return true, 'basic'
+  end
+})
+
+-- Symbol with a HARD dependency on MERGE_TEST_BASIC
+rspamd_config:register_symbol({
+  name = 'MERGE_HARD_DEP',
+  score = 1.0,
+  group = 'merge_test',
+  callback = function()
+    return true, 'hard_dep'
+  end
+})
+rspamd_config:register_dependency('MERGE_HARD_DEP', 'MERGE_TEST_BASIC')
+
+-- Symbol with a WEAK dependency on MERGE_TEST_BASIC
+rspamd_config:register_symbol({
+  name = 'MERGE_WEAK_DEP',
+  score = 1.0,
+  group = 'merge_test',
+  callback = function()
+    return true, 'weak_dep'
+  end
+})
+rspamd_config:register_dependency('MERGE_WEAK_DEP', 'MERGE_TEST_BASIC', true)
+
+-- Symbol in a separate group for group enable/disable tests
+rspamd_config:register_symbol({
+  name = 'MERGE_GROUP_SYM',
+  score = 2.0,
+  group = 'merge_group',
+  callback = function()
+    return true, 'group_sym'
+  end
+})
+
+-- Another symbol in the merge_group
+rspamd_config:register_symbol({
+  name = 'MERGE_GROUP_SYM2',
+  score = 3.0,
+  group = 'merge_group',
+  callback = function()
+    return true, 'group_sym2'
+  end
+})
+
+-- A prefilter for testing settings deps
+rspamd_config:register_symbol({
+  name = 'MERGE_PRE',
+  score = 0.5,
+  type = 'prefilter',
+  priority = 9,
+  group = 'merge_test',
+  flags = 'empty',
+  callback = function()
+    return true, 'pre'
+  end
+})