commit 2571c66: Merge branch 'master' into mw

[GitHub]

Author: Vsevolod Stakhov
Date: 2024-06-05 17:07:30 +0600
URL: https://github.com/rspamd/rspamd/commit/2571c66f538ae3913971b35e70ac584b848b742e (refs/pull/4980/head)

Merge branch 'master' into mw


 README.md                                          |   4 +-
 lualib/lua_mime.lua                                |   5 +-
 lualib/lua_scanners/common.lua                     |   2 +-
 src/controller.c                                   |   2 +-
 src/libmime/scan_result.c                          |   2 +-
 src/libserver/task.c                               |   3 +
 src/plugins/lua/hfilter.lua                        |  42 +++---
 src/plugins/lua/known_senders.lua                  | 150 ++++++++++++++++++++-
 src/plugins/lua/mime_types.lua                     |   2 +
 src/plugins/lua/replies.lua                        | 140 ++++++++++++++++---
 .../functional/cases/001_merged/102_multimap.robot |   7 +
 test/functional/cases/400_known_senders.robot      |  39 ++++++
 test/functional/cases/410_replies.robot            |  47 +++++++
 test/functional/configs/maps/words.list            |   4 +
 test/functional/configs/merged-override.conf       |   6 +
 test/functional/configs/merged.conf                |   1 +
 .../configs/{known_senders.conf => replies.conf}   |   3 +-
 test/functional/lib/rspamd.robot                   |   1 +
 test/functional/messages/inc_mail_known_sender.eml |  11 ++
 .../messages/inc_mail_unknown_sender.eml           |  11 ++
 test/functional/messages/replyto_1_1.eml           |  11 ++
 test/functional/messages/replyto_1_2.eml           |  11 ++
 test/functional/messages/replyto_1_2_s.eml         |  11 ++
 test/functional/messages/replyto_2_2.eml           |  11 ++
 test/functional/messages/set_replyto_1_1.eml       |  12 ++
 test/functional/messages/set_replyto_1_2_first.eml |  11 ++
 test/functional/messages/set_replyto_2_2.eml       |  11 ++
 test/functional/messages/words.eml                 |   3 +
 28 files changed, 517 insertions(+), 46 deletions(-)