commit f40cc55: Merge pull request #10 from rspamd/master
GitHub
noreply at github.com
Thu Feb 14 15:07:05 UTC 2019
Author: heraklit256
Date: 2019-02-13 20:35:27 +0000
URL: https://github.com/rspamd/rspamd/commit/f40cc5500eecf1e0b26d6b4be3b7f3bbb78dede0
Merge pull request #10 from rspamd/master
merge upstream into local master
.luacheckrc | 3 +-
conf/composites.conf | 233 +-
conf/groups.conf | 12 +-
conf/modules.d/antivirus.conf | 4 +
conf/modules.d/dkim_signing.conf | 15 +-
conf/modules.d/external_services.conf | 95 +
conf/modules.d/rbl.conf | 5 -
conf/scores.d/mime_types_group.conf | 5 +
conf/scores.d/rbl_group.conf | 4 -
config.h.in | 2 +-
contrib/librdns/resolver.c | 27 +
doc/Makefile | 6 +-
interface/js/app/upload.js | 4 +-
lualib/lua_cfg_transform.lua | 18 +
lualib/lua_dkim_tools.lua | 136 +-
lualib/lua_ffi/common.lua | 34 +
lualib/lua_ffi/dkim.lua | 140 +
lualib/lua_ffi/init.lua | 52 +
lualib/lua_scanners/clamav.lua | 62 +-
lualib/lua_scanners/common.lua | 245 +-
lualib/lua_scanners/dcc.lua | 84 +-
lualib/lua_scanners/fprot.lua | 40 +-
lualib/lua_scanners/icap.lua | 330 ++
lualib/lua_scanners/init.lua | 5 +-
lualib/lua_scanners/kaspersky_av.lua | 54 +-
lualib/lua_scanners/oletools.lua | 308 ++
lualib/lua_scanners/savapi.lua | 53 +-
lualib/lua_scanners/sophos.lua | 73 +-
lualib/lua_scanners/spamassassin.lua | 217 ++
lualib/lua_scanners/vadesecure.lua | 318 ++
lualib/lua_squeeze_rules.lua | 10 +-
lualib/lua_util.lua | 33 +-
lualib/rspamadm/mime.lua | 230 +-
rules/misc.lua | 35 +-
rules/regexp/misc.lua | 27 +-
src/CMakeLists.txt | 96 +-
src/client/CMakeLists.txt | 1 -
src/client/rspamc.c | 23 +-
src/controller.c | 21 +-
src/libcryptobox/base64/base64.c | 25 +
src/libcryptobox/cryptobox.h | 9 +
src/libcryptobox/curve25519/avx.S | 3138 ++++++++++----------
src/libcryptobox/curve25519/avx.c | 2 +-
src/libcryptobox/curve25519/constants.S | 18 +-
src/libcryptobox/ed25519/ed25519.c | 10 +-
src/libcryptobox/ed25519/ed25519.h | 1 +
src/libcryptobox/ed25519/ref.c | 2 +-
src/libmime/archives.c | 16 +-
src/libmime/content_type.c | 341 ++-
src/libmime/content_type.h | 9 +
src/libmime/email_addr.c | 185 +-
src/libmime/email_addr.h | 10 -
src/libmime/filter.c | 71 +-
src/libmime/filter.h | 54 +-
src/libmime/filter_private.h | 31 +
src/libmime/images.c | 63 +-
src/libmime/images.h | 9 +
src/libmime/message.c | 35 +-
src/libmime/message.h | 30 -
src/libmime/mime_encoding.c | 3 +
src/libmime/mime_expressions.c | 133 +-
src/libmime/mime_expressions.h | 7 +
src/libmime/mime_headers.c | 768 ++++-
src/libmime/mime_headers.h | 33 +
src/libmime/mime_parser.c | 38 +-
src/libmime/smtp_parsers.h | 3 +
src/libserver/cfg_file.h | 61 +-
.../siphash.h => libserver/cfg_file_private.h} | 38 +-
src/libserver/cfg_rcl.c | 10 +-
src/libserver/cfg_utils.c | 327 +-
src/libserver/dkim.c | 304 +-
src/libserver/dkim.h | 22 +-
src/libserver/dns.c | 1 -
src/libserver/dynamic_cfg.c | 8 +-
src/libserver/events.c | 1 +
src/libserver/html.c | 249 +-
src/libserver/html.h | 8 +-
src/libserver/milter.c | 60 +-
src/libserver/milter.h | 2 +
src/libserver/protocol.c | 118 +-
src/libserver/roll_history.c | 5 +-
src/libserver/rspamd_symcache.c | 79 +-
src/libserver/rspamd_symcache.h | 28 +
src/libserver/task.c | 34 +-
src/libserver/task.h | 2 +-
src/libserver/url.c | 323 +-
src/libserver/url.h | 26 +-
src/libstat/backends/redis_backend.c | 14 +-
src/libstat/stat_api.h | 6 +-
src/libutil/addr.c | 124 +-
src/libutil/addr.h | 19 +
src/libutil/fstring.c | 13 +
src/libutil/fstring.h | 9 +
src/libutil/hash.c | 10 +-
src/libutil/map.c | 5 +-
src/libutil/map_helpers.c | 28 +-
src/libutil/mem_pool.c | 2 +-
src/libutil/str_util.c | 249 +-
src/libutil/str_util.h | 46 +-
src/libutil/uthash_strcase.h | 3 +
src/lua/CMakeLists.txt | 3 +-
src/lua/lua_common.c | 1 +
src/lua/lua_common.h | 1 +
src/lua/lua_config.c | 203 +-
src/lua/lua_cryptobox.c | 2 +-
src/lua/lua_dns_resolver.c | 1 -
src/lua/lua_html.c | 26 +-
src/lua/lua_mimepart.c | 39 +-
src/lua/lua_task.c | 289 +-
src/lua/lua_thread_pool.c | 111 +-
src/lua/lua_thread_pool.h | 48 +-
src/lua/lua_udp.c | 607 ++++
src/lua/lua_url.c | 2 +
src/lua/lua_util.c | 56 +-
src/plugins/dkim_check.c | 504 ++--
src/plugins/fuzzy_check.c | 10 +-
src/plugins/lua/antivirus.lua | 59 +-
src/plugins/lua/arc.lua | 5 +-
src/plugins/lua/clickhouse.lua | 26 +-
src/plugins/lua/dkim_signing.lua | 86 +-
src/plugins/lua/dmarc.lua | 4 +-
src/plugins/lua/elastic.lua | 40 +-
src/plugins/lua/external_services.lua | 175 +-
src/plugins/lua/history_redis.lua | 12 +-
src/plugins/lua/metadata_exporter.lua | 1 +
src/plugins/lua/mid.lua | 22 +-
src/plugins/lua/milter_headers.lua | 26 +-
src/plugins/lua/mime_types.lua | 45 +-
src/plugins/lua/multimap.lua | 64 +-
src/plugins/lua/settings.lua | 243 +-
src/plugins/regexp.c | 18 +-
src/plugins/spf.c | 4 +
src/plugins/surbl.c | 17 +-
src/ragel/content_disposition_parser.rl | 2 +-
src/ragel/smtp_addr_parser.rl | 4 +-
src/ragel/smtp_address.rl | 37 +-
src/ragel/{smtp_whitespace.rl => smtp_base.rl} | 13 +-
src/ragel/smtp_date_parser.rl | 2 +-
src/ragel/smtp_ip.rl | 15 +
src/ragel/smtp_ip_parser.rl | 55 +
src/ragel/smtp_received.rl | 58 -
src/ragel/smtp_received_parser.rl | 317 --
src/rspamadm/CMakeLists.txt | 7 -
src/rspamd_proxy.c | 1 +
src/worker.c | 11 +-
test/CMakeLists.txt | 19 +-
test/functional/cases/102_multimap.robot | 11 +-
test/functional/cases/104_get_from.robot | 53 +
test/functional/cases/105_mimetypes.robot | 16 +
.../{001_simple.robot => 003_eddsa.robot} | 2 +-
.../{001_simple.robot => 004_invalidate_key.robot} | 33 +-
.../{001_simple.robot => 005_multiple.robot} | 16 +-
.../006_milter.robot} | 23 +-
test/functional/cases/160_antivirus.robot | 18 +-
.../cases/210_clickhouse/001_migration.robot | 16 +-
test/functional/cases/210_clickhouse/clickhouse.py | 4 +-
test/functional/cases/280_rules.robot | 10 +-
test/functional/cases/310_udp.robot | 46 +
test/functional/configs/antivirus.conf | 16 +-
test/functional/configs/dkim-eddsa.key | 1 +
.../dkim_signing/{simple.conf => eddsa.conf} | 3 +-
.../dkim_signing/{simple.conf => invalidate.conf} | 3 +-
.../configs/{ => dkim_signing}/milter.conf | 30 +-
test/functional/configs/dkim_signing/multiple.conf | 15 +
test/functional/configs/dynamic.conf | 117 +
test/functional/configs/lua_script.conf | 25 +
test/functional/configs/maps/mime_types.wl | 1 +
test/functional/configs/mime_types.conf | 1 +
test/functional/configs/multimap.conf | 2 +-
test/functional/configs/plugins.conf | 10 +
test/functional/configs/regexp.conf | 4 +
test/functional/data/schema_2/data.rspamd.sql | 112 +-
test/functional/data/schema_2/schema.sql | 3 +-
test/functional/lib/rspamd.robot | 2 +-
test/functional/lib/vars.py | 2 +-
test/functional/lua/get_from.lua | 8 +
test/functional/lua/miltertest/data_dkim.lua | 23 +
test/functional/lua/miltertest/dkim_many.lua | 11 +
test/functional/lua/miltertest/dkim_one.lua | 11 +
test/functional/lua/miltertest/lib.lua | 9 +
test/functional/lua/udp.lua | 81 +
test/functional/messages/exe_attm.eml | 22 +
test/functional/messages/from/from.eml | 2 +
test/functional/messages/from/from_comment.eml | 2 +
test/functional/messages/from/from_dn.eml | 2 +
test/functional/messages/from/from_dn_base64.eml | 2 +
test/functional/messages/from/from_dn_comment.eml | 2 +
test/functional/messages/from/from_quoted_dn.eml | 2 +
.../messages/from/from_quoted_dn_comment.eml | 2 +
.../messages/from/from_quoted_dn_middle.eml | 2 +
.../messages/from/from_quoted_dn_middle_inner.eml | 2 +
...e_name.eml => next2last-digits_in_brackets.eml} | 4 +-
...ile_name.eml => next2last-digits_in_parens.eml} | 4 +-
test/functional/util/dummy_udp.py | 24 +
test/lua/unit/received.lua | 71 +-
195 files changed, 10248 insertions(+), 4262 deletions(-)
More information about the Commits
mailing list