commit 72b95f4: Merge pull request #9 from rspamd/master

[GitHub]

Author: heraklit256
Date: 2019-01-13 08:21:14 +0000
URL: https://github.com/rspamd/rspamd/commit/72b95f4e4d9e00b3138a7c7989978c16cab28975

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

 .luacheckrc                                        |   7 +-
 CMakeLists.txt                                     |  37 +-
 centos/rspamd.spec                                 |   2 +-
 conf/common.conf                                   |   3 +-
 conf/mime_types.inc                                |   4 +-
 conf/modules.d/elastic.conf                        |   4 +-
 conf/options.inc                                   |   2 +-
 config.h.in                                        |   1 +
 contrib/DEPENDENCY_INFO.md                         |  47 +-
 contrib/librdns/rdns.h                             |   8 +
 contrib/librdns/util.c                             |  10 +
 debian/rules                                       |   2 +-
 interface/js/app/rspamd.js                         |   4 +-
 interface/js/app/upload.js                         |   7 +-
 lua_style.md                                       | 733 +++++++++++++++
 lualib/lua_antivirus.lua                           | 986 ---------------------
 lualib/lua_scanners/clamav.lua                     | 169 ++++
 lualib/lua_scanners/common.lua                     | 213 +++++
 lualib/lua_scanners/dcc.lua                        | 289 ++++++
 lualib/lua_scanners/fprot.lua                      | 172 ++++
 lualib/lua_scanners/init.lua                       |  62 ++
 lualib/lua_scanners/kaspersky_av.lua               | 190 ++++
 lualib/lua_scanners/savapi.lua                     | 254 ++++++
 lualib/lua_scanners/sophos.lua                     | 188 ++++
 lualib/lua_selectors.lua                           |   3 +-
 lualib/lua_squeeze_rules.lua                       |  19 +-
 lualib/lua_util.lua                                |  35 +-
 lualib/rspamadm/confighelp.lua                     |   2 +-
 lualib/rspamadm/configwizard.lua                   |   4 +-
 rules/headers_checks.lua                           |  43 +-
 rules/mid.lua                                      |   8 +-
 rules/misc.lua                                     |  31 +-
 rules/regexp/compromised_hosts.lua                 |   3 +-
 rules/regexp/headers.lua                           |  43 +-
 rules/regexp/misc.lua                              |   6 +-
 rules/regexp/upstream_spam_filters.lua             |   7 +
 rules/subject_checks.lua                           |   2 +
 src/libmime/archives.c                             | 471 ++++++++--
 src/libmime/archives.h                             |   1 +
 src/libmime/lang_detection.c                       |   2 +-
 src/libmime/message.c                              |  84 +-
 src/libmime/mime_encoding.c                        | 141 ++-
 src/libmime/mime_encoding.h                        |  38 +
 src/libmime/mime_expressions.c                     |   8 +-
 src/libmime/mime_parser.c                          |   2 +-
 src/libmime/mime_parser.h                          |   3 +
 src/libserver/cfg_rcl.c                            |  95 +-
 src/libserver/cfg_rcl.h                            |   1 +
 src/libserver/cfg_utils.c                          |   6 +-
 src/libserver/protocol.c                           |  23 +-
 src/libserver/protocol_internal.h                  |   1 +
 src/libserver/rspamd_symcache.c                    |   3 +-
 src/libserver/rspamd_symcache.h                    |   1 +
 src/libserver/task.h                               |   1 +
 src/libutil/printf.c                               |  12 +-
 src/lua/lua_common.c                               |  55 +-
 src/lua/lua_common.h                               |   1 +
 src/lua/lua_config.c                               |  24 +-
 src/lua/lua_dns_resolver.c                         |  12 +-
 src/lua/lua_task.c                                 |   2 +
 src/lua/lua_util.c                                 |  38 -
 src/plugins/dkim_check.c                           |  32 +-
 src/plugins/lua/antivirus.lua                      |  21 +-
 src/plugins/lua/arc.lua                            |   6 +-
 src/plugins/lua/asn.lua                            |  42 +-
 src/plugins/lua/bayes_expiry.lua                   |  13 +-
 src/plugins/lua/clickhouse.lua                     |  27 +-
 src/plugins/lua/clustering.lua                     |   3 +-
 src/plugins/lua/dcc.lua                            | 196 +---
 src/plugins/lua/dmarc.lua                          |  21 +-
 src/plugins/lua/elastic.lua                        |   7 +-
 .../lua/{antivirus.lua => external_services.lua}   |  90 +-
 src/plugins/lua/force_actions.lua                  |   6 +-
 src/plugins/lua/hfilter.lua                        |  87 +-
 src/plugins/lua/history_redis.lua                  |   3 +-
 src/plugins/lua/ip_score.lua                       |  28 +-
 src/plugins/lua/maillist.lua                       |   6 +-
 src/plugins/lua/milter_headers.lua                 |   6 +-
 src/plugins/lua/mime_types.lua                     |  49 +-
 src/plugins/lua/multimap.lua                       |   7 +-
 src/plugins/regexp.c                               |  30 +-
 src/rspamadm/confighelp.c                          |   2 +-
 test/functional/cases/105_mimetypes.robot          |   2 +-
 83 files changed, 3708 insertions(+), 1601 deletions(-)