cqrenet/relay
4
0
Fork 0
mirror of https://github.com/chatmail/relay.git synced 2026-05-19 20:38:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace rspamd rule weights with a strict rule

Browse Source
This commit is contained in:
link2xt
2024-01-14 08:45:23 +00:00
committed by missytake
parent a6f2f74520
commit b702848c33
3 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cmdeploy/src/cmdeploy/__init__.py
View File

@@ -354,17 +354,18 @@ def _configure_rspamd(dkim_selector: str, mail_domain: str) -> bool:
) )
need_restart |= options_inc.changed need_restart |= options_inc.changed
groups_conf = files.put( # https://rspamd.com/doc/modules/force_actions.html
name="set metrics for DKIM, SPF, and DMARC fails", force_actions_conf = files.put(
name="Set up rules to reject on DKIM, SPF and DMARC fails",
src=importlib.resources.files(__package__).joinpath( src=importlib.resources.files(__package__).joinpath(
"rspamd/policies_group.conf" "rspamd/force_actions.conf"
), ),
dest="/etc/rspamd/local.d/policies_group.conf", dest="/etc/rspamd/local.d/force_actions.conf",
user="root", user="root",
group="root", group="root",
mode="644", mode="644",
) )
need_restart |= groups_conf.changed need_restart |= force_actions_conf.changed
dkim_directory = "/var/lib/rspamd/dkim/" dkim_directory = "/var/lib/rspamd/dkim/"
dkim_key_path = f"{dkim_directory}{mail_domain}.{dkim_selector}.key" dkim_key_path = f"{dkim_directory}{mail_domain}.{dkim_selector}.key"

11
cmdeploy/src/cmdeploy/rspamd/force_actions.conf Normal file
View File

@@ -0,0 +1,11 @@
rules {
REJECT_DKIM_SPF {
action = "reject";
# Reject if
# bad DKIM signature (R_DKIM_REJECT)
# no DKIM signature (R_DKIM_NA)
# SPF failure (R_SPF_FAIL)
# DMARC policy failure (DMARC_POLICY_REJECT)
expression = "R_DKIM_REJECT | R_DKIM_NA | R_SPF_FAIL | DMARC_POLICY_REJECT";
}
}

14
cmdeploy/src/cmdeploy/rspamd/policies_group.conf
View File

@@ -1,14 +0,0 @@
symbols {
"R_DKIM_REJECT" {
weight = 15;
}
"R_SPF_FAIL" {
weight = 15;
}
"R_DKIM_NA" {
weight = 15;
}
"DMARC_POLICY_REJECT" {
weight = 15;
}
}