commit dab0418: Merge pull request #13 from rspamd/master

GitHub noreply at github.com
Mon May 6 17:49:06 UTC 2019


Author: heraklit256
Date: 2019-05-04 13:53:27 +0000
URL: https://github.com/rspamd/rspamd/commit/dab0418f52f1cbc43b8822310f44fb8b2fe858d9

Merge pull request #13 from rspamd/master
merge upstream into local master

 CMakeLists.txt                                     |   2 +-
 ChangeLog                                          |  25 +
 clang-plugin/printf_check.cc                       |   3 +-
 conf/common.conf                                   |   1 +
 conf/composites.conf                               |   7 +
 conf/modules.d/spamtrap.conf                       |   2 +-
 conf/scores.d/headers_group.conf                   |   4 +-
 conf/scores.d/hfilter_group.conf                   |  46 +-
 conf/scores.d/rbl_group.conf                       |   4 +-
 conf/scores.d/surbl_group.conf                     |   2 +-
 contrib/fpconv/fpconv.c                            |  11 +-
 contrib/fpconv/fpconv.h                            |   2 +-
 contrib/libucl/kvec.h                              |  80 +-
 contrib/libucl/ucl.h                               |  25 +-
 contrib/libucl/ucl_hash.c                          |  58 +-
 contrib/libucl/ucl_hash.h                          |  14 +-
 contrib/libucl/ucl_internal.h                      |  18 +-
 contrib/libucl/ucl_parser.c                        | 128 ++--
 contrib/libucl/ucl_util.c                          |  48 +-
 doc/Makefile                                       |   6 +-
 interface/css/rspamd.css                           |  75 +-
 lualib/lua_clickhouse.lua                          |  61 +-
 lualib/lua_dkim_tools.lua                          | 319 ++++++--
 lualib/lua_ffi/dkim.lua                            |   4 +-
 lualib/lua_scanners/clamav.lua                     |   8 +
 lualib/lua_scanners/common.lua                     |  22 +
 lualib/lua_scanners/dcc.lua                        |   8 +
 lualib/lua_scanners/fprot.lua                      |   8 +
 lualib/lua_scanners/icap.lua                       |   8 +
 lualib/lua_scanners/kaspersky_av.lua               |   8 +
 lualib/lua_scanners/oletools.lua                   |  10 +
 lualib/lua_scanners/savapi.lua                     |   8 +
 lualib/lua_scanners/sophos.lua                     |  10 +-
 lualib/lua_scanners/spamassassin.lua               |  10 +
 lualib/lua_scanners/vadesecure.lua                 |   9 +
 lualib/lua_util.lua                                |  28 +-
 lualib/rspamadm/vault.lua                          | 567 +++++++++++++++
 rules/forwarding.lua                               |   2 +-
 rules/headers_checks.lua                           |  26 +-
 rules/misc.lua                                     |   8 +-
 rules/regexp/upstream_spam_filters.lua             |  10 +-
 src/libcryptobox/cryptobox.c                       | 160 +++-
 src/libcryptobox/cryptobox.h                       |  29 +-
 src/libmime/archives.c                             |  12 +-
 src/libmime/filter.c                               | 131 +++-
 src/libmime/filter.h                               |   6 +-
 src/libmime/images.c                               |  18 +-
 src/libmime/lang_detection.c                       |   2 +
 src/libmime/message.c                              |   8 +-
 src/libserver/cfg_file.h                           |  15 +-
 src/libserver/cfg_rcl.c                            |  25 +-
 src/libserver/cfg_rcl.h                            |   1 +
 src/libserver/cfg_utils.c                          |   2 +-
 src/libserver/html.c                               |   9 +-
 src/libserver/monitored.c                          |  21 +-
 src/libserver/url.c                                | 809 +++++++++++----------
 src/libserver/url.h                                |   2 +-
 src/libstat/backends/sqlite3_backend.c             |   8 +-
 src/libutil/http_connection.c                      |  18 +-
 src/libutil/http_context.c                         |   4 +-
 src/libutil/printf.c                               |  22 +-
 src/lua/CMakeLists.txt                             |   4 +-
 src/lua/lua_common.c                               | 640 ++--------------
 src/lua/lua_common.h                               |  21 +-
 src/lua/lua_cryptobox.c                            | 426 ++++++++---
 src/lua/lua_logger.c                               |  68 +-
 src/lua/lua_task.c                                 | 369 +---------
 src/lua/lua_text.c                                 | 417 +++++++++++
 src/lua/lua_worker.c                               | 669 +++++++++++++++++
 src/plugins/dkim_check.c                           |   9 +-
 src/plugins/fuzzy_check.c                          |  44 ++
 src/plugins/lua/antivirus.lua                      |  18 +-
 src/plugins/lua/arc.lua                            | 173 ++---
 src/plugins/lua/clickhouse.lua                     | 315 +++++---
 src/plugins/lua/dkim_signing.lua                   | 189 ++---
 src/plugins/lua/dmarc.lua                          |  30 +-
 src/plugins/lua/emails.lua                         |   3 +
 src/plugins/lua/external_services.lua              |  18 +-
 src/plugins/lua/history_redis.lua                  |   2 +-
 src/plugins/lua/mime_types.lua                     |  19 +-
 src/plugins/lua/whitelist.lua                      |  37 +-
 src/rspamadm/confighelp.c                          |   2 +-
 src/rspamadm/lua_repl.c                            |   6 +-
 src/rspamadm/rspamadm.c                            |   2 +-
 src/worker.c                                       |   5 +-
 .../cases/210_clickhouse/001_migration.robot       |   2 +-
 test/functional/cases/210_clickhouse/clickhouse.py |   4 +-
 test/rspamd_lua_test.c                             |   2 +-
 88 files changed, 4270 insertions(+), 2221 deletions(-)


More information about the Commits mailing list