commit 4dfb85f: Merge branch 'master' into temp-add-ipfs-heuristics
GitHub
noreply at github.com
Mon Feb 20 21:42:10 UTC 2023
Author: Vsevolod Stakhov
Date: 2023-02-20 21:36:50 +0000
URL: https://github.com/rspamd/rspamd/commit/4dfb85f4610c47dc356762b5d4fa7ec3609d79b2 (refs/pull/4310/head)
Merge branch 'master' into temp-add-ipfs-heuristics
.drone.yml | 21 +-
.eslintrc.json | 1 +
.luacheckrc | 1 -
CMakeLists.txt | 12 +-
ChangeLog | 28 +
cmake/CompilerWarnings.cmake | 15 +-
cmake/Toolset.cmake | 29 +-
conf/actions.conf | 2 +-
conf/composites.conf | 31 +-
conf/maps.d/maillist.inc | 340 +++----
conf/maps.d/redirectors.inc | 2 +-
conf/maps.d/surbl-whitelist.inc | 24 +-
conf/modules.d/arc.conf | 2 +-
conf/modules.d/bimi.conf | 2 +-
conf/modules.d/clickhouse.conf | 1 -
conf/modules.d/multimap.conf | 1 -
conf/modules.d/rbl.conf | 40 +-
conf/modules.d/redis.conf | 2 +-
conf/modules.d/spamassassin.conf | 2 +-
conf/scores.d/content_group.conf | 7 +-
conf/scores.d/headers_group.conf | 1 +
conf/scores.d/mime_types_group.conf | 5 +-
conf/scores.d/policies_group.conf | 4 -
conf/scores.d/rbl_group.conf | 56 +-
conf/scores.d/subject_group.conf | 4 +-
conf/scores.d/surbl_group.conf | 69 +-
conf/worker-proxy.inc | 9 +-
config.h.in | 15 -
contrib/DEPENDENCY_INFO.md | 2 +-
contrib/ankerl/unordered_dense.h | 853 +++++++++++-----
contrib/libucl/lua_ucl.c | 5 +-
contrib/libucl/ucl_parser.c | 54 +-
contrib/uthash/uthash.h | 76 +-
debian/compat | 2 +-
debian/control | 25 +-
debian/rules | 72 +-
doc/rspamc.1 | 13 +
doc/rspamc.1.md | 4 +
interface/index.html | 3 +
interface/js/app/history.js | 2 +
lualib/lua_maps.lua | 270 ++++-
lualib/lua_mime.lua | 15 +-
lualib/lua_redis.lua | 21 +-
lualib/lua_scanners/kaspersky_se.lua | 1 +
lualib/lua_selectors/extractors.lua | 34 +
lualib/lua_selectors/init.lua | 93 +-
lualib/lua_selectors/transforms.lua | 47 +
lualib/lua_verdict.lua | 19 +
lualib/rspamadm/fuzzy_stat.lua | 74 +-
lualib/rspamadm/keypair.lua | 9 +
{centos/sources => rpm}/80-rspamd.preset | 0
{centos/sources => rpm}/rspamd.logrotate | 0
{centos => rpm}/rspamd.spec | 111 +-
rules/content.lua | 2 +-
rules/forwarding.lua | 1 -
rules/headers_checks.lua | 2 +-
rules/html.lua | 2 +-
rules/mid.lua | 20 +
rules/regexp/compromised_hosts.lua | 1 -
rules/regexp/headers.lua | 17 +-
rules/rspamd.lua | 2 +-
rules/subject_checks.lua | 2 +-
src/CMakeLists.txt | 2 +-
src/client/rspamc.cxx | 1058 ++++++++++++--------
src/controller.c | 13 +-
src/fuzzy_storage.c | 259 +++--
src/hs_helper.c | 8 +-
src/libcryptobox/keypair.c | 141 +--
src/libcryptobox/keypair.h | 53 +-
src/libcryptobox/keypair_private.h | 1 +
src/libmime/scan_result.c | 12 +-
src/libserver/CMakeLists.txt | 1 +
src/libserver/cfg_file.h | 2 +-
src/libserver/cfg_rcl.c | 30 +-
src/libserver/cfg_utils.c | 14 +-
src/libserver/css/css_tokeniser.cxx | 13 +-
src/libserver/css/css_tokeniser.hxx | 2 +-
src/libserver/fuzzy_backend/fuzzy_backend_redis.c | 9 +-
src/libserver/html/html.cxx | 102 +-
src/libserver/html/html_tag.hxx | 1 +
src/libserver/http/http_connection.c | 61 +-
src/libserver/http/http_message.c | 10 +
src/libserver/http/http_message.h | 7 +
src/libserver/http/http_router.c | 6 +-
src/libserver/http/http_util.c | 224 -----
src/libserver/http/http_util.h | 9 -
src/libserver/hyperscan_tools.cxx | 512 ++++++++++
src/libserver/hyperscan_tools.h | 72 ++
src/libserver/logger.h | 2 +-
src/libserver/maps/map_helpers.c | 194 +---
src/libserver/protocol.c | 31 +-
src/libserver/re_cache.c | 84 +-
src/libserver/rspamd_control.c | 106 +-
src/libserver/rspamd_control.h | 24 +-
src/libserver/symcache/symcache_impl.cxx | 13 +-
src/libserver/symcache/symcache_item.cxx | 8 +-
src/libserver/task.c | 9 -
src/libserver/task.h | 5 -
src/libserver/url.c | 82 +-
src/libserver/worker_util.c | 124 ++-
src/libserver/worker_util.h | 12 +
src/libstat/backends/redis_backend.c | 8 +
src/libstat/tokenizers/tokenizers.c | 2 +-
src/libutil/CMakeLists.txt | 3 +-
src/libutil/cxx/error.hxx | 128 +++
src/libutil/cxx/file_util.cxx | 435 ++++++++
src/libutil/cxx/{locked_file.hxx => file_util.hxx} | 149 ++-
src/libutil/cxx/hyperscan_tools.cxx | 97 --
src/libutil/cxx/locked_file.cxx | 367 -------
src/libutil/expression.c | 4 +-
src/libutil/multipattern.c | 151 +--
src/libutil/util.c | 224 +++++
src/libutil/util.h | 9 +
src/lua/lua_common.c | 158 ++-
src/lua/lua_common.h | 36 +-
src/lua/lua_config.c | 2 +-
src/lua/lua_cryptobox.c | 2 +-
src/lua/lua_mimepart.c | 1 -
src/lua/lua_redis.c | 5 +
src/lua/lua_task.c | 20 +-
src/lua/lua_tcp.c | 12 +-
src/lua/lua_url.c | 2 -
src/lua/lua_util.c | 2 +-
src/plugins/{chartable.c => chartable.cxx} | 297 +++---
src/plugins/dkim_check.c | 3 -
src/plugins/lua/antivirus.lua | 15 +
src/plugins/lua/clickhouse.lua | 3 +-
src/plugins/lua/history_redis.lua | 8 +-
src/plugins/lua/metadata_exporter.lua | 14 +-
src/plugins/lua/milter_headers.lua | 21 +-
src/plugins/lua/multimap.lua | 63 +-
src/plugins/lua/mx_check.lua | 17 +-
src/plugins/lua/once_received.lua | 12 +-
src/plugins/lua/phishing.lua | 17 +-
src/plugins/lua/ratelimit.lua | 43 +-
src/plugins/lua/rbl.lua | 24 +-
src/plugins/lua/reputation.lua | 2 +-
src/plugins/lua/settings.lua | 159 ++-
src/rspamd.c | 14 +-
src/rspamd_proxy.c | 36 +-
src/worker.c | 32 +-
test/functional/cases/001_merged/101_lua.robot | 4 +
.../functional/cases/001_merged/102_multimap.robot | 10 +
test/functional/cases/001_merged/280_rules.robot | 4 +
test/functional/cases/001_merged/__init__.robot | 15 +-
test/functional/cases/108_settings.robot | 6 +
test/functional/cases/116_dkim.robot | 2 +-
test/functional/cases/151_rspamadm_async.robot | 39 +-
test/functional/cases/162_url_redirector.robot | 13 +-
test/functional/cases/220_http.robot | 35 +-
test/functional/cases/230_tcp.robot | 46 +-
test/functional/configs/merged-local.conf | 3 +-
test/functional/configs/merged-override.conf | 10 +
test/functional/configs/merged.conf | 2 +-
test/functional/configs/settings.conf | 16 +
test/functional/lib/rspamd.py | 44 +-
test/functional/lib/rspamd.robot | 55 +-
test/functional/lua/hashes.lua | 2 +-
test/functional/lua/maps_kv.lua | 24 +
test/functional/lua/rspamadm/test_tcp_client.lua | 6 +-
test/functional/lua/tcp.lua | 9 +-
test/functional/lua/tlds.lua | 1 +
test/functional/messages/currency.eml | 5 +
test/functional/util/dummy_http.py | 253 ++---
test/functional/util/dummy_https.py | 125 ---
test/lua/unit/base32.lua | 34 +-
test/lua/unit/base64.lua | 198 ++--
test/lua/unit/compression.lua | 24 +-
test/lua/unit/expressions.lua | 1 -
test/lua/unit/fpconv.lua | 39 +-
test/lua/unit/lua_util.extract_specific_urls.lua | 1 -
test/lua/unit/quoted_printable.lua | 42 +-
test/lua/unit/redis_stat.lua | 72 --
test/lua/unit/rfc2047.lua | 46 +-
test/lua/unit/selectors.combined.lua | 45 +-
test/lua/unit/selectors.lua | 40 +-
test/lua/unit/smtp_addr.lua | 30 +-
test/lua/unit/sqlite3.lua | 19 +-
test/lua/unit/test_tld.dat | 14 +
test/lua/unit/url.lua | 10 +-
test/lua/unit/utf.lua | 136 +--
utils/CMakeLists.txt | 7 -
utils/mime_tool.c | 247 -----
utils/sa_trivial_convert.lua | 4 +-
184 files changed, 6025 insertions(+), 4206 deletions(-)
More information about the Commits
mailing list