From c4e8842dfdb97ea2f1daf082aaefb7f5f658f8ee Mon Sep 17 00:00:00 2001 From: Dimitri Huisman Date: Tue, 10 Oct 2023 08:19:36 +0000 Subject: [PATCH] Forbidden_file_extension.map could not be overridden. (cherry picked from commit 16e9d152dd9a4de69d9ba155a1859aee43387cc9) --- core/rspamd/start.py | 3 ++- towncrier/newsfragments/2937.bugfix | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 towncrier/newsfragments/2937.bugfix diff --git a/core/rspamd/start.py b/core/rspamd/start.py index d6991253..7baa6487 100755 --- a/core/rspamd/start.py +++ b/core/rspamd/start.py @@ -16,7 +16,8 @@ env = system.set_env() config_files = [] for rspamd_file in glob.glob("/conf/*"): conf.jinja(rspamd_file, env, os.path.join("/etc/rspamd/local.d", os.path.basename(rspamd_file))) - config_files.append(os.path.basename(rspamd_file)) + if rspamd_file != '/conf/forbidden_file_extension.map': + config_files.append(os.path.basename(rspamd_file)) for override_file in glob.glob("/overrides/*"): if os.path.basename(override_file) not in config_files: diff --git a/towncrier/newsfragments/2937.bugfix b/towncrier/newsfragments/2937.bugfix new file mode 100644 index 00000000..7ccd316c --- /dev/null +++ b/towncrier/newsfragments/2937.bugfix @@ -0,0 +1,2 @@ +forbidden_file_extension.map could not be overridden. This file can be overriden to tweak with file extensions are allowed. +The instructions on https://mailu.io/master/antispam.html#can-i-change-the-list-of-authorized-file-attachments work again.