diff options
| author | Vsevolod Stakhov <vsevolod@rspamd.com> | 2024-12-02 14:24:58 +0000 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@rspamd.com> | 2024-12-02 14:24:58 +0000 |
| commit | d4264e6b472a3f6ad83b6e107ad69ca025c10a1b (patch) | |
| tree | eba27b273af3ae2a23c86124539865d8e6272cce | |
| parent | 8ca3c76113c08a2955a9aabf421b705cd439b5f3 (diff) | |
| download | rspamd-d4264e6b472a3f6ad83b6e107ad69ca025c10a1b.tar.gz rspamd-d4264e6b472a3f6ad83b6e107ad69ca025c10a1b.zip | |
[Fix] Use `dkim_signing` for `sign_headers` option
Issue: #5225
| -rw-r--r-- | src/plugins/dkim_check.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/plugins/dkim_check.c b/src/plugins/dkim_check.c index b0340738e..1fbe8eff3 100644 --- a/src/plugins/dkim_check.c +++ b/src/plugins/dkim_check.c @@ -491,8 +491,17 @@ int dkim_module_config(struct rspamd_config *cfg, bool validate) dkim_module_ctx->trusted_only = FALSE; } + /* + * We should use sign headers from dkim_signing module as it is the module that + * is used actually for signing. + * See https://github.com/rspamd/rspamd/issues/5225 for details + */ if ((value = - rspamd_config_get_module_opt(cfg, "dkim", "sign_headers")) != NULL) { + rspamd_config_get_module_opt(cfg, "dkim_signing", "sign_headers")) != NULL) { + dkim_module_ctx->sign_headers = ucl_object_tostring(value); + } + else if ((value = + rspamd_config_get_module_opt(cfg, "dkim", "sign_headers")) != NULL) { dkim_module_ctx->sign_headers = ucl_object_tostring(value); } |