From 97103699499f80a968bf20b8c76989d7005b379a Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Sun, 13 Feb 2022 12:49:22 -0800 Subject: [PATCH] email: Narrowly match just rspamd's spam header There is no need to match generically for flags that are possibly generated by other spam software. Allow other rules to run after filing into Junk folder. Allow other sieve filter to be present in the FreedomBox configuration directory. Signed-off-by: Sunil Mohan Adapa Reviewed-by: James Valleroy --- .../email/data/etc/dovecot/freedombox-sieve-after/README.txt | 2 -- .../data/etc/dovecot/freedombox-sieve-after/sort-spam.sieve | 5 +---- 2 files changed, 1 insertion(+), 6 deletions(-) delete mode 100644 plinth/modules/email/data/etc/dovecot/freedombox-sieve-after/README.txt diff --git a/plinth/modules/email/data/etc/dovecot/freedombox-sieve-after/README.txt b/plinth/modules/email/data/etc/dovecot/freedombox-sieve-after/README.txt deleted file mode 100644 index 17160f2fd..000000000 --- a/plinth/modules/email/data/etc/dovecot/freedombox-sieve-after/README.txt +++ /dev/null @@ -1,2 +0,0 @@ -DO NOT PUT PERSONAL ITEMS HERE! -This folder in its entirety is managed by FreedomBox. diff --git a/plinth/modules/email/data/etc/dovecot/freedombox-sieve-after/sort-spam.sieve b/plinth/modules/email/data/etc/dovecot/freedombox-sieve-after/sort-spam.sieve index aebaf100a..a20a0f326 100644 --- a/plinth/modules/email/data/etc/dovecot/freedombox-sieve-after/sort-spam.sieve +++ b/plinth/modules/email/data/etc/dovecot/freedombox-sieve-after/sort-spam.sieve @@ -1,8 +1,5 @@ require ["fileinto", "mailbox"]; -if anyof(header :contains "X-Spam" "Yes", - header :contains "X-Spam-Status" "Yes", - header :matches "X-Spam-Flag" "YES") { +if header :is "X-Spam" "Yes" { fileinto :create "Junk"; - stop; }