public
nobgit
read
NobMail
Based on mailcow: dockerized
Languages
Repository composition by tracked source files.
PHP
49%
JavaScript
35%
HTML
9%
CSS
4%
Shell
2%
Python
1%
Lua
0%
Perl
0%
Ruby
0%
SCSS
0%
Create file
Wiki Documentation
Clone
https://nobgit.com/orgs/nobgit/nobmail.git
ssh://[email protected]:2222/orgs/nobgit/nobmail.git
Commit
[Rspamd] Add symbol HAM_TRAP or SPAM_TRAP for trap aliases
d94b5e43
data/conf/rspamd/dynmaps/settings.php | 25 +++++++++++++++++++++----
data/conf/rspamd/lua/rspamd.local.lua | 4 ++--
2 files changed, 23 insertions(+), 6 deletions(-)Diff
diff --git a/data/conf/rspamd/dynmaps/settings.php b/data/conf/rspamd/dynmaps/settings.php
index 3f358c1d..0569db90 100644
--- a/data/conf/rspamd/dynmaps/settings.php
+++ b/data/conf/rspamd/dynmaps/settings.php
@@ -394,21 +394,38 @@ while ($row = array_shift($rows)) {
*/
?>
- traps {
+ ham_trap {
<?php
- foreach (ucl_rcpts('spam@localhost', 'mailbox') as $rcpt) {
+ foreach (ucl_rcpts('ham@localhost', 'mailbox') as $rcpt) {
?>
rcpt = <?=json_encode($rcpt, JSON_UNESCAPED_SLASHES);?>;
<?php
}
- foreach (ucl_rcpts('ham@localhost', 'mailbox') as $rcpt) {
+?>
+ priority = 9;
+ apply "default" {
+ symbols_enabled = ["HISTORY_SAVE"];
+ }
+ symbols [
+ "HAM_TRAP"
+ ]
+ }
+
+ spam_trap {
+<?php
+ foreach (ucl_rcpts('spam@localhost', 'mailbox') as $rcpt) {
?>
rcpt = <?=json_encode($rcpt, JSON_UNESCAPED_SLASHES);?>;
<?php
}
?>
priority = 9;
- want_spam = yes;
+ apply "default" {
+ symbols_enabled = ["HISTORY_SAVE"];
+ }
+ symbols [
+ "SPAM_TRAP"
+ ]
}
<?php
// Start additional content
diff --git a/data/conf/rspamd/lua/rspamd.local.lua b/data/conf/rspamd/lua/rspamd.local.lua
index 6e7c7115..44242486 100644
--- a/data/conf/rspamd/lua/rspamd.local.lua
+++ b/data/conf/rspamd/lua/rspamd.local.lua
@@ -113,9 +113,9 @@ rspamd_config:register_symbol({
for _,fr in ipairs(from) do
local fr_split = rspamd_str_split(fr['addr'], '@')
if #fr_split == 2 then
- if fr_split[1] == 'postmaster' then
+ if fr_split[1] == 'postmaster' and task:get_user() then
-- no whitelist, keep signatures
- task:insert_result(true, 'POSTMASTER_FROM', -2500.0, from_ip_string)
+ task:insert_result(true, 'POSTMASTER_FROM', -2500.0)
return
end
end